From 0bf7ccb8fbf7fe9b6067c749d30a1e89fd6211eb Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 15 Jan 2024 10:21:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E9=93=BE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/supplier/SupplierContactsController.php       | 2 +-
 app/adminapi/lists/supplier/SupplierContactsLists.php        | 5 +++--
 app/common/model/supplier/SupplierContacts.php               | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/controller/supplier/SupplierContactsController.php b/app/adminapi/controller/supplier/SupplierContactsController.php
index 8d716cfb9..015f7f766 100644
--- a/app/adminapi/controller/supplier/SupplierContactsController.php
+++ b/app/adminapi/controller/supplier/SupplierContactsController.php
@@ -23,7 +23,7 @@ use app\adminapi\validate\supplier\SupplierContactsValidate;
 
 
 /**
- * SupplierContacts控制器
+ * 供应商联系人
  * Class SupplierContactsController
  * @package app\adminapi\controller\supplier
  */
diff --git a/app/adminapi/lists/supplier/SupplierContactsLists.php b/app/adminapi/lists/supplier/SupplierContactsLists.php
index 61e55f3cf..cc0ba26d0 100644
--- a/app/adminapi/lists/supplier/SupplierContactsLists.php
+++ b/app/adminapi/lists/supplier/SupplierContactsLists.php
@@ -22,7 +22,7 @@ use app\common\lists\ListsSearchInterface;
 use think\facade\Db;
 
 /**
- * SupplierContacts列表
+ * 供应商联系人
  * Class SupplierContactsLists
  * @package app\adminapi\listssupplier
  */
