pc端，维保流程

application/common/model/Maintain.php

@@ -26,21 +26,21 @@ class Maintain extends Model
     //状态枚举
     public function status_data($status = false){
         $data = [
-            0  => '待报价',  //等待初次报价 或 直接给指派师傅
+            0  => '待报价',        //等待初次报价 或 直接给指派师傅
             2  => '已取消',
 
             20 => '报价待审',      //通过就去30，驳回就到22
             22 => '报价审核驳回',   //等待再次报价
 
-            30 => '用户待确认',   //通过就去40，没有驳回
-            40 => '待指派',        //报价都审核过了，可派师傅了
+            30 => '用户待确认',     //确认就去40，没有驳回
+            40 => '待指派',        //报价都完成了，可以派师傅了
             50 => '已选师傅',
             60 => '材料已申请待领取',
-            70 => '材料已领取待上门', //待上门
+            70 => '材料已领取待上门',  //待上门
 
             80 => '已上门',
             90 => '已完成待验收',
-            92 => '验收驳回',//待二次上门
+            92 => '验收驳回',        //待二次上门
 
             100 => '验收通过已完成',
         ];

application/company/controller/Maintain.php

@@ -34,7 +34,8 @@ class Maintain extends Apic
         ];
 
         $list = Db::name($this->table)->field('status,count(id) as number')
-            ->where('status','NEQ',2)->where('company_id',$this->auth->company_id)->group('status')->select();
+//            ->where('status','NEQ',2)
+            ->where('company_id',$this->auth->company_id)->group('status')->select();
         if(!empty($list)){
             foreach($list as $key => $val){
                 if($val['status'] == 0){
@@ -43,14 +44,18 @@ class Maintain extends Apic
                 if(in_array($val['status'],[20,22])){
                     $rs['status_20'] += $val['number'];
                 }
+
                 if($val['status'] == 30){
                     $rs['status_30'] = $val['number'];
                 }
                 if(in_array($val['status'],[40,50,60,70,80,90,92])){
                     $rs['status_40'] += $val['number'];
                 }
-                if($val['status'] == 100){
+                /*if($val['status'] == 100){
                     $rs['status_100'] = $val['number'];
+                }*/
+                if(in_array($val['status'],[2,100])){
+                    $rs['status_100'] += $val['number'];
                 }
             }
         }
@@ -94,6 +99,9 @@ class Maintain extends Apic
             if($status == 40){
                 $map['mt.status'] = ['IN',[40,50,60,70,80,90,92]];
             }
+            if($status == 100){
+                $map['mt.status'] = ['IN',[2,100]];
+            }
         }
 
         $field = ['mt.id','mt.orderno','uc.projectname','mt.info','uc.header','mt.status'];
@@ -106,6 +114,9 @@ class Maintain extends Apic
             $maintain_model = new Maintainmodel();
             foreach($list as $key => $val){
                 $list[$key]['status_text'] = $maintain_model->status_data($val['status']);
+                //假状态
+                $list[$key]['fake_status']      = $this->fake_status($val['status']);
+                $list[$key]['fake_status_text'] = $this->fake_status_data($val['status']);
             }
         }
 
@@ -113,29 +124,53 @@ class Maintain extends Apic
     }
 
     //整合过的状态
-    private function status_data($status){
+    private function fake_status_data($status){
         $data = [
-            0  => '待报价',  //等待初次报价 或 直接给指派师傅
-            2  => '已取消',
+            0  => '待报价',
+            2  => '已完成',
 
-            20 => '报价待审',      //通过就去30，驳回就到22
-            22 => '报价审核驳回',   //等待再次报价
+            20 => '评估报价',
+            22 => '评估报价',
 
-            30 => '报价审核',   //通过就去40，没有驳回
-            40 => '待指派',        //报价都审核过了，可派师傅了
+            30 => '报价审核',
+            40 => '待处理',
             50 => '待处理',
             60 => '待处理',
-            70 => '待处理', //待上门
+            70 => '待处理',
 
             80 => '待处理',
             90 => '待处理',
-            92 => '待处理',//待二次上门
+            92 => '待处理',
 
             100 => '已完成',
         ];
 
         return isset($data[$status]) ? $data[$status] : $status;
     }
+    //整合过的状态
+    private function fake_status($status){
+        $data = [
+            0  => 0,
+            2  => 100,
+
+            20 => 20,
+            22 => 20,
+
+            30 => 30,
+            40 => 40,
+            50 => 40,
+            60 => 40,
+            70 => 40,
+
+            80 => 40,
+            90 => 40,
+            92 => 40,
+
+            100 => 100,
+        ];
+
+        return isset($data[$status]) ? $data[$status] : $status;
+    }
 
     //详情
     public function info(){
@@ -151,6 +186,10 @@ class Maintain extends Apic
         $maintain_model = new Maintainmodel();
         $info['status_text'] = $maintain_model->status_data($info['status']);
 
+        //假状态
+        $info['fake_status']      = $this->fake_status($info['status']);
+        $info['fake_status_text'] = $this->fake_status_data($info['status']);
+
         $info['filedata'] = json_decode($info['filedata'],true);
 
         //追加报价历史