From afa1a2b3849b8103c0a419d026691f8fc9341ea4 Mon Sep 17 00:00:00 2001 From: tcy <1193318383@qq.com> Date: Sun, 14 Sep 2025 15:20:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(teamMeeting):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=8F=AD=E4=BC=9A=E4=B8=BB=E9=A2=98=E5=AD=97=E6=AE=B5=E5=B9=B6?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=8F=AD=E7=BB=84=E4=BC=9A=E8=AE=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在TeamMeetingForm接口中添加meetingTheme字段 - 新增查询项目班组成员和分包公司班组的API - 完善班组会议详情抽屉组件，优化图片显示逻辑 - 扩展班组会议表单，增加班组、施工单位、宣讲人等多选功能 - 优化安全巡检页面布局和表单字段 --- src/api/safety/teamMeeting/index.ts | 15 ++++ src/api/safety/teamMeeting/types.ts | 4 + src/views/safety/safetyInspection/index.vue | 55 +++++++----- .../component/TeamMeetingDetailDrawer.vue | 7 +- src/views/safety/teamMeeting/index.vue | 85 ++++++++++++++++--- 5 files changed, 131 insertions(+), 35 deletions(-) diff --git a/src/api/safety/teamMeeting/index.ts b/src/api/safety/teamMeeting/index.ts index 073414c..e0c518d 100644 --- a/src/api/safety/teamMeeting/index.ts +++ b/src/api/safety/teamMeeting/index.ts @@ -61,3 +61,18 @@ export const delTeamMeeting = (id: string | number | Array) => method: 'delete' }); }; +// 查询项目班组下的成员列表 +export const listProjectTeamMember = (data: any) => { + return request({ + url: '/project/projectTeamMember/list', + method: 'get', + data + }); +}; +// 根据 id 查询项目以及项目下的分包公司、班组列表 +export const getProjectContractorTeamList = (id: string | number) => { + return request({ + url: '/project/project/contractorTeamList/' + id, + method: 'get' + }); +}; diff --git a/src/api/safety/teamMeeting/types.ts b/src/api/safety/teamMeeting/types.ts index c00a46e..2f37bc6 100644 --- a/src/api/safety/teamMeeting/types.ts +++ b/src/api/safety/teamMeeting/types.ts @@ -58,6 +58,10 @@ export interface TeamMeetingVO { } export interface TeamMeetingForm extends BaseEntity { + /** + * 班会主题 + */ + meetingTheme?: string; /** * 主键id */ diff --git a/src/views/safety/safetyInspection/index.vue b/src/views/safety/safetyInspection/index.vue index f75cdc3..a061c75 100644 --- a/src/views/safety/safetyInspection/index.vue +++ b/src/views/safety/safetyInspection/index.vue @@ -1,22 +1,26 @@