@@ -57,7 +57,8 @@ class SupplierContactsLists extends BaseAdminDataLists implements ListsSearchInt
     public function lists(): array
     {
         return SupplierContacts::where($this->searchWhere)
-            ->field('id,name,sex,birthday,contacts_type,responsible,contacts_cate,department,duties,work_phone,remark')
+            ->field('id,supplier_id,name,sex,birthday,contacts_type,responsible,contacts_cate,department,duties,work_phone,remark')
+            ->with(['supplier'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($data){
diff --git a/app/common/model/supplier/SupplierContacts.php b/app/common/model/supplier/SupplierContacts.php
index a38aa59ac..96b4d5315 100644
--- a/app/common/model/supplier/SupplierContacts.php
+++ b/app/common/model/supplier/SupplierContacts.php
@@ -65,4 +65,7 @@ class SupplierContacts extends BaseModel
 		return $dict[$data['id_type']];
 	}
 
+	public function supplier(){
+		return $this->hasOne(Supplier::class,'id','supplier_id')->bind(['supplier_name','supplier_code']);
+	}
 }
\ No newline at end of file

From ff58c364073922a75a9d6cf281218c36987cc530 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 15 Jan 2024 10:28:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0annex=20json=5Fencode?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/logic/bid/BidBiddingDecisionLogic.php            | 4 ++--
 app/adminapi/logic/bid/BidResultLogic.php                     | 4 ++--
 app/adminapi/logic/bid/BidSecurityApplyLogic.php              | 4 ++--
 app/adminapi/logic/bid/BidSecurityRefundLogic.php             | 4 ++--
 app/adminapi/logic/contract/ContractLogic.php                 | 4 ++--
 app/adminapi/logic/contract/ProcurementContractLogic.php      | 4 ++--
 app/adminapi/logic/contract/SubcontractingContractLogic.php   | 4 ++--
 app/adminapi/logic/custom/CustomContactsLogic.php             | 2 +-
 app/adminapi/logic/custom/CustomFollowLogic.php               | 2 +-
 app/adminapi/logic/custom/CustomerDemandLogic.php             | 4 ++--
 app/adminapi/logic/custom/CustomerDemandSolutionLogic.php     | 4 ++--
 app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php       | 4 ++--
 app/adminapi/logic/finance/FinancePaymentApplyLogic.php       | 4 ++--
 app/adminapi/logic/finance/FinanceReceiptRecordLogic.php      | 4 ++--
 app/adminapi/logic/finance/FinanceRefundApplyLogic.php        | 4 ++--
 app/adminapi/logic/finance/FinanceRefundRecordLogic.php       | 4 ++--
 app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php      | 4 ++--
 app/adminapi/logic/finance/FinanceReturnedRecordLogic.php     | 4 ++--
 app/adminapi/logic/material/MaterialLogic.php                 | 4 ++--
 app/adminapi/logic/material/MaterialPurchaseRequestLogic.php  | 4 ++--
 app/adminapi/logic/material/MaterialWarehouseLogic.php        | 4 ++--
 app/adminapi/logic/project/CompetitorLogic.php                | 4 ++--
 app/adminapi/logic/project/ProjectDocumentLogic.php           | 4 ++--
 app/adminapi/logic/project/ProjectEstimateLogic.php           | 4 ++--
 .../logic/project/ProjectInsuranceManagementLogic.php         | 4 ++--
 app/adminapi/logic/project/ProjectLaborContractLogic.php      | 4 ++--
 app/adminapi/logic/project/ProjectLogic.php                   | 4 ++--
 app/adminapi/logic/project/ProjectManagerAppointmentLogic.php | 4 ++--
 app/adminapi/logic/project/ProjectMaterialBudgetLogic.php     | 4 ++--
 app/adminapi/logic/project/ProjectPlanLogic.php               | 4 ++--
 app/adminapi/logic/project/ProjectSalaryPaymentLogic.php      | 2 +-
 app/adminapi/logic/project/ProjectSettlementLogic.php         | 4 ++--
 .../logic/project/ProjectSubcontractSettlementLogic.php       | 4 ++--
 app/adminapi/logic/project/ProjectSubpackageBudgetLogic.php   | 4 ++--
 app/adminapi/logic/quotation/QuotationLogic.php               | 2 +-
 app/adminapi/logic/supplier/SupplierContactsLogic.php         | 4 ++--
 app/adminapi/logic/supplier/SupplierLogic.php                 | 4 ++--
 37 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/app/adminapi/logic/bid/BidBiddingDecisionLogic.php b/app/adminapi/logic/bid/BidBiddingDecisionLogic.php
index 5e8336330..f453c50a0 100644
--- a/app/adminapi/logic/bid/BidBiddingDecisionLogic.php
+++ b/app/adminapi/logic/bid/BidBiddingDecisionLogic.php
@@ -62,7 +62,7 @@ class BidBiddingDecisionLogic extends BaseLogic
                 'project_assurance' => $params['project_assurance'] ?? 0,
                 'bid_project_overview' => $params['bid_project_overview'] ?? '',
                 'project_desc' => $params['project_desc'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
 			Project::where('id',$params['project_id'])->update([
 				'status' => 2,
@@ -106,7 +106,7 @@ class BidBiddingDecisionLogic extends BaseLogic
 	            'project_assurance' => $params['project_assurance'] ?? 0,
 	            'bid_project_overview' => $params['bid_project_overview'] ?? '',
 	            'project_desc' => $params['project_desc'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'update_time' => time(),
             ]);
             Db::commit();
diff --git a/app/adminapi/logic/bid/BidResultLogic.php b/app/adminapi/logic/bid/BidResultLogic.php
index f3ecb3f18..c67bcd31a 100644
--- a/app/adminapi/logic/bid/BidResultLogic.php
+++ b/app/adminapi/logic/bid/BidResultLogic.php
@@ -58,7 +58,7 @@ class BidResultLogic extends BaseLogic
                 'bidder_company' => $params['bidder_company'],
                 'bidder_amount' => $params['bidder_amount'],
                 'bid_summary' => $params['bid_summary'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'add_user' => $admin_id,
 	            'update_user' => $admin_id,
             ]);
@@ -91,7 +91,7 @@ class BidResultLogic extends BaseLogic
 	            'bidder_company' => $params['bidder_company'],
 	            'bidder_amount' => $params['bidder_amount'],
 	            'bid_summary' => $params['bid_summary'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'update_user' => $admin_id,
 	            'update_time' => time(),
             ]);
diff --git a/app/adminapi/logic/bid/BidSecurityApplyLogic.php b/app/adminapi/logic/bid/BidSecurityApplyLogic.php
index 40ca38de0..3b14dea34 100644
--- a/app/adminapi/logic/bid/BidSecurityApplyLogic.php
+++ b/app/adminapi/logic/bid/BidSecurityApplyLogic.php
@@ -52,7 +52,7 @@ class BidSecurityApplyLogic extends BaseLogic
                 'pay_type' => $params['pay_type'],
                 'refund_date' => !empty($params['refund_date']) ? strtotime($params['refund_date']) : 0,
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'deposit_bank' => $params['deposit_bank'],
                 'account_name' => $params['account_name'],
                 'account' => $params['account'],
@@ -87,7 +87,7 @@ class BidSecurityApplyLogic extends BaseLogic
 	            'pay_type' => $params['pay_type'],
 	            'refund_date' => !empty($params['refund_date']) ? strtotime($params['refund_date']) : 0,
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'deposit_bank' => $params['deposit_bank'],
 	            'account_name' => $params['account_name'],
 	            'account' => $params['account'],
diff --git a/app/adminapi/logic/bid/BidSecurityRefundLogic.php b/app/adminapi/logic/bid/BidSecurityRefundLogic.php
index fb89a7b86..b93f0dff5 100644
--- a/app/adminapi/logic/bid/BidSecurityRefundLogic.php
+++ b/app/adminapi/logic/bid/BidSecurityRefundLogic.php
@@ -52,7 +52,7 @@ class BidSecurityRefundLogic extends BaseLogic
                 'refund_amount' => $params['refund_amount'],
                 'refund_date' => strtotime($params['refund_date']),
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'bank_account_id' => $params['bank_account_id'] ?? 0,
             ]);
             Db::commit();
@@ -83,7 +83,7 @@ class BidSecurityRefundLogic extends BaseLogic
 	            'refund_amount' => $params['refund_amount'],
 	            'refund_date' => strtotime($params['refund_date']),
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'bank_account_id' => $params['bank_account_id'] ?? 0,
             ]);
 
diff --git a/app/adminapi/logic/contract/ContractLogic.php b/app/adminapi/logic/contract/ContractLogic.php
index 5c09cc65a..2f29cd73d 100644
--- a/app/adminapi/logic/contract/ContractLogic.php
+++ b/app/adminapi/logic/contract/ContractLogic.php
@@ -76,7 +76,7 @@ class ContractLogic extends BaseLogic
 				"contract_date" => strtotime($params['contract_date']),
 				"main_content" => $params['main_content'] ?? '',
 				"remark" => $params['remark'] ?? '',
