From be796ba02be1351fac9f9ca75c52fe886ec27ac4 Mon Sep 17 00:00:00 2001 From: weiz Date: Mon, 8 Jan 2024 17:32:50 +0800 Subject: [PATCH] update --- app/adminapi/lists/project/ProjectTotalBudgetLists.php | 4 ++-- app/adminapi/logic/project/ProjectTotalBudgetLogic.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/adminapi/lists/project/ProjectTotalBudgetLists.php b/app/adminapi/lists/project/ProjectTotalBudgetLists.php index e8a9cd09f..6b1de2536 100644 --- a/app/adminapi/lists/project/ProjectTotalBudgetLists.php +++ b/app/adminapi/lists/project/ProjectTotalBudgetLists.php @@ -40,7 +40,7 @@ class ProjectTotalBudgetLists extends BaseAdminDataLists implements ListsSearchI { return [ '=' => ['project_id'], - '%like%' => ['total_cost_code', 'project_manager'], + '%like%' => ['total_budget_code', 'project_manager'], ]; } @@ -58,7 +58,7 @@ class ProjectTotalBudgetLists extends BaseAdminDataLists implements ListsSearchI public function lists(): array { return ProjectTotalBudget::where($this->searchWhere) - ->field('id,project_id,total_cost_code,project_manager,budget_date,contract_amount,cl_cost,fb_cost,rg_cost,fy_cost,jj_cost,remark,budget_list') + ->field('id,project_id,total_budget_code,project_manager,budget_date,contract_amount,cl_cost,fb_cost,rg_cost,fy_cost,jj_cost,remark,budget_list') ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($data){ diff --git a/app/adminapi/logic/project/ProjectTotalBudgetLogic.php b/app/adminapi/logic/project/ProjectTotalBudgetLogic.php index 785e2c70f..12695aaff 100644 --- a/app/adminapi/logic/project/ProjectTotalBudgetLogic.php +++ b/app/adminapi/logic/project/ProjectTotalBudgetLogic.php @@ -47,7 +47,7 @@ class ProjectTotalBudgetLogic extends BaseLogic 'org_id' => $params['org_id'], 'dept_id' => $params['dept_id'], 'project_id' => $params['project_id'], - 'total_cost_code' => data_unique_code('项目总预算'), + 'total_budget_code' => data_unique_code('项目总预算'), 'contract_amount' => $params['contract_amount'], 'cl_cost' => $params['cl_cost'] ?? 0, 'fb_cost' => $params['fb_cost'] ?? 0, @@ -129,7 +129,7 @@ class ProjectTotalBudgetLogic extends BaseLogic */ public static function detail($params): array { - $data = ProjectTotalBudget::field('id,org_id,dept_id,project_id,total_cost_code,contract_amount,cl_cost,fb_cost,rg_cost,fy_cost,jj_cost,remark,budget_list,budget_date,project_manager') + $data = ProjectTotalBudget::field('id,org_id,dept_id,project_id,total_budget_code,contract_amount,cl_cost,fb_cost,rg_cost,fy_cost,jj_cost,remark,budget_list,budget_date,project_manager') ->findOrEmpty($params['id']); $org = Orgs::field('name')->where('id',$data['org_id'])->findOrEmpty(); $dept = Dept::field('name')->where('id',$data['dept_id'])->findOrEmpty();