|
|
@@ -36,7 +36,7 @@ class OrderIssueFilters
|
|
|
'log_content',
|
|
|
'is_imported',
|
|
|
'is_new_rejecting',
|
|
|
- 'logistic_id',
|
|
|
+ 'logistic',
|
|
|
'custom_code',
|
|
|
'hiddenTag',
|
|
|
'client_code',
|
|
|
@@ -50,7 +50,7 @@ class OrderIssueFilters
|
|
|
'id',
|
|
|
'created_at_start',
|
|
|
'created_at_end',
|
|
|
- 'order_issue_type_id',
|
|
|
+ 'order_issue_type',
|
|
|
'logistic_indemnity_money',
|
|
|
'baoshi_indemnity_money',
|
|
|
'rejectingStatus',
|
|
|
@@ -59,12 +59,12 @@ class OrderIssueFilters
|
|
|
'settlement_at_end',
|
|
|
'sendOrderClientCode',
|
|
|
'sendOrderLogisticNumber',
|
|
|
- 'user_workgroups',
|
|
|
+ 'workgroups',
|
|
|
'shop_name',
|
|
|
'finance_confirm',
|
|
|
'logistic_number_return',
|
|
|
'final_status',
|
|
|
- 'user_owner_group_id',
|
|
|
+ 'user_owner_group',
|
|
|
'archive_at_start',
|
|
|
'archive_at_end',
|
|
|
];
|
|
|
@@ -172,8 +172,8 @@ class OrderIssueFilters
|
|
|
|
|
|
$user = Auth::user();
|
|
|
$owner_ids = $user ? app('UserService')->getPermittingOwnerIds($user) : [];
|
|
|
- if (isset($this->params['owner_id'])){
|
|
|
- $this->searchWay($this->getOrderQuery(),$this->params['owner_id'],'orders.owner_id');
|
|
|
+ if (isset($this->params['owner'])){
|
|
|
+ $this->searchWay($this->getOrderQuery(),$this->params['owner'],'orders.owner_id');
|
|
|
} else{
|
|
|
$this->getOrderQuery()->whereIn('owner_id',$owner_ids);
|
|
|
}
|
|
|
@@ -249,7 +249,7 @@ class OrderIssueFilters
|
|
|
$this->queryBuilder->where('order_issues.is_new_rejecting',$is_new_rejecting);
|
|
|
}
|
|
|
|
|
|
- public function logistic_id($logistic_id)
|
|
|
+ public function logistic($logistic_id)
|
|
|
{
|
|
|
$this->getOrderQuery()->where('orders.logistic_id',$logistic_id);
|
|
|
}
|
|
|
@@ -324,7 +324,7 @@ class OrderIssueFilters
|
|
|
$this->queryBuilder->where('order_issues.created_at', '<=', $created_at_end . " 23:59:59");
|
|
|
}
|
|
|
|
|
|
- public function order_issue_type_id($order_issue_type_id)
|
|
|
+ public function order_issue_type($order_issue_type_id)
|
|
|
{
|
|
|
$this->searchWay($this->queryBuilder,$order_issue_type_id,'order_issues.order_issue_type_id');
|
|
|
}
|
|
|
@@ -370,7 +370,7 @@ class OrderIssueFilters
|
|
|
$this->searchWay($this->queryBuilder,$sendOrderClientCode,'order_issues.second_client_no');
|
|
|
}
|
|
|
|
|
|
- public function user_workgroups($user_work_groups)
|
|
|
+ public function workgroups($user_work_groups)
|
|
|
{
|
|
|
if(is_string($user_work_groups)){
|
|
|
$user_work_groups = explode(',', $user_work_groups);
|
|
|
@@ -431,7 +431,7 @@ class OrderIssueFilters
|
|
|
$this->queryBuilder->where('order_issues.finance_confirm',$finance_confirm);
|
|
|
}
|
|
|
|
|
|
- public function user_owner_group_id($user_owner_group_id)
|
|
|
+ public function user_owner_group($user_owner_group_id)
|
|
|
{
|
|
|
$this->queryBuilder->where('order_issues.user_owner_group_id',$user_owner_group_id);
|
|
|
}
|