-				"annex" => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
 	        foreach ($returned_money as $item)
 	        {
@@ -145,7 +145,7 @@ class ContractLogic extends BaseLogic
 	            "contract_date" => strtotime($params['contract_date']),
 	            "main_content" => $params['main_content'] ?? '',
 	            "remark" => $params['remark'] ?? '',
-	            "annex" => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
diff --git a/app/adminapi/logic/contract/ProcurementContractLogic.php b/app/adminapi/logic/contract/ProcurementContractLogic.php
index a81b037ed..35947b77c 100644
--- a/app/adminapi/logic/contract/ProcurementContractLogic.php
+++ b/app/adminapi/logic/contract/ProcurementContractLogic.php
@@ -81,7 +81,7 @@ class ProcurementContractLogic extends BaseLogic
 				//质保金比例
                 'retention_money_rate' => $params['retention_money_rate'],
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             foreach ($procurement_contract_detail as $v)
             {       
@@ -164,7 +164,7 @@ class ProcurementContractLogic extends BaseLogic
 				//质保金比例
 				'retention_money_rate' => $params['retention_money_rate'],
 				'remark' => $params['remark'] ?? '',
-				'annex' => !empty($params['annex']) ? $params['annex'] : null
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 			]);
 			foreach ($procurement_contract_detail as $v)
 			{
diff --git a/app/adminapi/logic/contract/SubcontractingContractLogic.php b/app/adminapi/logic/contract/SubcontractingContractLogic.php
index 467586ace..5a653a9dc 100644
--- a/app/adminapi/logic/contract/SubcontractingContractLogic.php
+++ b/app/adminapi/logic/contract/SubcontractingContractLogic.php
@@ -81,7 +81,7 @@ class SubcontractingContractLogic extends BaseLogic
 			    //质保金比例
 			    'retention_money_rate' => $params['retention_money_rate'],
 			    'remark' => $params['remark'] ?? '',
-			    'annex' => !empty($params['annex']) ? $params['annex'] : null
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 		    ]);
 		    foreach ($subcontracting_contract_detail as $v)
 		    {
@@ -165,7 +165,7 @@ class SubcontractingContractLogic extends BaseLogic
 			    //质保金比例
 			    'retention_money_rate' => $params['retention_money_rate'],
 			    'remark' => $params['remark'] ?? '',
-			    'annex' => !empty($params['annex']) ? $params['annex'] : null
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 		    ]);
 		    foreach ($subcontracting_contract_detail as $v)
 		    {
diff --git a/app/adminapi/logic/custom/CustomContactsLogic.php b/app/adminapi/logic/custom/CustomContactsLogic.php
index 99cf9d277..d4b9ddcf5 100644
--- a/app/adminapi/logic/custom/CustomContactsLogic.php
+++ b/app/adminapi/logic/custom/CustomContactsLogic.php
@@ -80,7 +80,7 @@ class CustomContactsLogic extends BaseLogic
                 'telephone' => $params['telephone'] ?? '',
                 'email' => $params['email'] ?? '',
                 'notes' => $params['notes'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] :null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
diff --git a/app/adminapi/logic/custom/CustomFollowLogic.php b/app/adminapi/logic/custom/CustomFollowLogic.php
index 9c6c48fc8..0dc0d8022 100644
--- a/app/adminapi/logic/custom/CustomFollowLogic.php
+++ b/app/adminapi/logic/custom/CustomFollowLogic.php
@@ -83,7 +83,7 @@ class CustomFollowLogic extends BaseLogic
 	            'date' => strtotime($params['date']),
 	            'types' => $params['types'],
 	            'description' => $params['description'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] :null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'coordinate' => $params['coordinate'] ?? '',
 	            'executor' => $params['executor'] ?? '',
 	            'next_follow_date' => strtotime($params['next_follow_date']),
diff --git a/app/adminapi/logic/custom/CustomerDemandLogic.php b/app/adminapi/logic/custom/CustomerDemandLogic.php
index 0f2c532a7..5eae75539 100644
--- a/app/adminapi/logic/custom/CustomerDemandLogic.php
+++ b/app/adminapi/logic/custom/CustomerDemandLogic.php
@@ -55,7 +55,7 @@ class CustomerDemandLogic extends BaseLogic
                 'importance' => $params['importance'],
                 'recording_time' => strtotime($params['recording_time']),
                 'demand_content' => $params['demand_content'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'add_user' => $admin_id,
 	            'update_user' => $admin_id,
             ]);
@@ -90,7 +90,7 @@ class CustomerDemandLogic extends BaseLogic
 	            'importance' => $params['importance'],
 	            'recording_time' => strtotime($params['recording_time']),
 	            'demand_content' => $params['demand_content'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'update_user' => $admin_id,
 	            'update_time' => time(),
             ]);
diff --git a/app/adminapi/logic/custom/CustomerDemandSolutionLogic.php b/app/adminapi/logic/custom/CustomerDemandSolutionLogic.php
index 0e2ffaf3e..98963589a 100644
--- a/app/adminapi/logic/custom/CustomerDemandSolutionLogic.php
+++ b/app/adminapi/logic/custom/CustomerDemandSolutionLogic.php
@@ -55,7 +55,7 @@ class CustomerDemandSolutionLogic extends BaseLogic
                 'submission_time' => strtotime($params['submission_time']),
                 'solution_content' => $params['solution_content'] ?? '',
                 'customer_feedback' => $params['customer_feedback'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'add_user' => $admin_id,
 	            'update_user' => $admin_id,
             ]);
