|
@@ -121,7 +121,8 @@ class SalesOrderService extends Service
|
|
|
foreach ($data['file'] as $value){
|
|
|
$insert[] = [
|
|
|
'sales_order_id' => $model->id,
|
|
|
- 'file' => $value,
|
|
|
+ 'file' => $value['url'],
|
|
|
+ 'name' => $value['name'],
|
|
|
'type' => SalesOrderInfo::type_four,
|
|
|
'crt_time' => $time,
|
|
|
];
|
|
@@ -252,7 +253,8 @@ class SalesOrderService extends Service
|
|
|
foreach ($data['file'] as $value){
|
|
|
$insert[] = [
|
|
|
'sales_order_id' => $model->id,
|
|
|
- 'file' => $value,
|
|
|
+ 'file' => $value['url'],
|
|
|
+ 'name' => $value['name'],
|
|
|
'type' => SalesOrderInfo::type_four,
|
|
|
'crt_time' => $time,
|
|
|
];
|
|
@@ -372,7 +374,6 @@ class SalesOrderService extends Service
|
|
|
|
|
|
$sales_info = SalesOrderInfo::where('del_time',0)
|
|
|
->where('sales_order_id',$sales['id'])
|
|
|
- ->select('id','sales_order_id','employee_id','type')
|
|
|
->get()->toArray();
|
|
|
$emp_map = Employee::whereIn('id',array_unique(array_merge_recursive([$sales['crt_id']],array_column($sales_info,'employee_id'))))
|
|
|
->pluck('emp_name','id')
|