From 877d43b1e3f5856312e4805662d237185a8a9fb9 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 30 Jul 2024 22:16:12 +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=E6=88=90=E6=9C=AC=E9=A1=B9=E7=9B=AE=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=B8=AD=E7=9A=84=E9=A1=B9=E7=9B=AE=E8=B4=9F=E8=B4=A3?= =?UTF-8?q?=E4=BA=BA=E5=8F=8A=E8=81=94=E7=B3=BB=E6=96=B9=E5=BC=8F=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/adminapi/lists/cost_project/CostApprovedProjectLists.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php index cebd377f3..cd8c50455 100644 --- a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php +++ b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php @@ -79,8 +79,9 @@ use app\common\model\financial\FinancialInvoice; ->each(function ($data) { $custom = MarketingCustom::field('name')->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'); $data['part_a_name'] = $custom['name']; + $data['marketing_custom'] = $custom; $data['signed_dept_name'] = $dept[$data['signed_dept']] ?? ''; $data['supervise_dept_name'] = $dept[$data['supervise_dept']] ?? ''; $data['signed_head_name'] = $admin[$data['signed_head']] ?? '';