@@ -89,7 +89,7 @@ class CustomerDemandSolutionLogic extends BaseLogic
 	            'submission_time' => strtotime($params['submission_time']),
 	            'solution_content' => $params['solution_content'] ?? '',
 	            'customer_feedback' => $params['customer_feedback'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'update_user' => $admin_id,
 	            'update_time' => time(),
             ]);
diff --git a/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php b/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
index d2fedbafb..0dd839075 100644
--- a/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
+++ b/app/adminapi/logic/finance/FinanceInvoiceApplyLogic.php
@@ -63,7 +63,7 @@ class FinanceInvoiceApplyLogic extends BaseLogic
                 'content' => $params['content'] ?? '',
                 'invoice_no' => $params['invoice_no'] ?? '',
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'invoicing_company_name' => $params['invoicing_company_name'] ?? '',
                 'taxpayer_identification_number' => $params['taxpayer_identification_number'] ?? '',
                 'deposit_bank' => $params['deposit_bank'] ?? '',
@@ -112,7 +112,7 @@ class FinanceInvoiceApplyLogic extends BaseLogic
 	            'content' => $params['content'] ?? '',
 	            'invoice_no' => $params['invoice_no'] ?? '',
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'invoicing_company_name' => $params['invoicing_company_name'] ?? '',
 	            'taxpayer_identification_number' => $params['taxpayer_identification_number'] ?? '',
 	            'deposit_bank' => $params['deposit_bank'] ?? '',
diff --git a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php
index a2e0ba7fb..0e9cad548 100644
--- a/app/adminapi/logic/finance/FinancePaymentApplyLogic.php
+++ b/app/adminapi/logic/finance/FinancePaymentApplyLogic.php
@@ -69,7 +69,7 @@ class FinancePaymentApplyLogic extends BaseLogic
                 'amount' => $params['amount'],
                 'desc' => $params['desc'] ?? '',
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'payee_bank' => $params['payee_bank'],
                 'payee_account_name' => $params['payee_account_name'],
                 'payee_account' => $params['payee_account'],
@@ -118,7 +118,7 @@ class FinancePaymentApplyLogic extends BaseLogic
 	            'amount' => $params['amount'],
 	            'desc' => $params['desc'] ?? '',
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'payee_bank' => $params['payee_bank'],
 	            'payee_account_name' => $params['payee_account_name'],
 	            'payee_account' => $params['payee_account'],
diff --git a/app/adminapi/logic/finance/FinanceReceiptRecordLogic.php b/app/adminapi/logic/finance/FinanceReceiptRecordLogic.php
index f4c743c54..2fcd80099 100644
--- a/app/adminapi/logic/finance/FinanceReceiptRecordLogic.php
+++ b/app/adminapi/logic/finance/FinanceReceiptRecordLogic.php
@@ -69,7 +69,7 @@ class FinanceReceiptRecordLogic extends BaseLogic
                 'amount_excluding_tax' => $params['invoice_amount'] * (1 - $tax_rate[$params['invoice_tax_rate']] / 100),
                 'receipt_date' => strtotime($params['receipt_date']),
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
@@ -116,7 +116,7 @@ class FinanceReceiptRecordLogic extends BaseLogic
 	            'amount_excluding_tax' => $params['invoice_amount'] * (1 - $tax_rate[$params['invoice_tax_rate']] / 100),
 	            'receipt_date' => strtotime($params['receipt_date']),
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
diff --git a/app/adminapi/logic/finance/FinanceRefundApplyLogic.php b/app/adminapi/logic/finance/FinanceRefundApplyLogic.php
index 4a361f055..7437739bb 100644
--- a/app/adminapi/logic/finance/FinanceRefundApplyLogic.php
+++ b/app/adminapi/logic/finance/FinanceRefundApplyLogic.php
@@ -55,7 +55,7 @@ class FinanceRefundApplyLogic extends BaseLogic
                 'refund_type' => $params['refund_type'],
                 'refund_user' => $params['refund_user'] ?? '',
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'collection_bank' => $params['collection_bank'],
                 'collection_account' => $params['collection_account'],
 	            'bank_account_id' => $params['bank_account_id'],
@@ -91,7 +91,7 @@ class FinanceRefundApplyLogic extends BaseLogic
 	            'refund_type' => $params['refund_type'],
 	            'refund_user' => $params['refund_user'] ?? '',
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'collection_bank' => $params['collection_bank'],
 	            'collection_account' => $params['collection_account'],
 	            'bank_account_id' => $params['bank_account_id'],
diff --git a/app/adminapi/logic/finance/FinanceRefundRecordLogic.php b/app/adminapi/logic/finance/FinanceRefundRecordLogic.php
index b67f8ed67..649cd2157 100644
--- a/app/adminapi/logic/finance/FinanceRefundRecordLogic.php
+++ b/app/adminapi/logic/finance/FinanceRefundRecordLogic.php
@@ -63,7 +63,7 @@ class FinanceRefundRecordLogic extends BaseLogic
                 'refund_type' => $params['refund_type'],
                 'reason' => $params['reason'] ?? '',
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'bank_account_id' => $params['bank_account_id'],
             ]);
             Db::commit();
@@ -105,7 +105,7 @@ class FinanceRefundRecordLogic extends BaseLogic
 	            'refund_type' => $params['refund_type'],
 	            'reason' => $params['reason'] ?? '',
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'bank_account_id' => $params['bank_account_id'],
 	            'update_time' => time(),
             ]);
