cqpCow 1 year ago
parent
commit
0c725d906a
2 changed files with 19 additions and 3 deletions
  1. 13 2
      app/Model/SalesOrder.php
  2. 6 1
      app/Service/SalesOrderService.php

+ 13 - 2
app/Model/SalesOrder.php

@@ -53,8 +53,19 @@ class SalesOrder extends UseScopeBaseModel
         self::State_zero => '未确认',
         self::State_zero => '未确认',
         self::State_one => '待确认',
         self::State_one => '待确认',
         self::State_two => '已确认',
         self::State_two => '已确认',
-        self::State_three => '已派销售',
-        self::State_four => '已派总设或分社',
+        self::State_three => '已线上派单',
+        self::State_four => '已门店派单',
+        self::State_five => '已下施工单',
+        self::State_six => '退换货',
+        self::State_seven => '公司完结',
+        self::State_eight => '客户完结',
+    ];
+    public static $state_2 = [
+        self::State_zero => '未确认',
+        self::State_one => '待确认',
+        self::State_two => '已确认',
+        self::State_three => '已确认',
+        self::State_four => '已门店派单',
         self::State_five => '已下施工单',
         self::State_five => '已下施工单',
         self::State_six => '退换货',
         self::State_six => '退换货',
         self::State_seven => '公司完结',
         self::State_seven => '公司完结',

+ 6 - 1
app/Service/SalesOrderService.php

@@ -783,7 +783,12 @@ class SalesOrderService extends Service
             $data['data'][$key]['product'] = $product[$value['id']] ?? [];
             $data['data'][$key]['product'] = $product[$value['id']] ?? [];
             $data['data'][$key]['fee'] = $fee[$value['id']] ?? "";
             $data['data'][$key]['fee'] = $fee[$value['id']] ?? "";
             if($value['sales_order_type'] == SalesOrder::Order_type_one){
             if($value['sales_order_type'] == SalesOrder::Order_type_one){
-                $data['data'][$key]['state_title'] = SalesOrder::$state[$value['state']] ?? '';
+                if($value['model_type'] == SalesOrder::Model_type_four){
+                    $state = SalesOrder::$state[$value['state']] ?? '';
+                }else{
+                    $state = SalesOrder::$state_2[$value['state']] ?? '';
+                }
+                $data['data'][$key]['state_title'] = $state;
             }else{
             }else{
                 $data['data'][$key]['state_title'] = SalesOrder::$state2[$value['state']] ?? '';
                 $data['data'][$key]['state_title'] = SalesOrder::$state2[$value['state']] ?? '';
             }
             }