From d5050f0dd07f8a7b3078508293df3a1771d21aba Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Sun, 1 Jun 2025 22:28:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=AE=A2=E5=8D=95=E9=87=8D?=
=?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/controller/orders/Auditorder.php | 2 ++
.../admin/controller/orders/Configorder.php | 4 ++--
.../admin/controller/orders/Dispatch2.php | 5 +++--
.../admin/view/orders/auditorder/edit.html | 10 +++++++++-
.../admin/view/orders/configorder/edit.html | 20 ++++++++-----------
.../admin/view/orders/dispatch2/edit.html | 19 +++++++++---------
.../admin/view/workers/worker/add.html | 14 +++++++++++++
.../admin/view/workers/worker/edit.html | 14 +++++++++++++
public/assets/js/backend/orders/dispatch2.js | 2 +-
9 files changed, 62 insertions(+), 28 deletions(-)
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 @@
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+