diff --git a/app/adminapi/lists/cost_project/CostProjectLists.php b/app/adminapi/lists/cost_project/CostProjectLists.php index f618f0a5b..17afafa93 100644 --- a/app/adminapi/lists/cost_project/CostProjectLists.php +++ b/app/adminapi/lists/cost_project/CostProjectLists.php @@ -40,8 +40,8 @@ class CostProjectLists extends BaseAdminDataLists implements ListsSearchInterfac public function setSearch(): array { return [ - '=' => ['cost_project_id'], - '%like%' => ['superior_sort', 'name'], + '=' => ['cost_project_id','types','industry'], + '%like%' => ['project_num', 'project_name'], ]; } diff --git a/app/adminapi/lists/task/TaskTypeLists.php b/app/adminapi/lists/task/TaskTypeLists.php index 3ce25d8a2..d11ab99e8 100644 --- a/app/adminapi/lists/task/TaskTypeLists.php +++ b/app/adminapi/lists/task/TaskTypeLists.php @@ -17,6 +17,7 @@ namespace app\adminapi\lists\task; use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsExcelInterface; +use app\common\model\cost_project\CostProject; use app\common\model\task\TaskType; use app\common\lists\ListsSearchInterface; @@ -65,7 +66,10 @@ class TaskTypeLists extends BaseAdminDataLists implements ListsSearchInterface,L }}) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) - ->select() + ->select()->each(function($data){ + $project = CostProject::field('project_name')->where('id',$data['cost_project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + }) ->toArray(); }