|
|
@@ -893,7 +893,7 @@ class ApplyOrderService extends Service
|
|
|
->where('apply_time',">=",$data['apply_time'][0])
|
|
|
->where('apply_time',"<=",$data['apply_time'][1])
|
|
|
->where('type',$data['type'])
|
|
|
- ->select('id','order_number','apply_time','mark','status')
|
|
|
+ ->select('id','order_number','apply_time','mark','status','storehouse_title')
|
|
|
->orderBy('id','desc');
|
|
|
if(isset($data['status'])) $model->where('status', $data['status']);
|
|
|
if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])){
|
|
|
@@ -992,6 +992,7 @@ class ApplyOrderService extends Service
|
|
|
'apply_time' => $tmp['apply_time'],
|
|
|
'mark' => $tmp['mark'],
|
|
|
'status_title' => $tmp['status_title'],
|
|
|
+ 'storehouse_title' => $tmp['storehouse_title'],
|
|
|
'id' => $t['data_id'] ?? 0,
|
|
|
// 'main_id' => $t['id'],
|
|
|
'quantity' => $t['quantity'] ?? 0,
|
cqp