|
@@ -519,7 +519,7 @@ class U8ServerService extends Service
|
|
->pluck('title','id')
|
|
->pluck('title','id')
|
|
->toArray();
|
|
->toArray();
|
|
$emp = Employee::whereIn('id',array_unique(array_column($main,'crt_id')))
|
|
$emp = Employee::whereIn('id',array_unique(array_column($main,'crt_id')))
|
|
- ->pluck('emp_name','id')
|
|
|
|
|
|
+ ->pluck('number','id')
|
|
->toArray();
|
|
->toArray();
|
|
$see = SeeRange::where('del_time',0)
|
|
$see = SeeRange::where('del_time',0)
|
|
->whereIn('data_id',array_column($main,'id'))
|
|
->whereIn('data_id',array_column($main,'id'))
|
|
@@ -571,7 +571,7 @@ class U8ServerService extends Service
|
|
}
|
|
}
|
|
foreach ($main as $key => $value){
|
|
foreach ($main as $key => $value){
|
|
$main[$key]['cbustype'] = "普通销售"; //业务类型(本身就是中文)
|
|
$main[$key]['cbustype'] = "普通销售"; //业务类型(本身就是中文)
|
|
- $main[$key]['cstname'] = $code_map[$value['sale_type']] ?? ""; //销售类型
|
|
|
|
|
|
+ $main[$key]['cstname'] = SalesOrder::$model_type_title[$value['model_type']] ?? ""; //销售类型
|
|
$main[$key]['ccusabbname'] = $customer_map[$value['customer_id']] ?? "";//客户简称
|
|
$main[$key]['ccusabbname'] = $customer_map[$value['customer_id']] ?? "";//客户简称
|
|
// $main[$key]['cdepname'] = $depart[$value['top_depart_id']] ?? "";//部门名称
|
|
// $main[$key]['cdepname'] = $depart[$value['top_depart_id']] ?? "";//部门名称
|
|
// $main[$key]['cpersoncode'] = $emp[$value['crt_id']] ?? "";//业务员
|
|
// $main[$key]['cpersoncode'] = $emp[$value['crt_id']] ?? "";//业务员
|