|
@@ -239,6 +239,14 @@ class InvoiceOrderService extends Service
|
|
|
$model->where('crt_time','<=',$end);
|
|
|
}
|
|
|
}
|
|
|
+ if(! empty($data['send_man'])){
|
|
|
+ $emp = Employee::where('del_time',0)
|
|
|
+ ->where('emp_name', 'LIKE', '%'.$data['send_man'].'%')
|
|
|
+ ->select('id')
|
|
|
+ ->get()->toArray();
|
|
|
+ $model->whereIn('send',array_unique(array_column($emp,'id')));
|
|
|
+ }
|
|
|
+ if(! empty($data['take'])) $model->where('take', 'LIKE', '%'.$data['take'].'%');
|
|
|
|
|
|
$list = $this->limit($model,'',$data);
|
|
|
$list = $this->fillListData($list);
|