diff --git a/app/adminapi/controller/ProjectCommissionController.php b/app/adminapi/controller/ProjectCommissionController.php index 7aae19ca8..724bf074b 100644 --- a/app/adminapi/controller/ProjectCommissionController.php +++ b/app/adminapi/controller/ProjectCommissionController.php @@ -105,6 +105,11 @@ class ProjectCommissionController extends BaseAdminController $result = ProjectCommissionLogic::detail($params); return $this->data($result); } + + public function datas() + { + return $this->data(ProjectCommissionLogic::datas()); + } } \ No newline at end of file diff --git a/app/adminapi/lists/ProjectCommissionDetailLists.php b/app/adminapi/lists/ProjectCommissionDetailLists.php index 4301eaa0e..bca773e5e 100644 --- a/app/adminapi/lists/ProjectCommissionDetailLists.php +++ b/app/adminapi/lists/ProjectCommissionDetailLists.php @@ -37,6 +37,7 @@ class ProjectCommissionDetailLists extends BaseAdminDataLists implements ListsSe public function setSearch(): array { return [ + '=' => ['project_commission_id'], '%like%' => ['engineer', 'task_name'], ]; } diff --git a/app/adminapi/logic/ProjectCommissionLogic.php b/app/adminapi/logic/ProjectCommissionLogic.php index 45cee9247..0e0b684b4 100644 --- a/app/adminapi/logic/ProjectCommissionLogic.php +++ b/app/adminapi/logic/ProjectCommissionLogic.php @@ -155,4 +155,16 @@ class ProjectCommissionLogic extends BaseLogic $data['project_commission_detail'] = ProjectCommissionDetail::field('id,engineer,task_name,task_type,professional_type,zj_amount,sk_amount,tc_rate,tc_amount,pay_amount,other_fee,remark')->where('project_commission_id', $data['id'])->select()->toArray(); return $data; } + + public static function datas() + { + $datas = ProjectCommission::field(['id', 'num']) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + foreach ($datas as &$item) { + $item['projectinfo'] = 'ID:' . $item['id'] . ' / 单号:' . $item['num']; + } + return $datas; + } } \ No newline at end of file