收款记录

app/common/controller/FinPaymentApplyController.php

@@ -75,7 +75,7 @@ class FinPaymentApplyController extends BaseController
      * @param array $data
      * @return array
      */
-    protected function showFormat($data)
+    public function showFormat($data)
     {
         if (isset($data['doc_user_id'])) //内勤
             $data['doc_user_name'] = User::where('id', $data['doc_user_id'])->value('name')??'';

app/common/controller/FinReceiptController.php

@@ -3,8 +3,12 @@ namespace app\common\controller;
 
 use app\common\controller\BaseController;
 use app\common\model\Country;
+use app\common\model\FinPaymentApply;
+use app\common\model\FinPaymentStock;
 use app\common\model\SysAccount;
 use app\common\model\SysCurrency;
+use app\common\model\SysDictItem;
+use app\common\model\User;
 use app\common\service\OssService;
 use app\common\traits\crud\CrudControllerTrait;
 use app\common\service\FinReceiptService;
@@ -81,6 +85,12 @@ class FinReceiptController extends BaseController
         } elseif (isset($data['fx_receipt_file'])) {
             $data['fx_receipt_file_full'] = '';
         }
+
+        if (!empty($data['payment_apply_id'])) {
+            $paymentApply = FinPaymentApply::where('id', $data['payment_apply_id'])->first()->toArray();
+            $paymentApply = (new FinPaymentApplyController())->showFormat($paymentApply);
+            $data['payment_apply'] = $paymentApply;
+        }
         return $data;
     }
 }

app/common/service/FinReceiptService.php

@@ -70,7 +70,7 @@ class FinReceiptService
                 }
 
                 // 关键字
-                if (isset($p['$query']) && $p['keyword']) {
+                if (isset($p['keyword']) && $p['keyword']) {
                     $k = '%' . $p['keyword'] . '%';
                     $config['orWhere'][] = ['remitter', 'like', $k];
                 }