Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 4d6b89b5 by 朱继来
Options

Merge branch 'zjl_brand_20200713'

parents e050cc59 ac484bc0
Inline Side-by-side
Showing with 57 additions and 12 deletions
app/Http/Controllers/AddOrderController.php
...@@ -880,8 +880,8 @@ Class AddOrderController extends Controller ...@@ -880,8 +880,8 @@ Class AddOrderController extends Controller
public function addGoods(Request $request) public function addGoods(Request $request)
{ {
if ($request->isMethod('post')) { if ($request->isMethod('post')) {
$add_type = $request->input('add_type', ''); // 新增类型 $add_type = $request->input('add_type', ''); // 新增类型 为空的话是新增有skuid商品
$goods_type = $request->input('goods_type', 1); // 商品类型 $goods_type = $request->input('goods_type', 1); // 商品类型 1-联营，2-自营
if ($add_type) { if ($add_type) {
$data['add_goods_name'] = $request->input('add_goods_name', ''); $data['add_goods_name'] = $request->input('add_goods_name', '');
...@@ -904,6 +904,17 @@ Class AddOrderController extends Controller ...@@ -904,6 +904,17 @@ Class AddOrderController extends Controller
$data['operator_id'] = $request->user->userId; $data['operator_id'] = $request->user->userId;
if ($goods_type == 1 && !$add_type) { if ($goods_type == 1 && !$add_type) {
$temp_save_info = DB::connection('order')->table('lie_order_extend')->where('order_id', $data['order_id'])->value('temp_save_info');
// 获取临时保存信息
if ($temp_save_info) {
$temp_save_info = json_decode($temp_save_info, true);
$goods_ids = array_column($temp_save_info['change_info'], 'goods_id'); // 获取商品ID集合
$goods_ids = array_filter($goods_ids, function($v) { return $v != ''; });
if (in_array($data['goods_id'], $goods_ids)) return ['errcode'=>1, 'errmsg'=>'商品已存在'];
}
$data['k1'] = time(); $data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi'); $data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
......
public/css/detail.css
...@@ -268,3 +268,11 @@ p, h4 { ...@@ -268,3 +268,11 @@ p, h4 {
color: #337ab7 !important; color: #337ab7 !important;
} }
/* 标准品牌背景色 */
.standard-brand-yellow {
background: yellow;
}
.standard-brand-green {
background: springgreen;
}
public/js/add_order.js
...@@ -888,7 +888,9 @@ ...@@ -888,7 +888,9 @@
'<td>'+list[i].brand_name+'</td>'; '<td>'+list[i].brand_name+'</td>';
if (goods_type == 1) { // 联营添加标准品牌列 if (goods_type == 1) { // 联营添加标准品牌列
html += '<td><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 += 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>';
} }
if (goods_type == 2) { if (goods_type == 2) {
......
public/js/change_order.js
...@@ -687,9 +687,15 @@ ...@@ -687,9 +687,15 @@
$('.change_item_'+i).find('.change_standard_brand_id').val(items[i].standard_brand_id); $('.change_item_'+i).find('.change_standard_brand_id').val(items[i].standard_brand_id);
$('.change_item_'+i).find('.change_standard_brand_name').val(items[i].standard_brand_name); $('.change_item_'+i).find('.change_standard_brand_name').val(items[i].standard_brand_name);
// input输入框 且 标准品牌存在
if ($('.change_item_'+i).find('.change_standard_brand_name').attr('type') == 'text' && items[i].standard_brand_name) {
$('.change_item_'+i).find('.change_standard_brand_name').parent('td').addClass('standard-brand-yellow');
}
if (items[i].status == -1) { if (items[i].status == -1) {
$('.change_item_'+i).find('.change_status').val(items[i].status); $('.change_item_'+i).find('.change_status').val(items[i].status);
$('.change_item_'+i).find('.change_status').next('.change_status_val').html('<i class="error">已取消</i>'); $('.change_item_'+i).find('.change_status').next('.change_status_val').html('<i class="error">已取消</i>');
$('.change_item_'+i).find('.deletegoods').hide();
} }
} }
...@@ -720,9 +726,15 @@ ...@@ -720,9 +726,15 @@
<input class="change_brand_id" type="hidden" name="change_info['+i+'][brand_id]" value="'+items[i].brand_id+'">\ <input class="change_brand_id" type="hidden" name="change_info['+i+'][brand_id]" value="'+items[i].brand_id+'">\
<input class="change_brand_name" type="hidden" name="change_info['+i+'][brand_name]" value="'+items[i].brand_name+'">\ <input class="change_brand_name" type="hidden" name="change_info['+i+'][brand_name]" value="'+items[i].brand_name+'">\
<p>'+items[i].brand_name+'</p>\ <p>'+items[i].brand_name+'</p>\
</td>\ </td>';
<td>\
<input type="hidden" class="change_standard_brand_id" name="change_info['+i+'][standard_brand_id]" value="'+items[i].standard_brand_id+'" />\ if (items[i].standard_brand_name) {
new_str += '<td class="standard-brand-yellow">';
} else {
new_str += '<td>';
}
new_str += '<input type="hidden" class="change_standard_brand_id" name="change_info['+i+'][standard_brand_id]" value="'+items[i].standard_brand_id+'" />\
<input type="text" class="change_standard_brand_name" name="change_info['+i+'][standard_brand_name]" value="'+items[i].standard_brand_name+'" readonly />\ <input type="text" class="change_standard_brand_name" name="change_info['+i+'][standard_brand_name]" value="'+items[i].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>\
...@@ -731,8 +743,10 @@ ...@@ -731,8 +743,10 @@
</td>\ </td>\
<td>\ <td>\
<input class="price only_number" name="change_info['+i+'][goods_price]" data-price="'+items[i].goods_price+'" value="'+items[i].goods_price+'">\ <input class="price only_number" name="change_info['+i+'][goods_price]" data-price="'+items[i].goods_price+'" value="'+items[i].goods_price+'">\
</td>\ </td>';
<td>\
if (items[i].status == 1) {
new_str += '<td>\
<input class="change_status" type="hidden" name="change_info['+i+'][status]" value="1">\ <input class="change_status" type="hidden" name="change_info['+i+'][status]" value="1">\
<span class="change_status_val">正常<i style="color:green;">(新增)</i></span>\ <span class="change_status_val">正常<i style="color:green;">(新增)</i></span>\
</td>'; </td>';
...@@ -757,6 +771,13 @@ ...@@ -757,6 +771,13 @@
<input type="hidden" name="change_info['+i+'][remarks]" value="'+items[i].remarks+'" />\ <input type="hidden" name="change_info['+i+'][remarks]" value="'+items[i].remarks+'" />\
</td>'; </td>';
} }
} else {
new_str += '<td>\
<input class="change_status" type="hidden" name="change_info['+i+'][status]" value="-1">\
<span class="change_status_val"><i style="color:red;">已取消</i></span>\
</td>\
<td><input class="is_add" type="hidden" name="change_info['+i+'][is_add]" value="1" /></td>';
}
new_str += '</tr>'; new_str += '</tr>';
} }
......
public/js/goods.js
...@@ -108,11 +108,12 @@ ...@@ -108,11 +108,12 @@
</td>\ </td>\
<td>\ <td>\
<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+'">\
<p>'+order_item.brand_name+'</p>\ <p>'+order_item.brand_name+'</p>\
</td>'; </td>';
if (order_item.standard_brand_name) { if (order_item.standard_brand_name) {
html += '<td>\ html += '<td class="standard-brand-green">\
<input class="change_standard_brand_id" type="hidden" name="change_info['+curr_no+'][standard_brand_id]" value="'+order_item.standard_brand_id+'">\ <input class="change_standard_brand_id" type="hidden" name="change_info['+curr_no+'][standard_brand_id]" value="'+order_item.standard_brand_id+'">\
<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_name" type="hidden" name="change_info['+curr_no+'][standard_brand_name]" value="'+order_item.standard_brand_name+'">\
<p>'+order_item.standard_brand_name+'</p>\ <p>'+order_item.standard_brand_name+'</p>\
......
public/js/standardBrand.js
...@@ -100,6 +100,7 @@ layui.use(['table', 'form'], function() { ...@@ -100,6 +100,7 @@ layui.use(['table', 'form'], function() {
} else { } else {
self.parents('tr').find('.change_standard_brand_id').val(scm_brand_id); self.parents('tr').find('.change_standard_brand_id').val(scm_brand_id);
self.parents('tr').find('.change_standard_brand_name').val(scm_brand_name); self.parents('tr').find('.change_standard_brand_name').val(scm_brand_name);
self.parent('td').addClass('standard-brand-yellow');
} }
return false; return false;
......
resources/views/changeOrder/content.blade.php
...@@ -162,6 +162,7 @@ ...@@ -162,6 +162,7 @@
<p>{{$v['supplier_name']}}</p> <p>{{$v['supplier_name']}}</p>
</td> </td>
<td> <td>
<input class="change_goods_id" type="hidden" name="change_info[{{$v['rec_id']}}][goods_id]" value="{{$v['goods_id']}}">
<input class="change_goods_name" type="hidden" name="change_info[{{$v['rec_id']}}][goods_name]" value="{{$v['goods_name']}}"> <input class="change_goods_name" type="hidden" name="change_info[{{$v['rec_id']}}][goods_name]" value="{{$v['goods_name']}}">
<p>{{$v['goods_name']}}</p> <p>{{$v['goods_name']}}</p>
</td> </td>
...@@ -171,7 +172,7 @@ ...@@ -171,7 +172,7 @@
<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> <td class="{{ $v['standard_brand_name'] && $v['status'] != -1 ? 'standard-brand-green' : '' }}">
<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']}}"/>
...@@ -405,7 +406,7 @@ ...@@ -405,7 +406,7 @@
@endif @endif
@if ($order_info['order_goods_type'] == 1) @if ($order_info['order_goods_type'] == 1)
<a class="btn btn-info tempSave" style="margin-right: 20px;">保存</a> <a class="btn btn-info tempSave" style="margin-right: 20px;">临时保存</a>
@endif @endif
@if ($order_info['order_goods_type'] == 2 && $order_temp_info['status'] == 1) @if ($order_info['order_goods_type'] == 2 && $order_temp_info['status'] == 1)
......
resources/views/orderlist/content.blade.php
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
<!-- 管理员和经理或有推送权限显示 --> <!-- 管理员和经理或有推送权限显示 -->
@if ((in_array($role, [1, 2]) || in_array('send_salesman', $userPerms))) @if ((in_array($role, [1, 2]) || in_array('send_salesman', $userPerms)))
<a class="btn btn-info" href="{{URL('sendSales', ['order_id'=>$v['order_id']])}}" target="_blank">推送</a> <a class="btn btn-info" href="{{URL('sendSales', ['order_id'=>$v['order_id']])}}" target="_blank">推送客服</a>
@endif @endif
@if ($v['status'] > 1 && in_array('download_contract', $userPerms)) @if ($v['status'] > 1 && in_array('download_contract', $userPerms))
......
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