Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 1cbc5fef by 朱继来
Options

Merge branch 'zjl_iteration_20190723'

parents 08254505 29b417c0
Inline Side-by-side
Showing with 71 additions and 76 deletions
app/Model/OrderModel.php
......@@ -120,7 +120,7 @@ class OrderModel extends Model
->where(function ($query) use ($map) {
// 订单推送业务员
if (!empty($map['order_send'])) {
$query->where('o.sale_id', '=', $map['order_send']);
$query->whereIn('o.sale_id', explode(',', $map['order_send']));
}
})
->where(function ($query) use ($map) {
......@@ -257,7 +257,7 @@ class OrderModel extends Model
})
->where('it.status', '<>', -1)
->where('o.order_goods_type', '=', $map['order_goods_type'])
->select('it.goods_id', 'it.goods_name', 'it.goods_number', 'it.goods_price', 'it.single_pre_price', 'it.brand_name', 'it.supplier_name', 'o.order_id', 'o.order_sn', 'o.order_type', 'o.order_pay_type', 'o.order_goods_type', 'o.order_source', 'o.create_time', 'o.status', 'o.order_amount', 'o.sale_type', 'o.currency', 'o.sale_id', 'o.cancel_reason', 'i.tax_title', 'i.inv_type', 'i.invoice_status', 'i.tax_title', 'i.company_address', 'i.company_phone', 'i.tax_no', 'i.bank_name', 'i.bank_account', 'a.consignee', 'a.address', 's.status as shipping_status', 'u.user_id', 'u.mobile', 'u.email', 'u.client_source', 'u.is_new', 'u.is_test', 'c.com_name', 'oe.send_remark', 'oe.is_new as is_new_order', 'oe.business_type')
->select('it.goods_id', 'it.goods_name', 'it.goods_number', 'it.goods_price', 'it.single_pre_price', 'it.brand_name', 'it.supplier_name', 'o.order_id', 'o.order_sn', 'o.order_type', 'o.order_pay_type', 'o.order_goods_type', 'o.order_source', 'o.create_time', 'o.status', 'o.order_amount', 'o.sale_type', 'o.currency', 'o.sale_id', 'o.cancel_reason', 'i.tax_title', 'i.inv_type', 'i.invoice_status', 'i.tax_title', 'i.company_address', 'i.company_phone', 'i.tax_no', 'i.bank_name', 'i.bank_account', 'a.consignee', 'a.address', 's.status as shipping_status', 'u.user_id', 'u.mobile', 'u.email', 'u.client_source', 'u.is_new', 'u.is_test', 'c.com_name', 'oe.send_remark', 'oe.is_new as is_new_order', 'oe.business_type', 'oe.jd_order_id')
->groupBy('it.rec_id')
->orderBy('o.create_time', 'DESC')
->get()
......@@ -269,9 +269,9 @@ class OrderModel extends Model
// 标题
if ($map['order_goods_type'] == 1) {
$headerCell = ['订单ID', '订单编号', '会员账号', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', 'SKUID', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', '客服', '商品总额', '运费', '附加费', '优惠券', '订单总额', '付款类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注', '是否为测试订单', '是否为新订单'];
$headerCell = ['订单ID', '订单编号', '京东订单编号', '会员账号', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', 'SKUID', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', '客服', '商品总额', '运费', '附加费', '优惠券', '订单总额', '付款类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注', '是否为测试订单', '是否为新订单'];
} else {
$headerCell = ['订单ID', '订单编号', '会员账号', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', 'SKUID', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', '客服', '商品总额', '运费', '附加费', '优惠券', '订单总额', '付款类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注', '是否为测试订单', '销售类型', '业务类型'];
$headerCell = ['订单ID', '订单编号', '京东订单编号', '会员账号', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', 'SKUID', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', '客服', '商品总额', '运费', '附加费', '优惠券', '订单总额', '付款类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注', '是否为测试订单', '销售类型', '业务类型'];
}
array_unshift($cellData, $headerCell);
......@@ -333,10 +333,11 @@ class OrderModel extends Model
$sales = DB::table('user_info')->where(['userId' => $order[$i]['sale_id']])->select('name')->first();
}
$tmp[$i]['order_id'] = $order[$i]['order_id'];
$tmp[$i]['order_sn'] = "\t".$order[$i]['order_sn']."\t";
$tmp[$i]['user_account'] = $order[$i]['mobile'] ? $order[$i]['mobile'] : $order[$i]['email'];
$tmp[$i]['order_id'] = $order[$i]['order_id'];
$tmp[$i]['order_sn'] = "\t".$order[$i]['order_sn']."\t";
$tmp[$i]['jd_order_id'] = "\t".$order[$i]['jd_order_id']."\t";
$tmp[$i]['user_account'] = $order[$i]['mobile'] ? $order[$i]['mobile'] : $order[$i]['email'];
// $tmp[$i]['is_new'] = $order[$i]['is_new'] == 1 ? '是' : '否'; // 是否为新用户
$tmp[$i]['consignee'] = isset($order[$i]['consignee']) ? $order[$i]['consignee'] : '';
......
public/js/add_order.js
......@@ -795,9 +795,13 @@
html += '<td><input type="text" class="goods_num" name="goods_num" value="'+list[i].goods_number+'"></td>'+
'<td class="goods_price">'+list[i].goods_price+'</td>'+
'<td class="goods_amount">'+list[i].goods_amount_format+'</td>'+
'<td>'+list[i].delivery_time+'</td>'+
'<td>'+list[i].supplier_name+'</td>'+
'<td><a class="btn btn-danger btn-xs remove-goods">删除</a></td>'+
'<td>'+list[i].delivery_time+'</td>';
if (role != 7) {
html += '<td>'+list[i].supplier_name+'</td>';
}
html += '<td><a class="btn btn-danger btn-xs remove-goods">删除</a></td>'+
'</tr>';
cart_ids.push(list[i].cart_id); // 购物车ID集合
......
resources/views/addOffline/content.blade.php
......@@ -223,6 +223,7 @@
var internal_uid = "{{$internal_uid}}";
var sale_id = "{{$sale_id}}";
var URL_api = "{{Config('website.api_domain')}}";
var role = "{{ $role }}";
$.lie.add_order.offline(internal_uid);
</script>
\ No newline at end of file
resources/views/addOnline/content.blade.php
......@@ -327,7 +327,10 @@
<th width="10%">采购单价</th>
<th width="10%">小计</th>
<th width="6%">货期</th>
<th width="10%">供应商</th>
<!-- 自营客服过滤供应商 -->
@if ($role != 7)
<th width="10%">供应商</th>
@endif
<th width="5%">操作</th>
</tr>
</thead>
......
resources/views/addOrder/content.blade.php
......@@ -403,6 +403,7 @@
<script>
var sale_id = "{{$sale_id}}";
var URL_api = "{{Config('website.api_domain')}}";
var role = "{{ $role }}";
$.lie.add_order.lyorder();
</script>
\ No newline at end of file
resources/views/detail/content.blade.php
......@@ -44,10 +44,10 @@
@endif
<th>交易状态</th>
<th>对账状态</th>
<th>支付方式</th>
<th>支付类型</th>
<th>支付状态</th>
<th>支付时间</th>
</tr>
<tr>
......@@ -66,54 +66,20 @@
{{$currency.number_format($order_info['order_amount'] - $order_info['advance_amount'], 2, '.', '')}}
</td>
@endif
<td>
<?php
switch ($order_info['status']) {
case -2: echo "审核未通过";break;
case -1: echo "已取消";break;
case 1: echo "待审核";break;
case 2: echo "待付款";break;
case 3: echo "待付尾款";break;
case 4: echo "待发货";break;
case 7: echo "部分发货";break;
case 8: echo "待收货";break;
case 10: echo "交易成功";break;
}
?>
</td>
<td>
<?php
if ($order_info['order_pay_type'] == 1) {
if (!empty($order_pay_log) && $order_pay_log[0]['order_id'] != '') {
echo '全款对账正常';
} else {
echo '未对账';
}
} else if ($order_info['order_pay_type'] == 2) {
if (isset($order_pay_log[1]) && $order_pay_log[1]['order_id'] != '') {
echo '尾款对账正常';
} else if (!empty($order_pay_log) && $order_pay_log[0]['order_id'] != '') {
echo '首款对账正常';
} else {
echo '未对账';
}
}
?>
</td>
<td>{{ Config('params.order_status')[$order_info['status']] }}</td>
<td>
<?php
if ($order_info['order_pay_type'] == 1) {
if (!empty($order_pay_log) && $order_pay_log[0]['pay_name'] != '') {
if ($order_info['order_pay_type'] == 2) { // 预付款
if (isset($order_pay_log[1]) && $order_pay_log[1]['pay_name'] != '') {
echo $order_pay_log[1]['pay_name'];
} else if (!empty($order_pay_log) && $order_pay_log[0]['pay_name'] != '') {
echo $order_pay_log[0]['pay_name'];
} else {
echo '--';
}
} else if ($order_info['order_pay_type'] == 2) {
if (isset($order_pay_log[1]) && $order_pay_log[1]['pay_name'] != '') {
echo $order_pay_log[1]['pay_name'];
} else if (!empty($order_pay_log) && $order_pay_log[0]['pay_name'] != '') {
} else {
if (!empty($order_pay_log) && $order_pay_log[0]['pay_name'] != '') {
echo $order_pay_log[0]['pay_name'];
} else {
echo '--';
......@@ -125,35 +91,41 @@
<td>
<?php
if ($order_info['order_pay_type'] == 1) {
if (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != '') {
if (!empty($order_pay_log)) {
echo '全款';
} else {
echo '--';
}
} else if ($order_info['order_pay_type'] == 2) {
if (isset($order_pay_log[1]) && $order_pay_log[1]['pay_type'] != '') {
if (isset($order_pay_log[1])) {
echo '尾款';
} else if (!empty($order_pay_log) && $order_pay_log[0]['pay_type'] != '') {
} else if (!empty($order_pay_log)) {
echo '预付款';
} else {
echo '--';
}
}
} else if ($order_info['order_pay_type'] == 3) {
if (!empty($order_pay_log)) {
echo '账期';
} else {
echo '--';
}
}
?>
</td>
<td>
<?php
if ($order_info['order_pay_type'] == 1) {
if (!empty($order_pay_log) && $order_pay_log[0]['is_paid'] != '') {
echo $order_pay_log[0]['is_paid'] == 1 ? '已支付' : '未支付';
if ($order_info['order_pay_type'] == 2) {
if (isset($order_pay_log[1]) && $order_pay_log[1]['is_paid'] != '') {
echo $order_pay_log[1]['is_paid'] == 1 ? '尾款已支付' : '未支付';
} else if (!empty($order_pay_log) && $order_pay_log[0]['is_paid'] != '') {
echo $order_pay_log[0]['is_paid'] == 1 ? '首款已支付' : '未支付';
} else {
echo '--';
}
} else if ($order_info['order_pay_type'] == 2) {
if (isset($order_pay_log[1]) && $order_pay_log[1]['is_paid'] != '') {
echo $order_pay_log[1]['is_paid'] == 1 ? '已支付' : '未支付';
} else if (!empty($order_pay_log) && $order_pay_log[0]['is_paid'] != '') {
} else {
if (!empty($order_pay_log) && $order_pay_log[0]['is_paid'] != '') {
echo $order_pay_log[0]['is_paid'] == 1 ? '已支付' : '未支付';
} else {
echo '--';
......@@ -161,6 +133,8 @@
}
?>
</td>
<td>{{ $order_info['pay_time'] ? date('Y-m-d H:i:s', $order_info['pay_time']) : '' }}</td>
</tr>
</table>
......@@ -186,6 +160,7 @@
</tr>
<tr>
<th>订单编号</th>
<th>京东订单编号</th>
<th>会员账号</th>
<th>收货人</th>
<th>联系电话/手机</th>
......@@ -197,9 +172,8 @@
@endif
</tr>
<tr>
<td>
{{$order_info['order_sn']}}
</td>
<td>{{$order_info['order_sn']}}</td>
<td>{{ $order_temp_info['jd_order_id'] }}</td>
<td>
@if ($user_mobile)
......@@ -496,7 +470,11 @@
<th>小计</th>
<th>货期</th>
<th>供应商</th>
<!-- 15011111111和自营客服均不展示供应商列 -->
@if ($role != 12 && $role != 7)
<th>供应商</th>
@endif
<?php
if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2])) {
......@@ -533,7 +511,10 @@
@endif
<td>{{$v['delivery_time']}}</td>
<td>{{$v['supplier_name']}}</td>
@if ($role != 12 && $role != 7)
<td>{{$v['supplier_name']}}</td>
@endif
@if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2]))
<td><a class="btn btn-danger deletegoods" href="javascript:;" data-id="{{$v['rec_id']}}">删除</a></td>
......
resources/views/orderlist/content.blade.php
......@@ -75,8 +75,8 @@
<dl>
<dt>推送业务员：</dt>
<dd>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7">
<option value="">全部</option>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7" multiple>
<!-- <option value="">全部</option> -->
<option value="0">无推送</option>
<optgroup label="在职">
@foreach ($sale_list as $v)
......@@ -488,7 +488,8 @@
$('.order_payment_mode').selectpicker('val', order_payment_mode.split(',')).trigger("change");
$('.order_source_pf').selectpicker('val', order_source_pf.split(',')).trigger("change");
$('#shipping_name').selectpicker('val', shipping_name);
$('#order_send').selectpicker('val', order_send);
// $('#order_send').selectpicker('val', order_send);
$('#order_send').selectpicker('val', order_send.split(',')).trigger("change");
$('.order_pay_type').selectpicker('val', order_pay_type.split(',')).trigger("change");
$('.is_new').selectpicker('val', is_new.split(',')).trigger("change");
$('#erp_order_id').selectpicker('val', erp_order_id);
......
resources/views/selfOrder/content.blade.php
......@@ -71,8 +71,8 @@
<dl>
<dt>客服：</dt>
<dd>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7">
<option value="">全部</option>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true" data-size="7" multiple>
<!-- <option value="">全部</option> -->
<option value="0">无推送</option>
<optgroup label="在职">
@foreach ($sale_list as $v)
......@@ -441,7 +441,8 @@
$('.order_payment_mode').selectpicker('val', order_payment_mode.split(',')).trigger("change");
$('.order_source_pf').selectpicker('val', order_source_pf.split(',')).trigger("change");
$('#order_invoice_status').selectpicker('val', order_invoice_status);
$('#order_send').selectpicker('val', order_send);
// $('#order_send').selectpicker('val', order_send);
$('#order_send').selectpicker('val', order_send.split(',')).trigger("change");
// $('.order_pay_type').selectpicker('val', order_pay_type.split(',')).trigger("change");
$('.order_pay_type').selectpicker('val', order_pay_type);
$('.is_new').selectpicker('val', is_new.split(',')).trigger("change");
......
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