From ae41dbb0e75a08f6db64d7731aba8cfe56113fbf Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 18 Dec 2023 14:46:12 +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/bid/BidBuyBiddingDocumentLists.php     | 2 +-
 app/adminapi/lists/bid/BidSecurityApplyLists.php          | 2 +-
 app/adminapi/lists/bid/BidSecurityRefundLists.php         | 2 +-
 app/adminapi/lists/contract/ContractLists.php             | 2 +-
 app/adminapi/lists/contract/ProcurementContractLists.php  | 2 +-
 .../lists/contract/SubcontractingContractLists.php        | 2 +-
 app/adminapi/lists/cost/CostBudgetDetailLists.php         | 8 +++++++-
 app/adminapi/lists/cost/CostBudgetLists.php               | 2 +-
 app/adminapi/lists/finance/FinanceInvoiceApplyLists.php   | 2 +-
 app/adminapi/lists/finance/FinancePaymentApplyLists.php   | 2 +-
 app/adminapi/lists/finance/FinancePaymentPlanLists.php    | 2 +-
 app/adminapi/lists/finance/FinanceReceiptRecordLists.php  | 2 +-
 app/adminapi/lists/finance/FinanceRefundRecordLists.php   | 2 +-
 app/adminapi/lists/finance/FinanceReturnedMoneyLists.php  | 2 +-
 14 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php b/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
