1

app/Model/SalesOrder.php

@@ -28,17 +28,28 @@ class SalesOrder extends Model
         self::Model_type_three
     ];
 
+    //安装件
     const State_zero = 0;//未派单
     const State_one = 1;//已派销售
     const State_two = 2;//已派公司或分社
     const State_three = 3;//已下施工单
     const State_four = 4;//退换货
+    const State_five = 5;//完结
     public static $state = [
         self::State_zero => '未派单',
         self::State_one => '已派销售',
         self::State_two => '已派总设或分社',
         self::State_three => '已下施工单',
         self::State_four => '退换货',
+        self::State_five => '完结',
+    ];
+
+    //快递件
+    const State2_zero = 0;//未发货
+    const State2_one = 1;//已发货
+    public static $state2 = [
+        self::State2_zero => '未发货',
+        self::State2_one => '已发货',
     ];
 
     public static $prefix = [

app/Service/SalesOrderService.php

@@ -616,7 +616,11 @@ class SalesOrderService extends Service
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
             $data['data'][$key]['product'] = $product[$value['id']] ?? [];
             $data['data'][$key]['fee'] = $fee[$value['id']] ?? [];
-            $data['data'][$key]['state_name'] = SalesOrder::$state[$value['state']] ?? '';
+            if($value['sales_order_type'] == SalesOrder::Order_type_one){
+                $data['data'][$key]['state_name'] = SalesOrder::$state[$value['state']] ?? '';
+            }else{
+                $data['data'][$key]['state_name'] = SalesOrder::$state2[$value['state']] ?? '';
+            }
         }
 
         return $data;