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']] ?? '';