2

app/Model/SalesOrder.php

@@ -64,26 +64,18 @@ class SalesOrder extends UseScopeBaseModel
     const State_six = 6;//退换货
     const State_seven = 7;//完结 公司
     const State_eight = 8;//完结 客户
+
+    const special_status = -100;
+    //审核通过条件  安装件 且 线上订单的已审核是2  其它是3
+    const search = "(sales_order_type = " . SalesOrder::Order_type_one . " and ((model_type = " . SalesOrder::Model_type_four ." and state = " . SalesOrder::State_two.") or (model_type <> " . SalesOrder::Model_type_four ." and state = " . SalesOrder::State_three.")))";
     public static $state = [
         self::State_minus_one => '已驳回',
         self::State_zero => '待创建人确认',
         self::State_one => '待审批人审核',
         self::State_two => '审核通过',
-        self::State_three => '已线上派单',
-        self::State_four => '已门店派单',
-        self::State_five => '已下施工单',
-        self::State_six => '退换货',
-        self::State_seven => '公司完结',
-        self::State_eight => '客户完结',
-    ];
-    public static $state_2 = [
-        self::State_minus_one => '已驳回',
-        self::State_zero => '待创建人确认',
-        self::State_one => '待审批人审核',
-        self::State_two => '审核通过',
-        self::State_three => '审核通过',
+        self::State_three => '待被指派门店接收',
         self::State_four => '已门店派单',
-        self::State_five => '已下施工单',
+        self::State_five => '施工中',
         self::State_six => '退换货',
         self::State_seven => '公司完结',
         self::State_eight => '客户完结',

app/Service/ExportFileService.php

@@ -161,11 +161,7 @@ class ExportFileService extends Service
                     $sign_time = empty($value->sign_time) ? '' : date('Y-m-d',$value->sign_time);
                     $product_tmp = $product[$value->id] ?? [];
                     if($value->sales_order_type == SalesOrder::Order_type_one){
-                        if($value->model_type == SalesOrder::Model_type_four){
-                            $state = SalesOrder::$state[$value->state] ?? '';
-                        }else{
-                            $state = SalesOrder::$state_2[$value->state] ?? '';
-                        }
+                        $state = SalesOrder::$state[$value->state] ?? '';
                     }else{
                         $state = SalesOrder::$state2[$value->state] ?? '';
                     }
@@ -334,11 +330,7 @@ class ExportFileService extends Service
                     $sign_time = empty($value->sign_time) ? '' : date('Y-m-d',$value->sign_time);
                     $product_tmp = $product[$value->id] ?? [];
                     if($value->sales_order_type == SalesOrder::Order_type_one){
-                        if($value->model_type == SalesOrder::Model_type_four){
-                            $state = SalesOrder::$state[$value->state] ?? '';
-                        }else{
-                            $state = SalesOrder::$state_2[$value->state] ?? '';
-                        }
+                        $state = SalesOrder::$state[$value->state] ?? '';
                     }else{
                         $state = SalesOrder::$state2[$value->state] ?? '';
                     }

app/Service/RangeService.php

@@ -553,8 +553,8 @@ class RangeService extends Service
             //待审核
             $args = "(sales_order_type = " . SalesOrder::Order_type_one . " and state = ". SalesOrder::State_one . ")";
         }elseif($search['is_check'] == 2){
-            //已审 线上订单的已审核是2  其它是 3 state = ". SalesOrder::State_two . "
-            $args = "(sales_order_type = " . SalesOrder::Order_type_one . " and ((model_type = " . SalesOrder::Model_type_four ." and state = " . SalesOrder::State_two.") or (model_type <> " . SalesOrder::Model_type_four ." and state = " . SalesOrder::State_three.")))";
+            //已审 线上订单的已审核是2  其它是 3
+            $args = SalesOrder::search;
         }
 
         return $args;

app/Service/SalesOrderService.php

@@ -586,7 +586,7 @@ class SalesOrderService extends Service
         $state_array = $this->getStateMake($sales);
 
         foreach ($sales as $key => $value){
-            $sales[$key]['state_title'] = $this->makeState($value, $value['crt_name'], $state_array);
+            $sales[$key]['state_title'] = $this->makeState($value, $state_array);
             $sales[$key]['plat_type_title'] = $basic_map[$value['plat_type']] ?? '';
             $sales[$key]['order_type_title'] = $basic_map[$value['order_type']] ?? '';
             $sales[$key]['car_type_title'] = $basic_map[$value['car_type']] ?? '';
@@ -776,7 +776,13 @@ class SalesOrderService extends Service
 //                $model->where('state', '>=', SalesOrder::State_four);
             }
         }
-        if(isset($data['state'])) $model->where('state',$data['state']);
+        if(isset($data['state'])) {
+            if($data['state'] == SalesOrder::special_status){
+                $model->whereRaw(SalesOrder::search);
+            }else{
+                $model->where('state', $data['state']);
+            }
+        }
         if(isset($data['invoice_state'])) $model->where('invoice_state',$data['invoice_state']);
         if(! empty($data['order_type'])) $model->where('order_type',$data['order_type']);
         if(! empty($data['plat_type'])) $model->where('plat_type',$data['plat_type']);
@@ -1070,7 +1076,7 @@ class SalesOrderService extends Service
             $data['data'][$key]['employee_two_title'] = $employee_two[$value['id']] ?? "";
             $data['data'][$key]['purchase'] = $purchase[$value['id']] ?? "";
             $data['data'][$key]['fee'] = $fee[$value['id']] ?? "";
-            $data['data'][$key]['state_title'] = $this->makeState($value, $crt_name, $state_array);
+            $data['data'][$key]['state_title'] = $this->makeState($data['data'][$key], $state_array);
             $data['data'][$key]['invoice_state_name'] = SalesOrder::$invoice_state[$value['invoice_state']] ?? '';
             $data['data'][$key]['is_confirm_title'] = $value['is_confirm'] ? "已接收" : "未接收" ;
             $tmp = $invoiceData[$value['id']] ?? [];
@@ -1445,20 +1451,19 @@ class SalesOrderService extends Service
         return (new OaService())->getOaTeamDetailList($order_no);
     }
 
-    public function makeState($value,$crt_name, $state_array){
+    public function makeState($value, $state_array){
         if($value['sales_order_type'] == SalesOrder::Order_type_one){
             //安装件
             if(! empty($state_array[$value['order_number']])){
                 $emp_tmp = $state_array[$value['order_number']];
                 $state = "待" . $emp_tmp . "审核";
             }elseif($value['state'] == SalesOrder::State_zero){
-                $state = "待" . $crt_name . "确认";
+                $state = "待" . $value['crt_name'] . "提交";
+            }elseif($value['state'] == SalesOrder::State_three && $value['model_type'] != SalesOrder::Model_type_four){
+                // 除线上订单外 3状态即使审核通过（本来3是指派销售 除了线上订单 其它不需要）
+                $state = SalesOrder::$state[SalesOrder::State_two] ?? '';
             }else{
-                if($value['model_type'] == SalesOrder::Model_type_four){
-                    $state = SalesOrder::$state[$value['state']] ?? '';
-                }else{
-                    $state = SalesOrder::$state_2[$value['state']] ?? '';
-                }
+                $state = SalesOrder::$state[$value['state']] ?? '';
             }
         }else{
             //快递件