Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 2d55f439 by 朱继来
Options

Merge branch 'zjl_brand_20210715' into development

parents 4f2834d8 056fb95e
Inline Side-by-side
Showing with 38 additions and 31 deletions
public/js/add_order.js
...@@ -1025,10 +1025,14 @@ ...@@ -1025,10 +1025,14 @@
'<td>'+list[i].goods_name+'</td>'+ '<td>'+list[i].goods_name+'</td>'+
'<td>'+list[i].brand_name+'</td>'; '<td>'+list[i].brand_name+'</td>';
if (goods_type == 1) { // 联营添加标准品牌列 // if (goods_type == 1) { // 联营添加标准品牌列
html += list[i].standard_brand_name ? '<td class="standard-brand-yellow">' : '<td>'; // html += list[i].standard_brand_name ? '<td class="standard-brand-yellow">' : '<td>';
html += '<input type="text" class="change_standard_brand_name" name="standard_brand_name" value="'+list[i].standard_brand_name+'" readonly /><i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true" data-type=1></i></td>'; // html += '<input type="text" class="change_standard_brand_name" name="standard_brand_name" value="'+list[i].standard_brand_name+'" readonly /><i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true" data-type=1></i></td>';
// }
if (goods_type == 1) { // 联营添加标准品牌列 2021-7-15
html += '<td>'+ list[i].standard_brand_name +'<td>';
} }
// if (goods_type == 2) { // if (goods_type == 2) {
......
public/js/goods.js
...@@ -133,21 +133,22 @@ ...@@ -133,21 +133,22 @@
<input class="change_brand_id" type="hidden" name="change_info['+curr_no+'][brand_id]" value="'+order_item.brand_id+'">\ <input class="change_brand_id" type="hidden" name="change_info['+curr_no+'][brand_id]" value="'+order_item.brand_id+'">\
<input class="change_brand_id" type="hidden" name="change_info['+curr_no+'][brand_name]" value="'+order_item.brand_name+'">\ <input class="change_brand_id" type="hidden" name="change_info['+curr_no+'][brand_name]" value="'+order_item.brand_name+'">\
<p>'+order_item.brand_name+'</p>\ <p>'+order_item.brand_name+'</p>\
</td>'; </td>\
<td>'+order_item.standard_brand_name+'</td>';
if (order_item.standard_brand_name) {
html += '<td class="standard-brand-green">\ // if (order_item.standard_brand_name) {
<input class="change_standard_brand_id" type="hidden" name="change_info['+curr_no+'][standard_brand_id]" value="'+order_item.standard_brand_id+'">\ // html += '<td class="standard-brand-green">\
<input class="change_standard_brand_name" type="hidden" name="change_info['+curr_no+'][standard_brand_name]" value="'+order_item.standard_brand_name+'">\ // <input class="change_standard_brand_id" type="hidden" name="change_info['+curr_no+'][standard_brand_id]" value="'+order_item.standard_brand_id+'">\
<p>'+order_item.standard_brand_name+'</p>\ // <input class="change_standard_brand_name" type="hidden" name="change_info['+curr_no+'][standard_brand_name]" value="'+order_item.standard_brand_name+'">\
</td>'; // <p>'+order_item.standard_brand_name+'</p>\
} else { // </td>';
html += '<td>\ // } else {
<input class="change_standard_brand_id" type="hidden" name="change_info['+curr_no+'][standard_brand_id]">\ // html += '<td>\
<input class="change_standard_brand_name" type="text" name="change_info['+curr_no+'][standard_brand_name]" readonly>\ // <input class="change_standard_brand_id" type="hidden" name="change_info['+curr_no+'][standard_brand_id]">\
<i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true" data-type=2></i>\ // <input class="change_standard_brand_name" type="text" name="change_info['+curr_no+'][standard_brand_name]" readonly>\
</td>'; // <i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true" data-type=2></i>\
} // </td>';
// }
html += '<td>\ html += '<td>\
...@@ -351,16 +352,17 @@ ...@@ -351,16 +352,17 @@
<td>\ <td>\
<p>'+add_brand_name+'</p>\ <p>'+add_brand_name+'</p>\
</td>\ </td>\
<td>\ <td></td>\
<!-- <td>\
<input class="change_standard_brand_id" type="hidden" name="change_info['+curr_no+'][standard_brand_id]">\ <input class="change_standard_brand_id" type="hidden" name="change_info['+curr_no+'][standard_brand_id]">\
<input class="change_standard_brand_name" type="text" name="change_info['+curr_no+'][standard_brand_name]" readonly>\ <input class="change_standard_brand_name" type="text" name="change_info['+curr_no+'][standard_brand_name]" readonly>\
<i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true" data-type=2></i>\ <i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true" data-type=2></i>\
</td>\ </td> -->\
<td>\ <td>\
<input class="num change_number" name="change_info['+curr_no+'][goods_number]" value="'+add_goods_number+'">\ <input type="text" class="num change_number" name="change_info['+curr_no+'][goods_number]" value="'+add_goods_number+'">\
</td>\ </td>\
<td>\ <td>\
<input class="price only_number" name="change_info['+curr_no+'][goods_price]" data-price="'+add_goods_price+'" value="'+add_goods_price+'">\ <input type="text" class="price only_number" name="change_info['+curr_no+'][goods_price]" data-price="'+add_goods_price+'" value="'+add_goods_price+'">\
</td>\ </td>\
<td>\ <td>\
<select id="buyer_id_'+curr_no+'" class="form-control change_buyer_id selectpicker" name="change_info['+curr_no+'][buyer_id]" data-live-search="true" data-size="5" title="请选择采购员">\ <select id="buyer_id_'+curr_no+'" class="form-control change_buyer_id selectpicker" name="change_info['+curr_no+'][buyer_id]" data-live-search="true" data-size="5" title="请选择采购员">\
......
resources/views/changeOrder/content.blade.php
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
/* 提交审核弹框label */ /* 提交审核弹框label */
.submit-check label { display: inline-block; width: 120px; text-align: right;} .submit-check label { display: inline-block; width: 120px; text-align: right;}
input[type="text"] {width: 120px;} input[type="text"] {width: 120px;}
.order-change-main table th { text-align: center; vertical-align: middle; } .order-change-main table th, .order-change-main table td { text-align: center; vertical-align: middle; }
</style> </style>
<div class="tabs-box"> <div class="tabs-box">
...@@ -74,14 +74,14 @@ ...@@ -74,14 +74,14 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<span><i class="text-danger">*</i> 终端中文名称：</span> <span>终端中文名称：</span>
<input type="text" class="customer_cn" name="customer_cn" value="{{ $order_extra ? $order_extra['customer_cn'] : '' }}"> <input type="text" class="customer_cn" name="customer_cn" value="{{ $order_extra ? $order_extra['customer_cn'] : '' }}">
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<span><i class="text-danger">*</i> 客户类型：</span> <span>客户类型：</span>
<select class="layui-select customer_type" name="customer_type"> <select class="layui-select customer_type" name="customer_type">
<option value="">请选择</option> <option value="">请选择</option>
@if (Config('params.end_user_type')) @if (Config('params.end_user_type'))
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<span><i class="text-danger">*</i> 终端英文名称：</span> <span>终端英文名称：</span>
<input type="text" class="customer_en" name="customer_en" value="{{ $order_extra ? $order_extra['customer_en'] : '' }}"> <input type="text" class="customer_en" name="customer_en" value="{{ $order_extra ? $order_extra['customer_en'] : '' }}">
<a href="https://translate.google.cn/" target="_blank">谷歌翻译</a> <a href="https://translate.google.cn/" target="_blank">谷歌翻译</a>
</div> </div>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<span><i class="text-danger">*</i> 产品用途：</span> <span>产品用途：</span>
<select class="layui-select product_use_classone_sn" name="product_use_classone_sn"> <select class="layui-select product_use_classone_sn" name="product_use_classone_sn">
<option value="">请选择</option> <option value="">请选择</option>
@if ($api_dgk_config_one) @if ($api_dgk_config_one)
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<span><i class="text-danger">*</i> 终端客户网址：</span> <span>终端客户网址：</span>
<input type="text" class="customer_website" name="customer_website" value="{{ $order_extra ? $order_extra['customer_website'] : '' }}"> <input type="text" class="customer_website" name="customer_website" value="{{ $order_extra ? $order_extra['customer_website'] : '' }}">
</div> </div>
</div> </div>
...@@ -197,14 +197,15 @@ ...@@ -197,14 +197,15 @@
<p>{{$v['brand_name']}}</p> <p>{{$v['brand_name']}}</p>
</td> </td>
@if ($order_info['order_goods_type'] == 1) @if ($order_info['order_goods_type'] == 1)
<td class="{{ $v['standard_brand_name'] && $v['status'] != -1 ? 'standard-brand-green' : '' }}"> <!-- <td class="{{ $v['standard_brand_name'] && $v['status'] != -1 ? 'standard-brand-green' : '' }}"> -->
<td>
<input type="hidden" class="change_standard_brand_id" name="change_info[{{$v['rec_id']}}][standard_brand_id]" value="{{$v['standard_brand_id']}}" /> <input type="hidden" class="change_standard_brand_id" name="change_info[{{$v['rec_id']}}][standard_brand_id]" value="{{$v['standard_brand_id']}}" />
@if ($v['standard_brand_name'] || $v['status'] == -1) @if ($v['standard_brand_name'] || $v['status'] == -1)
<input type="hidden" class="change_standard_brand_name" name="change_info[{{$v['rec_id']}}][standard_brand_name]" value="{{$v['standard_brand_name']}}"/> <input type="hidden" class="change_standard_brand_name" name="change_info[{{$v['rec_id']}}][standard_brand_name]" value="{{$v['standard_brand_name']}}"/>
<p>{{$v['standard_brand_name']}}</p> <p>{{$v['standard_brand_name']}}</p>
@else @else
<input type="text" class="change_standard_brand_name" name="change_info[{{$v['rec_id']}}][standard_brand_name]" readonly /> <!-- <input type="text" class="change_standard_brand_name" name="change_info[{{$v['rec_id']}}][standard_brand_name]" readonly />
<i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true" data-type=2></i> <i class="fa fa-exclamation-triangle fa-2x select-standard-brand" aria-hidden="true" data-type=2></i> -->
@endif @endif
</td> </td>
@endif @endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment