1

app/Service/SalesOrderService.php

@@ -47,32 +47,23 @@ class SalesOrderService extends Service
             $model->sales_order_type = $data['sales_order_type'];
             $model->model_type = $data['model_type'];
             $model->order_number = $data['order_number'];
-            $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;
+            $model->install_method = $data['install_method'] ?? 0;
+            $model->install_position = $data['install_position'] ?? 0;
             $model->sign_time = $data['sign_time'] ?? 0;
-            $model->contract_state = $data['contract_state'] ?? 0;
             $model->product_total = $data['product_total'] ?? 0;
             $model->rate = $data['rate'] ?? 0;
             $model->mark = $data['mark'] ?? '';
             $model->construction_time = $data['construction_time'] ?? 0;
             $model->handover_time = $data['handover_time'] ?? 0;
-            $model->expire_time = $data['expire_time'] ?? 0;
             $model->other_fee = $data['other_fee'] ?? 0;
             $model->discount_fee = $data['discount_fee'] ?? 0;
             $model->contract_fee = $data['contract_fee'] ?? 0;
-            $model->contract_type = $data['contract_type'] ?? 0;
             $model->pay_way = $data['pay_way'] ?? 0;
-            $model->send_state = $data['send_state'] ?? 0;
-            $model->logistics_company = $data['logistics_company'] ?? 0;
-            $model->logistics_number = $data['logistics_number'] ?? '';
             $model->car_type = $data['car_type'] ?? 0;
             $model->year = $data['year'] ?? '';
             $model->mileage = $data['mileage'] ?? '';
@@ -202,32 +193,24 @@ class SalesOrderService extends Service
             $model->sales_order_type = $data['sales_order_type'];
             $model->model_type = $data['model_type'];
             $model->order_number = $data['order_number'];
-            $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->install_method = $data['install_method'] ?? 0;
+            $model->install_position = $data['install_position'] ?? 0;
             $model->customer_id = $data['customer_id'] ?? 0;
             $model->sign_time = $data['sign_time'] ?? 0;
-            $model->contract_state = $data['contract_state'] ?? 0;
             $model->product_total = $data['product_total'] ?? 0;
             $model->rate = $data['rate'] ?? 0;
             $model->mark = $data['mark'] ?? '';
             $model->construction_time = $data['construction_time'] ?? 0;
             $model->handover_time = $data['handover_time'] ?? 0;
-            $model->expire_time = $data['expire_time'] ?? 0;
             $model->other_fee = $data['other_fee'] ?? 0;
             $model->discount_fee = $data['discount_fee'] ?? 0;
             $model->contract_fee = $data['contract_fee'] ?? 0;
-            $model->contract_type = $data['contract_type'] ?? 0;
             $model->pay_way = $data['pay_way'] ?? 0;
-            $model->send_state = $data['send_state'] ?? 0;
-            $model->logistics_company = $data['logistics_company'] ?? 0;
-            $model->logistics_number = $data['logistics_number'] ?? '';
             $model->car_type = $data['car_type'] ?? 0;
             $model->year = $data['year'] ?? '';
             $model->mileage = $data['mileage'] ?? '';
@@ -401,34 +384,20 @@ 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'],
-            $sales['contract_type'],
             $sales['car_type'],
             $sales['pay_way'],
-            $sales['send_state'],
-            $sales['logistics_company'],
         ];
         $basic_map = BasicType::whereIn('id',$array)
             ->pluck('title','id')
             ->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']] ?? '';
-            $sales[$key]['contract_type_title'] = $basic_map[$value['contract_type']] ?? '';
             $sales[$key]['car_type_title'] = $basic_map[$value['car_type']] ?? '';
             $sales[$key]['pay_way_title'] = $basic_map[$value['pay_way']] ?? '';
-            $sales[$key]['send_state_title'] = $basic_map[$value['send_state']] ?? '';
-            $sales[$key]['logistics_company_title'] = $basic_map[$value['logistics_company']] ?? '';
         }
         $sales = $sales[0];
 
@@ -556,7 +525,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','plat_type','business_type','sale_type','plat_order')
+            ->select('id','sales_order_type','model_type','order_number','selling_price','vin_no','car_type','order_type','customer_id','sign_time','crt_id','crt_time','mark','product_total','rate','construction_time','handover_time','other_fee','discount_fee','contract_fee','pay_way','car_type','year','mileage','color','original_set','processing','state','invoice_state','plat_type','plat_order','install_method','install_position')
             ->orderby('id', 'desc');
 
         if(! empty($data['order_number'])) $model->where('order_number','LIKE', '%'.$data['order_number'].'%');
@@ -599,8 +568,6 @@ class SalesOrderService extends Service
         if(isset($data['state'])) $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['business_type'])) $model->where('business_type',$data['business_type']);
