From bd44af9af574c8cb48401f63cafe2c8d3dafb6c5 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 15 Dec 2023 16:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=B3=E8=81=94=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/finance/FinancePaymentApplyLists.php | 3 +++
 app/adminapi/logic/finance/FinancePaymentApplyLogic.php | 2 ++
 app/adminapi/logic/finance/FinancePaymentPlanLogic.php  | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/app/adminapi/lists/finance/FinancePaymentApplyLists.php b/app/adminapi/lists/finance/FinancePaymentApplyLists.php
index bf8574a79..5e7c62e2f 100644
--- a/app/adminapi/lists/finance/FinancePaymentApplyLists.php
+++ b/app/adminapi/lists/finance/FinancePaymentApplyLists.php
@@ -66,6 +66,9 @@ class FinancePaymentApplyLists extends BaseAdminDataLists implements ListsSearch
                 //关联数据 供应商后续添加
                 $item['supplier_name'] = '供应商名称';
                 $item['contract_type'] = '1';
+                $item['approve_no'] = '付款单号';
+                $item['approve_step'] = '流程步骤';
+                $item['approve_settle_status'] = 1;
                 return $item;
             })
             ->toArray();
diff --git a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php
index 9ec6219b3..17fc55850 100644
--- a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php
+++ b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php
@@ -139,6 +139,8 @@ class FinancePaymentApplyLogic extends BaseLogic
         $financePaymentApply = FinancePaymentApply::findOrEmpty($params['id']);
         $financePaymentApply->contract;
         $financePaymentApply->plan;
+        // 供应商关联数据后续添加
+        $financePaymentApply->supplier = null;
         $financePaymentApply->project = null;
         if (!empty($financePaymentApply->contract->project_id)) {
             $financePaymentApply->project = Project::findOrEmpty($financePaymentApply->contract->project_id);
diff --git a/app/adminapi/logic/finance/FinancePaymentPlanLogic.php b/app/adminapi/logic/finance/FinancePaymentPlanLogic.php
index 813cbc1b5..0be71adf1 100644
--- a/app/adminapi/logic/finance/FinancePaymentPlanLogic.php
+++ b/app/adminapi/logic/finance/FinancePaymentPlanLogic.php
@@ -120,6 +120,8 @@ class FinancePaymentPlanLogic extends BaseLogic
     {
         $financePaymentPlan = FinancePaymentPlan::findOrEmpty($params['id']);
         $financePaymentPlan->contract;
+        // 供应商关联数据后续添加
+        $financePaymentPlan->supplier = null;
         $financePaymentPlan->project = null;
         if (!empty($financePaymentPlan->contract->project_id)) {
             $financePaymentPlan->project = Project::findOrEmpty($financePaymentPlan->contract->project_id);