diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index a030bc7..cdff946 100644 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -166,6 +166,7 @@ class Order extends Backend 'plan_time', 'coupon_id', 'create_time', + 'audit_time', 'total', 'online_amount', 'aftersale_id' @@ -911,7 +912,7 @@ class Order extends Backend $where[] = [implode("|", $searcharr), "LIKE", "%{$search}%"]; } $index = 0; - + $op = (array)json_decode($op, true); foreach ($filter as $k => $v) { if ($k == 'user.nickname' || $k == 'is_timeout') continue; if (!preg_match('/^[a-zA-Z0-9_\-\.]+$/', $k)) { @@ -1047,6 +1048,7 @@ class Order extends Backend } } }; + return [$where, $sort, $order, $offset, $limit, $page, $alias, $bind]; } diff --git a/application/admin/controller/orders/Dispatch.php b/application/admin/controller/orders/Dispatch.php index 2e84f73..92a717f 100644 --- a/application/admin/controller/orders/Dispatch.php +++ b/application/admin/controller/orders/Dispatch.php @@ -149,6 +149,7 @@ class Dispatch extends Backend if(!empty($existDispatch)){ $this->error('该订单已经派单,不可重复操作'); } + sleep(2); $insert = [ 'admin_id' => $this->auth->id, diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js index 9af9451..ffc3677 100644 --- a/public/assets/js/backend/order.js +++ b/public/assets/js/backend/order.js @@ -227,10 +227,17 @@ ${data.receive_type == 1 ? '已收定金' : '已收全款'} events: Table.api.events.image, formatter: Table.api.formatter.images }, + // { + // field: 'update_time', + // title: __('Update_time'), + // operate: false, + // addclass: 'datetimerange', + // autocomplete: false + // }, { - field: 'update_time', - title: __('Update_time'), - operate: false, + field: 'audit_time', + title: '完成时间', + operate: 'RANGE', addclass: 'datetimerange', autocomplete: false },