diff --git a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
index 92431ad06..0ec9d1e91 100644
--- a/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
+++ b/app/adminapi/logic/finance/FinanceReturnedMoneyLogic.php
@@ -54,7 +54,7 @@ class FinanceReturnedMoneyLogic extends BaseLogic
                 'return_status' => $params['return_status'],
                 'return_duty_id' => $params['return_duty_id'],
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
@@ -87,7 +87,7 @@ class FinanceReturnedMoneyLogic extends BaseLogic
 	            'return_status' => $params['return_status'],
 	            'return_duty_id' => $params['return_duty_id'],
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
diff --git a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php
index a3539ae17..ca45c2257 100644
--- a/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php
+++ b/app/adminapi/logic/finance/FinanceReturnedRecordLogic.php
@@ -58,7 +58,7 @@ class FinanceReturnedRecordLogic extends BaseLogic
                 'return_desc' => $params['return_desc'] ?? '',
                 'receiver' => $params['receiver'] ?? '',
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'bank_account_id' => $params['bank_account_id'],
             ]);
             Db::commit();
@@ -95,7 +95,7 @@ class FinanceReturnedRecordLogic extends BaseLogic
 	            'return_desc' => $params['return_desc'] ?? '',
 	            'receiver' => $params['receiver'] ?? '',
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'bank_account_id' => $params['bank_account_id'],
 	            'update_time' => time(),
             ]);
diff --git a/app/adminapi/logic/material/MaterialLogic.php b/app/adminapi/logic/material/MaterialLogic.php
index 513ea91d2..7b4b01c80 100644
--- a/app/adminapi/logic/material/MaterialLogic.php
+++ b/app/adminapi/logic/material/MaterialLogic.php
@@ -55,7 +55,7 @@ class MaterialLogic extends BaseLogic
                 'inventory' => $params['inventory'] ?? 0,
                 'sales_price' => $params['sales_price'] ?? 0,
                 'cost_price' => $params['cost_price'] ?? 0,
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'add_user' => $admin_id,
                 'update_user' => $admin_id,
             ]);
@@ -93,7 +93,7 @@ class MaterialLogic extends BaseLogic
 	            'inventory' => $params['inventory'] ?? 0,
 	            'sales_price' => $params['sales_price'] ?? 0,
 	            'cost_price' => $params['cost_price'] ?? 0,
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'update_user' => $admin_id,
 	            'update_time' => time()
             ]);
diff --git a/app/adminapi/logic/material/MaterialPurchaseRequestLogic.php b/app/adminapi/logic/material/MaterialPurchaseRequestLogic.php
index e54080e81..fd84d9faf 100644
--- a/app/adminapi/logic/material/MaterialPurchaseRequestLogic.php
+++ b/app/adminapi/logic/material/MaterialPurchaseRequestLogic.php
@@ -54,7 +54,7 @@ class MaterialPurchaseRequestLogic extends BaseLogic
                 'apply_date' => strtotime($params['apply_date']),
                 'arrival_date' => strtotime($params['arrival_date']),
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
 	        foreach ($detail as $item)
 	        {
@@ -100,7 +100,7 @@ class MaterialPurchaseRequestLogic extends BaseLogic
 	            'apply_date' => strtotime($params['apply_date']),
 	            'arrival_date' => strtotime($params['arrival_date']),
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
diff --git a/app/adminapi/logic/material/MaterialWarehouseLogic.php b/app/adminapi/logic/material/MaterialWarehouseLogic.php
index f660507bc..664a16dfd 100644
--- a/app/adminapi/logic/material/MaterialWarehouseLogic.php
+++ b/app/adminapi/logic/material/MaterialWarehouseLogic.php
@@ -55,7 +55,7 @@ class MaterialWarehouseLogic extends BaseLogic
                 'address' => $params['address'] ?? '',
                 'telephone' => $params['telephone'],
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
@@ -89,7 +89,7 @@ class MaterialWarehouseLogic extends BaseLogic
 	            'address' => $params['address'] ?? '',
 	            'telephone' => $params['telephone'],
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'update_time' => time()
             ]);
             Db::commit();
diff --git a/app/adminapi/logic/project/CompetitorLogic.php b/app/adminapi/logic/project/CompetitorLogic.php
index 58e8da016..f069a8c34 100644
--- a/app/adminapi/logic/project/CompetitorLogic.php
+++ b/app/adminapi/logic/project/CompetitorLogic.php
@@ -55,7 +55,7 @@ class CompetitorLogic extends BaseLogic
                 'competitor_advantages' => $params['competitor_advantages'] ?? '',
                 'competitor_disadvantages' => $params['competitor_disadvantages'] ?? '',
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'add_user' => $admin_id,
 	            'update_user' => $admin_id,
             ]);
@@ -92,7 +92,7 @@ class CompetitorLogic extends BaseLogic
 	            'competitor_advantages' => $params['competitor_advantages'] ?? '',
 	            'competitor_disadvantages' => $params['competitor_disadvantages'] ?? '',
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'add_user' => $admin_id,
 	            'update_time' => time(),
             ]);
