Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 58a9a6f0 by 朱继来
Options

1. 财务对账弹窗; 

2.调整列表筛选、样式;
parent 9abecb92
Inline Side-by-side
Showing with 428 additions and 412 deletions
app/Http/Controllers/OrderController.php
......@@ -417,10 +417,12 @@ Class OrderController extends Controller
}
$map['order_goods_type'] = $tid;
$size = 10;
if ($tid == 1) {
$map['order_type_filter'] = [1];
} else if ($tid == 2) {
$size = 20;
$map['order_type_filter'] = [1, 3]; // 1. 网站 2. 京东
} else if ($tid == 3) {
$map['order_goods_type'] = 1; // 联营订单
......@@ -447,6 +449,7 @@ Class OrderController extends Controller
$data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
$data['p'] = $request->input('p', 1); // 当前页码
$data['size'] = $size; // 当前页条数
$data['map'] = $map;
$response = json_decode(curlApi($url, $data), true);
......@@ -1305,15 +1308,12 @@ Class OrderController extends Controller
public function selfCheckPay(Request $request, $id)
{
if ($request->isMethod('post')) {
$order_id = $request->input('order_id', '');
// $serial_number = $request->input('serial_number', '');
$operator_id = $request->user->userId;
$url = Config('website.api_domain').'order/selfcheckpay';
$data['order_id'] = $order_id;
// $data['serial_number'] = $serial_number;
$data['operator_id'] = $operator_id;
$data['order_id'] = $request->input('order_id', '');
// $data['serial_number'] = $request->input('serial_number', '');
$data['operator_id'] = $request->user->userId;
$data['trans_amount'] = $request->input('trans_amount', 0);
$data['k1'] = time();
$data['k2'] = md5(md5($data['k1']).'fh6y5t4rr351d2c3bryi');
......
app/Model/OrderModel.php
......@@ -136,12 +136,33 @@ class OrderModel extends Model
->where(function ($query) use ($map) {
// 订单来源
if (!empty($map['order_source_pf'])) {
if ($map['order_source_pf'] == 1) {
$query->whereRaw("FIND_IN_SET('pf=1', o.order_source)");
} else {
$query->whereRaw("FIND_IN_SET('pf=2', o.order_source)");
$order_source_pf = explode(',', $map['order_source_pf']);
$string = '';
foreach ($order_source_pf as $v) {
switch ($v) {
case '1':
case '2':
case '6':
$string .= "FIND_IN_SET('pf=".$v."', o.order_source) OR ";
break;
case '3':
$string .= "oe.order_type != 0 OR ";
break;
case '4':
$string .= "o.order_type = 3 OR ";
break;
}
}
$query->whereRaw(rtrim($string, ' OR '));
// if ($map['order_source_pf'] == 1) {
// $query->whereRaw("FIND_IN_SET('pf=1', o.order_source)");
// } else {
// $query->whereRaw("FIND_IN_SET('pf=2', o.order_source)");
// }
}
})
->where(function ($query) use ($map) {
......@@ -177,12 +198,23 @@ class OrderModel extends Model
->where(function ($query) use ($map) {
// 支付方式
if (!empty($map['order_payment_mode'])) {
switch ($map['order_payment_mode']) {
case '1': $order_payment_mode = '微信';break;
case '2': $order_payment_mode = '支付宝';break;
case '3': $order_payment_mode = '银联';break;
$pay_name = explode(',', $map['order_payment_mode']);
$order_payment_mode = [];
foreach ($pay_name as $v) {
switch ($v) {
case '1': $order_payment_mode[] = '微信支付';break;
case '2': $order_payment_mode[] = '支付宝';break;
case '3': $order_payment_mode[] = '银联支付(B2B)';break;
case '4': $order_payment_mode[] = '银联支付(B2C)';break;
case '5': $order_payment_mode[] = '账期支付';break;
case '6': $order_payment_mode[] = '京东支付';break;
case '7': $order_payment_mode[] = '交通银行';break;
case '8': $order_payment_mode[] = '恒生银行';break;
}
}
$query->where('p.pay_name', '=', $order_payment_mode);
$query->whereIn('p.pay_name', $order_payment_mode);
}
})
->where(function ($query) use ($map) {
......
config/website.php
......@@ -71,4 +71,7 @@ return [
// 财务系统接口地址 （自营发票）
'finance-self-invoice-url' => 'http://192.168.1.97/webapi/checkOrderBillStatus',
// 支付地址
'pay_url' => 'https://www.liexin.com/v3/pay/online?id=',
];
public/css/order.css
......@@ -39,7 +39,7 @@
/*表格上面的操作栏*/
.search-box > div{line-height:30px; margin:0px;padding-top: 10px;}
.search-box > div dl{margin:0;padding:0 1px; display: inline-block;*float:left; }
.search-box > div dl{margin:0;padding:0 1px; display: inline-block;*float:left; width: 400px; }
.search-box > div dl dt,.search-box > div dl dd{float:left; height:30px; line-height:26px; vertical-align:middle; margin:0;padding:0;}
.search-box > div dl dt{width:80px;text-align:right; font-weight:normal;}
.search-box > div dl dd{width:170px; }
......@@ -315,6 +315,6 @@ input[type="color"],
width: 150px;
}
.bs-select-all, .bs-deselect-all{
width: 100% !important;
}
\ No newline at end of file
.bs-select-all{float: left; width: 42% !important;}
.bs-deselect-all{float: right; width: 50% !important;}
.bootstrap-select .btn{padding: 4px 12px;}
\ No newline at end of file
public/js/order.js
......@@ -66,24 +66,41 @@
return rs;
}
$('.searchOrder').click(function(){
// 搜索、导出条件
function orderListCommon(url) {
var order_type = $('#order_type').data('default'),
order_contain = $('input[name=order_contain]').val(),
time_start = $('input[name="time_start"]').val(),
time_end = $('input[name="time_end"]').val(),
// order_type_a = $('#order_type_a').data('default'),
order_pay_type = $('#order_pay_type').val(),
order_status = $('#order_status').val(),
shipping_name = $('#shipping_name').data('default'),
order_pay_type = $('#order_pay_type').val() ? $('#order_pay_type').val() : '',
order_status = $('#order_status').val() ? $('#order_status').val() : '',
shipping_name = $('#shipping_name').val() ? $('#shipping_name').val() : '',
order_send = $('#order_send').val(),
order_source_pf = $('#order_source_pf').data('default'),
order_source_pf = $('#order_source_pf').val() ? $('#order_source_pf').val() : '',
order_source_adtag = $('input[name="order_source_adtag"]').val(),
order_source_ptag = $('input[name="order_source_ptag"]').val(),
erp_order_id = $('#erp_order_id').val() ? $('#erp_order_id').val() : '',
test_order = $('input[name=test_order]'),
erp_order_id = $('#erp_order_id').data('default'),
is_new = $('#is_new').val(),
is_new_order = $('#is_new_order').data('default'),
listUrl = '/list';
is_new = $('#is_new').val() ? $('#is_new').val() : '';
order_payment_mode = $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '',
is_new_order = $('#is_new_order').val() ? $('#is_new_order').val() : '';
if (url == '/export') {
if (test_order.length) {
if (!order_contain && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && ! order_source_ptag && !erp_order_id && !is_new && !is_new_order && !order_payment_mode && !test_order.is(':checked')) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag && !erp_order_id && !is_new && !is_new_order && !order_payment_mode) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
}
}
var listUrl = url;
listUrl += '?order_type=' + order_type;
......@@ -147,67 +164,32 @@
listUrl += '&is_new_order=' + is_new_order;
}
if (order_payment_mode) {
listUrl += '&order_payment_mode=' + order_payment_mode;
}
if (test_order.is(':checked')) {
listUrl += '&test_order=' + 1;
}
if (!order_contain && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag && !erp_order_id && (is_new === '') && !is_new_order && !test_order.is(':checked')) {
if (!order_contain && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag && !erp_order_id && (is_new === '') && !is_new_order && !order_payment_mode && !test_order.is(':checked')) {
listUrl = '/list';
}
if (url == '/export') {
listUrl += '&order_goods_type='+1;
}
location.href = listUrl;
}
$('.searchOrder').click(function(){
orderListCommon('/list');
})
// 导出订单
$('.exportExcel').click(function() {
var order_type = $('#order_type').data('default'),
order_contain = $('input[name=order_contain]').val(),
time_start = $('input[name="time_start"]').val(),
time_end = $('input[name="time_end"]').val(),
// order_type_a = $('#order_type_a').data('default'),
order_pay_type = $('#order_pay_type').val() ? $('#order_pay_type').val() : '',
order_status = $('#order_status').val(),
shipping_name = $('#shipping_name').data('default'),
order_send = $('#order_send').val(),
order_source_pf = $('#order_source_pf').data('default'),
order_source_adtag = $('input[name="order_source_adtag"]').val(),
order_source_ptag = $('input[name="order_source_ptag"]').val(),
erp_order_id = $('#erp_order_id').data('default'),
test_order = $('input[name=test_order]'),
is_new = $('#is_new').val() ? $('#is_new').val() : '';
is_new_order = $('#is_new_order').data('default');
if (test_order.length) {
if (!order_contain && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && ! order_source_ptag && !erp_order_id && !is_new && !is_new_order && !test_order.is(':checked')) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag && !erp_order_id && !is_new && !is_new_order) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
}
if(time_start){
time_start = Date.parse(time_start) / 1000;
}
if(time_end){
time_end = Date.parse(time_end) / 1000 + (24*60*60-1);
}
if (order_status == null) {
order_status = '';
}
if (test_order.is(':checked')) {
test_order = 1;
} else {
test_order = '';
}
location.href = '/export?order_type='+order_type+'&order_contain='+order_contain+'&time_start='+time_start+'&time_end='+time_end+'&order_pay_type='+order_pay_type+'&order_status='+order_status+'&shipping_name='+shipping_name+'&order_send='+order_send+'&order_source_pf='+order_source_pf+'&order_source_adtag='+order_source_adtag+'&order_source_ptag='+order_source_ptag+'&erp_order_id='+erp_order_id+'&test_order='+test_order+'&is_new='+is_new+'&is_new_order='+is_new_order+'&order_goods_type='+1;
orderListCommon('/export');
})
// 选择查看测试订单
......@@ -273,9 +255,9 @@
order_contain = $('input[name=order_contain]').val(),
time_start = $('input[name="time_start"]').val(),
time_end = $('input[name="time_end"]').val(),
order_status = $('#order_status').data('default'),
order_status = $('#order_status').val(),
order_send = $('#order_send').val(),
order_source = $('#order_source').data('default'),
order_source = $('#order_source').val(),
listUrl = '/erp_order';
listUrl += '?order_type=' + order_type;
......@@ -1303,7 +1285,7 @@
return false;
} else if (client_source == 1) {
if ($('#input-other-source').val() == '') {
layer.msg('请填写其他来源！');
layer.msg('请填写其他来源');
return false;
}
}
......@@ -1358,6 +1340,16 @@
return false;
}
// 预付款
if (pay_type == 2) {
var deposit_amount = $('input[name=deposit_amount]').val();
if (!deposit_amount) {
layer.msg('请填写定金金额');
return false;
}
}
// 非账期订单选择付款时间
if (pay_type != 3) {
if (payTime == '') {
......@@ -1671,16 +1663,45 @@
// layer.alert('请输入流水号');
// return false;
// }
var content = '';
var trans_amount = 0;
// 财务对账
if (role == 9) {
var trans_amount = $('input[name=trans_amount]').val();
if (!trans_amount) {
layer.msg('请输入客户线下转账金额');
return false;
}
content += '<div>';
if (trans_amount == order_amount) {
content += '<p><i class="fa fa-check-circle" style="color:green;"></i> 应付金额和对账金额一致</p>';
} else {
content += '<p><i class="fa fa-warning error"></i> 应付金额和对账金额不一致，请谨慎核对！</p>';
}
content += '<p>应付金额：<span class="error">'+order_amount+'</span></p>';
content += '<p>对账金额：<span class="error">'+trans_amount+'</span></p>';
content += '</div>';
} else {
content = '请仔细核对订单金额后确认';
}
layer.open({
title: '收款确认',
content: '请仔细核对订单金额后确认',
title: '确认提示',
area: ['360px', '240px'],
content: content,
btn:['确认', '取消'],
btn1:function(){
$.ajax({
url:'/self_check_pay/'+order_id,
// data: {order_id : order_id, serial_number : serial_number},
data: {order_id : order_id},
data: {order_id: order_id, trans_amount: trans_amount},
type:'post',
dataType: 'json',
success:function(resp){
......
public/js/self_order.js
......@@ -6,28 +6,44 @@
index:function(){
$.lie.droplist($('.droplist'));
$('.search_self_order').click(function(){
// 搜索、导出条件
function orderListCommon(url) {
var order_type = $('#order_type').data('default'),
order_contain = $('input[name=order_contain]').val(),
time_start = $('input[name="time_start"]').val(),
time_end = $('input[name="time_end"]').val(),
order_status = $('#order_status').data('default'),
sale_type = $('#sale_type').data('default'),
// order_send = $('#order_send').data('default'),
order_source_pf = $('#order_source_pf').data('default'),
order_payment_mode = $('#order_payment_mode').data('default'),
order_invoice_status = $('#order_invoice_status').data('default'),
order_status = $('#order_status').val() ? $('#order_status').val() : '',
sale_type = $('#sale_type').val() ? $('#sale_type').val() : '',
order_payment_mode = $('#order_payment_mode').val() ? $('#order_payment_mode').val() : ''
// order_send = $('#order_send').val(),
order_source_pf = $('#order_source_pf').val() ? $('#order_source_pf').val() : '',
order_invoice_status = $('#order_invoice_status').val() ? $('#order_invoice_status').val() : '',
order_source_adtag = $('input[name="order_source_adtag"]').val(),
order_source_ptag = $('input[name="order_source_ptag"]').val(),
test_order = $('input[name=test_order]'),
is_new = $('#is_new').data('default'),
// is_new_order = $('#is_new_order').data('default'),
listUrl = '/self_order';
is_new = $('#is_new').val() ? $('#is_new').val() : '';
// is_new_order = $('#is_new_order').val() ? $('#is_new_order').val() : '';
if (url == '/export') {
if (test_order.length) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !test_order.is(':checked')) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
}
}
var listUrl = url;
listUrl += '?order_type=' + order_type;
if (order_contain) {
listUrl += '&order_contain=' + order_contain;
listUrl += '&order_contain=' + specialStr(order_contain);
}
if(time_start){
......@@ -50,18 +66,14 @@
listUrl += '&sale_type=' + sale_type;
}
// if (order_send) {
// listUrl += '&order_send=' + order_send;
// }
if (order_payment_mode) {
listUrl += '&order_payment_mode=' + order_payment_mode;
}
if (order_source_pf) {
listUrl += '&order_source_pf=' + order_source_pf;
}
if (order_payment_mode) {
listUrl += '&order_payment_mode=' + order_payment_mode;
}
if (order_invoice_status) {
listUrl += '&order_invoice_status=' + order_invoice_status;
}
......@@ -74,11 +86,11 @@
listUrl += '&order_source_ptag=' + order_source_ptag;
}
if (is_new !== '') {
if (is_new) {
listUrl += '&is_new=' + is_new;
}
// if (is_new_order !== '') {
// if (is_new_order) {
// listUrl += '&is_new_order=' + is_new_order;
// }
......@@ -90,54 +102,20 @@
listUrl = '/self_order';
}
if (url == '/export') {
listUrl += '&order_goods_type='+2;
}
location.href = listUrl;
}
$('.search_self_order').click(function(){
orderListCommon('/self_order');
})
// 导出订单
$('.self_export').click(function() {
var order_type = $('#order_type').data('default'),
order_contain = $('input[name=order_contain]').val(),
time_start = $('input[name="time_start"]').val(),
time_end = $('input[name="time_end"]').val(),
order_status = $('#order_status').data('default'),
sale_type = $('#sale_type').data('default'),
// order_send = $('#order_send').data('default'),
order_source_pf = $('#order_source_pf').data('default'),
order_payment_mode = $('#order_payment_mode').data('default'),
order_invoice_status = $('#order_invoice_status').data('default'),
order_source_adtag = $('input[name="order_source_adtag"]').val(),
order_source_ptag = $('input[name="order_source_ptag"]').val(),
is_new = $('#is_new').data('default'),
// is_new_order = $('#is_new_order').data('default'),
test_order = $('input[name=test_order]');
if (test_order.length) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !test_order.is(':checked')) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
}
if(time_start){
time_start = Date.parse(time_start) / 1000;
}
if(time_end){
time_end = Date.parse(time_end) / 1000 + (24*60*60-1);
}
if (test_order.is(':checked')) {
test_order = 1;
} else {
test_order = '';
}
location.href = '/export?order_type='+order_type+'&order_contain='+order_contain+'&time_start='+time_start+'&time_end='+time_end+'&order_payment_mode='+order_payment_mode+'&order_status='+order_status+'&sale_type='+sale_type+'&order_invoice_status='+order_invoice_status+'&order_source_pf='+order_source_pf+'&order_source_adtag='+order_source_adtag+'&order_source_ptag='+order_source_ptag+'&test_order='+test_order+'&is_new='+is_new+'&order_goods_type='+2;
orderListCommon('/export');
})
// 选择查看测试订单
......@@ -198,71 +176,6 @@
})
})
// 填写订单取消原因
$('.input-cancel-reason').click(function(){
var self = $(this);
var order_id = self.data('oid');
var content = '<div class="form-group">'+
'<div class="input-radio">'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="平台信任度问题">平台信任度问题</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="商品质量不放心">商品质量不放心</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="价格问题">价格问题</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="货期问题">货期问题</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="配套服务问题">配套服务问题</label>'+
'<label class="radio-inline"><input type="radio" name="cancel_reason" value="1">其他</label>'+
'</div>'+
'<div class="input-other-reason">'+
'<textarea class="form-control" name="input-other-reason" placeholder="请填写其他原因"></textarea>'+
'</div>'+
'</div>';
layer.open({
area: ['650px', '220px'],
title: '填写订单取消原因',
content: content,
btn:['确认', '取消'],
btn1:function(){
var cancel_reason = $('input[name=cancel_reason]:checked').val();
var other_reason = $('textarea[name=input-other-reason]').val();
if (cancel_reason == null) {
layer.tips('请选择取消原因', $('.input-radio'));
return false;
} else if (cancel_reason == 1) {
if (other_reason == '') {
layer.tips('请填写其他原因', $('.input-other-reason'));
return false;
} else {
cancel_reason = other_reason;
}
}
$.ajax({
url:'/ajaxInputCancelReason',
data: {order_id : order_id, cancel_reason:cancel_reason},
type:'post',
dataType: 'json',
success:function(resp){
if(resp.errcode == 0){
self.remove();
layer.msg(resp.errmsg);
layer.close();
} else {
layer.alert(resp.errmsg);
}
},
error:function(){
layer.alert('网络异常');
}
});
},
btn2:function(index){
layer.close(index);
}
})
})
}
}
});
......
resources/views/detail/checkPay.blade.php
<p style="margin-left: 5px;">对账操作</p>
<div class="tabs-box">
<!-- 判断订单类型 1.全款，2.预付款 -->
<!-- 判断订单类型 1.全款，2.预付款，3.账期 -->
<?php
switch ($order_info['order_pay_type']) {
case 1:
case 3:
if ($order_info['status'] == 4) {
echo '<p>订单对账正常</p>
<p>流水号：'.$order_pay_log[0]['serial_number'].'</p>
......
resources/views/detail/content.blade.php
......@@ -390,10 +390,14 @@
<table class="table">
<thead>
<tr class="caption">
<th>商品名</th>
@if ($order_info['order_goods_type'] == 2)
<th>商品ID</th>
<th>商品名</th>
<th>型号</th>
@else
<th>商品名</th>
@endif
<th>制造商</th>
@if ($username != 'vpadmin@ichunt.com')
......@@ -420,11 +424,12 @@
@if (!empty($order_items_info))
@foreach ($order_items_info as $v)
<tr>
@if ($order_info['order_goods_type'] == 1)
<td><a href="{{Config('website.main_url').'goods_'.$v['goods_id'].'.html?ptag=order'}}" target="_blank">{{$v['goods_name']}}</a></td>
@else
@if ($order_info['order_goods_type'] == 2)
<td>{{$v['goods_id']}}</td>
<td><a href="{{Config('website.main_url').'item/'.$v['goods_id'].'.html?ptag=order'}}" target="_blank">{{$v['goods_name']}}</a></td>
<td>{{ App\Http\Controllers\getGoodsName($v['goods_id']) }}</td>
@else
<td><a href="{{Config('website.main_url').'goods_'.$v['goods_id'].'.html?ptag=order'}}" target="_blank">{{$v['goods_name']}}</a></td>
@endif
<td>{{$v['brand_name']}}</td>
......@@ -499,14 +504,15 @@
<tr>
<td>{{ isset($order_temp_info) && $order_temp_info['order_type'] == 3 ? '（自营内部采购下单享95折优惠）' : '' }}订单总额：</td>
<td>
<span style="color:red;font-size:20px">{{$currency}}
<span class="amount">{{$order_info['order_amount']}}</span>
</span>
<span style="color:red;font-size:20px">{{$currency}}
<span class="amount">{{$order_info['order_amount']}}</span>
</span>
</td>
</tr>
</table>
</div>
<p>客户付款地址：{{ Config('website.pay_url').$order_info['order_id'] }}</p>
</div>
<?php $client_source = App\Http\Controllers\clientSource($order_info['user_id']); ?>
......
resources/views/detail/selfCheckPay.blade.php
<p style="margin-left: 5px;">对账操作</p>
<div class="tabs-box">
<!-- 判断订单类型 1.全款，2.预付款 -->
<!-- 判断订单状态 4待发货 -->
@if ($order_info['status'] == 4)
<p>订单对账正常</p>
<p class="error">订单总金额：{{ $order_info['order_amount'] }}</p>
<!-- <p>流水号：{{ $order_pay_log[0]['serial_number'] }}</p> -->
<p class="error">对账金额：{{ $order_pay_log[0]['pay_amount'] }}</p>
@else
<p class="error">订单总金额：{{ $order_info['order_amount'] }}</p>
<!-- <p> 流水号：
<input style="width: 200px;" type="text" name="serial_number" value="{{ isset($order_pay_log[0]['serial_number']) ? $order_pay_log[0]['serial_number'] : '' }}">
<span style="color:orange;">请录入流水号，流水号为英文、数字</span>
</p> -->
<p style="margin-top: 20px;"><a class="btn btn-default self-sure-pay">确认收款</a></p>
<!-- role=9 财务对账 -->
@if ($role == 9)
<p><input type="text" style="width: 200px;" name="trans_amount" value="" placeholder="请输入客户线下转账金额"></p>
<p style="margin-top: 20px;"><a class="btn btn-info self-sure-pay">确认收款</a></p>
@else
<p class="error">订单总金额：{{ $order_info['order_amount'] }}</p>
<p style="margin-top: 20px;"><a class="btn btn-info self-sure-pay">确认收款</a></p>
@endif
@endif
</div>
<script>
var role = "{{$role}}"; // 用户角色
var order_amount = "{{$order_info['order_amount']}}"; // 订单总额
</script>
<div class="hide" id="sure-pay">
<p><label><input type="radio" name="status" value="1" checked> 款项正常</label></p>
<p><label><input type="radio" name="status" value="2"> 款项异常</label></p>
......
resources/views/erpOrder/content.blade.php
......@@ -11,7 +11,7 @@
<div class="span12">
<table style="width:100%">
<tr>
<td width="93%">
<td>
<dl>
<dt>查询类型：</dt>
<dd style="width:auto !important;">
......@@ -36,32 +36,27 @@
</dl>
<dl>
<dt>订单状态：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_status']}}" id="order_status" name="order_status">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="-1">已取消</li>
<li data-val="1">待审核</li>
<li data-val="2">待付款</li>
<li data-val="3">待付尾款</li>
<li data-val="4">待发货</li>
<li data-val="7">部分发货</li>
<li data-val="8">待收货</li>
<li data-val="10">交易成功</li>
</ul>
</div>
<dd>
<select id="order_status" name="order_status" class="form-control order_status selectpicker" title="全部" multiple>
<option value="-1">已取消</option>
<option value="1">待审核</option>
<option value="2">待付款</option>
<option value="3">待付尾款</option>
<option value="4">待发货</option>
<option value="7">部分发货</option>
<option value="8">待收货</option>
<option value="10">交易成功</option>
</select>
</dd>
</dl>
<dl>
<dt>订单来源：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_source']}}" id="order_source" name="order_source">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="2">ERP</li>
<li data-val="3">京东</li>
</ul>
</div>
<dd>
<select id="order_source" name="order_source" class="form-control order_source selectpicker" title="全部">
<option value="">全部</option>
<option value="2">ERP</option>
<option value="3">京东</option>
</select>
</dd>
</dl>
<style>
......@@ -69,7 +64,7 @@
</style>
<dl>
<dt>推送业务员：</dt>
<dd style="width: 115px;">
<dd>
<select id="order_send" name="order_send" class="form-control order_send selectpicker" title="全部" data-live-search="true">
<optgroup label="在职">
@foreach ($sale_list as $v)
......@@ -98,16 +93,14 @@
</dd>
</dl>
</td>
<td width="7%">
<dl>
<dt>
<button type="submit" class="nbtn searchErpOrder">搜索</button>
</dt>
</dl>
</td>
</tr>
</table>
<div class="text-center">
<div class="search-btn">
<button type="submit" class="nbtn searchErpOrder">搜索</button>
</div>
</div>
</div>
</div>
</div>
......@@ -311,7 +304,22 @@
</div>
<script>
var order_status = "{{$condition['order_status']}}";
var order_source = "{{$condition['order_source_pf']}}";
var order_send = "{{$condition['order_send']}}";
$(".order_status").selectpicker({
actionsBox:true, //在下拉选项添加选中所有和取消选中的按钮
countSelectedText:"已选中{0}项",
selectedTextFormat:"count > 5",
selectAllText: '全选',
deselectAllText: '取消全选',
})
$('.order_status').selectpicker('val', order_status.split(',')).trigger("change");
$('#order_send').selectpicker('val', order_send);
$('#order_source').selectpicker('val', order_source);
$('#order_send').selectpicker('val', order_send);
$.lie.order.index();
......
resources/views/orderlist/content.blade.php
......@@ -11,7 +11,7 @@
<div class="span12">
<table style="width:100%">
<tr>
<td width="85%">
<td>
<dl>
<dt>查询类型：</dt>
<dd style="width:auto !important;">
......@@ -35,9 +35,7 @@
</dd>
</dl>
<style>
.bs-select-all{float: left; width: 42% !important;}
.bs-deselect-all{float: right; width: 50% !important;}
.order_status .btn, .order_send .btn{padding: 4px 12px;}
</style>
<dl>
<dt>订单状态：</dt>
......@@ -56,7 +54,7 @@
</dl>
<dl>
<dt>付款类型：</dt>
<dd style="width: 115px;">
<dd>
<select id="order_pay_type" name="order_pay_type" class="form-control order_pay_type selectpicker" title="全部" multiple>
<option value="1">全款</option>
<option value="2">预付款</option>
......@@ -66,19 +64,17 @@
</dl>
<dl>
<dt>配送方式：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['shipping_name']}}" id="shipping_name" name="shipping_name" >
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="1">快递配送</li>
<li data-val="2">自提</li>
</ul>
</div>
<dd>
<select id="shipping_name" name="shipping_name" class="form-control shipping_name selectpicker" title="全部">
<option value="">全部</option>
<option value="1">快递配送</option>
<option value="2">自提</option>
</select>
</dd>
</dl>
<dl>
<dt>推送业务员：</dt>
<dd style="width: 115px;">
<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>
<option value="0">无推送</option>
......@@ -99,6 +95,21 @@
</select>
</dd>
</dl>
<dl>
<dt>支付方式：</dt>
<dd>
<select id="order_payment_mode" name="order_payment_mode" class="form-control order_payment_mode selectpicker" title="全部" multiple>
<option value="1">微信支付</option>
<option value="2">支付宝</option>
<option value="3">银联支付(B2B)</option>
<option value="4">银联支付(B2C)</option>
<option value="5">账期支付</option>
<option value="6">京东支付</option>
<option value="7">交通银行</option>
<option value="8">恒生银行</option>
</select>
</dd>
</dl>
<!-- <dl>
<dt>支付状态：</dt>
<dd>
......@@ -112,22 +123,21 @@
</div>
</dd>
</dl> -->
@if ($username != 'vpadmin@ichunt.com')
<dl>
<dt>订单来源：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_source_pf']}}" id="order_source_pf" name="order_source_pf">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="1">PC端</li>
<li data-val="2">移动端</li>
<li data-val="3">后台</li>
<li data-val="6">小程序</li>
</ul>
</div>
<dd>
<select id="order_source_pf" name="order_source_pf" class="form-control order_source_pf selectpicker" title="全部" multiple>
<option value="1">PC端</option>
<option value="2">移动端</option>
<option value="3">后台</option>
<option value="6">小程序</option>
</select>
</dd>
</dl>
@endif
<dl>
<dt>adtag来源：</dt>
<dd>
......@@ -143,44 +153,33 @@
@if ($username != 'vpadmin@ichunt.com')
<dl>
<dt>同步状态：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['erp_order_id']}}" id="erp_order_id" name="erp_order_id">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="1">已同步</li>
</ul>
</div>
<dd>
<select id="erp_order_id" name="erp_order_id" class="form-control erp_order_id selectpicker" title="全部">
<option value="">全部</option>
<option value="1">已同步</option>
</select>
</dd>
</dl>
@endif
<dl>
<dt>用户标签：</dt>
<dd>
<select id="is_new" name="is_new" class="form-control is_new selectpicker" title="全部" multiple>
<select id="is_new" name="is_new" class="form-control is_new selectpicker" title="全部">
<option value="">全部</option>
<option value="0">用户</option>
<option value="1">新客户</option>
<option value="2">老客户</option>
</select>
<!-- <div class="droplist" data-default="{{$condition['is_new']}}" name="is_new" id="is_new">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="0">用户</li>
<li data-val="1">新客户</li>
<li data-val="2">老客户</li>
</ul>
</div> -->
</dd>
</dl>
<dl>
<dt>新订单：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['is_new_order']}}" id="is_new_order" name="is_new_order">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="1">是</li>
<li data-val="0">否</li>
</ul>
</div>
<dd>
<select id="is_new_order" name="is_new_order" class="form-control is_new_order selectpicker" title="全部">
<option value="">全部</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</dd>
</dl>
......@@ -194,7 +193,7 @@
@endif
</td>
<td width="15%">
<!-- <td width="15%">
<dl>
<dt class="search-btn">
<button class="nbtn searchOrder">搜索</button>
......@@ -206,10 +205,19 @@
</dt>
@endif
</dl>
</td>
</td> -->
</tr>
</table>
</table>
<div class="text-center">
<div class="search-btn">
<button class="nbtn searchOrder">搜索</button>
@if (in_array('export', $userPerms))
<button class="nbtn exportExcel" style="margin-left: 20px; background: #23c6c8 !important;">导出</button>
@endif
</div>
</div>
</div>
</div>
</div>
......@@ -237,7 +245,7 @@
@if (empty($list))
<tr>
<td colspan="10">没有查询到相关记录~</td>
<td class="text-center" colspan="12">没有查询到相关记录~</td>
</tr>
@else
<tbody>
......@@ -538,15 +546,20 @@
<script>
var test_order = "{{$condition['test_order']}}";
var order_status = "{{$condition['order_status']}}";
var order_payment_mode = "{{$condition['order_payment_mode']}}";
var order_source_pf = "{{$condition['order_source_pf']}}";
var shipping_name = "{{$condition['shipping_name']}}";
var order_send = "{{$condition['order_send']}}";
var order_pay_type = "{{$condition['order_pay_type']}}";
var is_new = "{{$condition['is_new']}}";
var is_new = "{{$condition['is_new']}}";
var erp_order_id = "{{$condition['erp_order_id']}}";
var is_new_order = "{{$condition['is_new_order']}}";
if (test_order) {
$('input[name=test_order]').attr('checked', true);
}
$(".order_status").selectpicker({
$(".order_status, .order_payment_mode, .order_source_pf").selectpicker({
actionsBox:true, //在下拉选项添加选中所有和取消选中的按钮
countSelectedText:"已选中{0}项",
selectedTextFormat:"count > 5",
......@@ -555,9 +568,14 @@
})
$('.order_status').selectpicker('val', order_status.split(',')).trigger("change");
$('.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_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);
$('#is_new_order').selectpicker('val', is_new_order);
$.lie.order.index();
......
resources/views/selfOrder/content.blade.php
......@@ -11,7 +11,7 @@
<div class="span12">
<table style="width:100%">
<tr>
<td width="85%">
<td>
<dl>
<dt>查询类型：</dt>
<dd style="width:auto !important;">
......@@ -37,92 +37,75 @@
</dl>
<dl>
<dt>订单状态：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_status']}}" id="order_status" name="order_status">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="-1">已取消</li>
<li data-val="1">待审核</li>
<li data-val="2">待付款</li>
<li data-val="4">待发货</li>
<li data-val="8">待收货</li>
<li data-val="10">交易成功</li>
</ul>
</div>
<dd>
<select id="order_status" name="order_status" class="form-control order_status selectpicker" title="全部" multiple>
<option value="-1">已取消</option>
<option value="1">待审核</option>
<option value="2">待付款</option>
<option value="3">待付尾款</option>
<option value="4">待发货</option>
<option value="7">部分发货</option>
<option value="8">待收货</option>
<option value="10">交易成功</option>
</select>
</dd>
</dl>
</dl>
<dl>
<dt>销售类型：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['sale_type']}}" id="sale_type" name="sale_type">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="1">现卖</li>
<li data-val="2">预售</li>
</ul>
</div>
<dd>
<select id="sale_type" name="sale_type" class="form-control sale_type selectpicker" title="全部">
<option value="">全部</option>
<option value="1">现卖</option>
<option value="2">预售</option>
</select>
</dd>
</dl>
<dl>
</dl>
<!-- <dl>
<dt>客服：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_send']}}" id="order_send" name="order_send" >
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
@foreach ($sale_list as $v)
<li data-val="{{$v->userId}}">{{$v->name}}</li>
@endforeach
</ul>
</div>
<dl>
<dt>支付方式：</dt>
<dd>
<select id="order_payment_mode" name="order_payment_mode" class="form-control order_payment_mode selectpicker" title="全部" multiple>
<option value="1">微信支付</option>
<option value="2">支付宝</option>
<option value="3">银联支付(B2B)</option>
<option value="4">银联支付(B2C)</option>
<option value="5">账期支付</option>
<option value="6">京东支付</option>
<option value="7">交通银行</option>
<option value="8">恒生银行</option>
</select>
</dd>
</dl> -->
</dl>
<!-- 京东自营角色不显示订单来源 -->
@if ($role != 6)
<dl>
<dt>订单来源：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_source_pf']}}" id="order_source_pf" name="order_source_pf">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="1">PC端</li>
<li data-val="2">移动端</li>
<li data-val="3">后台</li>
<li data-val="4">京东</li>
<li data-val="6">小程序</li>
</ul>
</div>
<dd>
<select id="order_source_pf" name="order_source_pf" class="form-control order_source_pf selectpicker" title="全部" multiple>
<option value="1">PC端</option>
<option value="2">移动端</option>
<option value="3">后台</option>
<option value="4">京东</option>
<option value="6">小程序</option>
</select>
</dd>
</dl>
@endif
<dl>
<dt>支付方式：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_payment_mode']}}" id="order_payment_mode" name="order_payment_mode">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="1">微信</li>
<li data-val="2">支付宝</li>
<li data-val="3">银联</li>
</ul>
</div>
</dd>
</dl>
<dl>
<dt>发票类型：</dt>
<dd style="width: 115px;">
<div class="droplist" data-default="{{$condition['order_invoice_status']}}" id="order_invoice_status" name="order_invoice_status">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="1">未开票</li>
<li data-val="2">已开普票</li>
<li data-val="3">已开专票</li>
</ul>
</div>
<dd>
<select id="order_invoice_status" name="order_invoice_status" class="form-control order_invoice_status selectpicker" title="全部">
<option value="">全部</option>
<option value="1">未开票</option>
<option value="2">已开普票</option>
<option value="3">已开专票</option>
</select>
</dd>
</dl>
<dl>
<dt>adtag来源：</dt>
<dd>
......@@ -135,17 +118,16 @@
<input type="text" name="order_source_ptag" value="{{$condition['order_source_ptag']}}" placeholder="请输入内容">
</dd>
</dl>
<dl>
<dt>用户标签：</dt>
<dd>
<div class="droplist" data-default="{{$condition['is_new']}}" name="is_new" id="is_new">
<ul class="dropdown-menu">
<li data-val="" class="active">全部</li>
<li data-val="0">用户</li>
<li data-val="1">新客户</li>
<li data-val="2">老客户</li>
</ul>
</div>
<select id="is_new" name="is_new" class="form-control is_new selectpicker" title="全部">
<option value="">全部</option>
<option value="0">用户</option>
<option value="1">新客户</option>
<option value="2">老客户</option>
</select>
</dd>
</dl>
<!-- <dl>
......@@ -170,22 +152,18 @@
</dl>
@endif
</td>
<td width="15%">
<dl>
<dt class="search-btn">
<button class="nbtn search_self_order">搜索</button>
</dt>
@if (in_array('self_order_export', $userPerms))
<dt class="order-export">
<button class="nbtn self_export" style="background: #23c6c8 !important;">导出</button>
</dt>
@endif
</dl>
</td>
</tr>
</table>
</table>
<div class="text-center">
<div class="search-btn">
<button class="nbtn search_self_order">搜索</button>
@if (in_array('export', $userPerms))
<button class="nbtn self_export" style="margin-left: 20px; background: #23c6c8 !important;">导出</button>
@endif
</div>
</div>
</div>
</div>
</div>
......@@ -209,7 +187,7 @@
@if (empty($list))
<tr>
<td colspan="10">没有查询到相关记录~</td>
<td class="text-center" colspan="10">没有查询到相关记录~</td>
</tr>
@else
<tbody>
......@@ -382,10 +360,36 @@
<script>
var test_order = "{{$condition['test_order']}}";
var order_status = "{{$condition['order_status']}}";
var sale_type = "{{$condition['sale_type']}}";
var order_payment_mode = "{{$condition['order_payment_mode']}}";
var order_source_pf = "{{$condition['order_source_pf']}}";
var order_invoice_status = "{{$condition['order_invoice_status']}}";
var order_send = "{{$condition['order_send']}}";
var order_pay_type = "{{$condition['order_pay_type']}}";
var is_new = "{{$condition['is_new']}}";
if (test_order) {
$('input[name=test_order]').attr('checked', true);
}
$(".order_status, .order_payment_mode, .order_source_pf").selectpicker({
actionsBox:true, //在下拉选项添加选中所有和取消选中的按钮
countSelectedText:"已选中{0}项",
selectedTextFormat:"count > 5",
selectAllText: '全选',
deselectAllText: '取消全选',
})
$('.order_status').selectpicker('val', order_status.split(',')).trigger("change");
$('#sale_type').selectpicker('val', sale_type);
$('.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_pay_type').selectpicker('val', order_pay_type.split(',')).trigger("change");
$('.is_new').selectpicker('val', is_new.split(',')).trigger("change");
$.lie.self.index();
$.lie.order.cancelorder();
</script>
\ No newline at end of file
resources/views/selfOrder/css.blade.php
<link href="/css/bootstrap.min.css" rel="stylesheet">
<link href="/css/bootstrap-select.min.css" rel="stylesheet">
<link href="/font-awesome/css/font-awesome.css" rel="stylesheet">
<link href="/css/style.css" rel="stylesheet">
<link href="/layer/skin/layer.css" rel="stylesheet">
......
resources/views/selfOrder/js.blade.php
<script src="/js/jquery-2.2.1.js"></script>
<script src="/js/jquery.form.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script src="/js/bootstrap-select.min.js"></script>
<script src="/layer/layer.js"></script>
<script src="/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
<script src="/js/plugins/metisMenu/jquery.metisMenu.js"></script>
<script src="/js/inspinia.min.js"></script>
<script src="/js/common.js"></script>
<script src="/js/order.js"></script>
<script src="/js/self_order.js"></script>
<script src="/js/orderamount.js"></script>
<script src="/js/plugins/DatePicker/WdatePicker.js"></script>
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