feat(teamMeeting): 添加班会主题字段并完善班组会议功能

- 在TeamMeetingForm接口中添加meetingTheme字段
- 新增查询项目班组成员和分包公司班组的API
- 完善班组会议详情抽屉组件，优化图片显示逻辑
- 扩展班组会议表单，增加班组、施工单位、宣讲人等多选功能
- 优化安全巡检页面布局和表单字段

src/api/safety/teamMeeting/index.ts

@@ -61,3 +61,18 @@ export const delTeamMeeting = (id: string | number | Array<string | number>) =>
     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'
+  });
+};

src/api/safety/teamMeeting/types.ts

@@ -58,6 +58,10 @@ export interface TeamMeetingVO {
 }
 
 export interface TeamMeetingForm extends BaseEntity {
+  /**
+   * 班会主题
+   */
+  meetingTheme?: string;
   /**
    * 主键id
    */

src/views/safety/safetyInspection/index.vue

@@ -1,22 +1,26 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="检查类型" prop="checkType">
               <el-select v-model="queryParams.checkType" placeholder="全部" clearable>
-                <el-option v-for="dict in safety_inspection_check_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-option v-for="dict in safety_inspection_check_type" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="违章类型" prop="violationType">
               <el-select v-model="queryParams.violationType" placeholder="全部" clearable>
-                <el-option v-for="dict in safety_inspection_violation_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-option v-for="dict in safety_inspection_violation_type" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="处理状态" prop="status">
               <el-select v-model="queryParams.status" placeholder="全部" clearable>
-                <el-option v-for="dict in safety_inspection_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-option v-for="dict in safety_inspection_type" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -32,15 +36,18 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyInspection:add']"> 新增 </el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyInspection:add']">
+              新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['safety:safetyInspection:remove']">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+              v-hasPermi="['safety:safetyInspection:remove']">
               删除
             </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['safety:safetyInspection:export']">导出 </el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport"
+              v-hasPermi="['safety:safetyInspection:export']">导出 </el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -93,11 +100,13 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220">
           <template #default="scope">
             <el-space>
-              <el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)" v-hasPermi="['safety:safetyInspection:query']">
+              <el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)"
+                v-hasPermi="['safety:safetyInspection:query']">
                 详情
               </el-button>
               <!-- <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:safetyInspection:edit']">修改 </el-button> -->
-              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:safetyInspection:remove']">
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['safety:safetyInspection:remove']">
                 删除
               </el-button>
             </el-space>
@@ -105,7 +114,8 @@
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改安全巡检工单对话框 -->
 
@@ -116,12 +126,14 @@
         </el-form-item>
         <el-form-item label="检查类型" prop="checkType">
           <el-select v-model="form.checkType" placeholder="请选择检查类型">
-            <el-option v-for="dict in safety_inspection_check_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+            <el-option v-for="dict in safety_inspection_check_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="违章类型" prop="violationType">
           <el-select v-model="form.violationType" placeholder="请选择违章类型">
-            <el-option v-for="dict in safety_inspection_violation_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+            <el-option v-for="dict in safety_inspection_violation_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="巡检结果" prop="inspectionResult">
@@ -129,12 +141,14 @@
         </el-form-item>
         <el-form-item label="工单整改单位" prop="rectificationUnit">
           <el-select v-model="form.rectificationUnit" placeholder="请选择整改单位类型">
-            <el-option v-for="dict in rectification_unit_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+            <el-option v-for="dict in rectification_unit_type" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="整改班组" prop="teamId">
           <el-select v-model="form.teamId" placeholder="请选择整改班组">
-            <el-option v-for="item in teamOpt" :key="item.value" :label="item.label" :value="item.value" @click="changeForeman(item.value)" />
+            <el-option v-for="item in teamOpt" :key="item.value" :label="item.label" :value="item.value"
+              @click="changeForeman(item.value)" />
           </el-select>
         </el-form-item>
         <el-form-item label="整改人" prop="correctorId">