diff --git a/app/adminapi/logic/project/ProjectDocumentLogic.php b/app/adminapi/logic/project/ProjectDocumentLogic.php
index 1f1b669b2..e072be33b 100644
--- a/app/adminapi/logic/project/ProjectDocumentLogic.php
+++ b/app/adminapi/logic/project/ProjectDocumentLogic.php
@@ -49,7 +49,7 @@ class ProjectDocumentLogic extends BaseLogic
                 'name' => $params['name'],
                 'describe' => $params['describe'],
                 'version' => $params['version'],
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
@@ -78,7 +78,7 @@ class ProjectDocumentLogic extends BaseLogic
                 'name' => $params['name'],
                 'describe' => $params['describe'],
                 'version' => $params['version'],
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
 
             Db::commit();
diff --git a/app/adminapi/logic/project/ProjectEstimateLogic.php b/app/adminapi/logic/project/ProjectEstimateLogic.php
index f6f7682ae..1ed47d125 100644
--- a/app/adminapi/logic/project/ProjectEstimateLogic.php
+++ b/app/adminapi/logic/project/ProjectEstimateLogic.php
@@ -60,7 +60,7 @@ class ProjectEstimateLogic extends BaseLogic
                 'technician' => $params['technician'] ?? 0,
                 'estimate_amount' => $params['estimate_amount'] ?? 0,
                 'ask' => $params['ask'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'add_user' => $admin_id,
 	            'update_user' => $admin_id,
             ]);
@@ -98,7 +98,7 @@ class ProjectEstimateLogic extends BaseLogic
 	            'technician' => $params['technician'] ?? 0,
 	            'estimate_amount' => $params['estimate_amount'] ?? 0,
 	            'ask' => $params['ask'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'update_user' => $admin_id,
 	            'update_time' => time(),
             ]);
diff --git a/app/adminapi/logic/project/ProjectInsuranceManagementLogic.php b/app/adminapi/logic/project/ProjectInsuranceManagementLogic.php
index 8adcad3f5..14727a816 100644
--- a/app/adminapi/logic/project/ProjectInsuranceManagementLogic.php
+++ b/app/adminapi/logic/project/ProjectInsuranceManagementLogic.php
@@ -55,7 +55,7 @@ class ProjectInsuranceManagementLogic extends BaseLogic
                 'insurance_detail' => $params['insurance_detail'],
                 'invoice_no' => $params['invoice_no'],
                 'handler' => $params['handler'],
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
@@ -91,7 +91,7 @@ class ProjectInsuranceManagementLogic extends BaseLogic
                 'insurance_detail' => $params['insurance_detail'],
                 'invoice_no' => $params['invoice_no'],
                 'handler' => $params['handler'],
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
diff --git a/app/adminapi/logic/project/ProjectLaborContractLogic.php b/app/adminapi/logic/project/ProjectLaborContractLogic.php
index 745741a67..f605addbd 100644
--- a/app/adminapi/logic/project/ProjectLaborContractLogic.php
+++ b/app/adminapi/logic/project/ProjectLaborContractLogic.php
@@ -57,7 +57,7 @@ class ProjectLaborContractLogic extends BaseLogic
                 'release_time' => strtotime($params['release_time']),
                 'release_reason' => $params['release_reason'],
                 'remark' => $params['remark'],
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'add_user' => $admin_id,
                 'update_user' => $admin_id,
             ]);
@@ -96,7 +96,7 @@ class ProjectLaborContractLogic extends BaseLogic
 	            'release_time' => strtotime($params['release_time']),
                 'release_reason' => $params['release_reason'],
                 'remark' => $params['remark'],
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'update_user' => $admin_id,
 	            'update_time' => time(),
             ]);
diff --git a/app/adminapi/logic/project/ProjectLogic.php b/app/adminapi/logic/project/ProjectLogic.php
index d9514d6cb..9cb05391b 100644
--- a/app/adminapi/logic/project/ProjectLogic.php
+++ b/app/adminapi/logic/project/ProjectLogic.php
@@ -74,7 +74,7 @@ class ProjectLogic extends BaseLogic
                 'strategic_significance' => $params['strategic_significance'] ?? 0,
                 'industry' => $params['industry'] ?? 0,
                 'unit_nature' => $params['unit_nature'] ?? 0,
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'status' => 0,
 				'is_budget' => 0,
 	            'add_user' => $adminId
@@ -130,7 +130,7 @@ class ProjectLogic extends BaseLogic
 	            'strategic_significance' => $params['strategic_significance'] ?? 0,
 	            'industry' => $params['industry'] ?? 0,
 	            'unit_nature' => $params['unit_nature'] ?? 0,
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'update_time' => time(),
             ]);
             Db::commit();
