修改会议内表格

src/views/backend/meeting/index.vue

@@ -25,9 +25,13 @@
                 @keyup.enter.native="handleQuery" />
             </el-form-item> -->
         <el-form-item label="会议类型" prop="meetingType">
-          <el-select v-model="queryParams.meetingType" placeholder="请选择会议类型" clearable size="small">
+          <!-- <el-select v-model="queryParams.meetingType" placeholder="请选择会议类型" clearable size="small" @change="echange">
             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INFRA_CONFIG_TYPE)" :key="dict.value"
               :label="dict.label" :value="dict.value" />
+          </el-select> -->
+          <el-select v-model="queryParams.meetingType" placeholder="请选择会议类型" clearable size="small" @change="echange">
+            <el-option key="1" value="1" label="工作会议"></el-option>
+            <el-option key="2" value="2" label="培训会议"></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="状态" prop="status">
@@ -71,7 +75,8 @@
       <el-table-column label="会议主题" align="center" prop="meetingSubject" />
       <el-table-column label="会议类型" align="center" prop="meetingType">
         <template v-slot="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_CONFIG_TYPE" :value="scope.row.meetingType" />
+          <!-- <dict-tag :type="DICT_TYPE.INFRA_CONFIG_TYPE" :value="scope.row.meetingType" /> -->
+          <span>{{ scope.row.meetingType === '1' ? '工作会议' : '培训会议' }}</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="状态" align="center" prop="status">
@@ -174,18 +179,28 @@
       </div>
     </el-dialog>
     <!-- 查看会议人员 -->
-    <el-dialog title="提示" :visible.sync="meetPeopleModal" width="30%">
-      <el-table :data="meetPeople" style="width: 100%">
-        <el-table-column prop="ppName" label="姓名" width="180">
-        </el-table-column>
-        <el-table-column prop="ppTel" label="电话号">
+    <el-dialog title="会议人员" :visible.sync="meetPeopleModal" width="60%">
+      <el-table :data="meetPeople">
+        <el-table-column label="ID" align="center" prop="id" />
+        <el-table-column label="所属会议" align="center" prop="meetingId" />
+        <el-table-column label="参会人姓名" align="center" prop="ppName" />
+        <el-table-column label="参会人联系电话" align="center" prop="ppTel" />
+        <el-table-column label="参会人单位id" align="center" prop="orgId" />
+        <el-table-column label="参会人职务" align="center" prop="ppDuty" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template v-slot="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
         </el-table-column>
-        <el-table-column prop="ppTel" label="电话号">
-          <template scope="scope">
-            <span>{{ dutyComputed || scope.row.ppDuty }}</span>
+        <el-table-column label="状态" align="center" prop="status" />
+        <el-table-column lalign="center" fixed="right" width="180">
+          <template v-slot="scope">
+            <el-button type="text" plain icon="el-icon-download" size="mini" @click="handleExport"
+              :loading="exportLoading1" >导出</el-button>
           </template>
         </el-table-column>
       </el-table>
+      <pagination v-show="total > 0" :total="total" page.sync="1" limit.sync="10" @pagination="getList" />
       <span slot="footer" class="dialog-footer">
         <el-button @click="meetPeopleModal = false">取 消</el-button>
         <el-button type="primary" @click="meetPeopleModal = false">确 定</el-button>
@@ -198,13 +213,15 @@
 
 import { createMeeting, updateMeeting, deleteMeeting, getMeeting, getMeetingPage, exportMeetingExcel, getmeetingorg, broadMeeting, setupMeetingOrg, getMeetPeople } from "@/api/backend/meeting"
 import choiceSelect from '@/components/choiceSelect';
+import { createMeetingParticipants, updateMeetingParticipants, deleteMeetingParticipants, getMeetingParticipants, getMeetingParticipantsPage, exportMeetingParticipantsExcel } from "@/api/backend/meetingParticipants";
 import handleSelectedOrg from '@/components/handleSelectedOrg';
+import meetPage from '../meetingParticipants/index.vue'
 import { getTableHeight } from "@/utils/ruoyi.js";
 
 export default {
   name: "Meeting",
   components: {
-    choiceSelect, handleSelectedOrg
+    choiceSelect, handleSelectedOrg, meetPage
   },
   data() {
     return {
@@ -259,7 +276,8 @@ export default {
       // 已选择单位
       openSelectedOrg: false,
       meetPeople: [],//会议所属人员
-      meetPeopleModal: false
+      meetPeopleModal: false,
+      exportLoading1: false,
     }
   },
   mounted() {
@@ -312,6 +330,7 @@ export default {
       getMeetingPage(this.queryParams).then(response => {
         this.list = response.data.list
         this.total = response.data.total
+        console.log(response.data.total, 'total');
         this.loading = false
       })
     },
@@ -520,10 +539,33 @@ export default {
         pageNo: 1,
         pageSize: 10
       }).then(res => {
-        console.log(res, 'resddd');
+        // console.log(res, 'resddd');
         this.meetPeople = res.data.list
+        this.total = res.data.total
         this.meetPeopleModal = true
       })
+    },
+    echange(e) {
+      // console.log(e,'eee');//周期1，重要2
+      getMeetingPage({ pageNo: 1, pageSize: 10, meetingType: e }).then(res => {
+        // console.log(res, 'res');
+        this.list = res.data.list
+        this.total = res.data.total
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.$modal.confirm('是否确认导出所有会议参会人员明细数据项?').then(() => {
+        this.exportLoading1 = true;
+        return exportMeetingParticipantsExcel(params);
+      }).then(response => {
+        this.$download.excel(response, '会议参会人员明细.xls');
+        this.exportLoading1 = false;
+      }).catch(() => { });
     }
   },
   computed: {