From 352ce5cb13c1331f5dd1974d9b31a5b3d007b29d Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 15 Dec 2023 14:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=98=E6=AC=BE=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finance/FinancePaymentApplyLogic.php      |  2 ++
 .../finance/FinancePaymentApplyValidate.php   | 25 ++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php
index 6256fe5b5..9ec6219b3 100644
--- a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php
+++ b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php
@@ -44,6 +44,7 @@ class FinancePaymentApplyLogic extends BaseLogic
             FinancePaymentApply::create([
                 'supplier_id' => $params['supplier_id'] ?? 0,
                 'contract_id' => $params['contract_id'] ?? 0,
+                'approve_id' => $params['approve_id'] ?? 0,
                 'pay_date' => $params['pay_date'] ?? '',
                 'period' => $params['period'] ?? 0,
                 'payment_plan_id' => $params['payment_plan_id'] ?? 0,
@@ -85,6 +86,7 @@ class FinancePaymentApplyLogic extends BaseLogic
             FinancePaymentApply::where('id', $params['id'])->update([
                 'supplier_id' => $params['supplier_id'] ?? 0,
                 'contract_id' => $params['contract_id'] ?? 0,
+                'approve_id' => $params['approve_id'] ?? 0,
                 'pay_date' => $params['pay_date'] ?? '',
                 'period' => $params['period'] ?? 0,
                 'payment_plan_id' => $params['payment_plan_id'] ?? 0,
diff --git a/app/adminapi/validate/finance/FinancePaymentApplyValidate.php b/app/adminapi/validate/finance/FinancePaymentApplyValidate.php
index 41ca75ed9..9c2b3cd2f 100644
--- a/app/adminapi/validate/finance/FinancePaymentApplyValidate.php
+++ b/app/adminapi/validate/finance/FinancePaymentApplyValidate.php
@@ -31,12 +31,13 @@ class FinancePaymentApplyValidate extends BaseValidate
       * @var string[]
       */
     protected $rule = [
-        'id' => 'require',
-        'supplier_id' => 'require',
-        'contract_id' => 'require',
-        'pay_date' => 'require',
-        'pay_type' => 'require',
-        'amount' => 'require',
+        'id' => 'require',
+        'supplier_id' => 'require',
+        'contract_id' => 'require',
+        'approve_id' => 'require',
+        'pay_date' => 'require',
+        'pay_type' => 'require',
+        'amount' => 'require',
     ];
 
 
@@ -45,12 +46,12 @@ class FinancePaymentApplyValidate extends BaseValidate
      * @var string[]
      */
     protected $field = [
-        'id' => 'id',
-        'supplier_id' => '供应商id',
-        'contract_id' => '合同id',
-        'pay_date' => '付款日期',
-        'pay_type' => '付款方式',
-        'amount' => '本次申请金额',
+        'id' => 'id',
+        'supplier_id' => '供应商id',
+        'contract_id' => '合同id',
+        'pay_date' => '付款日期',
+        'pay_type' => '付款方式',
+        'amount' => '本次申请金额',
     ];