diff --git a/application/admin/controller/orders/Auditorder.php b/application/admin/controller/orders/Auditorder.php index f8403dc..5e396b0 100644 --- a/application/admin/controller/orders/Auditorder.php +++ b/application/admin/controller/orders/Auditorder.php @@ -130,7 +130,7 @@ class Auditorder extends Backend if($audit_status){ $params['status'] = Order::STATUS_FINISHED; }else{ - $params['status'] = Order::STATUS_CHECKING; + $params['status'] = Order::STATUS_CHECKONCE; } $params['audit_admin_id'] = $this->auth->id; diff --git a/application/admin/controller/orders/Configorder.php b/application/admin/controller/orders/Configorder.php index 4e1018a..e901e14 100644 --- a/application/admin/controller/orders/Configorder.php +++ b/application/admin/controller/orders/Configorder.php @@ -109,7 +109,7 @@ class Configorder extends Backend } $params = $this->preExcludeFields($params); - if($row->status != Order::STATUS_CHECKING){ + if(!in_array($row->status,[Order::STATUS_CHECKING,Order::STATUS_CHECKONCE])){ $this->error('订单不允许操作'); } $result = false; diff --git a/application/admin/model/Order.php b/application/admin/model/Order.php index 411d49a..234d410 100644 --- a/application/admin/model/Order.php +++ b/application/admin/model/Order.php @@ -49,7 +49,8 @@ class Order extends Model const STATUS_DISPATCHING = 10; //待派单 const STATUS_DISPATCHED = 20; //已派单 //const STATUS_ING = 30; //进行中 - const STATUS_CHECKING = 40; //待派单 + const STATUS_CHECKING = 40; //待审核 + const STATUS_CHECKONCE = 41; //审核未通过 const STATUS_AUDITING = 50; //审核中 const STATUS_FINISHED = 60; //已完成 const STATUS_CANCEL = -10; //取消 @@ -61,7 +62,9 @@ class Order extends Model { return ['0' => __('Status 0'),'10' => __('Status 10'), '20' => __('Status 20'), //'30' => __('Status 30'), - '40' => __('Status 40'), '50' => __('Status 50'), '60' => __('Status 60'), '-10' => __('Status -10')]; + '40' => __('Status 40'), + '41' => __('Status 41'), + '50' => __('Status 50'), '60' => __('Status 60'), '-10' => __('Status -10')]; } @@ -146,7 +149,8 @@ class Order extends Model self::STATUS_FINISHED ], self::TAB_SETTING => [ - self::STATUS_CHECKING + self::STATUS_CHECKING, + self::STATUS_CHECKONCE ], ]; return $tabStatus[$tab] ?? []; diff --git a/public/assets/js/backend/orders/configorder.js b/public/assets/js/backend/orders/configorder.js index 385f447..bd4a84a 100644 --- a/public/assets/js/backend/orders/configorder.js +++ b/public/assets/js/backend/orders/configorder.js @@ -36,7 +36,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'dispatch.admin_user', title: __('Dispatch.admin_user'), operate: '='}, - {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"30":__('Status 30'),"40":__('Status 40'),"50":__('Status 50'),"60":__('Status 60'),"-10":__('Status -10')}, formatter: Table.api.formatter.status}, + {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"10":__('Status 10'),"20":__('Status 20'),"30":__('Status 30'),"40":__('Status 40'),"41":__('Status 41'),"50":__('Status 50'),"60":__('Status 60'),"-10":__('Status -10')}, formatter: Table.api.formatter.status}, + + {field: 'audit_remark', title: __('审核备注'), operate:false}, + + // {field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},