Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 840ae7b2 by 朱继来
Options

Merge branch 'zjl_product_tracking_20201117'

parents bd63db89 4a4a37ec
Inline Side-by-side
Showing with 8 additions and 4 deletions
public/js/list.js
......@@ -568,14 +568,14 @@ console.log(listUrl)
layer.open({
area: ['300px'],
title: '编辑ERP单号',
title: '编辑内部编码',
content: content,
btn:['确认', '取消'],
btn1: function(index) {
var new_erp_sn = $('.new_erp_sn').val();
if (!new_erp_sn) {
layer.tips('请输入ERP单号', $('.new_erp_sn'));
layer.tips('请输入内部编码', $('.new_erp_sn'));
return false;
}
......
resources/views/orderlist/content.blade.php
......@@ -275,7 +275,11 @@
<th class="pl30">会员账号</th>
<th class="pl30">公司</th>
<th class="pl30">订单编号</th>
<th class="pl30">ERP单号</th>
@if ($username != 'vpadmin@ichunt.com')
<th class="pl30">ERP单号</th>
@else
<th class="pl30">内部编码</th>
@endif
<th class="pl30">应付金额</th>
<th class="pl30">订单状态</th>
<th class="pl30">主管审核</th>
......@@ -426,7 +430,7 @@
@endif
@if ($username == 'vpadmin@ichunt.com')
<a class="btn btn-info edit_erp_sn" data-oid="{{$v['order_id']}}" data-erp_sn="{{ $order_extend ? $order_extend->erp_sn : '' }}">编辑ERP单号</a>
<a class="btn btn-info edit_erp_sn" data-oid="{{$v['order_id']}}" data-erp_sn="{{ $order_extend ? $order_extend->erp_sn : '' }}">编辑内部编码</a>
@endif
@if ($username == 'admin@ichunt.com' && empty($order_extend->erp_sn) && $order_extend->is_manager_audit == 3)
......
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