cqpCow hace 1 año
padre
commit
ba9e7d93df
Se han modificado 2 ficheros con 195 adiciones y 212 borrados
  1. 1 1
      app/Model/BasicType.php
  2. 194 211
      app/Service/SalesOrderService.php

+ 1 - 1
app/Model/BasicType.php

@@ -19,7 +19,7 @@ class BasicType extends Model
         5 => '进展阶段类型',
         6 => '客户状态类型',
         7 => '决策关系类型',
-        8 => '级别类型',
+        8 => '客户分级',
         9 => '状态类型',
         10 => '车型',
         11 => '订单类型',

+ 194 - 211
app/Service/SalesOrderService.php

@@ -4,10 +4,10 @@ namespace App\Service;
 
 use App\Model\BasicType;
 use App\Model\Customer;
-use App\Model\CustomerInfo;
-use App\Model\Depart;
 use App\Model\Employee;
 use App\Model\SalesOrder;
+use App\Model\SalesOrderInfo;
+use App\Model\SalesOrderProductInfo;
 use Illuminate\Support\Facades\DB;
 
 class SalesOrderService extends Service
@@ -19,110 +19,95 @@ class SalesOrderService extends Service
         try {
             DB::beginTransaction();
 
-            $model = Customer::where('id',$data['id'])->first();
-            $model->title = $data['title'];
+            $model = SalesOrder::where('id', $data['id'])->first();
             $model->model_type = $data['model_type'];
-            $model->customer_intention = $data['customer_intention'] ?? 0;
-            $model->customer_from = $data['customer_from'] ?? 0;
-            $model->customer_type = $data['customer_type'] ?? 0;
-            $model->car_type = $data['car_type'] ?? 0;
-            $model->consulting_product = $data['consulting_product'] ?? '';
-            $model->intention_product = $data['intention_product'] ?? 0;
-            $model->progress_stage = $data['progress_stage'] ?? 0;
-            $model->address1 = $data['address1'] ?? '';
-            $model->address2 = $data['address2'] ?? '';
+            $model->order_number = $data['order_number'];
+            $model->title = $data['title'] ?? '';
+            $model->selling_price = $data['selling_price'] ?? 0;
+            $model->vin_no = $data['vin_no'] ?? '';
+            $model->order_type = $data['order_type'] ?? 0;
+            $model->deal_type = $data['deal_type'] ?? 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->importance = $data['importance'] ?? '';
-            $model->company = $data['company'] ?? '';
-            $model->company_short_name = $data['company_short_name'] ?? '';
-            $model->depart_id = $data['depart_id'] ?? 0;
-            $model->state_type = $data['state_type'] ?? 0;
-            $model->customer_state = $data['customer_state'] ?? 0;
-            $model->customer_grade = $data['customer_grade'] ?? 0;
+            $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->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'] ?? '';
+            $model->color = $data['color'] ?? '';
+            $model->original_set = $data['original_set'] ?? '';
+            $model->processing = $data['processing'] ?? '';
             $model->save();
             $time = time();
 
-            CustomerInfo::where('del_time',0)
-                ->where('customer_id',$data['id'])
+            SalesOrderInfo::where('del_time',0)
+                ->where('sales_order_id',$data['id'])
+                ->update(['del_time' => $time]);
+            SalesOrderProductInfo::where('del_time',0)
+                ->where('sales_order_id',$data['id'])
                 ->update(['del_time' => $time]);
-
-            if(! empty($data['customer_contact'])){
-                $insert = [];
-                foreach ($data['customer_contact'] as $value){
-                    $insert[] = [
-                        'customer_id' => $model->id,
-                        'contact_type' => $value['id'],
-                        'contact_info' => $value['info'],
-                        'type' => CustomerInfo::type_one,
-                        'crt_time' => $time,
-                    ];
-                }
-                CustomerInfo::insert($insert);
-            }
 
             if(! empty($data['employee_one'])){
                 $insert = [];
                 foreach ($data['employee_one'] as $value){
                     $insert[] = [
-                        'customer_id' => $model->id,
+                        'sales_order_id' => $model->id,
                         'employee_id' => $value,
-                        'type' => CustomerInfo::type_two,
+                        'type' => SalesOrderInfo::type_one,
                         'crt_time' => $time,
                     ];
                 }
-                CustomerInfo::insert($insert);
+                SalesOrderInfo::insert($insert);
             }
 
             if(! empty($data['employee_two'])){
                 $insert = [];
                 foreach ($data['employee_two'] as $value){
                     $insert[] = [
-                        'customer_id' => $model->id,
+                        'sales_order_id' => $model->id,
                         'employee_id' => $value,
-                        'type' => CustomerInfo::type_three,
+                        'type' => SalesOrderInfo::type_two,
                         'crt_time' => $time,
                     ];
                 }
-                CustomerInfo::insert($insert);
+                SalesOrderInfo::insert($insert);
             }
 
             if(! empty($data['employee_three'])){
                 $insert = [];
                 foreach ($data['employee_three'] as $value){
                     $insert[] = [
-                        'customer_id' => $model->id,
+                        'sales_order_id' => $model->id,
                         'employee_id' => $value,
-                        'type' => CustomerInfo::type_four,
+                        'type' => SalesOrderInfo::type_three,
                         'crt_time' => $time,
                     ];
                 }
-                CustomerInfo::insert($insert);
+                SalesOrderInfo::insert($insert);
             }
 
-            if(! empty($data['img'])){
+            if(! empty($data['product'])){
                 $insert = [];
-                foreach ($data['img'] as $value){
+                foreach ($data['product'] as $value){
                     $insert[] = [
-                        'customer_id' => $model->id,
-                        'file' => $value,
-                        'type' => CustomerInfo::type_five,
+                        'sales_order_id' => $model->id,
+                        'product_id' => $value,
                         'crt_time' => $time,
                     ];
                 }
-                CustomerInfo::insert($insert);
-            }
-
-            if(! empty($data['file'])){
-                $insert = [];
-                foreach ($data['file'] as $value){
-                    $insert[] = [
-                        'customer_id' => $model->id,
-                        'file' => $value,
-                        'type' => CustomerInfo::type_six,
-                        'crt_time' => $time,
-                    ];
-                }
-                CustomerInfo::insert($insert);
+                SalesOrderProductInfo::insert($insert);
             }
 
             DB::commit();
@@ -141,107 +126,89 @@ class SalesOrderService extends Service
         try {
             DB::beginTransaction();
 
-            $model = new Customer();
-            $model->title = $data['title'];
+            $model = new SalesOrder();
             $model->model_type = $data['model_type'];
-            $model->customer_intention = $data['customer_intention'] ?? 0;
-            $model->customer_from = $data['customer_from'] ?? 0;
-            $model->customer_type = $data['customer_type'] ?? 0;
+            $model->order_number = $data['order_number'];
+            $model->title = $data['title'] ?? '';
+            $model->selling_price = $data['selling_price'] ?? 0;
+            $model->vin_no = $data['vin_no'] ?? '';
+            $model->order_type = $data['order_type'] ?? 0;
+            $model->deal_type = $data['deal_type'] ?? 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->logistics_company = $data['logistics_company'] ?? 0;
+            $model->logistics_number = $data['logistics_number'] ?? '';
             $model->car_type = $data['car_type'] ?? 0;
-            $model->consulting_product = $data['consulting_product'] ?? '';
-            $model->intention_product = $data['intention_product'] ?? 0;
-            $model->progress_stage = $data['progress_stage'] ?? 0;
-            $model->address1 = $data['address1'] ?? '';
-            $model->address2 = $data['address2'] ?? '';
+            $model->year = $data['year'] ?? '';
+            $model->mileage = $data['mileage'] ?? '';
+            $model->color = $data['color'] ?? '';
+            $model->original_set = $data['original_set'] ?? '';
+            $model->processing = $data['processing'] ?? '';
             $model->crt_id = $user['id'];
-            $model->mark = $data['mark'] ?? '';
-            $model->importance = $data['importance'] ?? '';
-            $model->company = $data['company'] ?? '';
-            $model->company_short_name = $data['company_short_name'] ?? '';
-            $model->depart_id = $data['depart_id'] ?? 0;
-            $model->state_type = $data['state_type'] ?? 0;
-            $model->customer_state = $data['customer_state'] ?? 0;
-            $model->customer_grade = $data['customer_grade'] ?? 0;
             $model->save();
             $time = time();
 
-            if(! empty($data['customer_contact'])){
-                $insert = [];
-                foreach ($data['customer_contact'] as $value){
-                    $insert[] = [
-                        'customer_id' => $model->id,
-                        'contact_type' => $value['id'],
-                        'contact_info' => $value['info'],
-                        'type' => CustomerInfo::type_one,
-                        'crt_time' => $time,
-                    ];
-                }
-                CustomerInfo::insert($insert);
-            }
-
             if(! empty($data['employee_one'])){
                 $insert = [];
                 foreach ($data['employee_one'] as $value){
                     $insert[] = [
-                        'customer_id' => $model->id,
+                        'sales_order_id' => $model->id,
                         'employee_id' => $value,
-                        'type' => CustomerInfo::type_two,
+                        'type' => SalesOrderInfo::type_one,
                         'crt_time' => $time,
                     ];
                 }
-                CustomerInfo::insert($insert);
+                SalesOrderInfo::insert($insert);
             }
 
             if(! empty($data['employee_two'])){
                 $insert = [];
                 foreach ($data['employee_two'] as $value){
                     $insert[] = [
-                        'customer_id' => $model->id,
+                        'sales_order_id' => $model->id,
                         'employee_id' => $value,
-                        'type' => CustomerInfo::type_three,
+                        'type' => SalesOrderInfo::type_two,
                         'crt_time' => $time,
                     ];
                 }
-                CustomerInfo::insert($insert);
+                SalesOrderInfo::insert($insert);
             }
 
             if(! empty($data['employee_three'])){
                 $insert = [];
                 foreach ($data['employee_three'] as $value){
                     $insert[] = [
-                        'customer_id' => $model->id,
+                        'sales_order_id' => $model->id,
                         'employee_id' => $value,
-                        'type' => CustomerInfo::type_four,
-                        'crt_time' => $time,
-                    ];
-                }
-                CustomerInfo::insert($insert);
-            }
-
-            if(! empty($data['img'])){
-                $insert = [];
-                foreach ($data['img'] as $value){
-                    $insert[] = [
-                        'customer_id' => $model->id,
-                        'file' => $value,
-                        'type' => CustomerInfo::type_five,
+                        'type' => SalesOrderInfo::type_three,
                         'crt_time' => $time,
                     ];
                 }
-                CustomerInfo::insert($insert);
+                SalesOrderInfo::insert($insert);
             }
 
-            if(! empty($data['file'])){
+            if(! empty($data['product'])){
                 $insert = [];
-                foreach ($data['file'] as $value){
+                foreach ($data['product'] as $value){
                     $insert[] = [
-                        'customer_id' => $model->id,
-                        'file' => $value,
-                        'type' => CustomerInfo::type_six,
+                        'sales_order_id' => $model->id,
+                        'product_id' => $value,
                         'crt_time' => $time,
                     ];
                 }
-                CustomerInfo::insert($insert);
+                SalesOrderProductInfo::insert($insert);
             }
 
             DB::commit();
@@ -259,11 +226,14 @@ class SalesOrderService extends Service
         try {
             DB::beginTransaction();
 
-            Customer::whereIn('id',$data['id'])->update([
+            SalesOrder::whereIn('id',$data['id'])->update([
                 'del_time'=> time()
             ]);
-            CustomerInfo::where('del_time',0)
-                ->where('customer_id',$data['id'])
+            SalesOrderInfo::where('del_time',0)
+                ->where('sales_order_id',$data['id'])
+                ->update(['del_time' => time()]);
+            SalesOrderProductInfo::where('del_time',0)
+                ->where('sales_order_id',$data['id'])
                 ->update(['del_time' => time()]);
 
             DB::commit();
@@ -278,79 +248,70 @@ class SalesOrderService extends Service
     public function salesOrderDetail($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据!'];
 
-        $customer = Customer::where('del_time',0)
+        $sales = SalesOrderInfo::where('del_time',0)
             ->where('id',$data['id'])
             ->first();
-        if(empty($customer)) return [false,'客户不存在或已被删除'];
-        $customer = $customer->toArray();
-        $customer['customer_contact'] = $customer['employee_one'] = $customer['employee_two'] = $customer['employee_three'] = $customer['img'] = $customer['file'] =[];
+        if(empty($sales)) return [false,'销售订单不存在或已被删除'];
+        $sales = $sales->toArray();
+        $sales['employee_one'] = $sales['employee_two'] = $sales['employee_three'] = $sales['product'] = [];
         $array = [
-            $customer['customer_intention'],
-            $customer['customer_from'],
-            $customer['customer_type'],
-            $customer['car_type'],
-            $customer['intention_product'],
-            $customer['progress_stage'],
-            $customer['state_type'],
-            $customer['customer_state'],
-            $customer['customer_grade'],
+            $sales['order_type'],
+            $sales['deal_type'],
+            $sales['contract_state'],
+            $sales['car_type'],
+            $sales['pay_way'],
+            $sales['logistics_company'],
+            $sales['state_type'],
         ];
         $basic_map = BasicType::whereIn('id',$array)
             ->pluck('title','id')
             ->toArray();
-        $depart_title = Depart::where('id',$customer['depart_id'])->select('title')->value();
-        foreach ($customer as $key => $value){
-            $customer[$key]['customer_intention_title'] = $basic_map[$value['customer_intention']] ?? '';
-            $customer[$key]['customer_from_title'] = $basic_map[$value['customer_from']] ?? '';
-            $customer[$key]['customer_type_title'] = $basic_map[$value['customer_type']] ?? '';
-            $customer[$key]['car_type_title'] = $basic_map[$value['car_type']] ?? '';
-            $customer[$key]['intention_product_title'] = $basic_map[$value['intention_product']] ?? '';
-            $customer[$key]['progress_stage_title'] = $basic_map[$value['progress_stage']] ?? '';
-            $customer[$key]['state_type_title'] = $basic_map[$value['state_type']] ?? '';
-            $customer[$key]['customer_state_title'] = $basic_map[$value['customer_state']] ?? '';
-            $customer[$key]['customer_grade_title'] = $basic_map[$value['customer_grade']] ?? '';
-            $customer[$key]['depart_title'] = $depart_title ?? '';
+        foreach ($sales as $key => $value){
+            $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]['car_type_title'] = $basic_map[$value['car_type']] ?? '';
+            $sales[$key]['pay_way_title'] = $basic_map[$value['pay_way']] ?? '';
+            $sales[$key]['logistics_company_title'] = $basic_map[$value['logistics_company']] ?? '';
+            $sales[$key]['state_type_title'] = $basic_map[$value['state_type']] ?? '';
         }
 
-        $customer_info = CustomerInfo::where('del_time',0)
-            ->where('customer_id',$customer['id'])
-            ->select('id','customer_id','contact_type','contact_info','employee_id','file','type')
+        $sales_info = SalesOrderInfo::where('del_time',0)
+            ->where('sales_order_id',$sales['id'])
+            ->select('id','sales_order_id','employee_id','type')
             ->get()->toArray();
-        foreach ($customer_info as $value){
-            if($value['type'] == CustomerInfo::type_one){
-                $customer['customer_contact'][] = [
-                    'id' => $value['contact_type'],
-                    'info' => $value['contact_info']
-                ];
-            }elseif ($value['type'] == CustomerInfo::type_two){
-                $customer['employee_one'][] = [
-                    $value['employee_id']
-                ];
-            }elseif ($value['type'] == CustomerInfo::type_three){
-                $customer['employee_two'][] = [
+        foreach ($sales_info as $value){
+            if($value['type'] == SalesOrderInfo::type_one){
+                $sales['employee_one'][] = [
                     $value['employee_id']
                 ];
-            }elseif ($value['type'] == CustomerInfo::type_four){
-                $customer['employee_three'][] = [
+            }elseif ($value['type'] == SalesOrderInfo::type_two){
+                $sales['employee_two'][] = [
                     $value['employee_id']
                 ];
-            }elseif ($value['type'] == CustomerInfo::type_five){
-                $customer['img'][] = [
-                    $value['employee_id']
-                ];
-            }elseif ($value['type'] == CustomerInfo::type_six){
-                $customer['file'][] = [
+            }elseif ($value['type'] == SalesOrderInfo::type_three){
+                $sales['employee_three'][] = [
                     $value['employee_id']
                 ];
             }
         }
 
-        return [true, $customer];
+        $sales_p_info = SalesOrderProductInfo::where('del_time',0)
+            ->where('sales_order_id',$sales['id'])
+            ->select('id','sales_order_id','product_id')
+            ->get()->toArray();
+        foreach ($sales_p_info as $value){
+            $sales['product'][] = [
+                $value['product_id']
+            ];
+        }
+
+        return [true, $sales];
     }
 
     public function salesOrderList($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')
+        $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')
             ->orderby('id', 'desc')
             ->where('model_type',$data['model_type']);
 
@@ -362,35 +323,59 @@ class SalesOrderService extends Service
         return [true, $list];
     }
 
-    public function salesOrderRule($data, $is_add = true){
-        if(empty($data['model_type'])) return [false,'客户模板类型不能为空'];
-        if(! in_array($data['model_type'],Customer::$model_type)) return [false,'客户模板类型错误'];
-        if(empty($data['title'])) return [false,'客户名称不能为空'];
-        if($data['model_type'] == Customer::Model_type_one){
-            if(empty($data['customer_from'])) return [false,'客户来源不能为空'];
-            if(empty($data['customer_type'])) return [false,'客户类别不能为空'];
-            if(empty($data['consulting_product'])) return [false,'咨询产品不能为空'];
-            if(empty($data['progress_stage'])) return [false,'进展阶段不能为空'];
-            if(empty($data['employee_one'])) return [false,'销售SA不能为空'];
+    public function salesOrderRule(&$data, $is_add = true){
+        if(empty($data['model_type'])) return [false,'订单模板类型不能为空'];
+        if(! in_array($data['model_type'],SalesOrder::$model_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'])) return [false,'签订日期不能为空'];
+        $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['contract_fee'])) return [false,'合同金额不能为空'];
+        if(! is_numeric($data['contract_fee']) || $data['contract_fee'] < 0)  return [false,'合同金额不正确'];
+        $formattedNumber = number_format($data['contract_fee'], 2, '.', '');
+        if($formattedNumber != $data['contract_fee']) return [false,'合同金额请不要超过两位小数'];
+
+        if($data['model_type'] == SalesOrder::Model_type_one){
+            if(empty($data['order_type'])) return [false,'订单类型不能为空'];
+            if(empty($data['construction_time'])) return [false,'施工日期不能为空'];
+            $data['construction_time'] = $this->changeDateToDateMin($data['construction_time']);
+            if(empty($data['handover_time'])) return [false,'交车日期不能为空'];
+            $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['customer_contact'])) return [false,'客户联系方式不能为空'];
+            if(empty($data['year'])) return [false,'年份不能为空'];
+            if(empty($data['mileage'])) return [false,'表显里程不能为空'];
         }
 
         if($is_add){
-            $bool = Customer::where('del_time',0)
-                ->where('title',$data['title'])
-                ->where('model_type',$data['model_type'])
-                ->exists();
+            $bool = SalesOrder::where('del_time',0)->where('order_number',$data['order_number'])->exists();
+            if($bool) return [false,'合同单号已存在,请重新获取'];
+
+            if($data['model_type'] == SalesOrder::Model_type_two){
+                $boolean = SalesOrder::where('del_time',0)
+                    ->where('title',$data['title'])
+                    ->where('model_type',$data['model_type'])
+                    ->exists();
+            }
         }else{
             if(empty($data['id'])) return [false,'ID不能为空'];
-            $bool = Customer::where('del_time',0)
-                ->where('id','<>',$data['id'])
-                ->where('title',$data['title'])
-                ->where('model_type',$data['model_type'])
-                ->exists();
+            if($data['model_type'] == SalesOrder::Model_type_two){
+                $boolean = SalesOrder::where('del_time',0)
+                    ->where('id','<>',$data['id'])
+                    ->where('title',$data['title'])
+                    ->where('model_type',$data['model_type'])
+                    ->exists();
+            }
         }
-        if($bool) return [false,'客户名称不能重复'];
+        if(isset($boolean) && $boolean) return [false,'合同名称不能重复'];
 
         return [true, $data];
     }
@@ -398,28 +383,26 @@ class SalesOrderService extends Service
     public function fillData($data){
         if(empty($data['data'])) return $data;
 
-        $array = array_unique(array_merge_recursive(array_column($data['data'],'customer_intention'),array_column($data['data'],'customer_from'),array_column($data['data'],'customer_type'),array_column($data['data'],'car_type'),array_column($data['data'],'intention_product'),array_column($data['data'],'progress_stage'),array_column($data['data'],'state_type'),array_column($data['data'],'customer_state'),array_column($data['data'],'customer_grade')));
+        $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')));
         $basic_map = BasicType::whereIn('id',$array)
             ->pluck('title','id')
             ->toArray();
-        $depart_title = Depart::where('id',array_unique(array_column($data['data'],'depart_id')))
-            ->pluck('title','id')
-            ->toArray();
         $emp = Employee::whereIn('id',array_unique(array_column($data['data'],'crt_id')))
             ->pluck('emp_name','id')
             ->toArray();
+        $customer = Customer::whereIn('id',array_unique(array_column($data['data'],'customer_id')))
+            ->pluck('title','id')
+            ->toArray();
 
         foreach ($data['data'] as $key => $value){
-            $data['data'][$key]['customer_intention_title'] = $basic_map[$value['customer_intention']] ?? '';
-            $data['data'][$key]['customer_from_title'] = $basic_map[$value['customer_from']] ?? '';
-            $data['data'][$key]['customer_type_title'] = $basic_map[$value['customer_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]['car_type_title'] = $basic_map[$value['car_type']] ?? '';
-            $data['data'][$key]['intention_product_title'] = $basic_map[$value['intention_product']] ?? '';
-            $data['data'][$key]['progress_stage_title'] = $basic_map[$value['progress_stage']] ?? '';
+            $data['data'][$key]['pay_way_title'] = $basic_map[$value['pay_way']] ?? '';
+            $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_state_title'] = $basic_map[$value['customer_state']] ?? '';
-            $data['data'][$key]['customer_grade_title'] = $basic_map[$value['customer_grade']] ?? '';
-            $data['data'][$key]['depart_title'] = $depart_title[$value['depart_id']] ?? '';
+            $data['data'][$key]['customer_title'] = $customer[$value['customer_id']] ?? '';
             $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']] ?? '';
         }