|
@@ -782,12 +782,14 @@ class SalesOrderService extends Service
|
|
|
}
|
|
|
if(isset($data['state'])) {
|
|
|
if($data['state'] == SalesOrder::special_status){
|
|
|
- $model->whereRaw(SalesOrder::search);
|
|
|
+ $model->whereRaw(SalesOrder::search1);
|
|
|
}else{
|
|
|
+ if($data['state'] == SalesOrder::State_three) $model->where('dispatch_time_first','>',0);
|
|
|
$model->where('state', $data['state']);
|
|
|
}
|
|
|
}
|
|
|
if(isset($data['invoice_state'])) $model->where('invoice_state',$data['invoice_state']);
|
|
|
+ if(isset($data['is_confirm'])) $model->where('is_confirm',$data['is_confirm']);
|
|
|
if(! empty($data['order_type'])) $model->where('order_type',$data['order_type']);
|
|
|
if(! empty($data['plat_type'])) $model->where('plat_type',$data['plat_type']);
|
|
|
if(! empty($data['plat_type_title'])) {
|
|
@@ -1091,9 +1093,16 @@ class SalesOrderService extends Service
|
|
|
$data['data'][$key]['is_confirm_title'] = $value['is_confirm'] ? "已接收" : "未接收" ;
|
|
|
$tmp = $invoiceData[$value['id']] ?? [];
|
|
|
$data['data'][$key]['invoice_arr'] = implode(',', $tmp);
|
|
|
- $data['data'][$key]['dispatch_company'] = $dispatch[$value['id']] ?? '';
|
|
|
+ $dispatch_company = $dispatch[$value['id']] ?? '';
|
|
|
+ $data['data'][$key]['dispatch_company'] = $dispatch_company;
|
|
|
$data['data'][$key]['u8_message'] = $u8[$value['id']] ?? '';
|
|
|
$data['data'][$key]['construction_no'] = $construction_array[$value['id']] ?? '';
|
|
|
+ if($value['is_confirm']){
|
|
|
+ $show = $dispatch_company . '已接收';
|
|
|
+ }else{
|
|
|
+ $show = '待' . $dispatch_company . '接收';
|
|
|
+ }
|
|
|
+ $data['data'][$key]['wx_show'] = $show;
|
|
|
|
|
|
//用于计算--------
|
|
|
//已收(审核后)
|