-        if(! empty($data['sale_type'])) $model->where('sale_type',$data['sale_type']);
         if(! empty($data['plat_type'])) $model->where('plat_type',$data['plat_type']);
         if(! empty($data['plat_order'])) $model->where('plat_order','LIKE', '%'.$data['plat_order'].'%');
         if(! empty($data['customer'])) {
@@ -636,15 +603,14 @@ class SalesOrderService extends Service
      * @return array
      */
     public function salesOrderRule(&$data, $user, $is_add = true){
-        if(empty($data['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['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,'请选择签订人'];
         if(! empty($data['sign_time'])) $data['sign_time'] = $this->changeDateToDateMin($data['sign_time']);
         if(! empty($data['expire_time'])) $data['expire_time'] = $this->changeDateToDateMin($data['expire_time']);
-//        if(empty($data['contract_state'])) return [false,'请选择合同状态'];
 //        if(empty($data['employee_two'])) return [false,'请选择负责人'];
 //        if(empty($data['product'])) return [false,'请选择产品'];
         if(! empty($data['product'])){
@@ -677,7 +643,6 @@ class SalesOrderService extends Service
             if(! empty($data['handover_time'])) $data['handover_time'] = $this->changeDateToDateMin($data['handover_time']);
 //            if(empty($data['deal_type'])) return [false,'成交类型不能为空'];
         }elseif($data['model_type'] == SalesOrder::Model_type_two){
-            if(empty($data['title'])) return [false,'合同名称不能为空'];
         }else{
 //            if(empty($data['car_type'])) return [false,'车型不能为空'];
 //            if(empty($data['year'])) return [false,'年份不能为空'];
@@ -723,7 +688,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_column($data['data'],'plat_type'),array_column($data['data'],'business_type'),array_column($data['data'],'sale_type')));
+        $array = array_unique(array_merge_recursive(array_column($data['data'],'order_type'),array_column($data['data'],'car_type'),array_column($data['data'],'pay_way'),array_column($data['data'],'install_position'),array_column($data['data'],'install_method'),array_column($data['data'],'plat_type')));
         $basic_map = BasicType::whereIn('id',$array)
             ->pluck('title','id')
             ->toArray();
@@ -773,24 +738,18 @@ class SalesOrderService extends Service
             $fee[$value['sales_order_id']] = $value['other_fee_1'];
         }
         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']] ?? '';
-            $data['data'][$key]['deal_type_title'] = $basic_map[$value['deal_type']] ?? '';
-            $data['data'][$key]['contract_state_title'] = $basic_map[$value['contract_state']] ?? '';
-            $data['data'][$key]['contract_type_title'] = $basic_map[$value['contract_type']] ?? '';
+            $data['data'][$key]['install_method_title'] = $basic_map[$value['install_method']] ?? '';
+            $data['data'][$key]['install_position_title'] = $basic_map[$value['install_position']] ?? '';
             $data['data'][$key]['car_type_title'] = $basic_map[$value['car_type']] ?? '';
             $data['data'][$key]['pay_way_title'] = $basic_map[$value['pay_way']] ?? '';
-            $data['data'][$key]['send_state_title'] = $basic_map[$value['send_state']] ?? '';
-            $data['data'][$key]['logistics_company_title'] = $basic_map[$value['logistics_company']] ?? '';
             $data['data'][$key]['customer_title'] = $customer[$value['customer_id']] ?? '';
             $data['data'][$key]['sign_time'] = $value['sign_time'] ? date('Y-m-d',$value['sign_time']) : '';
             $data['data'][$key]['construction_time'] = $value['construction_time'] ? date('Y-m-d H:i:s',$value['construction_time']) : '';
             $data['data'][$key]['handover_time'] = $value['handover_time'] ? date('Y-m-d H:i:s',$value['handover_time']) : '';
-            $data['data'][$key]['expire_time'] = $value['expire_time'] ? date('Y-m-d H:i:s',$value['expire_time']) : '';
             $data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
             $data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
             $data['data'][$key]['product'] = $product[$value['id']] ?? [];
@@ -1060,7 +1019,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','plat_type','business_type','sale_type','plat_order')
+            ->select('id','sales_order_type','model_type','order_number','selling_price','vin_no','car_type','order_type','customer_id','sign_time','crt_id','crt_time','mark','product_total','rate','construction_time','handover_time','other_fee','discount_fee','contract_fee','pay_way','car_type','year','mileage','color','original_set','processing','state','invoice_state','plat_type','plat_order','install_method','install_position')
             ->orderby('id', 'desc');
 
         if(! empty($data['openid'])){

app/Service/U8ServerService.php

@@ -503,7 +503,7 @@ class U8ServerService extends Service
             ->get()->toArray();
         $product_map = array_column($product,null,'id');
 
-        $code_map = BasicType::whereIn('id',array_unique(array_merge_recursive(array_column($main,'business_type'),array_column($main,'sale_type'),array_column($main,'plat_type'))))
+        $code_map = BasicType::whereIn('id',array_unique(array_merge_recursive(array_column($main,'sale_type'),array_column($main,'plat_type'))))
             ->pluck('title','id')
             ->toArray();
         $customer_map = Customer::whereIn('id',array_unique(array_column($main,'customer_id')))
@@ -562,7 +562,7 @@ class U8ServerService extends Service
             $sub_map[$value['sales_order_id']][] = $value;
         }
         foreach ($main as $key => $value){
-            $main[$key]['cbustype'] = $code_map[$value['business_type']] ?? ""; //业务类型(本身就是中文)
+            $main[$key]['cbustype'] = "普通销售"; //业务类型(本身就是中文)
             $main[$key]['cstname'] = $code_map[$value['sale_type']] ?? ""; //销售类型
             $main[$key]['ccusabbname'] = $customer_map[$value['customer_id']] ?? "";//客户简称
             $main[$key]['cdepname'] = $depart[$value['top_depart_id']] ?? "";//部门名称