xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

内勤备货单查询

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-12-09 11:08:51 +08:00
parent 7258d9890e
commit 0ace4a7b0b
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/service/ApprovalRecordsService.php
+26 -3
View File
@@ -61,7 +61,7 @@ class ApprovalRecordsService
// if (!in_array(1, $request->user->role_ids)) { // if (!in_array(1, $request->user->role_ids)) {
// $config['where']['approver_id'] = $request->user->uid; // $config['where']['approver_id'] = $request->user->uid;
// } // }
$roles_id = array_intersect([1,5,6], $request->user->role_ids); $roles_id = array_intersect([1,6], $request->user->role_ids);
if(count($roles_id) == 0){ if(count($roles_id) == 0){
if(in_array(4, $request->user->role_ids)){ if(in_array(4, $request->user->role_ids)){
$report = User::where('report_to',$request->user->uid)->pluck('id')->toArray(); $report = User::where('report_to',$request->user->uid)->pluck('id')->toArray();
@@ -89,8 +89,31 @@ class ApprovalRecordsService
} }
if ($p['scene'] === 'history') { if ($p['scene'] === 'history') {
if (!in_array(1, $request->user->role_ids) && !in_array(5, $request->user->role_ids)) { // if (!in_array(1, $request->user->role_ids) && !in_array(5, $request->user->role_ids)) {
$config['where']['approver_id'] = $request->user->uid; // $config['where']['approver_id'] = $request->user->uid;
// }
$roles_id = array_intersect([1,6], $request->user->role_ids);
if(count($roles_id) == 0){
if(in_array(4, $request->user->role_ids)){
$report = User::where('report_to',$request->user->uid)->pluck('id')->toArray();
$report = array_merge($report, [$request->user->uid]);
$config['where']['approver_id'] = ['in',$report];
} elseif (in_array(5, $request->user->role_ids)){ //内勤
$userGroupMember = UserGroupMembers::where('user_id',$request->user->uid)
->where('is_leader',1)
->first();
if($userGroupMember){
$report = UserGroupMembers::where('group_id',$userGroupMember->group_id)
->pluck('user_id')
->toArray();
$report = array_merge($report, [$request->user->uid]);
$config['where']['salesperson_id'] = ['in',$report];
}else{ //内勤没有负责的组时
$config['where']['salesperson_id'] = $request->user->uid;
}
} else {
$config['where']['approver_id'] = $request->user->uid;
}
} }
$config['where']['status'] = ['!=', 'pending']; $config['where']['status'] = ['!=', 'pending'];
} }