From a87b88559f8a285ec7a00bbcaf9c366c9fec4b62 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 30 Jul 2024 21:43:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=90=A5=E9=94=80=E5=90=88=E7=BA=A6=E5=8F=8A?=
 =?UTF-8?q?=E6=88=90=E6=9C=AC=E9=A1=B9=E7=9B=AE=E9=80=BB=E8=BE=91=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=8F=8A?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F=E8=8E=B7=E5=8F=96=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cost_project/CostApprovedProjectLogic.php    | 16 ++++++++++------
 .../MarketingFrameworkAgreementLogic.php         |  2 --
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/adminapi/logic/cost_project/CostApprovedProjectLogic.php b/app/adminapi/logic/cost_project/CostApprovedProjectLogic.php
index 9ec930435..10767c2a9 100644
--- a/app/adminapi/logic/cost_project/CostApprovedProjectLogic.php
+++ b/app/adminapi/logic/cost_project/CostApprovedProjectLogic.php
@@ -7,8 +7,8 @@
 	use app\common\model\dept\Dept;
 	use app\common\model\marketing\MarketingContract;
 	use app\common\model\marketing\MarketingCustom;
-	
-	
+use app\common\model\marketing\MarketingCustomContacts;
+
 	/**
 	 * 待立项造价项目逻辑
 	 * Class CostApprovedProjectLogic
@@ -29,12 +29,16 @@
 			$contract = MarketingContract::field('contract_name')->where('id', $data['related_contract_id'])->findOrEmpty();
 			$custom = MarketingCustom::where('id', $data['part_a'])->findOrEmpty();
 			$dept = Dept::where('id', 'in', [$data['signed_dept'], $data['supervise_dept']])->column('name', 'id');
-			$admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id');
+			$admin = Admin::where('id', 'in', [$data['signed_head'], $data['project_manager'], $data['seal_user']])->column('name', 'id');
+			// $telephone=MarketingCustomContacts::where('name',$data['part_a_contact'])->value('telephone');
+			$part_a_contact=MarketingCustomContacts::where('name',$data['part_a_contact'])->find();
+
 			$data['framework_agreement_name'] = $contract?->contract_name;
 			$data['part_a_name'] = $custom['name'];
-			$data['part_a_acontact'] =$custom['invoice_contact']? Admin::where('id',$custom['invoice_contact'])->value('name'):'';
-			$data['part_a_acontactnum'] = $custom['telephone'];
-			$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']] ?? '';
+			$data['part_a_telephone'] = $custom['telephone']??'';
+			$data['part_a_acontact'] =$data['part_a_contact'];
+			$data['part_a_acontactnum'] = $part_a_contact['telephone'];
+			$data['part_b_signatory_name'] =$part_a_contact['name'];
 			$data['signed_dept_name'] = $dept[$data['signed_dept']] ?? '';
 			$data['supervise_dept_name'] = $dept[$data['supervise_dept']] ?? '';
 			$data['signed_head_name'] = $admin[$data['signed_head']] ?? '';
diff --git a/app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php b/app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php
index 4ae9483ae..c2f99a26c 100644
--- a/app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php
+++ b/app/adminapi/logic/marketing/MarketingFrameworkAgreementLogic.php
@@ -169,9 +169,7 @@ use app\common\model\oa\FlowApprove;
 			$dept = Dept::field('name')->where('id', $data['signed_dept'])->findOrEmpty();
 			$admin = Admin::where('id', 'in', [$data['signed_head'], $data['seal_user']])->column('name', 'id');
 			$name=MarketingCustomContacts::where('id',$data['part_b_signatory'])->value('name');
-			$telephone=MarketingCustomContacts::where('id',$data['part_a_contact'])->value('telephone');
 			$data['part_a_name'] = $custom['name'];
-			$data['part_a_telephone'] = $telephone;
 			$data['part_b_signatory_name'] = $name ?? '';
 			$data['signed_dept_name'] = $dept['name'];
 			$data['signed_head_name'] = $admin[$data['signed_head']] ?? '';