From 9e9afb302d148b1c1d3573c34ea83724b295dcdc Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Tue, 23 Jan 2024 10:25:41 +0800 Subject: [PATCH] update --- .../logic/contract/SubcontractingContractNegotiationLogic.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php b/app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php index 696d2013a..60a6ad2fa 100644 --- a/app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php +++ b/app/adminapi/logic/contract/SubcontractingContractNegotiationLogic.php @@ -129,9 +129,10 @@ class SubcontractingContractNegotiationLogic extends BaseLogic { $data = SubcontractingContractNegotiation::field('id,project_id,subcontracting_contract_id,negotiation_name,negotiation_no,negotiation_amount,negotiation_type,sign_date,warranty_amount,warranty_expire_date,negotiation_content,negotiation_detail,negotiation_quotation,negotiation_basis') ->findOrEmpty($params['id']); - $subcontracting_contract = SubcontractingContract::field('supplier_id,contract_no')->where('id',$data['subcontracting_contract_id'])->findOrEmpty(); + $subcontracting_contract = SubcontractingContract::field('supplier_id,contract_no,contract_name')->where('id',$data['subcontracting_contract_id'])->findOrEmpty(); $project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty(); $supplier = Supplier::field('supplier_name,supplier_code')->where('id',$subcontracting_contract['supplier_id'])->findOrEmpty(); + $data['contract_name'] = $subcontracting_contract['contract_name']; $data['contract_no'] = $subcontracting_contract['contract_no']; $data['supplier_name'] = $supplier['supplier_name']; $data['supplier_code'] = $supplier['supplier_code'];