Merge branch 'feature/inv' into develop

2026-02-05 13:18:36 +08:00
parent f67f9ddef9 e84aba0a49
commit 385f380914
1 changed files with 7 additions and 0 deletions
@@ -61,6 +61,13 @@ class InvRequisitionService
                }elseif(isset($p['applicant_id']) && $p['applicant_id']){
                    $config['where']['applicant_id'] = $p['applicant_id'];
                }
+                if(isset($p['phase']) && $p['phase'] == 'approve'){//借用审批中
+                    $config['where']['status'] = ['in',[10,11,13]];
+                }elseif(isset($p['phase']) && $p['phase'] == 'repaid'){//已全部归还
+                    $config['where']['unreturned'] = 17;
+                }elseif(isset($p['phase']) && $p['phase'] == 'unreturned'){ //未归还
+                    $config['where']['status'] = ['in',[12,14,15,16,18]];
+                }
                $config['order']['id'] = 'desc';
                break;
            case 'show':