1

app/Model/BasicType.php

@@ -35,5 +35,7 @@ class BasicType extends UseScopeBaseModel
         22 => '产品价格',
         23 => '安装地点',
         24 => '平台类型',
+        25 => '业务类型',
+        26 => '销售类型',
     ];
 }

app/Model/SalesOrder.php

@@ -19,15 +19,18 @@ class SalesOrder extends UseScopeBaseModel
     const Model_type_one = 1; // 线下订单合同
     const Model_type_two = 2; // 分社订货合同
     const Model_type_three = 3; // 二手车精品加装合同
+    const Model_type_four = 4; // 线上订单合同
     public static $model_type = [
         self::Model_type_one,
         self::Model_type_two,
-        self::Model_type_three
+        self::Model_type_three,
+        self::Model_type_four,
     ];
     public static $model_type_title = [
         self::Model_type_one => '线下订单合同',
         self::Model_type_two => '分社订货合同',
         self::Model_type_three => '二手车精品加装合同',
+        self::Model_type_four => '线上订单合同',
     ];
 
     //安装件
@@ -69,8 +72,9 @@ class SalesOrder extends UseScopeBaseModel
     ];
 
     public static $prefix = [
-        self::Model_type_one => 'T9XS.',
+        self::Model_type_one => 'T9XX.',
         self::Model_type_two => 'T9SO.',
-        self::Model_type_three => 'T9XS.'
+        self::Model_type_three => 'T9XX.',
+        self::Model_type_four => 'T9XS.'
     ];
 }

app/Service/SalesOrderService.php

@@ -49,6 +49,10 @@ class SalesOrderService extends Service
             $model->title = $data['title'] ?? '';
             $model->selling_price = $data['selling_price'] ?? 0;
             $model->vin_no = $data['vin_no'] ?? '';
+            $model->business_type = $data['business_type'] ?? 0;
+            $model->sale_type = $data['sale_type'] ?? 0;
+            $model->plat_type = $data['plat_type'] ?? 0;
+            $model->plat_order = $data['plat_order'] ?? '';
             $model->order_type = $data['order_type'] ?? 0;
             $model->deal_type = $data['deal_type'] ?? 0;
             $model->customer_id = $data['customer_id'] ?? 0;
@@ -198,6 +202,10 @@ class SalesOrderService extends Service
             $model->title = $data['title'] ?? '';
             $model->selling_price = $data['selling_price'] ?? 0;
             $model->vin_no = $data['vin_no'] ?? '';
+            $model->business_type = $data['business_type'] ?? 0;
+            $model->sale_type = $data['sale_type'] ?? 0;
+            $model->plat_type = $data['plat_type'] ?? 0;
+            $model->plat_order = $data['plat_order'] ?? '';
             $model->order_type = $data['order_type'] ?? 0;
             $model->deal_type = $data['deal_type'] ?? 0;
             $model->customer_id = $data['customer_id'] ?? 0;