@@ -152,17 +166,20 @@
         <el-form-item label="问题隐患" prop="hiddenDanger">
           <el-input v-model="form.hiddenDanger" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="整改措施" prop="measure">
+        <!-- <el-form-item label="整改措施" prop="measure">
           <el-input v-model="form.measure" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="要求整改期限" prop="checkTime">
-          <el-date-picker clearable v-model="form.rectificationDeadline" type="date" value-format="YYYY-MM-DD" placeholder="选择要求整改期限" />
+          <el-date-picker clearable v-model="form.rectificationDeadline" type="date" value-format="YYYY-MM-DD"
+            placeholder="选择要求整改期限" />
         </el-form-item>
         <el-form-item label="检查附件" prop="checkFile">
-          <file-upload v-model="form.checkFile" :file-size="20" :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
+          <file-upload v-model="form.checkFile" :file-size="20"
+            :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
         </el-form-item>
         <el-form-item label="整改附件" prop="rectificationFile">
-          <file-upload v-model="form.rectificationFile" :file-size="20" :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
+          <file-upload v-model="form.rectificationFile" :file-size="20"
+            :file-type="['doc', 'docx', 'pdf', 'png', 'jpg', 'jpeg']" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />

src/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue

@@ -7,12 +7,13 @@
       </el-descriptions-item>
       <el-descriptions-item label="班组名称">{{ teamMeetingDetail?.teamName }}</el-descriptions-item>
       <el-descriptions-item label="施工单位">{{ teamMeetingDetail?.contractorName }}</el-descriptions-item>
-      <el-descriptions-item label="开会时间">{{ dayjs(teamMeetingDetail?.meetingDate).format('YYYY 年 MM 月 DD 日') }}</el-descriptions-item>
+      <el-descriptions-item label="开会时间">{{ dayjs(teamMeetingDetail?.meetingDate).format('YYYY 年 MM 月 DD 日')
+      }}</el-descriptions-item>
       <el-descriptions-item label="上传时间">{{ teamMeetingDetail?.createTime }}</el-descriptions-item>
       <el-descriptions-item :span="2" label="班会内容">{{ teamMeetingDetail?.content }}</el-descriptions-item>
-      <el-descriptions-item :span="2" label="班会图片">
+      <el-descriptions-item :span="2" label="班会图片" v-if="teamMeetingDetail?.pictureUrlList">
         <el-space wrap>
-          <span :key="item" v-for="item in teamMeetingDetail?.pictureUrlList">
+          <span :key="item" v-for="item in teamMeetingDetail?.pictureUrlList?.split(',')">
             <image-preview :src="item" width="200px" />
           </span>
         </el-space>

src/views/safety/teamMeeting/index.vue

@@ -1,11 +1,13 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="开会时间" prop="meetingDate">
-              <el-date-picker clearable v-model="queryParams.meetingDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择开会时间" />
+              <el-date-picker clearable v-model="queryParams.meetingDate" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择开会时间" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -19,11 +21,13 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:teamMeeting:add']"> 新增 </el-button>
-          </el-col> -->
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['safety:teamMeeting:remove']">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:teamMeeting:add']"> 新增
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+              v-hasPermi="['safety:teamMeeting:remove']">
               删除
             </el-button>
           </el-col>
@@ -59,11 +63,13 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-space>
-              <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)" v-hasPermi="['safety:teamMeeting:query']">
+              <el-button link type="primary" icon="View" @click="handleShowDrawer(scope.row)"
+                v-hasPermi="['safety:teamMeeting:query']">
                 详情
               </el-button>
               <!-- <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:teamMeeting:edit']"> 修改 </el-button> -->
-              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:teamMeeting:remove']">
+              <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
+                v-hasPermi="['safety:teamMeeting:remove']">
                 删除
               </el-button>
             </el-space>
