diff --git a/application/admin/controller/orders/Auditorder.php b/application/admin/controller/orders/Auditorder.php index 6898b8d..33d76b9 100644 --- a/application/admin/controller/orders/Auditorder.php +++ b/application/admin/controller/orders/Auditorder.php @@ -4,6 +4,7 @@ namespace app\admin\controller\orders; use app\admin\model\Message; use app\admin\model\Order; +use app\admin\model\Worker; use app\common\controller\Backend; use think\Db; use think\Exception; @@ -108,6 +109,7 @@ class Auditorder extends Backend } if (false === $this->request->isPost()) { $this->view->assign('row', $row); + $this->view->assign('worker',Worker::where('status',$order->worker_id)->find()); return $this->view->fetch(); } $params = $this->request->post('row/a'); diff --git a/application/admin/controller/orders/Configorder.php b/application/admin/controller/orders/Configorder.php index c5b8cdd..235e1a1 100644 --- a/application/admin/controller/orders/Configorder.php +++ b/application/admin/controller/orders/Configorder.php @@ -103,8 +103,8 @@ class Configorder extends Backend } if (false === $this->request->isPost()) { $this->view->assign('row', $row); - $workerRate = Worker::where('id',$row->worker_id)->value('rate'); - $this->view->assign('rate', $workerRate); + $worker = Worker::where('id',$row->worker_id)->find(); + $this->view->assign('worker', $worker); return $this->view->fetch(); } $params = $this->request->post('row/a'); diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php index db15828..786c7e5 100644 --- a/application/admin/controller/orders/Dispatch2.php +++ b/application/admin/controller/orders/Dispatch2.php @@ -163,6 +163,7 @@ class Dispatch2 extends Backend if (false === $this->request->isPost()) { $this->view->assign('row', $row); $this->view->assign('order', $order); + $this->view->assign('worker',Worker::where('status',$order->worker_id)->find()); return $this->view->fetch(); } @@ -255,8 +256,8 @@ class Dispatch2 extends Backend $this->view->assign('order', $order); $this->view->assign('action','finish'); - $workerRate = Worker::where('id',$row->worker_id)->value('rate'); - $this->view->assign('rate', $workerRate); + $worker = Worker::where('id',$row->worker_id)->find(); + $this->view->assign('worker', $worker); return $this->view->fetch('edit'); } diff --git a/application/admin/view/orders/auditorder/edit.html b/application/admin/view/orders/auditorder/edit.html index 5c0905e..6e261d9 100644 --- a/application/admin/view/orders/auditorder/edit.html +++ b/application/admin/view/orders/auditorder/edit.html @@ -127,12 +127,20 @@
- +
+ +
+ +
+ +
+
+
diff --git a/application/admin/view/orders/configorder/edit.html b/application/admin/view/orders/configorder/edit.html index 2d823f1..55b04c0 100644 --- a/application/admin/view/orders/configorder/edit.html +++ b/application/admin/view/orders/configorder/edit.html @@ -185,12 +185,17 @@
- -
- + +
+
+ +
+ +
+
@@ -203,15 +208,6 @@
- -
- -
- -
-
- -
diff --git a/application/admin/view/orders/dispatch2/edit.html b/application/admin/view/orders/dispatch2/edit.html index 7fa37da..bbead07 100644 --- a/application/admin/view/orders/dispatch2/edit.html +++ b/application/admin/view/orders/dispatch2/edit.html @@ -176,22 +176,21 @@
- +
-
- -
- -
-
- -
- + +
+
+ +
+ +
+
diff --git a/application/admin/view/workers/worker/add.html b/application/admin/view/workers/worker/add.html index 78550a9..13c7265 100644 --- a/application/admin/view/workers/worker/add.html +++ b/application/admin/view/workers/worker/add.html @@ -13,6 +13,20 @@
+ +
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/application/admin/view/workers/worker/edit.html b/application/admin/view/workers/worker/edit.html index d2b658c..b837ae8 100644 --- a/application/admin/view/workers/worker/edit.html +++ b/application/admin/view/workers/worker/edit.html @@ -15,6 +15,20 @@ value="{$row.tel|htmlentities}">
+ +
+ +
+ +
+
+
+ +
+ +
+
+
diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js index 8e36fd4..f385542 100644 --- a/public/assets/js/backend/orders/dispatch2.js +++ b/public/assets/js/backend/orders/dispatch2.js @@ -150,7 +150,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, // {field: 'admin_id', title: __('Admin_id')}, {field: 'admin_user', title: __('Admin_user'), operate: 'LIKE'}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'update_time', title: __('Update_time'), operate:false, addclass:'datetimerange', autocomplete:false}, + //{field: 'update_time', title: __('Update_time'), operate:false, addclass:'datetimerange', autocomplete:false}, {field: 'finish_time', title: __('Finish_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,