diff --git a/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php b/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php
index b6f0de882..fb99dbd08 100644
--- a/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php
+++ b/app/adminapi/logic/project/ProjectManagerAppointmentLogic.php
@@ -57,7 +57,7 @@ class ProjectManagerAppointmentLogic extends BaseLogic
                 'start_date' => strtotime($params['start_date']),
                 'delivery_date' => strtotime($params['delivery_date']),
                 'remark' => $params['remark'],
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
@@ -90,7 +90,7 @@ class ProjectManagerAppointmentLogic extends BaseLogic
                 'start_date' => strtotime($params['start_date']),
                 'delivery_date' => strtotime($params['delivery_date']),
                 'remark' => $params['remark'],
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
diff --git a/app/adminapi/logic/project/ProjectMaterialBudgetLogic.php b/app/adminapi/logic/project/ProjectMaterialBudgetLogic.php
index c2ebda7a9..2298bca76 100644
--- a/app/adminapi/logic/project/ProjectMaterialBudgetLogic.php
+++ b/app/adminapi/logic/project/ProjectMaterialBudgetLogic.php
@@ -51,7 +51,7 @@ class ProjectMaterialBudgetLogic extends BaseLogic
                 'project_id' => $params['project_id'],
 				'material_budget_code' => data_unique_code('项目材料预算'),
                 'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
 	        foreach ($detail as $item)
 	        {
@@ -93,7 +93,7 @@ class ProjectMaterialBudgetLogic extends BaseLogic
 	            'dept_id' => $params['dept_id'],
 	            'project_id' => $params['project_id'],
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
 	        foreach ($detail as $item)
 	        {
diff --git a/app/adminapi/logic/project/ProjectPlanLogic.php b/app/adminapi/logic/project/ProjectPlanLogic.php
index f9fe4c006..b3ba1d274 100644
--- a/app/adminapi/logic/project/ProjectPlanLogic.php
+++ b/app/adminapi/logic/project/ProjectPlanLogic.php
@@ -51,7 +51,7 @@ class ProjectPlanLogic extends BaseLogic
                 'deliver_time' => strtotime($params['deliver_time']),
                 'declare_time' => strtotime($params['declare_time']),
                 'remark' => $params['remark'],
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'add_user' => $adminId,
             ]);
             Db::commit();
@@ -82,7 +82,7 @@ class ProjectPlanLogic extends BaseLogic
 	            'deliver_time' => strtotime($params['deliver_time']),
 	            'declare_time' => strtotime($params['declare_time']),
 	            'remark' => $params['remark'],
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
diff --git a/app/adminapi/logic/project/ProjectSalaryPaymentLogic.php b/app/adminapi/logic/project/ProjectSalaryPaymentLogic.php
index d3c95ff7e..cc671ca42 100644
--- a/app/adminapi/logic/project/ProjectSalaryPaymentLogic.php
+++ b/app/adminapi/logic/project/ProjectSalaryPaymentLogic.php
@@ -55,7 +55,7 @@ class ProjectSalaryPaymentLogic extends BaseLogic
                 'total_amount' => $params['total_amount'],
 				'total_amount_uppercase' => $params['total_amount_uppercase'],
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
 	        foreach($payment_detail as $v){
 		        ProjectSalaryDetail::create([
diff --git a/app/adminapi/logic/project/ProjectSettlementLogic.php b/app/adminapi/logic/project/ProjectSettlementLogic.php
index 6b8e304f9..16f758d49 100644
--- a/app/adminapi/logic/project/ProjectSettlementLogic.php
+++ b/app/adminapi/logic/project/ProjectSettlementLogic.php
@@ -52,7 +52,7 @@ class ProjectSettlementLogic extends BaseLogic
                 'remaining_amount' => $params['remaining_amount'],
 	            'settlement_date' => strtotime($params['settlement_date']),
                 'remark' => $params['remark'],
-                'annex' =>  !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'add_user' => $admin_id
             ]);
             Db::commit();
@@ -84,7 +84,7 @@ class ProjectSettlementLogic extends BaseLogic
                 'remaining_amount' => $params['remaining_amount'],
 				'settlement_date' => strtotime($params['settlement_date']),
                 'remark' => $params['remark'],
-                'annex' =>  !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'update_time' => time()
             ]);
             Db::commit();
diff --git a/app/adminapi/logic/project/ProjectSubcontractSettlementLogic.php b/app/adminapi/logic/project/ProjectSubcontractSettlementLogic.php
index bb8b6449e..2bdd85e8c 100644
--- a/app/adminapi/logic/project/ProjectSubcontractSettlementLogic.php
+++ b/app/adminapi/logic/project/ProjectSubcontractSettlementLogic.php
@@ -52,7 +52,7 @@ class ProjectSubcontractSettlementLogic extends BaseLogic
                 'remaining_amount' => $params['remaining_amount'],
                 'settlement_date' => strtotime($params['settlement_date']),
                 'remark' => $params['remark'],
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'add_user' => $admin_id,
             ]);
 
@@ -85,7 +85,7 @@ class ProjectSubcontractSettlementLogic extends BaseLogic
                 'remaining_amount' => $params['remaining_amount'],
                 'settlement_date' => strtotime($params['settlement_date']),
                 'remark' => $params['remark'],
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'add_user' => $params['add_user'],
 	            'update_time' => time(),
             ]);