@@ -380,6 +388,9 @@ class SalesOrderService extends Service
         $sales['sales_order_type_title'] = SalesOrder::$order_type[$sales['sales_order_type']] ?? '';
         $sales['activity_product'] = $sales['file'] = $sales['employee_one'] = $sales['employee_two'] = $sales['employee_three'] = $sales['product'] = $sales['dispatch_depart_one'] = $sales['dispatch_employee'] = $sales['dispatch_depart_two'] = [];
         $array = [
+            $sales['business_type'],
+            $sales['sale_type'],
+            $sales['plat_type'],
             $sales['order_type'],
             $sales['deal_type'],
             $sales['contract_state'],
@@ -394,6 +405,9 @@ class SalesOrderService extends Service
             ->toArray();
         $sales = [$sales];
         foreach ($sales as $key => $value){
+            $sales[$key]['business_type_title'] = $basic_map[$value['business_type']] ?? '';
+            $sales[$key]['sale_type_title'] = $basic_map[$value['sale_type']] ?? '';
+            $sales[$key]['plat_type_title'] = $basic_map[$value['plat_type']] ?? '';
             $sales[$key]['order_type_title'] = $basic_map[$value['order_type']] ?? '';
             $sales[$key]['deal_type_title'] = $basic_map[$value['deal_type']] ?? '';
             $sales[$key]['contract_state_title'] = $basic_map[$value['contract_state']] ?? '';
@@ -529,7 +543,7 @@ class SalesOrderService extends Service
     public function salesOrderList($data,$user){
         $model = SalesOrder::Clear($user,$data);
         $model = $model->where('del_time',0)
-            ->select('title','id','sales_order_type','model_type','order_number','selling_price','vin_no','car_type','order_type','deal_type','customer_id','sign_time','contract_state','crt_id','crt_time','mark','product_total','rate','construction_time','handover_time','expire_time','other_fee','discount_fee','contract_fee','contract_type','pay_way','send_state','logistics_company','logistics_number','car_type','year','mileage','color','original_set','processing','state','invoice_state')
+            ->select('title','id','sales_order_type','model_type','order_number','selling_price','vin_no','car_type','order_type','deal_type','customer_id','sign_time','contract_state','crt_id','crt_time','mark','product_total','rate','construction_time','handover_time','expire_time','other_fee','discount_fee','contract_fee','contract_type','pay_way','send_state','logistics_company','logistics_number','car_type','year','mileage','color','original_set','processing','state','invoice_state','plat_type','business_type','sale_type','plat_order')
             ->orderby('id', 'desc');
 
         if(! empty($data['order_number'])) $model->where('order_number','LIKE', '%'.$data['order_number'].'%');
@@ -584,9 +598,9 @@ class SalesOrderService extends Service
      * @return array
      */
     public function salesOrderRule(&$data, $user, $is_add = true){
-        if(empty($data['sales_order_type'])) return [false,'合同类型不能为空'];
         if(empty($data['model_type'])) return [false,'订单模板类型不能为空'];
-        if(! in_array($data['model_type'],SalesOrder::$model_type)) return [false,'订单模板类型错误'];
+        if(! in_array($data['model_type'],SalesOrder::$model_type)) return [false,'合同模板错误'];
+        if(empty($data['sales_order_type'])) return [false,'类型不能为空'];
         if(empty($data['order_number'])) return [false,'合同编号不能为空'];
 //        if(empty($data['customer_id'])) return [false,'请选择客户'];
 //        if(empty($data['employee_one'])) return [false,'请选择签订人'];
@@ -671,7 +685,7 @@ class SalesOrderService extends Service
     public function fillData($data,$ergs){
         if(empty($data['data'])) return $data;
 
-        $array = array_unique(array_merge_recursive(array_column($data['data'],'order_type'),array_column($data['data'],'deal_type'),array_column($data['data'],'contract_state'),array_column($data['data'],'car_type'),array_column($data['data'],'pay_way'),array_column($data['data'],'logistics_company'),array_column($data['data'],'send_state'),array_column($data['data'],'contract_type')));
+        $array = array_unique(array_merge_recursive(array_column($data['data'],'order_type'),array_column($data['data'],'deal_type'),array_column($data['data'],'contract_state'),array_column($data['data'],'car_type'),array_column($data['data'],'pay_way'),array_column($data['data'],'logistics_company'),array_column($data['data'],'send_state'),array_column($data['data'],'contract_type'),array_column($data['data'],'plat_type'),array_column($data['data'],'business_type'),array_column($data['data'],'sale_type')));
         $basic_map = BasicType::whereIn('id',$array)
             ->pluck('title','id')
             ->toArray();
@@ -721,6 +735,9 @@ class SalesOrderService extends Service
             $fee[$value['sales_order_id']][] = $value;
         }
         foreach ($data['data'] as $key => $value){
+            $data['data'][$key]['business_type_title'] = $basic_map[$value['business_type']] ?? '';
+            $data['data'][$key]['sale_type_title'] = $basic_map[$value['sale_type']] ?? '';
+            $data['data'][$key]['plat_type_title'] = $basic_map[$value['plat_type']] ?? '';
             $data['data'][$key]['sales_order_type_title'] = SalesOrder::$order_type[$value['sales_order_type']] ?? '';
             $data['data'][$key]['model_type_title'] = SalesOrder::$model_type_title[$value['model_type']] ?? '';
             $data['data'][$key]['order_type_title'] = $basic_map[$value['order_type']] ?? '';
@@ -966,7 +983,7 @@ class SalesOrderService extends Service
 
     public function salesOrderListsalesOrderWxList($data,$user){
         $model = SalesOrder::where('del_time',0)
-            ->select('title','id','sales_order_type','model_type','order_number','selling_price','vin_no','car_type','order_type','deal_type','customer_id','sign_time','contract_state','crt_id','crt_time','mark','product_total','rate','construction_time','handover_time','expire_time','other_fee','discount_fee','contract_fee','contract_type','pay_way','send_state','logistics_company','logistics_number','car_type','year','mileage','color','original_set','processing','state','invoice_state')
+            ->select('title','id','sales_order_type','model_type','order_number','selling_price','vin_no','car_type','order_type','deal_type','customer_id','sign_time','contract_state','crt_id','crt_time','mark','product_total','rate','construction_time','handover_time','expire_time','other_fee','discount_fee','contract_fee','contract_type','pay_way','send_state','logistics_company','logistics_number','car_type','year','mileage','color','original_set','processing','state','invoice_state','plat_type','business_type','sale_type','plat_order')
             ->orderby('id', 'desc');
 
         if(! empty($data['openid'])){

config/header/37.php

@@ -19,14 +19,26 @@ return [
         'value' => '类型',
     ],
     [
-        'key' => 'customer_title',
-        'value' => '客户',
+        'key' => 'business_type_title',
+        'value' => '业务类型',
+    ],
+    [
+        'key' => 'sale_type_title',
+        'value' => '销售类型',
     ],
     [
         'key' => 'sign_time',
         'value' => '签订时间',
     ],
     [
+        'key' => 'plat_order',
+        'value' => '平台单号',
+    ],
+    [
+        'key' => 'plat_type_title',
+        'value' => '平台类型',
+    ],
+    [
         'key' => 'contract_state_title',
         'value' => '合同状态',
     ],