From 4874a8cae82f75dba97ba2ca8210928757179cd0 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 2 Jun 2025 12:52:52 +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/Dispatch2.php     | 20 ++++++++++---------
 .../admin/view/orders/configorder/edit.html   |  2 +-
 .../admin/view/orders/dispatch2/edit.html     |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php
index 786c7e5..359e0ab 100644
--- a/application/admin/controller/orders/Dispatch2.php
+++ b/application/admin/controller/orders/Dispatch2.php
@@ -94,15 +94,17 @@ class Dispatch2 extends Backend
                         $row->btn_record = false;
                         $now = date('Y-m-d H:i:s');
                         //未上门
-                        if(empty($row->arrive_time) ){
-                            if($row->plan_time < $now){
-                                $row->btn_record = true;
-                            }
-                        }else{
-                            //已上门 完成时间超了
-                            if($row->estimated_finish_time > $now)
-                            {        //预估完成时间过了
-                                if($row->notice_num>0 ){
+                        if($row->status == OrderDispatch::STATUS_PLANIT){       //待上门
+                            if(empty($row->arrive_time))
+                            {
+                                if($row->plan_time < $now)
+                                {
+                                    $row->btn_record = true;
+                                }
+                            }else{
+                                //已上门 完成时间超了
+                                if($row->estimated_finish_time > $now)
+                                {        //预估完成时间过了
                                     $row->btn_record = true;
                                 }
                             }
diff --git a/application/admin/view/orders/configorder/edit.html b/application/admin/view/orders/configorder/edit.html
index 55b04c0..20eef6b 100644
--- a/application/admin/view/orders/configorder/edit.html
+++ b/application/admin/view/orders/configorder/edit.html
@@ -188,7 +188,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 data-rule="required" name="row[cost_rate]" type="number" min="0" max="100" step="1" class="form-control" value="{$worker.rate|htmlentities}">
+            <input  name="row[cost_rate]" readonly type="number" min="0" max="100" step="1" class="form-control" value="{$worker.rate|htmlentities}">
         </div>
     </div>
 
diff --git a/application/admin/view/orders/dispatch2/edit.html b/application/admin/view/orders/dispatch2/edit.html
index bbead07..e56a747 100644
--- a/application/admin/view/orders/dispatch2/edit.html
+++ b/application/admin/view/orders/dispatch2/edit.html
@@ -176,7 +176,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 data-rule="required" name="order[cost_rate]" type="number" min="0" max="100" step="1" class="form-control" value="{$worker.rate|htmlentities}">
+            <input readonly name="order[cost_rate]" type="number" min="0" max="100" step="1" class="form-control" value="{$worker.rate|htmlentities}">
         </div>
     </div>