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 @@