Skip to content

朱继来 / 后台订单管理

Go to a project
Commit fd2a61e3 by 朱继来
Options

Merge branch 'zjl_hk_order_20201130'

parents 09b82f11 25ad9f52
Inline Side-by-side
Showing with 31 additions and 5 deletions
app/Http/Controllers/OrderController.php
......@@ -466,6 +466,7 @@ Class OrderController extends Controller
$map['is_manager_audit'] = $request->input('is_manager_audit', '');
$map['order_remark'] = $request->input('order_remark', '');
$map['pur_time'] = $request->input('pur_time', '');
$map['delivery_place'] = $request->input('delivery_place', '');
$perm = new PermController;
......
app/Model/OrderModel.php
......@@ -167,6 +167,12 @@ class OrderModel extends Model
// $query->whereIn('o.order_type', $map['order_type_filter']);
// }
// })
->where(function ($query) use ($map) {
// 交货地
if (!empty($map['delivery_place'])) {
$query->where('o.delivery_place', $map['delivery_place']);
}
})
->where(function ($query) use ($map) {
// 同步状态
if (!empty($map['erp_order_id'])) {
......
public/js/list.js
......@@ -88,6 +88,7 @@
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(),
delivery_place = $('#delivery_place').val() ? $('#delivery_place').val() : '',
erp_order_id = $('#erp_order_id').val() ? $('#erp_order_id').val() : '',
test_order = $('input[name=test_order]'),
is_new = $('#is_new').val() ? $('#is_new').val() : '';
......@@ -103,12 +104,12 @@
if (url == '/export') {
if (type == 1) { // 联营
if (test_order.length) {
if (!order_contain && !order_sn && !erp_sn && !goods_name && !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') && !is_manager_audit) {
if (!order_contain && !order_sn && !erp_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag && !delivery_place && !erp_order_id && !is_new && !is_new_order && !order_payment_mode && !test_order.is(':checked') && !is_manager_audit) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !order_sn && !erp_sn && !goods_name && !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 && !is_manager_audit) {
if (!order_contain && !order_sn && !erp_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_status && !shipping_name && !order_send && !order_source_pf && !order_source_adtag && !order_source_ptag && !delivery_place && !erp_order_id && !is_new && !is_new_order && !order_payment_mode && !is_manager_audit) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
......@@ -204,6 +205,10 @@
listUrl += '&order_source_ptag=' + order_source_ptag;
}
if (delivery_place) {
listUrl += '&delivery_place=' + delivery_place;
}
if (erp_order_id) {
listUrl += '&erp_order_id=' + erp_order_id;
}
......@@ -272,7 +277,7 @@
// 联营导出订单
$('.exportExcel').click(function() {
var listUrl = orderListCommon('/export', 1);
console.log(listUrl)
$.get(listUrl, function(resp) {
if (resp.err_code != 0) {
layer.msg(resp.err_msg);
......@@ -521,6 +526,7 @@ console.log(listUrl)
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(),
delivery_place : $('#delivery_place').val() ? $('#delivery_place').val() : '',
erp_order_id : $('#erp_order_id').val() ? $('#erp_order_id').val() : '',
test_order : $('input[name=test_order]').is(':checked') ? 1 : 0,
is_new : $('#is_new').val() ? $('#is_new').val() : '',
......
resources/views/orderlist/content.blade.php
......@@ -183,12 +183,23 @@
<input type="text" name="order_source_adtag" value="{{$condition['order_source_adtag']}}" placeholder="请输入内容">
</dd>
</dl>
<dl>
<!-- <dl>
<dt>ptag来源：</dt>
<dd>
<input type="text" name="order_source_ptag" value="{{$condition['order_source_ptag']}}" placeholder="请输入内容">
</dd>
</dl> -->
<dl>
<dt>交货地：</dt>
<dd>
<select id="delivery_place" name="delivery_place" class="form-control delivery_place selectpicker" title="全部">
<option value="">全部</option>
<option value="1">大陆</option>
<option value="2">香港</option>
</select>
</dd>
</dl>
@if ($username != 'vpadmin@ichunt.com')
<dl>
<dt>同步状态：</dt>
......@@ -390,7 +401,7 @@
@if (in_array('check_order', $userPerms) && $v['sale_id'])
@if (isset($order_extend->is_manager_audit) && $order_extend->is_manager_audit != 3 && in_array($v['status'], [1, 2]))
<a class="btn btn-success" href="{{URL('change', ['order_id'=>$v['order_id']])}}" target="_blank">人工审单</a>
@elseif ($v['status'] == 2 && $order_extend->is_manager_audit == 3 && in_array($role, [1, 2]))
@elseif ($v['status'] == 2 && $order_extend && $order_extend->is_manager_audit == 3 && in_array($role, [1, 2]))
<a class="btn btn-success re-audit" data-id="{{$v['order_id']}}">反审</a>
@endif
@endif
......@@ -499,6 +510,7 @@
var order_send = "{{$condition['order_send']}}";
var order_pay_type = "{{$condition['order_pay_type']}}";
var is_new = "{{$condition['is_new']}}";
var delivery_place = "{{$condition['delivery_place']}}";
var erp_order_id = "{{$condition['erp_order_id']}}";
var is_new_order = "{{$condition['is_new_order']}}";
var is_manager_audit = "{{$condition['is_manager_audit']}}";
......@@ -525,6 +537,7 @@
$('#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");
$('#delivery_place').selectpicker('val', delivery_place);
$('#erp_order_id').selectpicker('val', erp_order_id);
$('#is_new_order').selectpicker('val', is_new_order);
$('.is_manager_audit').selectpicker('val', is_manager_audit.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