From 417679cf37c0d796a08babac7a896ef168723001 Mon Sep 17 00:00:00 2001
From: zhaocheng <578322713@qq.com>
Date: Sat, 12 Oct 2019 11:53:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=BB=B4=E4=BF=AE=E8=B0=83?=
 =?UTF-8?q?=E5=BA=A6=E5=90=8E=E7=BB=AD=E6=B5=81=E7=A8=8B=EF=BC=8C=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=AE=8C=E6=88=90=E6=8F=90=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/models/FixCarT.php                 |  5 +++--
 frontend/controllers/FixCarController.php | 14 +++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/models/FixCarT.php b/common/models/FixCarT.php
index 368dc4a..3956b56 100644
--- a/common/models/FixCarT.php
+++ b/common/models/FixCarT.php
@@ -179,7 +179,8 @@ class FixCarT extends \common\models\Base
                 $result = '维修调度';
                 break;
             case 2:
-                $result = '司机接车';
+//                $result = '司机接车';
+                $result = '提单完成';
                 break;
             case 3:
                 $result = '前台派工';
@@ -197,7 +198,7 @@ class FixCarT extends \common\models\Base
                 $result = '财务结算';
                 break;
             default:
-                $result = '';
+                $result = '待处理';
         }
         return $result;
     }
diff --git a/frontend/controllers/FixCarController.php b/frontend/controllers/FixCarController.php
index 6630309..d34cf3b 100644
--- a/frontend/controllers/FixCarController.php
+++ b/frontend/controllers/FixCarController.php
@@ -427,7 +427,8 @@ class FixCarController extends BaseController
                     $log_info->remark = '提交到维修调度';
                 }
                 if($status == 2) {
-                    $log_info->remark = '提交到司机接车';
+//                    $log_info->remark = '提交到司机接车';
+                    $log_info->remark = '提单完成';
                 }
                 if($status == 3) {
                     $log_info->remark = '提交到前台派工';
@@ -443,11 +444,11 @@ class FixCarController extends BaseController
                     var_dump($log_info->errors);
                 }
                 //如果是客户自上门，则直接到前台派工
-                if($status == 2) {
-                    if($receive_type == '客户自送') {
-                        $status = 3;
-                    }
-                }
+//                if($status == 2) {
+//                    if($receive_type == '客户自送') {
+//                        $status = 3;
+//                    }
+//                }
             }
             $row->status = $status;
 
@@ -473,7 +474,6 @@ class FixCarController extends BaseController
                 exit;
             }
 
-
             $result['success'] = true;
             $result['msg'] = '保存成功';
             $result['fix_id'] = $row->id;