Merge branch 'feature/inv' into develop

app/common/service/InvRequisitionApproveService.php

@@ -138,12 +138,9 @@ class InvRequisitionApproveService
 //                    return ['status' => 'noop', 'msg' => '非当前审批'];
 //                }
                 return ['status' => 'noop', 'msg' => '无待处理记录'];
+            } else if ($pendingRecord->approver_id != $uid) { //检查当前用户是否为审核人
+                return ['status' => 'noop', 'msg' => '无审核权限'];
             }
-//            else{
-//                if ($pendingRecord->approver_id == $uid) {
-//                    return ['status' => 'noop', 'msg' => '无审核权限'];
-//                }
-//            }
 
             $now = time();
 

app/common/service/InvRequisitionItemReturnService.php

@@ -561,6 +561,13 @@ class InvRequisitionItemReturnService
         return $config;
     }
 
+    /** 分页列表 */
+    public function serviceList(Request $request, string $scene = 'index')
+    {
+        $InvRequisitionReturn = new InvRequisitionReturnService();
+        return $InvRequisitionReturn->serviceList($request, $scene);
+    }
+
     /** 查看单条 */
     public function serviceShow(Request $request, string $scene = 'show')
     {

app/common/service/InvRequisitionService.php

@@ -65,7 +65,7 @@ class InvRequisitionService
                 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;
+                    $config['where']['status'] = 17;
                 }elseif(isset($p['phase']) && $p['phase'] == 'unreturned'){ //未归还
                     $config['where']['status'] = ['in',[12,14,15,16,18]];
                 }