From 44f21c4247fb898f524f968af96e73cc8b894b2d Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 18 Dec 2023 11:59:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/cost/CostBudgetLists.php   | 12 +++++++---
 app/adminapi/logic/cost/CostBudgetLogic.php   | 22 ++++++++++---------
 .../finance/FinanceInvoiceApplyLogic.php      |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/app/adminapi/lists/cost/CostBudgetLists.php b/app/adminapi/lists/cost/CostBudgetLists.php
index 26831e234..fccf10dba 100644
--- a/app/adminapi/lists/cost/CostBudgetLists.php
+++ b/app/adminapi/lists/cost/CostBudgetLists.php
@@ -15,7 +15,7 @@
 namespace app\adminapi\lists\cost;
 
 
-use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\cost\CostBudget;
 use app\common\lists\ListsSearchInterface;
 
@@ -38,7 +38,7 @@ class CostBudgetLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['years', 'document_preparation_time'],
+            '=' => ['years', 'document_preparation_time'],
         ];
     }
 
@@ -58,7 +58,13 @@ class CostBudgetLists extends BaseAdminDataLists implements ListsSearchInterface
             ->field(['id', 'years', 'document_preparation_time', 'total', 'remark', 'annex'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
-            ->select()
+            ->select()->each(function($item, $key){
+                //关联数据 供应商后续添加               
+                $item['approve_no'] = '付款单号';
+                $item['approve_step'] = '流程步骤';
+                $item['approve_settle_status'] = 1;
+                return $item;
+            })
             ->toArray();
     }
 
diff --git a/app/adminapi/logic/cost/CostBudgetLogic.php b/app/adminapi/logic/cost/CostBudgetLogic.php
index fd6f3ae05..fd890381a 100644
--- a/app/adminapi/logic/cost/CostBudgetLogic.php
+++ b/app/adminapi/logic/cost/CostBudgetLogic.php
@@ -41,11 +41,12 @@ class CostBudgetLogic extends BaseLogic
         Db::startTrans();
         try {
             CostBudget::create([
-                'years' => $params['years'],
-                'document_preparation_time' => $params['document_preparation_time'],
-                'total' => $params['total'],
-                'remark' => $params['remark'],
-                'annex' => $params['annex'],
+                'approve_id' => $params['approve_id'] ?? 0,
+                'years' => $params['years'] ?? '',
+                'document_preparation_time' => $params['document_preparation_time'] ?? '',
+                'total' => $params['total'] ?? 0,
+                'remark' => $params['remark'] ?? '',
+                'annex' => $params['annex'] ?? '',
             ]);
 
             Db::commit();
@@ -70,11 +71,12 @@ class CostBudgetLogic extends BaseLogic
         Db::startTrans();
         try {
             CostBudget::where('id', $params['id'])->update([
-                'years' => $params['years'],
-                'document_preparation_time' => $params['document_preparation_time'],
-                'total' => $params['total'],
-                'remark' => $params['remark'],
-                'annex' => $params['annex'],
+                'approve_id' => $params['approve_id'] ?? 0,
+                'years' => $params['years'] ?? '',
+                'document_preparation_time' => $params['document_preparation_time'] ?? '',
+                'total' => $params['total'] ?? 0,
+                'remark' => $params['remark'] ?? '',
+                'annex' => $params['annex'] ?? '',
             ]);
 
             Db::commit();
diff --git a/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php b/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
index 8955fdc97..e806a1491 100644
--- a/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
+++ b/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
@@ -166,7 +166,7 @@ class FinanceInvoiceApplyLogic extends BaseLogic
             $financeInvoiceApply->document = BidBuyBiddingDocument::findOrEmpty($financeInvoiceApply->contract->buy_bidding_document_id);
         }
         if (!empty($financeInvoiceApply->document->project_id)) {
-            $financeInvoiceApply->project = Custom::findOrEmpty($financeInvoiceApply->document->project_id);
+            $financeInvoiceApply->project = Project::findOrEmpty($financeInvoiceApply->document->project_id);
         }
         return $financeInvoiceApply->toArray();
     }