合同

app/Service/CustomerService.php

@@ -385,8 +385,7 @@ class CustomerService extends Service
     public function customerList($data,$user){
         $model = Customer::where('del_time',0)
             ->select('title','id','model_type','customer_intention','customer_from','customer_type','car_type','consulting_product','intention_product','progress_stage','address1','address2','crt_id','crt_time','mark','importance','company','company_short_name','depart_id','state_type','customer_state','customer_grade')
-            ->orderby('id', 'desc')
-            ->where('model_type',$data['model_type']);
+            ->orderby('id', 'desc');
 
         if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
         if(! empty($data['time_type'])) {
@@ -402,6 +401,8 @@ class CustomerService extends Service
                 $model->where('crt_time','<=',$end);
             }
         }
+        if(! empty($data['model_type'])) $model->where('model_type',$data['model_type']);
+
         $list = $this->limit($model,'',$data);
         $list = $this->fillData($list);
 

app/Service/SalesOrderService.php

@@ -41,6 +41,7 @@ class SalesOrderService extends Service
             $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;
@@ -104,7 +105,7 @@ class SalesOrderService extends Service
                     $insert[] = [
                         'sales_order_id' => $model->id,
                         'product_id' => $value['product_id'],
-                        'price' => $value['price'],
+                        'price' => $value['retail_price'],
                         'number' => $value['number'],
                         'mark' => $value['mark'],
                         'crt_time' => $time,
@@ -151,6 +152,7 @@ class SalesOrderService extends Service
             $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;
@@ -208,7 +210,7 @@ class SalesOrderService extends Service
                     $insert[] = [
                         'sales_order_id' => $model->id,
                         'product_id' => $value['product_id'],
-                        'price' => $value['price'],
+                        'price' => $value['retail_price'],
                         'number' => $value['number'],
                         'mark' => $value['mark'],
                         'crt_time' => $time,
@@ -266,6 +268,7 @@ class SalesOrderService extends Service
             $sales['contract_state'],
             $sales['car_type'],
             $sales['pay_way'],
+            $sales['send_state'],
             $sales['logistics_company'],
             $sales['state_type'],
         ];
@@ -279,6 +282,7 @@ class SalesOrderService extends Service
             $sales[$key]['contract_state_title'] = $basic_map[$value['contract_state']] ?? '';
             $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[$key]['state_type_title'] = $basic_map[$value['state_type']] ?? '';
         }
@@ -313,7 +317,7 @@ class SalesOrderService extends Service
             $sales['product'][] = [
                 'product_id' => $value['product_id'],
                 'mark' => $value['mark'],
-                'price' => $value['price'],
+                'retail_price' => $value['price'],
                 'number' => $value['number'],
             ];
         }
@@ -325,11 +329,11 @@ class SalesOrderService extends Service
 
     public function salesOrderList($data,$user){
         $model = SalesOrder::where('del_time',0)
-            ->select('title','id','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','logistics_company','logistics_number','car_type','year','mileage','color','original_set','processing','state')
-            ->orderby('id', 'desc')
-            ->where('model_type',$data['model_type']);
+            ->select('title','id','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')
+            ->orderby('id', 'desc');
 
         if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
+        if(! empty($data['model_type'])) $model->where('model_type',$data['model_type']);
 
         $list = $this->limit($model,'',$data);
         $list = $this->fillData($list);
@@ -354,9 +358,9 @@ class SalesOrderService extends Service
             $res = $this->checkNumber($value['number']);
             if(! $res) return [false,'请输入正确的产品数量'];
 
-            if(empty($value['price'])) return [false,'产品单价不能为空'];
-            $res = $this->checkNumber($value['price']);
-            if(! $res) return [false,'产品单价请输入不超过两位小数的数值'];
+            if(empty($value['retail_price'])) return [false,'产品零售价不能为空'];
+            $res = $this->checkNumber($value['retail_price']);
+            if(! $res) return [false,'产品零售价请输入不超过两位小数的数值'];
         }
         if(empty($data['contract_fee'])) return [false,'合同金额不能为空'];
         $res = $this->checkNumber($data['contract_fee']);
@@ -418,7 +422,7 @@ class SalesOrderService extends Service
     public function fillData($data){
         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'],'state_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'],'state_type'),array_column($data['data'],'send_state')));
         $basic_map = BasicType::whereIn('id',$array)
             ->pluck('title','id')
             ->toArray();
@@ -435,6 +439,7 @@ class SalesOrderService extends Service
             $data['data'][$key]['contract_state_title'] = $basic_map[$value['contract_state']] ?? '';
             $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]['state_type_title'] = $basic_map[$value['state_type']] ?? '';
             $data['data'][$key]['customer_title'] = $customer[$value['customer_id']] ?? '';