待审核筛选

app/common/service/InvRequisitionService.php

@@ -60,10 +60,12 @@ class InvRequisitionService
                     $config['where']['applicant_id'] = $request->user->uid;
                 } elseif (isset($p['applicant_id']) && $p['applicant_id']) { //指定人员的申请
                     $config['where']['applicant_id'] = $p['applicant_id'];
-                } else { //审批人对应的记录
+                }
+               /* else { //审批人对应的记录
+                    $config['with'] = ['approval'];
                     $config['where']['approval.approver_id'] = $request->user->uid;
                     //$config['where']['approval.action'] = 0;
-                }
+                }*/
                 if(isset($p['phase']) && $p['phase'] == 'approve'){//借用审批中
                     $config['where']['status'] = ['in',[10,11]];
                     if(isset($p['scene']) && $p['scene'] == 'approval'){

app/mobile/controller/InvRequisitionController.php

@@ -54,10 +54,11 @@ class InvRequisitionController extends BaseController
     public function index(Request $request)
     {
         try {
+            $param = $request->all();
             $applicant_id = $request->get('applicant_id');
             $raw = $this->service->serviceList($request);
             $uid = $request->user->uid;
-            $data = $this->formatindex($raw,$applicant_id,$uid);
+            $data = $this->formatindex($raw,$applicant_id,$uid,$param);
 //            $data = $this->transformData($raw, method_exists($this, 'indexFormat')
 //                ? [$this, 'indexFormat']
 //                : null);
@@ -67,11 +68,18 @@ class InvRequisitionController extends BaseController
         }
     }
 
-    public function formatindex($p,$applicant_id,$uid){
+    public function formatindex($p,$applicant_id,$uid,$param){
         $records = $p->getCollection()
             ->map(fn($item) => $this->indexFormat($item, $applicant_id,$uid))
             ->toArray();
 
+        if(isset($param['phase']) && $param['phase'] == 'pending'){
+            foreach ($records as $key => $record) {
+                if($record['action']==1 || $record['action']==2)
+                    unset($records[$key]);
+            }
+        }
+
         return [
             'records' => $records,
             'total'   => $p->total(),