index 02c8ee5db..41769af13 100644
--- a/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
+++ b/app/adminapi/lists/bid/BidBuyBiddingDocumentLists.php
@@ -63,7 +63,7 @@ class BidBuyBiddingDocumentLists extends BaseAdminDataLists implements ListsSear
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['bbbd.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加               
+                //关联数据后续添加               
                 $item['approve_no'] = '付款单号';
                 $item['approve_step'] = '流程步骤';
                 $item['approve_settle_status'] = 1;
diff --git a/app/adminapi/lists/bid/BidSecurityApplyLists.php b/app/adminapi/lists/bid/BidSecurityApplyLists.php
index 4ba581d36..58849d844 100644
--- a/app/adminapi/lists/bid/BidSecurityApplyLists.php
+++ b/app/adminapi/lists/bid/BidSecurityApplyLists.php
@@ -63,7 +63,7 @@ class BidSecurityApplyLists extends BaseAdminDataLists implements ListsSearchInt
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['bsa.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加               
+                //关联数据后续添加               
                 $item['approve_no'] = '付款单号';
                 $item['approve_step'] = '流程步骤';
                 $item['approve_settle_status'] = 1;
diff --git a/app/adminapi/lists/bid/BidSecurityRefundLists.php b/app/adminapi/lists/bid/BidSecurityRefundLists.php
index 8f6ad2a76..f54098ac0 100644
--- a/app/adminapi/lists/bid/BidSecurityRefundLists.php
+++ b/app/adminapi/lists/bid/BidSecurityRefundLists.php
@@ -63,7 +63,7 @@ class BidSecurityRefundLists extends BaseAdminDataLists implements ListsSearchIn
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['bsr.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加               
+                //关联数据后续添加               
                 $item['approve_no'] = '付款单号';
                 $item['approve_step'] = '流程步骤';
                 $item['approve_settle_status'] = 1;
diff --git a/app/adminapi/lists/contract/ContractLists.php b/app/adminapi/lists/contract/ContractLists.php
index 1928fe691..896f82298 100644
--- a/app/adminapi/lists/contract/ContractLists.php
+++ b/app/adminapi/lists/contract/ContractLists.php
@@ -63,7 +63,7 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['c.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加               
+                //关联数据后续添加               
                 $item['approve_no'] = '付款单号';
                 $item['approve_step'] = '流程步骤';
                 $item['approve_settle_status'] = 1;
diff --git a/app/adminapi/lists/contract/ProcurementContractLists.php b/app/adminapi/lists/contract/ProcurementContractLists.php
index b66e3d639..3595efd42 100644
--- a/app/adminapi/lists/contract/ProcurementContractLists.php
+++ b/app/adminapi/lists/contract/ProcurementContractLists.php
@@ -70,7 +70,7 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['pc.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加
+                //关联数据后续添加
                 $item['supplier_name'] = '供应商名称';
                 $item['approve_no'] = '付款单号';
                 $item['approve_step'] = '流程步骤';
diff --git a/app/adminapi/lists/contract/SubcontractingContractLists.php b/app/adminapi/lists/contract/SubcontractingContractLists.php
index 36e0ec27b..23888f420 100644
--- a/app/adminapi/lists/contract/SubcontractingContractLists.php
+++ b/app/adminapi/lists/contract/SubcontractingContractLists.php
@@ -72,7 +72,7 @@ class SubcontractingContractLists extends BaseAdminDataLists implements ListsSea
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['pc.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加
+                //关联数据后续添加
                 $item['supplier_name'] = '供应商名称';
                 $item['approve_no'] = '付款单号';
                 $item['approve_step'] = '流程步骤';
diff --git a/app/adminapi/lists/cost/CostBudgetDetailLists.php b/app/adminapi/lists/cost/CostBudgetDetailLists.php
index 648234082..ec0cb08cd 100644
--- a/app/adminapi/lists/cost/CostBudgetDetailLists.php
+++ b/app/adminapi/lists/cost/CostBudgetDetailLists.php
@@ -58,7 +58,13 @@ class CostBudgetDetailLists extends BaseAdminDataLists implements ListsSearchInt
             ->field(['id', 'cost_subject_id', 'cost_budget_id', 'dept_id', 'month1', 'month2', 'month3', 'month4', 'month5', 'month6', 'month7', 'month8', 'month9', 'month10', 'month11', 'month12'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
-            ->select()
+            ->select()->each(function($item, $key){
+                //关联数据后续添加               
+                $item['subject_no'] = '科目编号';
+                $item['subject_first'] = '一级科目';
+                $item['subject_second'] = '二级科目';
+                return $item;
+            })
             ->toArray();
     }
 
diff --git a/app/adminapi/lists/cost/CostBudgetLists.php b/app/adminapi/lists/cost/CostBudgetLists.php
index fccf10dba..1b8123330 100644
--- a/app/adminapi/lists/cost/CostBudgetLists.php
+++ b/app/adminapi/lists/cost/CostBudgetLists.php
@@ -59,7 +59,7 @@ class CostBudgetLists extends BaseAdminDataLists implements ListsSearchInterface
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加               
+                //关联数据后续添加               
                 $item['approve_no'] = '付款单号';
                 $item['approve_step'] = '流程步骤';
                 $item['approve_settle_status'] = 1;
diff --git a/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php b/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php
index 598789265..f231d9c50 100644
--- a/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php
+++ b/app/adminapi/lists/finance/FinanceInvoiceApplyLists.php
@@ -64,7 +64,7 @@ class FinanceInvoiceApplyLists extends BaseAdminDataLists implements ListsSearch
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['fia.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加               
+                //关联数据后续添加               
                 $item['approve_no'] = '付款单号';
                 $item['approve_step'] = '流程步骤';
                 $item['approve_settle_status'] = 1;
diff --git a/app/adminapi/lists/finance/FinancePaymentApplyLists.php b/app/adminapi/lists/finance/FinancePaymentApplyLists.php
index 2eb6299dc..3d185a588 100644
--- a/app/adminapi/lists/finance/FinancePaymentApplyLists.php
+++ b/app/adminapi/lists/finance/FinancePaymentApplyLists.php
@@ -63,7 +63,7 @@ class FinancePaymentApplyLists extends BaseAdminDataLists implements ListsSearch
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['fpa.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加
+                //关联数据后续添加
                 $item['supplier_name'] = '供应商名称';
                 $item['contract_type'] = '1';
                 $item['approve_no'] = '付款单号';
diff --git a/app/adminapi/lists/finance/FinancePaymentPlanLists.php b/app/adminapi/lists/finance/FinancePaymentPlanLists.php
index 8372a2edc..3797223eb 100644
--- a/app/adminapi/lists/finance/FinancePaymentPlanLists.php
+++ b/app/adminapi/lists/finance/FinancePaymentPlanLists.php
@@ -62,7 +62,7 @@ class FinancePaymentPlanLists extends BaseAdminDataLists implements ListsSearchI
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['fpp.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加
+                //关联数据后续添加
                 $item['supplier_name'] = '供应商名称';
                 $item['contract_type'] = '1';
                 return $item;
diff --git a/app/adminapi/lists/finance/FinanceReceiptRecordLists.php b/app/adminapi/lists/finance/FinanceReceiptRecordLists.php
index 7d3a384a9..6155b90fc 100644
--- a/app/adminapi/lists/finance/FinanceReceiptRecordLists.php
+++ b/app/adminapi/lists/finance/FinanceReceiptRecordLists.php
@@ -63,7 +63,7 @@ class FinanceReceiptRecordLists extends BaseAdminDataLists implements ListsSearc
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['frr.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加
+                //关联数据后续添加
                 $item['supplier_name'] = '供应商名称';
                 $item['contract_type'] = '1';
                 return $item;
diff --git a/app/adminapi/lists/finance/FinanceRefundRecordLists.php b/app/adminapi/lists/finance/FinanceRefundRecordLists.php
index 11547996e..9d7e178a4 100644
--- a/app/adminapi/lists/finance/FinanceRefundRecordLists.php
+++ b/app/adminapi/lists/finance/FinanceRefundRecordLists.php
@@ -62,7 +62,7 @@ class FinanceRefundRecordLists extends BaseAdminDataLists implements ListsSearch
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['frr.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加
+                //关联数据后续添加
                 $item['supplier_name'] = '供应商名称';
                 $item['supplier_no'] = '供应编号';
                 $item['contract_type'] = '1';
diff --git a/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php b/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php
index 2315e9331..e945d8beb 100644
--- a/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php
+++ b/app/adminapi/lists/finance/FinanceReturnedMoneyLists.php
@@ -67,7 +67,7 @@ class FinanceReturnedMoneyLists extends BaseAdminDataLists implements ListsSearc
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['frd.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据 供应商后续添加               
+                //关联数据后续添加               
                 $item['approve_no'] = '付款单号';
                 $item['approve_step'] = '流程步骤';
                 $item['approve_settle_status'] = 1;