From 39bee274915eeae34cd736648c60659f41f7336a Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Thu, 27 Mar 2025 20:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/orders/Dispatch2.php     |  3 +-
 .../admin/view/orders/auditorder/edit.html    |  4 +--
 .../admin/view/orders/dispatch2/edit.html     | 29 ++++++++++++-------
 application/common/Logic/OrderLogic.php       |  2 +-
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php
index 324610e..94eb748 100644
--- a/application/admin/controller/orders/Dispatch2.php
+++ b/application/admin/controller/orders/Dispatch2.php
@@ -288,6 +288,7 @@ class Dispatch2 extends Backend
                 $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                 $row->validateFailException()->validate($validate);
             }
+            $params['status'] = OrderDispatch::STATUS_FINISH;
             $params['finish_time'] = date('Y-m-d H:i:s');
             $result = $row->allowField(true)->save($params);
 
@@ -376,7 +377,7 @@ class Dispatch2 extends Backend
      * @throws DataNotFoundException
      * @throws ModelNotFoundException
      */
-    public function del()
+    public function del($ids=null)
     {
         if (false === $this->request->isPost()) {
             $this->error(__("Invalid parameters"));
diff --git a/application/admin/view/orders/auditorder/edit.html b/application/admin/view/orders/auditorder/edit.html
index 2d42163..5392f79 100644
--- a/application/admin/view/orders/auditorder/edit.html
+++ b/application/admin/view/orders/auditorder/edit.html
@@ -161,9 +161,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Audit_remark')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea class="form-control" name="row[audit_remark]" >
-                {$row.audit_remark|htmlentities}
-            </textarea>
+            <textarea class="form-control" placeholder="审核备注" name="row[audit_remark]" >{$row.audit_remark|htmlentities}</textarea>
         </div>
     </div>
 
diff --git a/application/admin/view/orders/dispatch2/edit.html b/application/admin/view/orders/dispatch2/edit.html
index 027b5f9..b3a0080 100644
--- a/application/admin/view/orders/dispatch2/edit.html
+++ b/application/admin/view/orders/dispatch2/edit.html
@@ -15,35 +15,35 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('订单号')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-order_no" readonly data-field="order_no" type="text" value="{$order.order_no|htmlentities}">
+            <input id="c-order_no" readonly class="form-control" data-field="order_no" type="text" value="{$order.order_no|htmlentities}">
         </div>
     </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('服务')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-item_title" readonly type="text" value="{$order.item_title|htmlentities}">
+            <input id="c-item_title" readonly class="form-control" type="text" value="{$order.item_title|htmlentities}">
         </div>
     </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('客户姓名')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-customer" readonly type="text" value="{$order.customer|htmlentities}">
+            <input id="c-customer" readonly class="form-control" type="text" value="{$order.customer|htmlentities}">
         </div>
     </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('客户电话')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-tel" readonly type="text" value="{$order.tel|htmlentities}">
+            <input id="c-tel" readonly class="form-control" type="text" value="{$order.tel|htmlentities}">
         </div>
     </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('客户地址')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-address" readonly type="text" value="{$order.address|htmlentities}">
+            <input id="c-address" readonly class="form-control" type="text" value="{$order.address|htmlentities}">
         </div>
     </div>
 
@@ -51,14 +51,14 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('当前师傅')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input readonly type="text" value="{$row.worker_name|htmlentities}">
+            <input readonly type="text" class="form-control" value="{$row.worker_name|htmlentities}">
         </div>
     </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('师傅电话')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input readonly type="text" value="{$row.worker_tel|htmlentities}">
+            <input readonly type="text" class="form-control" value="{$row.worker_tel|htmlentities}">
         </div>
     </div>
 
@@ -66,7 +66,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('当前进度')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input  readonly type="text" value="{$row.status_text|htmlentities}">
+            <input  readonly type="text" class="form-control" value="{$row.status_text|htmlentities}">
         </div>
     </div>
 
@@ -74,7 +74,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('已收款(￥)')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input  readonly type="text" value="{$order.online_amount|htmlentities}">
+            <input  readonly type="text"  class="form-control" value="{$order.online_amount|htmlentities}">
         </div>
     </div>
 
@@ -121,12 +121,19 @@
     </div>
 
 
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea class="form-control" placeholder="备注" name="row[remark]" >{$row.remark|htmlentities}</textarea>
+        </div>
+    </div>
+
 
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
             <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('确认完成任务')}</button>
-            <span class="warning">请确认无误后再操作</span>
+            <span class="warning text-danger xs" >请确认无误后再操作</span>
         </div>
     </div>
 
@@ -178,7 +185,7 @@
             <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
         </div>
     </div>
-    {notempty}
+    {/notempty}
 
 
 
diff --git a/application/common/Logic/OrderLogic.php b/application/common/Logic/OrderLogic.php
index bafe7d7..92a1b77 100644
--- a/application/common/Logic/OrderLogic.php
+++ b/application/common/Logic/OrderLogic.php
@@ -36,7 +36,7 @@ class OrderLogic
     {
 
         $order = $this->OrderModel->where('id',$orderDispatch->order_id)->find();
-        if(!$order->status != Order::STATUS_DISPATCHED){
+        if($order->status != Order::STATUS_DISPATCHED){
             throw new Exception('订单状态不允许当前操作');
         }