@@ -71,13 +77,40 @@
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改站班会对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="50%" append-to-body>
       <el-form ref="teamMeetingFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="开会时间" prop="meetingDate">
-          <el-date-picker clearable v-model="form.meetingDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择开会时间" />
+          <el-date-picker clearable v-model="form.meetingDate" type="date" value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择开会时间" />
+        </el-form-item>
+        <el-form-item label="班组名称" prop="teamId">
+          <el-select v-model="form.teamId" placeholder="请选择班组">
+            <el-option v-for="item in teamList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="施工单位" prop="contractorId">
+          <el-select v-model="form.contractorId" placeholder="请选择施工单位">
+            <el-option v-for="item in contractorList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="宣讲人" prop="compereId">
+          <el-select v-model="form.compereId" placeholder="请选择宣讲人">
+            <el-option v-for="item in compereList" :key="item.memberId" :label="item.memberName"
+              :value="item.memberId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="参与人" prop="participantIdList">
+          <el-select v-model="form.participantIdList" placeholder="请选择参与人" multiple>
+            <el-option v-for="item in participantList" :key="item.memberId" :label="item.memberName"
+              :value="item.memberId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="班会主题" prop="meetingTheme">
+          <el-input v-model="form.meetingTheme" placeholder="请输入班会主题" />
         </el-form-item>
         <el-form-item label="班会内容">
           <editor v-model="form.content" :min-height="192" />
@@ -105,7 +138,7 @@
 <script setup name="TeamMeeting" lang="ts">
 console.log(111);
 
-import { addTeamMeeting, delTeamMeeting, getTeamMeeting, listTeamMeeting, updateTeamMeeting } from '@/api/safety/teamMeeting';
+import { addTeamMeeting, delTeamMeeting, getTeamMeeting, listTeamMeeting, updateTeamMeeting, listProjectTeamMember, getProjectContractorTeamList } from '@/api/safety/teamMeeting';
 import { TeamMeetingForm, TeamMeetingQuery, TeamMeetingVO } from '@/api/safety/teamMeeting/types';
 import { useUserStoreHook } from '@/store/modules/user';
 import TeamMeetingDetailDrawer from '@/views/safety/teamMeeting/component/TeamMeetingDetailDrawer.vue';
@@ -124,6 +157,12 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
+const teamList = ref<any>([]);
+const contractorList = ref<any>([]);
+const compereList = ref<any>([]);
+const participantList = ref<any>([]);
+
+
 
 const queryFormRef = ref<ElFormInstance>();
 const teamMeetingFormRef = ref<ElFormInstance>();
@@ -143,7 +182,8 @@ const initFormData: TeamMeetingForm = {
   participantIdList: undefined,
   content: undefined,
   pictureList: undefined,
-  remark: undefined
+  remark: undefined,
+  meetingTheme: undefined
 };
 const data = reactive<PageData<TeamMeetingForm, TeamMeetingQuery>>({
   form: { ...initFormData },
@@ -284,9 +324,28 @@ onUnmounted(() => {
   listeningProject();
 });
 console.log(11);
+const getTeamAndContractor = async () => {
+  const projectId = currentProject.value?.id;
+  const { data: { teamList: teamListRes, contractorList: contractorListRes } } = await getProjectContractorTeamList(projectId);
+  console.log(teamListRes, contractorListRes);
 
+  teamList.value = teamListRes;
+  contractorList.value = contractorListRes;
+};
+const getUsers = async () => {
+  const { rows } = await listProjectTeamMember({
+    projectId: currentProject.value?.id
+  })
+  compereList.value = rows.filter(item => item.postId == 1)
+  participantList.value = rows.filter(item => item.postId == 0)
+};
+const getData = async () => {
+  await getTeamAndContractor()
+  await getUsers()
+};
 onMounted(() => {
   console.log(122);
   getList();
+  getData();
 });
 </script>