diff --git a/application/admin/controller/orders/Auditorder.php b/application/admin/controller/orders/Auditorder.php index e38898d..6a9f11f 100644 --- a/application/admin/controller/orders/Auditorder.php +++ b/application/admin/controller/orders/Auditorder.php @@ -23,7 +23,8 @@ class Auditorder extends Backend { parent::_initialize(); $this->model = new \app\admin\model\Order(); - $this->view->assign("statusList", $this->model->getStatusList()); + //$this->view->assign("statusList", $this->model->getStatusList()); + $this->view->assign("statusList", $this->model->getAuditStatusList()); } diff --git a/application/admin/controller/orders/Dispatch.php b/application/admin/controller/orders/Dispatch.php index 17cf820..2dcc2f5 100644 --- a/application/admin/controller/orders/Dispatch.php +++ b/application/admin/controller/orders/Dispatch.php @@ -25,13 +25,14 @@ class Dispatch extends Backend */ protected $model = null; + protected $searchFields = 'order.order_no,order.tel,order.customer,worker_name,worker_tel'; + public function _initialize() { parent::_initialize(); $this->model = new \app\admin\model\OrderDispatch; $this->view->assign("typeList", $this->model->getTypeList()); $this->view->assign("statusList", $this->model->getStatusList()); - $this->view->assign("isNoticeList", $this->model->getIsNoticeList()); } diff --git a/application/admin/model/Order.php b/application/admin/model/Order.php index 4082bf4..9e66841 100644 --- a/application/admin/model/Order.php +++ b/application/admin/model/Order.php @@ -65,6 +65,12 @@ class Order extends Model } + public function getAuditStatusList() + { + return [self::STATUS_AUDITING => __('Status 50'), self::STATUS_FINISHED => __('Status 60'), ]; + } + + public function getStatusTextAttr($value, $data) { $value = $value ?: ($data['status'] ?? ''); diff --git a/application/admin/view/orders/auditorder/index.html b/application/admin/view/orders/auditorder/index.html index aa2f5ec..79afc6e 100644 --- a/application/admin/view/orders/auditorder/index.html +++ b/application/admin/view/orders/auditorder/index.html @@ -1,5 +1,17 @@