diff --git a/app/adminapi/logic/project/ProjectSubpackageBudgetLogic.php b/app/adminapi/logic/project/ProjectSubpackageBudgetLogic.php
index d3147d63c..d161f8b43 100644
--- a/app/adminapi/logic/project/ProjectSubpackageBudgetLogic.php
+++ b/app/adminapi/logic/project/ProjectSubpackageBudgetLogic.php
@@ -51,7 +51,7 @@ class ProjectSubpackageBudgetLogic extends BaseLogic
                 'project_id' => $params['project_id'],
 	            'subpackage_budget_code' => data_unique_code('项目分包预算'),
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
 	        foreach ($detail as $item)
 	        {
@@ -96,7 +96,7 @@ class ProjectSubpackageBudgetLogic extends BaseLogic
 	            'project_id' => $params['project_id'],
 	            'subpackage_budget_code' => data_unique_code('项目分包预算'),
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
 	        foreach ($detail as $item)
 	        {
diff --git a/app/adminapi/logic/quotation/QuotationLogic.php b/app/adminapi/logic/quotation/QuotationLogic.php
index 456b34e58..ec4f35cc4 100644
--- a/app/adminapi/logic/quotation/QuotationLogic.php
+++ b/app/adminapi/logic/quotation/QuotationLogic.php
@@ -67,7 +67,7 @@ class QuotationLogic extends BaseLogic
                 'total_amount' => $amount_including_tax + $params['freight'] + $params['other_fee'],
                 'customer_require' => $params['customer_require'] ?? '',
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             foreach ($quotation_detail as $item)
             {
diff --git a/app/adminapi/logic/supplier/SupplierContactsLogic.php b/app/adminapi/logic/supplier/SupplierContactsLogic.php
index c591d4fb0..1453678c5 100644
--- a/app/adminapi/logic/supplier/SupplierContactsLogic.php
+++ b/app/adminapi/logic/supplier/SupplierContactsLogic.php
@@ -61,7 +61,7 @@ class SupplierContactsLogic extends BaseLogic
                 'id_type' => $params['id_type'] ?? 0,
                 'idcard' => $params['idcard'] ?? '',
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
             ]);
             Db::commit();
             return true;
@@ -104,7 +104,7 @@ class SupplierContactsLogic extends BaseLogic
                 'id_type' => $params['id_type'] ?? 0,
                 'idcard' => $params['idcard'] ?? '',
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'update_time' => time(),
             ]);
             Db::commit();
diff --git a/app/adminapi/logic/supplier/SupplierLogic.php b/app/adminapi/logic/supplier/SupplierLogic.php
index 2a1ace6df..2ca662060 100644
--- a/app/adminapi/logic/supplier/SupplierLogic.php
+++ b/app/adminapi/logic/supplier/SupplierLogic.php
@@ -62,7 +62,7 @@ class SupplierLogic extends BaseLogic
                 'email' => $params['email'] ?? '',
                 'address' => $params['address'] ?? '',
                 'remark' => $params['remark'] ?? '',
-                'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
                 'invoice_company_name' => $params['invoice_company_name'] ?? '',
                 'taxpayer_identification_number' => $params['taxpayer_identification_number'] ?? '',
                 'bank_name' => $params['bank_name'] ?? '',
@@ -113,7 +113,7 @@ class SupplierLogic extends BaseLogic
 	            'email' => $params['email'] ?? '',
 	            'address' => $params['address'] ?? '',
 	            'remark' => $params['remark'] ?? '',
-	            'annex' => !empty($params['annex']) ? $params['annex'] : null,
+                'annex' => $params['annex']? json_encode($params['annex']) : '',
 	            'invoice_company_name' => $params['invoice_company_name'] ?? '',
 	            'taxpayer_identification_number' => $params['taxpayer_identification_number'] ?? '',
 	            'bank_name' => $params['bank_name'] ?? '',

From 8a195679f391531be01365872ba0883cfed9c102 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 15 Jan 2024 10:52:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=98=8E=E7=BB=86-?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0custom=5Fname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lists/material/MaterialPurchaseRequestDetailLists.php  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/lists/material/MaterialPurchaseRequestDetailLists.php b/app/adminapi/lists/material/MaterialPurchaseRequestDetailLists.php
index c6c793d30..3255609c2 100644
--- a/app/adminapi/lists/material/MaterialPurchaseRequestDetailLists.php
+++ b/app/adminapi/lists/material/MaterialPurchaseRequestDetailLists.php
@@ -23,7 +23,7 @@ use app\common\model\material\MaterialPurchaseRequestDetail;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\project\Project;
 use app\common\model\project\ProjectMaterialBudgetDetail;
-
+use think\facade\Db;
 
 /**
  * 材料采购申请明细列表
@@ -71,11 +71,12 @@ class MaterialPurchaseRequestDetailLists extends BaseAdminDataLists implements L
             ->order(['id' => 'desc'])
             ->select()->each(function($data){
 		        $material_purchase_request = MaterialPurchaseRequest::field('material_purchase_request_code,project_id,apply_date,arrival_date')->where('id',$data['material_purchase_request_id'])->findOrEmpty();
-		        $project = Project::field('name,project_code')->where('id',$material_purchase_request['project_id'])->findOrEmpty();
-		        $project_material_budget_detail = ProjectMaterialBudgetDetail::field('material_id')->where('id',$data['project_material_budget_detail_id'])->findOrEmpty();
+		        $project = Project::where('id',$material_purchase_request['project_id'])->field('name,project_code,custom_id')->findOrEmpty();
+                $project_material_budget_detail = ProjectMaterialBudgetDetail::field('material_id')->where('id',$data['project_material_budget_detail_id'])->findOrEmpty();
 		        $material = Material::field('first_level,second_level,three_level,name,code,specs,brand,parameter_description,unit')->where('id',$project_material_budget_detail['material_id'])->findOrEmpty();
 		        $material_classify = MaterialClassify::where('id','in',[$material['first_level'],$material['second_level'],$material['three_level']])->column('name','id');
 		        $data['material_purchase_request_code'] = $material_purchase_request['material_purchase_request_code'];
+				$data['custom_name'] = Db::name('custom')->where('id',$project['custom_id'])->value('name');
 				$data['project_name'] = $project['name'];
 		        $data['project_code'] = $project['project_code'];
 		        $data['apply_date'] = $material_purchase_request['apply_date'];