|
@@ -356,6 +356,7 @@ class Purchase extends BaseController
|
|
|
isset($params['end']) && $selectParams['end'] = $params['end'];
|
|
|
isset($params['supplierId']) && $selectParams['supplierId'] = $params['supplierId'];//供应商id
|
|
|
isset($params['buyerId']) && $selectParams['buyerId'] = $params['buyerId'];//采购员id
|
|
|
+ isset($params['shopId']) && $selectParams['shopId'] = $params['shopId'];//门店id
|
|
|
|
|
|
|
|
|
$selectParams['onReturn'] = isset($params['onReturn']) ? $params['onReturn'] : 0;
|
|
@@ -470,6 +471,10 @@ class Purchase extends BaseController
|
|
|
'offset' => $offset,
|
|
|
];
|
|
|
$export = isset($params['export']) ? $params['export'] : 0;
|
|
|
+
|
|
|
+ if(!empty($this->shopId)){
|
|
|
+ $selectParams["shopId"] = $this->shopId;
|
|
|
+ }
|
|
|
|
|
|
$orderData = $this->objMPurchase->getAllPurchaseDetails($selectParams, $export);
|
|
|
|
|
@@ -504,6 +509,7 @@ class Purchase extends BaseController
|
|
|
'end' => isset($params['end']) ? $params['end'] : '',
|
|
|
'search' => isset($params['search']) ? $params['search'] : '',
|
|
|
'merchantId' => isset($params['merchantId']) ? $params['merchantId'] : '',
|
|
|
+ 'shopId'=>isset($params['shopId']) ? $params['shopId'] : '',
|
|
|
];
|
|
|
$pageParams = pageToOffset($params['page'] ? : 1, $params['pageSize'] ? : 10);
|
|
|
$selectParams['limit'] = $pageParams['limit'];
|