|
@@ -207,8 +207,7 @@ class PurchaseOrderService extends Service
|
|
*/
|
|
*/
|
|
public function getList($data,$user){
|
|
public function getList($data,$user){
|
|
$model = new PurchaseOrder(['userData' => $user]);
|
|
$model = new PurchaseOrder(['userData' => $user]);
|
|
- $model->where('del_time',0)
|
|
|
|
- ->select('order_number','id','depart_id','top_depart_id','mark','crt_time','state','crt_id','order_type','sales_order_id','supplier','purchase_id','purchase_total','rate','discount_fee','other_fee','total','is_purchase_to_main')
|
|
|
|
|
|
+ $model = $model->where('del_time',0)->select('order_number','id','depart_id','top_depart_id','mark','crt_time','state','crt_id','order_type','sales_order_id','supplier','purchase_id','purchase_total','rate','discount_fee','other_fee','total','is_purchase_to_main')
|
|
->orderby('id', 'desc');
|
|
->orderby('id', 'desc');
|
|
if(! empty($data['order_number'])) $model->where('order_number', 'LIKE', '%'.$data['order_number'].'%');
|
|
if(! empty($data['order_number'])) $model->where('order_number', 'LIKE', '%'.$data['order_number'].'%');
|
|
if(! empty($data['depart_id'])) $model->where('depart_id', $data['depart_id']);
|
|
if(! empty($data['depart_id'])) $model->where('depart_id', $data['depart_id']);
|