待入账与入账实际汇率

2025-11-01 14:02:15 +08:00
parent 8674063e6e
commit 4dbd72acce
2 changed files with 13 additions and 1 deletions
@@ -214,13 +214,18 @@ class FinPaymentApplyService
            $query->whereDoesntHave('receipt');
        }

+        if(isset($param['scene']) && $param['scene'] == 'pending'){ //待入账列表
+            $query->where('receipt_id', '>' ,'0');
+            $query->where('submit_files','!=','');
+        }
+
        if($param['scene'] == 'delete'){ //查询作废数据
            $query->onlyTrashed();
        }elseif ($param['scene'] == 'all'){ //查询包含作废数据的全量数据
            $query->withTrashed();
        }

-        if ((isset($param['scene']) && $param['scene'] == 'list') || empty($param['receipt_id'])) {
+        if ((isset($param['scene']) && ($param['scene'] == 'list' || $param['scene'] == 'pending'))|| empty($param['receipt_id']) ) {
            return $query->orderBy('id','desc')->paginate($limit, ['*'], 'page', $page);
        }