From 18013bf4b8f5a20593fdbf238fd1a8471dc1f3be Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Wed, 27 Mar 2024 09:18:57 +0800
Subject: [PATCH] update

---
 .../lists/financial/FinancialBudgetDocDetailLists.php      | 7 ++++++-
 app/adminapi/lists/financial/FinancialBudgetDocLists.php   | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/lists/financial/FinancialBudgetDocDetailLists.php b/app/adminapi/lists/financial/FinancialBudgetDocDetailLists.php
index 6c4566f52..1895ad75f 100644
--- a/app/adminapi/lists/financial/FinancialBudgetDocDetailLists.php
+++ b/app/adminapi/lists/financial/FinancialBudgetDocDetailLists.php
@@ -17,6 +17,7 @@
 	
 	use app\adminapi\lists\BaseAdminDataLists;
 	use app\common\lists\ListsSearchInterface;
+	use app\common\model\dept\Dept;
 	use app\common\model\financial\FinancialBudgetDocDetail;
 	
 	
@@ -58,7 +59,11 @@
 				->field(['id', 'budget_doc_id', 'dept_id', 'type', 'amount', 'remark'])
 				->limit($this->limitOffset, $this->limitLength)
 				->order(['id' => 'desc'])
-				->select()
+				->select()->each(function ($data) {
+					$dept = Dept::field('name')->where('id', $data['dept_id'])->findOrEmpty();
+					$data['dept_name'] = $dept['name'];
+					$data['type_text'] = $data->type_text;
+				})
 				->toArray();
 		}
 		
diff --git a/app/adminapi/lists/financial/FinancialBudgetDocLists.php b/app/adminapi/lists/financial/FinancialBudgetDocLists.php
index 65f2e1a91..6a75bb02b 100644
--- a/app/adminapi/lists/financial/FinancialBudgetDocLists.php
+++ b/app/adminapi/lists/financial/FinancialBudgetDocLists.php
@@ -63,8 +63,13 @@
 				->limit($this->limitOffset, $this->limitLength)
 				->order(['id' => 'desc'])
 				->select()->each(function ($data) {
-					$contract = CostApprovedProject::field('contract_name')->where('id', $data['contract_id'])->findOrEmpty();
+					$contract = CostApprovedProject::field('contract_name,part_a,create_date,money,contract_type')->where('id', $data['contract_id'])->findOrEmpty();
 					$data['contract_name'] = $contract['contract_name'];
+					$data['part_a'] = $contract['part_a'];
+					$data['create_date'] = $contract['create_date'];
+					$data['money'] = $contract['money'];
+					$data['contract_type'] = $contract['contract_type'];
+					$data['contract_type_text'] = $contract->contract_type_text;
 					$data['total_amount'] = FinancialBudgetDocDetail::where('budget_doc_id', $data['id'])->sum('amount');
 				})
 				->toArray();