合并分支 'fc' 到 'process_PCV1.0'

public/config.js

 // const urlConfig = {
 
-//     production_url: 'http://172.18.27.190:8080/confhd',//接口环境
-//     jump_url: 'http://hypz.hzswb.cn/confphone/#/',//跳转移动端路径
-//     unitAbbrevia_url:'http://172.18.27.190:8080/demo'
+//       production_url: 'http://172.18.27.190:8080/confhd',//接口环境
+//       jump_url: 'http://hypz.hzswb.cn/confphone/#/',//跳转移动端路径
+//       unitAbbrevia_url: 'http://172.18.27.190:8080/demo'
 
-    
-//     // production_url: 'http://120.27.238.48:9888',//接口环境
-//     // jump_url: 'http://120.27.238.48:8080/confphone/#/'//跳转移动端路径
-//     // unitAbbrevia_url:'http://120.27.238.48:8089/demo'
-// }
 
+//       // production_url: 'http://120.27.238.48:9888',//接口环境
+//       // jump_url: 'http://120.27.238.48:8080/confphone/#/'//跳转移动端路径
+//       // unitAbbrevia_url:'http://120.27.238.48:8089/demo'
+// }
 const urlConfig = {
-      production_url: 'https://lyfydp.longyou.gov.cn:9443/meeting/api/man',//接口环境
-      jump_url: 'https://lyfydp.longyou.gov.cn:9443/meeting/h5/#/'//跳转移动端路径
+      production_url: 'https://lyfydp.longyou.gov.cn:9443/meeting/api/h5',//接口环境
+      // production_url: 'http://192.168.102.124:6788',
+      jump_url: 'https://lyfydp.longyou.gov.cn:9443/meeting/h5/#/', //跳转移动端路径
 }
\ No newline at end of file

src/views/meeting/componets/MeetingItem.vue

@@ -8,10 +8,10 @@
       </div>
     </div>
     <div class="meeting_item item" :class="[
-      { green_item: item.processStatus === 1 },
-      { orange_item: item.processStatus === 2 },
-      { blue_item: item.processStatus === 3 },
-    ]" v-for="(item, index) of meetingLists" :key="index" @click="enterConf(item)">
+        { green_item: item.processStatus === 1 },
+        { orange_item: item.processStatus === 2 },
+        { blue_item: item.processStatus === 3 },
+      ]" v-for="(item, index) of  meetingLists " :key="index" @click="enterConf(item)">
       <div class="meeting_item_part1">
         <div class="meeting_item_text" v-if="flash">
           <el-tooltip :content="item.processName" effect="light" placement="bottom"
@@ -22,17 +22,15 @@
           <div class="time_record" @click.stop v-if="item.processStatus === 3">
             <time-record :startTime="item.processDate" :tagFlag="true"></time-record>
           </div>
-          <div class="time_record" :class="
-            new Date(item.processDate).getTime() - new Date().getTime() < 0
+          <div class="time_record" :class="new Date(item.processDate).getTime() - new Date().getTime() < 0
               ? 'overdue'
               : ''
-          " @click.stop v-else>
+            " @click.stop v-else>
 
-            <time-count-down :endTime="item.processDate" @modifyDate="modifyDate" :item="item" :tagFlag="
-              new Date(item.processDate).getTime() - new Date().getTime() < 0
+            <time-count-down :endTime="item.processDate" @modifyDate="modifyDate" :item="item" :tagFlag="new Date(item.processDate).getTime() - new Date().getTime() < 0
                 ? false
                 : true
-            "></time-count-down>
+              "></time-count-down>
           </div>
         </div>
         <div class="publish_tag">
@@ -53,16 +51,17 @@
       <div class="meeting_item_part2">
         <div class="meeting_item_text" v-show="(msg.key !== '来源' && msg.key !== '联系人')" v-for="(msg, index) of item.data"
           :key="index">
-          <span class="text_key">{{ msg.key }}：</span>
+          <span class="text_key" v-if="msg.key">{{ msg.key }}：</span>
           <span class="text_value" v-if="msg.key !== '预定状态'">{{ msg.value }}</span>
           <span class="text_value" v-else>{{ msg.value == 0 ? '待审核' : msg.value == 1 ? '审核成功' : msg.value == 2 ? '审核不通过' :
-            ''
+            '无需审核'
           }}</span>
           <span class="address_des" v-if="msg.key === '地址' && (msg.value === '' || msg.value === null)">请在排座时选厅</span>
         </div>
       </div>
       <div class="foot_but">
-        <div class="but close_but" @click.stop="endConf(item)">关闭会议</div>
+        <div class="but close_but" v-if="item.processStatus === 3" @click.stop="closeConf(item)">结束会议</div>
+        <div class="but end_but" v-if="item.processStatus !== 3" @click.stop="endConf(item)">关闭会议</div>
         <div class="but start_but" v-if="item.processStatus === 2" @click.stop="startConf(item)">
           <div>开始会议</div>
         </div>
@@ -183,6 +182,53 @@ export default {
           })
         })
     },
+    closeConf(item) {
+      this.$confirm(`会议主题：${item.processName} </br>确认”结束“？`, '提示', {
+        customClass: 'message_box',
+        dangerouslyUseHTMLString: true,
+        confirmButtonText: '关闭',
+        cancelButtonText: '取消',
+      })
+        .then(() => {
+          this.loadingOptions.text = '正在结束会议...'
+          let loading = Loading.service(this.loadingOptions)
+          this.$axios
+            .getEndConf(item.id, 2)
+            .then((res) => {
+              if (res.data.code === 200) {
+                this.$message({
+                  message: '会议已结束！',
+                  type: 'success',
+                })
+                loading.close()
+                this.$emit('getData')
+              }
+            })
+            .catch((err) => { })
+        })
+        .catch((action) => {
+          // if (action === "cancel") {
+          //   this.loadingOptions.text = "正在关闭会议...";
+          //   let loading = Loading.service(this.loadingOptions);
+          //   this.$axios.getEndConf(item.id, 2).then((res) => {
+          //     console.log(res);
+          //     if (res.data.code === 200) {
+          //       this.$message({
+          //         message: "会议已关闭！",
+          //         type: "success",
+          //       });
+          //       loading.close();
+          //       this.$emit("getData");
+          //     }
+          //   });
+          // } else {
+          //   this.$message({
+          //     type: "info",
+          //     message: "已取消",
+          //   });
+          // }
+        })
+    },
     endConf(item) {
       this.$confirm(`会议主题：${item.processName} </br>确认”关闭“？`, '提示', {
         customClass: 'message_box',
@@ -194,7 +240,7 @@ export default {
           this.loadingOptions.text = '正在关闭会议...'
           let loading = Loading.service(this.loadingOptions)
           this.$axios
-            .getEndConf(item.id, 2)
+            .getEndConf(item.id, 3)
             .then((res) => {
               if (res.data.code === 200) {
                 this.$message({
@@ -377,6 +423,12 @@ export default {
         color: #e24f51;
       }
 
+      .end_but {
+        // background-color: 
+        background: rgba(119, 140, 162, 0.12);
+        color: #778ca2;
+      }
+
       .start_but {
         div {
           width: 100%;

src/views/meeting/componets/TimeCountDown.vue

@@ -20,7 +20,7 @@
 
     <el-dialog title="修改过期会议" :visible.sync="dialogFormVisible" :before-close="handleClose" class="selectTimeDialog"
       width="1500px" v-if="item
-      ">
+        ">
       <div class="conferenceName">会议名称：{{ item.processName }}</div>
       <div class="dialog_top">
         <div class="name">{{ currentConfenrenceObj.conferenceName }}</div>
@@ -38,7 +38,7 @@
       <div class="timeList">
         <timeList :canClick="canClick" :conferenceProcessReservationRecordList="conferenceProcessReservationRecordList"
           :isHover="false
-          " @getTimeRange="getTimeRange"></timeList>
+            " @getTimeRange="getTimeRange"></timeList>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="handleClose()">取 消</el-button>
@@ -164,10 +164,11 @@ export default {
       return y + '-' + m + '-' + d
     },
     selectTime() {
-      console.log(this.item.data[this.item.data.length - 1])
+      // console.log(this.countDown);
+      // console.log(this.item.data)
       let index = this.item.data.length - 1
-      if (this.item.data[index].key == '预定状态' && this.item.data[index].value == 2) {
-        console.log(213113);
+      if ((this.item.data[index].key == '预定状态' && (this.item.data[index].value == 0 || this.item.data[index].value == 1 || this.item.data[index].value == 2)) && this.countDown == '已过期') {
+        // console.log(213113);
         this.tipsDialogVisible = true
       } else {
         this.$axios.rescheduleMeeting(this.item.id).then((res) => {
@@ -342,7 +343,7 @@ export default {
 
           .key {
             color: #778ca2;
-            width: 55px;
+            max-width: 90px;
           }
 
           .value {

src/views/meeting/operation/chooseModule/index.vue

@@ -103,7 +103,7 @@
       <div class="box" v-if="trueList.length == 0"></div>
       <time-list ref="timeList" class="time_list" :canClick="canClick"
         :conferenceProcessReservationRecordList="conferenceProcessReservationRecordList" :isHover="false
-        " @getTimeRange="getTimeRange"></time-list>
+          " @getTimeRange="getTimeRange"></time-list>
       <div class="time_bottom">
         <div class="time_tips">注：更换时间不换会议室，不影响已排座数据；同一时间段重复预定的，遇此情况请线下协商会议改期。</div>
         <!-- <div class="yuding" @click="yuding()">下一步</div> -->
@@ -311,8 +311,14 @@ export default {
     this.getConferenceList(this.ruleForm)
     // console.log();
     // console.log(new Date().toDateString())
-    this.getDate()
 
+    this.getDate()
+    console.log('yuding', this.$route.query.yudingStatus);
+    if (this.$route.query.yudingStatus) {
+      // this.yuding = 
+      this.isActive = 1
+      this.$emit('getPredetermine', this.$route.query.yudingStatus)
+    }
   },
 
   methods: {
@@ -411,6 +417,8 @@ export default {
                   isProcess: this.$route.query.isProcess,
                 },
               })
+              //重新获取头部数据
+              this.$emit('getTopData')
             } else {
               loading.close()
               this.$message.error(res.data.data)
@@ -418,7 +426,7 @@ export default {
           })
         } else {
           loading.close()
-          this.$message.error(`${res.data.data}`)
+          this.$message.error(`${response.data.data}`)
         }
       })
 
@@ -457,50 +465,52 @@ export default {
     //查询会议室
     getConferenceList(data, currentConfenrence) {
       console.log('curr', this.currentConfenrence);
+      console.log('123', this.conferenceId);
       // console.log();
       this.$axios.findReservationConference(data).then((res) => {
         if (res.data.code == 200) {
-          // console.log('resresresres', res)
+          console.log('resresresres', res)
           this.trueList = res.data.data.conferenceAndUseInfoVoList
 
-          // console.log(this.trueList)
+          console.log('trueList', this.trueList)
           this.dataLists = res.data.data
           let boole = false
-          if (res.data.data.conferenceName) {
-
-            for (let i in this.trueList) {
-              // console.log(33);
-              if (res.data.data.conferenceName == this.trueList[i].conferenceName) {
-                console.log(132);
-                this.currentConfenrence = this.trueList[i]
-                currentConfenrence = this.trueList[i]
-                this.chooseConfs(this.trueList[i], this.trueList[i])
-                // this.$nextTick(() => {
-                //   this.$refs.timeList.selectRange(res.data.data.reservationStartTime.split(' ')[1])
-                //   this.$refs.timeList.selectRange(res.data.data.reservationEndTime.split(' ')[1])
-                // })
-                // this.$nextTick(() => {
-                //   this.$refs.timeList.selectRange(currentConfenrence.reservationStartTime.split(' ')[1])
-                //   this.$refs.timeList.selectRange(currentConfenrence.reservationEndTime.split(' ')[1])
-                // })
-                // console.log('true');
-                boole = true
-                // break
-              }
-            }
-            // console.log(123);
-            if (!boole) {
-              // console.log('qqqqqqqqqqqqqqqqqqqqqqqqq');
-              currentConfenrence = this.trueList[0]
-              this.chooseConfs(this.trueList[0], currentConfenrence)
+          // if (res.data.data.conferenceName) {
+
+          for (let i in this.trueList) {
+            console.log(this.trueList[i].conferenceId);
+            if (this.currentConfenrence.conferenceId == this.trueList[i].conferenceId) {
+              console.log(132);
+              console.log(this.trueList[i]);
+              // this.currentConfenrence = this.trueList[i]
+              currentConfenrence = this.trueList[i]
+              this.chooseConfs(this.trueList[i], this.trueList[i])
+              // this.$nextTick(() => {
+              //   this.$refs.timeList.selectRange(res.data.data.reservationStartTime.split(' ')[1])
+              //   this.$refs.timeList.selectRange(res.data.data.reservationEndTime.split(' ')[1])
+              // })
               // this.$nextTick(() => {
               //   this.$refs.timeList.selectRange(currentConfenrence.reservationStartTime.split(' ')[1])
               //   this.$refs.timeList.selectRange(currentConfenrence.reservationEndTime.split(' ')[1])
               // })
+              // console.log('true');
+              boole = true
+              // break
             }
-          } else {
-            // this.choosePei(this.radio)
           }
+          // console.log(123);
+          if (!boole) {
+            // console.log('qqqqqqqqqqqqqqqqqqqqqqqqq');
+            currentConfenrence = this.trueList[0]
+            this.chooseConfs(this.trueList[0], currentConfenrence)
+            // this.$nextTick(() => {
+            //   this.$refs.timeList.selectRange(currentConfenrence.reservationStartTime.split(' ')[1])
+            //   this.$refs.timeList.selectRange(currentConfenrence.reservationEndTime.split(' ')[1])
+            // })
+          }
+          // } else {
+          // this.choosePei(this.radio)
+          // }
           this.choosePei(this.radio, currentConfenrence)
         }
       })
@@ -687,6 +697,7 @@ export default {
       this.conferenceProcessReservationRecordList = item.conferenceProcessReservationRecordList
       let { reservationEndTime, reservationStartTime } = this.currentConfenrence
       this.currentConfenrence = { ...item, reservationEndTime, reservationStartTime }
+      // this.currentConfenrence.con
       // this.currentConfenrence = item
       console.log(this.currentConfenrence);
       console.log(this.trueList);

src/views/meeting/operation/noticeMeeting/addNoticeUnitDialog.vue

 <template>
   <div>
-    <el-dialog
-      title="增加通知单位"
-      :visible.sync="visible "
-      :before-close="dialogTableHandleClose"
-      append-to-body
-      class="table_dialog"
-      width="1100px"
-    >
+    <el-dialog title="增加通知单位" :visible.sync="visible" :before-close="dialogTableHandleClose" append-to-body
+      class="table_dialog" width="1100px">
       <div class="body">
         <div class="top">
           <el-form ref="form" :model="form" label-width="110px" :inline="true">
             <el-form-item label="选择参会单位：">
-              <el-select
-                v-model="form.unitId"
-                placeholder="模糊输入（权限单位）"
-                filterable
-                @change="unitNameChange()"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.unitId"
-                  :label="item.unitName"
-                  :value="item.unitId"
-                ></el-option>
+              <el-select v-model="form.unitId" placeholder="模糊输入（权限单位）" filterable @change="unitNameChange()">
+                <el-option v-for="item in options" :key="item.unitId" :label="item.unitName"
+                  :value="item.unitId"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -33,7 +18,7 @@
         </div>
         <div class="table_wai">
           <div class="tips">
-            <div>已选单位：{{tableData.length}}家</div>
+            <div>已选单位：{{ tableData.length }}家</div>
             <!-- <div>批量删除</div> -->
           </div>
           <el-table :data="tableData" height="100%" stripe>
@@ -54,15 +39,10 @@
         <el-button @click="dialogTableHandleClose()">取消</el-button>
         <el-button @click="submitTable()">确认</el-button>
       </div>
-      <el-dialog
-        width="30%"
-        title="提示"
-        :visible.sync="confirmDelVisible"
-        :before-close="confirmDelHandleClose"
-        append-to-body
-      >
+      <el-dialog width="30%" title="提示" :visible.sync="confirmDelVisible" :before-close="confirmDelHandleClose"
+        append-to-body>
         <div style="display:flex;flex-direction: column;align-items: center;}">
-          <div>参会单位：{{currentDelObj.unitName}}</div>
+          <div>参会单位：{{ currentDelObj.unitName }}</div>
           <div>确认删除？</div>
         </div>
         <div slot="footer" class="dialog-footer">
@@ -74,7 +54,7 @@
   </div>
 </template>
   
-  <script>
+<script>
 export default {
   props: {
     addNoticeUnitVisible: {
@@ -102,21 +82,26 @@ export default {
     //提交选好的单位
     submitTable() {
       console.log(this.chosenArea)
-      let params = {
-        processId: this.$route.query.processId,
-        sysUnitAuthPersonShowVoList: [...this.tableData],
-        areaId: this.chosenArea.id,
-      } // console.log(this.$route.query.processId)
-      this.$axios.addNoticeUnit(params).then((res) => {
-        console.log(res)
-        if (res.data.code == 200) {
-          this.$message.success('新增成功')
-          this.$emit('getInit')
-          this.dialogTableHandleClose()
-        } else {
-          this.$message.error(`${res.data.data}`)
-        }
-      })
+      if (this.tableData.length !== 0) {
+        let params = {
+          processId: this.$route.query.processId,
+          sysUnitAuthPersonShowVoList: [...this.tableData],
+          areaId: this.chosenArea.id,
+        } // console.log(this.$route.query.processId)
+        this.$axios.addNoticeUnit(params).then((res) => {
+          console.log(res)
+          if (res.data.code == 200) {
+            this.$message.success('新增成功')
+            this.$emit('getInit')
+            this.dialogTableHandleClose()
+          } else {
+            this.$message.error(`${res.data.data}`)
+          }
+        })
+      } else {
+        this.$message.warning('请增加通知单位后再确认')
+      }
+
     },
 
     dialogTableHandleClose() {
@@ -204,6 +189,7 @@ export default {
     width: 100%;
     display: flex;
     flex-direction: column;
+
     .top {
       // width: 100%;
 
@@ -213,8 +199,10 @@ export default {
         justify-content: space-between;
       }
     }
+
     .table_wai {
       height: 400px;
+
       .tips {
         height: 38px;
         line-height: 38px;

src/views/meeting/operation/noticeMeeting/lableTable.vue

 <template>
   <div>
-    <el-dialog
-      title="增加通知单位"
-      :visible.sync="visible "
-      :before-close="lableTableHandleClose"
-      append-to-body
-      class="table_dialog"
-      width="900px"
-    >
+    <el-dialog title="增加通知单位" :visible.sync="visible" :before-close="lableTableHandleClose" append-to-body
+      class="table_dialog" width="1000px">
       <div class="body">
         <div class="left">
-          <div class="tips">标签：{{AllLabelObj.customOrgNum}}个</div>
+          <div class="tips">标签：{{ AllLabelObj.customOrgNum }}个</div>
           <div class="label_list">
-            <div
-              v-for="(item,index) in AllLabelObj.noticeCustomOrgVoList"
-              :key="index"
-              :class="active==index?'active':''"
-              @click="checkLabel(item,index)"
-            >{{ item.customOrgName}}/{{item.unitNum}}家</div>
+            <div v-for="(item, index) in AllLabelObj.noticeCustomOrgVoList" :key="index"
+              :class="active == index ? 'active' : ''" @click="checkLabel(item, index)"><span class="name">{{
+                item.customOrgName }}</span> /{{ item.unitNum }}家</div>
           </div>
         </div>
         <div class="table_wai">
           <div class="tips">
-            <div>已选单位：{{selectArr.length}}家</div>
+            <div>已选单位：{{ selectArr.length }}家</div>
             <!-- <div>批量删除</div> -->
           </div>
-          <el-table
-            :data="tableData"
-            height="100%"
-            stripe
-            @selection-change="handleSelectionChange"
-          >
+          <el-table ref="tableDom" :data="tableData" height="100%" stripe @selection-change="handleSelectionChange"
+            @row-click="toggleSelection">
             <!-- :row-key="getRowKeys" -->
             <el-table-column type="selection" width="55"></el-table-column>
             <el-table-column property="unitName" label="参会单位"></el-table-column>
@@ -51,13 +38,8 @@
         <el-button @click="qvxiaoHandleClose()">取消</el-button>
         <el-button @click="submitTable()">确认</el-button>
       </div>
-      <el-dialog
-        width="30%"
-        title="提示"
-        :visible.sync="confirmDelVisible"
-        :before-close="confirmDelHandleClose"
-        append-to-body
-      >
+      <el-dialog width="30%" title="提示" :visible.sync="confirmDelVisible" :before-close="confirmDelHandleClose"
+        append-to-body>
         <div style="display:flex;flex-direction: column;align-items: center;}">
           <!-- <div>参会单位：{{currentDelObj.unitName}}</div> -->
           <div>确认删除？</div>
@@ -71,7 +53,7 @@
   </div>
 </template>
   
-  <script>
+<script>
 export default {
   props: {
     labelTableVisible: {
@@ -113,13 +95,27 @@ export default {
     //   }
     // },
     handleSelectionChange(val) {
-      // console.log(val)
+      console.log(val)
       this.selectArr = val // if()
       // console.log(this.currentLabelObj)
       // this.$set(this.selectArrObj, `${this.currentLabelObj.customOrgId}`, val)
       // console.log(this.selectArrObj)
       // console.log(this.currentLabelObj)
     },
+    toggleSelection(row) {
+      console.log(row);
+      let filter = this.selectArr.filter((id, index) => row.id === id)
+      if (filter.length === 0) {
+        this.selectArr = this.selectArr.concat(row)
+      } else {
+        this.selectArr = this.selectArr.filter((id, index) => row.id !== id)
+      }
+      if (row) {
+        this.$refs.tableDom.toggleRowSelection(row)
+      }
+
+      // this.$refs['tableDom'].handleSelectionChange(row)
+    },
     //选择标签 查询单位
     getUnit(data) {
       this.$axios.findUnitByCustomOrgId(data).then((res) => {
@@ -195,7 +191,7 @@ export default {
       console.log(item)
     },
     //选择标签
-    selectTable() {},
+    selectTable() { },
     //模糊搜索
     findSysUnitAuthPerson(data) {
       // console.log(data)
@@ -235,8 +231,10 @@ export default {
     width: 100%;
     display: flex;
     flex-direction: row;
+
     .left {
       width: 200px;
+
       .tips {
         width: 100%;
         height: 40px;
@@ -246,6 +244,7 @@ export default {
 
         color: black;
       }
+
       .label_list {
         width: 100%;
         height: 100%;
@@ -255,6 +254,9 @@ export default {
         flex-direction: column;
         align-items: center;
         overflow: hidden;
+
+
+
         div {
           width: 150px;
           height: 60px;
@@ -264,17 +266,31 @@ export default {
           margin-top: 20px;
           border-radius: 8px;
           cursor: pointer;
+          display: flex;
+          align-items: center;
+          justify-content: center;
         }
+
         .active {
           background: #5474e8;
           color: #fff;
         }
+
+        .name {
+          display: inline-block;
+          max-width: 100px;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+        }
       }
     }
+
     .table_wai {
       width: calc(100% - 195px);
       height: 600px;
       margin-left: 5px;
+
       .tips {
         height: 38px;
         line-height: 38px;

src/views/meeting/operation/operation.vue

@@ -108,11 +108,11 @@
         <!--          人员排座-->
         <!--        </div>-->
         <div :class="[
-          { activeBut: $route.path === item.path },
-          { qiehuanBut: $route.path !== item.path },
-          { clickBoole: (auditStatus == 0 || auditStatus == 2) && item.name == '智能排座' }
-        ]" class="but" v-for="(item, index) of butList" @click="toPath(item)" v-show="$route.meta.title !== 'chooseModule' &&
-  ((index != 3 && $route.query.isProcess == 2) || $route.query.isProcess == 1)">
+            { activeBut: $route.path === item.path },
+            { qiehuanBut: $route.path !== item.path },
+            { clickBoole: (auditStatus == 0 || auditStatus == 2) && item.name == '智能排座' }
+          ]" class="but" v-for="(item, index) of butList" @click="toPath(item)" v-show="$route.meta.title !== 'chooseModule' &&
+    ((index != 3 && $route.query.isProcess == 2) || $route.query.isProcess == 1)">
           <div class="rot" v-if="item.name === '人员准备' && $store.state.updateF === true"></div>
           {{ item.name }}
         </div>
@@ -120,15 +120,16 @@
 
       <div class="row_wrap row_font_size20" v-if="$route.query.isProcess == 1">
         <div class="row_item" :class="[
-          { condition: item.key === '联系人' },
-          { count: item.key === '倒计时' },
-        ]" v-for="(item, index) of meetingForm" :key="index">
+            { condition: item.key === '联系人' },
+            { count: item.key === '倒计时' },
+          ]" v-for="(item, index) of meetingForm" :key="index">
           <span class="row_item_label" v-if="item.key !== '倒计时'">{{ item.key }}：</span>
 
           <span class="row_item_text" v-if="item.key === '倒计时'">
             <time-count-down :endTime="item.value"></time-count-down>
           </span>
-          <span class="row_item_text" v-else>{{ item.value }}
+          <span class="row_item_text" v-else>
+            <span class="row_item_text_value">{{ item.value }}</span>
 
             <span v-if="item.key === '地址'" class="processBoole"
               :class="auditStatus == 0 ? 'yellow' : auditStatus == 1 ? 'blue' : auditStatus == 2 ? 'red' : ''"
@@ -136,9 +137,8 @@
                 auditStatus == 1 ? '审核通过' : auditStatus == 2 ? '未通过' : '' }}</span>
           </span>
           <!-- <span class="row_item_text_hover">{{ item.value }}</span> -->
-          <span class="address_des" v-if="
-            item.key === '地址' && (item.value === '' || item.value === null)
-          ">请在排座时选厅</span>
+          <span class="address_des" v-if="item.key === '地址' && (item.value === '' || item.value === null)
+            ">请在排座时选厅</span>
 
         </div>
       </div>
@@ -197,7 +197,7 @@
         <div class="but fabu_but" :class="auditStatus == 0 || auditStatus == 2 ? 'notShowPu' : ''"
           @click="auditStatus == 0 || auditStatus == 2 ? '' : showPublish()" v-if="($route.meta.title === '会议查看' || $route.meta.title === '会议配置')
             && this.$route.query.isProcess == 1
-          ">发布</div>
+            ">发布</div>
 
         <!--        <div-->
         <!--          class="but normal_but"-->
@@ -221,13 +221,13 @@
       </div>
     </div>
     <div class="router_view_wrap" :class="{
-      router_view_wraps: $route.meta.title === '会议查看',
-      isAllScreens: $store.state.isAllScreen,
-    }">
+        router_view_wraps: $route.meta.title === '会议查看',
+        isAllScreens: $store.state.isAllScreen,
+      }">
       <div class="content">
         <router-view ref="select_wrap" @judgeStatus="judgeStatus" @updateData="updateData"
           @getNoticeStatus="getNoticeStatus" @getPredetermine="getPredetermine" :oneself="oneself"
-          :auditStatus="auditStatus" :status="status"></router-view>
+          :auditStatus="auditStatus" :status="status" @getTopData="getTopData"></router-view>
       </div>
     </div>
     <!--    </div>-->
@@ -465,6 +465,8 @@ export default {
       this.getData()
       this.dontshows()
     }
+
+
   },
   destroyed() {
     //离开页面清除监听
@@ -483,6 +485,12 @@ export default {
     }
   },
   methods: {
+
+    //重新获取头部数据
+    getTopData() {
+      console.log('getDate');
+      this.getData()
+    },
     processHandleClose() {
       this.processDialogVisible = false
     },
@@ -547,6 +555,8 @@ export default {
             query: { processId: this.$route.query.processId },
           })
           this.getData() //重新人员准备需要重新获取头部信息
+        } else {
+          this.$message.error(`${res.data.data}`)
         }
       })
     },
@@ -652,7 +662,6 @@ export default {
               },
             ]
           } else {
-
             this.meetingForm = [
               {
                 key: '时间',
@@ -1507,8 +1516,22 @@ export default {
         .row_item_text {
           color: #3a3c4b;
           margin-right: 36px;
+          max-width: 290px;
+          // text-overflow: ellipsis;
+          // white-space: nowrap;
+          // overflow: hidden;
+          display: flex;
+          align-items: center;
+
+          .row_item_text_value {
+            display: inline-block;
+            max-width: 200px;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            overflow: hidden;
+          }
 
-
+          .processBoole {}
         }
 
         .row_item_text_hover {
@@ -1574,18 +1597,14 @@ export default {
 
       .condition {
         .row_item_text {
-          width: 200px;
+          max-width: 200px;
           /* 不换行 */
           white-space: nowrap;
           /* 隐藏超出部分 */
           overflow: hidden;
           /* 显示省略号 */
           text-overflow: ellipsis;
-
-
         }
-
-
       }
 
       .count {

src/views/meeting/operation/overview/index.vue

@@ -32,12 +32,11 @@
         <div class="row_item line_hight_32">
           <div class="row_item_label">会议管理人：</div>
           <div class="person_select_show">
-            <el-tag type="info" v-for="tag in managerTags" :key="tag.cractUnid" @close="handleClose(tag)" :closable="
-              !(
+            <el-tag type="info" v-for="tag in managerTags" :key="tag.cractUnid" @close="handleClose(tag)" :closable="!(
                 role === 'ROLE_HUIYIADMIN' &&
                 userId !== overviewData.processSponsorUuid
               )
-            ">{{ tag.cnName }}</el-tag>
+              ">{{ tag.cnName }}</el-tag>
             <el-button class="authorize_but" size="small" type="primary" @click="applyAdmin">授
               权</el-button>
           </div>
@@ -225,17 +224,17 @@
                   </div>
                   <div class="main">
                     <el-time-select placeholder="起始时间" v-model="item.agendaBeginHour" :picker-options="{
-                      start: '08:00',
-                      step: '00:15',
-                      end: '18:30',
-                    }" @change="changYi(item)"></el-time-select>至
-                    <el-time-select @change="changYi(item)" placeholder="结束时间" v-model="item.agendaEndHour"
-                      :picker-options="{
                         start: '08:00',
                         step: '00:15',
                         end: '18:30',
-                        minTime: item.agendaBeginHour,
-                      }"></el-time-select>
+                      }" @change="changYi(item)"></el-time-select>至
+                    <el-time-select @change="changYi(item)" placeholder="结束时间" v-model="item.agendaEndHour"
+                      :picker-options="{
+                          start: '08:00',
+                          step: '00:15',
+                          end: '18:30',
+                          minTime: item.agendaBeginHour,
+                        }"></el-time-select>
                   </div>
                 </div>
               </div>
@@ -533,7 +532,7 @@ export default {
         if (res.data.code == 200) {
           this.noteTableData = res.data.data
           for (let i in this.noteTableData) {
-            this.$set(this.noteTableData[i], 'sortNum', i)
+            this.$set(this.noteTableData[i], 'sortNum', Number(i + 1))
           }
         }
       })

src/views/meeting/state/beforeMeeting/index.vue

@@ -151,6 +151,7 @@ export default {
       this.processId = id
     },
     init() {
+      console.log('meetingLists', this.meetingLists);
       this.meetingLists.forEach((item, index) => {
         // 字数限制30字,超出不显示
         console.log(item)
@@ -161,9 +162,9 @@ export default {
           item.showName = item.processName
         }
         //没选会议室 auditStatus=null
-        if (item.auditStatus == 0 || item.auditStatus == 1 || item.auditStatus == 2) {
-          item.data.push({ key: '预定状态', value: item.auditStatus })
-        }
+        // if (item.auditStatus) {
+        item.data.push({ key: '预定状态', value: item.auditStatus })
+        // }
 
         this.$forceUpdate()
       })

src/views/meetingPlace/components/test.vue

 <template>
   <div id="appMain" v-loading="loading">
-    <div
-      class="helps"
-      :class="{ helped: !alls }"
-      @click="showHelp"
-      v-show="!$store.state.showImageFlag"
-    >
+    <div class="helps" :class="{ helped: !alls }" @click="showHelp" v-show="!$store.state.showImageFlag">
       <img src="../../../assets/meetingPalce/paiwei/help.png" alt="" />
     </div>
     <div class="section">
       <div class="left" v-show="alls" id="lefts">
-        <areaList
-          :confName="confName"
-          @createArea="createArea"
-          @custom="custom"
-          @blockId="blockId"
-          @changeC="changeC"
-          @changeSigns="changeSigns"
-          @chooseRules="chooseRules"
-          @deleteAreaId="deleteAreaId"
-          @changeAreaName="changeAreaName"
-        ></areaList>
+        <areaList :auditStatus="auditStatus" :confName="confName" @createArea="createArea" @custom="custom"
+          @blockId="blockId" @changeC="changeC" @changeSigns="changeSigns" @chooseRules="chooseRules"
+          @deleteAreaId="deleteAreaId" @changeAreaName="changeAreaName"></areaList>
       </div>
 
       <div class="pull">
-        <HelloWorld
-          ref="secRight"
-          :checkeds="checkeds"
-          :blockIds="blockIds"
-          :choosePersons="choosePersons"
-          :chooseFlag="chooseFlag"
-          :changeCon="changeCon"
-          :chaSign="chaSign"
-          :chooseR="chooseR"
-          :hideFlags="hideFlags"
-          :areasId="areasId"
-          :signNames="signNames"
-          :changeAreaNames="changeAreaNames"
-          :changeSignNames="changeSignNames"
-          :autoSorts="autoSorts"
-          :changeDatas="changeDatas"
-          :sortFlag="sortFlag"
-          :createAreas="createAreas"
-          :deleteAreaIds="deleteAreaIds"
-          :areaId="areaId"
-          @clickPerson="clickPerson"
-          @showLoading="showLoading"
-          @clearAllFlag="clearAllFlag"
-          @foos="foos"
-          @sureLoad="sureLoad"
-          @screenAlls="screenAlls"
-          @conferenceName="conferenceName"
-        />
+        <HelloWorld ref="secRight" :checkeds="checkeds" :blockIds="blockIds" :choosePersons="choosePersons"
+          :chooseFlag="chooseFlag" :changeCon="changeCon" :chaSign="chaSign" :chooseR="chooseR" :hideFlags="hideFlags"
+          :areasId="areasId" :signNames="signNames" :changeAreaNames="changeAreaNames" :changeSignNames="changeSignNames"
+          :autoSorts="autoSorts" :changeDatas="changeDatas" :sortFlag="sortFlag" :createAreas="createAreas"
+          :deleteAreaIds="deleteAreaIds" :areaId="areaId" @clickPerson="clickPerson" @showLoading="showLoading"
+          @clearAllFlag="clearAllFlag" @foos="foos" @sureLoad="sureLoad" @screenAlls="screenAlls"
+          @conferenceName="conferenceName" />
       </div>
       <div class="right" v-show="alls" id="lefts">
-        <PeopleList
-          @checked="checked"
-          @choosePer="choosePer"
-          @changeSignName="changeSignName"
-          @autoSort="autoSort"
-          @changeData="changeData"
-          :clickPersons="clickPersons"
-          :clearNums="clearNums"
-          :blockIds="blockIds"
-          @startFlag="startFlag"
-          :fooFlag="fooFlag"
-          @sorts="sorts"
-          @hideBox="hideBox"
-        ></PeopleList>
+        <PeopleList @checked="checked" @choosePer="choosePer" @changeSignName="changeSignName" @autoSort="autoSort"
+          @changeData="changeData" :clickPersons="clickPersons" :clearNums="clearNums" :blockIds="blockIds"
+          @startFlag="startFlag" :fooFlag="fooFlag" @sorts="sorts" @hideBox="hideBox"></PeopleList>
       </div>
     </div>
   </div>
@@ -80,6 +35,8 @@ import Banner from "../pages/banner.vue";
 import Rumb from "../pages/first/rumb.vue";
 export default {
   name: "tes",
+  props: ['auditStatus'],
+
   data() {
     return {
       //获取会议名称和时间
@@ -168,8 +125,10 @@ export default {
       sessionStorage.setItem("sysRoles", details.sysRoles[0]);
     }
     this.$store.commit("changeId", 0);
+    // console.log(this.auditStatus);
     // console.log("userNDirection2", sessionStorage.getItem("userNDirection2"));
   },
+
   mounted() {
     this.$nextTick(() => {
       setTimeout(() => {
@@ -306,25 +265,30 @@ export default {
 
   // overflow: hidden;
 }
+
 #banner {
   width: 100%;
   // min-width: 1920px;
   background-color: #e6edf4;
 }
+
 .breadcrumb {
   margin-left: 35px;
   margin-top: 15px;
 }
+
 /deep/.el-breadcrumb {
   font-size: 18px;
   color: #5474e8;
 }
+
 .topNav {
   height: 80px;
   width: 100%;
   background-color: #2348a3;
   display: flex;
   box-shadow: 0px 3px 5px rgba(84, 116, 235, 0.2);
+
   .title {
     margin-left: 40px;
     display: flex;
@@ -334,27 +298,33 @@ export default {
     font-weight: bold;
     flex: 1;
     margin-top: -15px;
+
     .content {
       margin-left: 15px;
     }
   }
+
   .tabitem {
     flex: 3;
     position: relative;
     top: 5px;
   }
+
   .manager {
     display: flex;
     align-items: center;
     color: #e8ebf9;
+
     img {
       margin-right: 15px;
     }
+
     .content {
       margin-right: 30px;
     }
   }
 }
+
 .helps {
   position: fixed;
   top: 16%;
@@ -368,6 +338,7 @@ export default {
   align-items: center;
   cursor: pointer;
 }
+
 .header {
   width: 95.5%;
   height: 60px;
@@ -378,15 +349,18 @@ export default {
   margin: 40px 0px 10px 29px;
   display: flex;
   align-items: center;
+
   .confName {
     display: flex;
     font-size: 20px;
     color: #778ca2;
+
     span {
       color: #3a3c4b;
       padding-left: 16px;
       padding-right: 80px;
     }
+
     img {
       padding-left: 20px;
       width: 18px;
@@ -394,16 +368,19 @@ export default {
       vertical-align: middle;
     }
   }
+
   .confTime {
     display: flex;
     font-size: 20px;
     color: #778ca2;
+
     span {
       color: #3a3c4b;
       padding-left: 16px;
       padding-right: 80px;
     }
   }
+
   .confAddress {
     display: flex;
     font-size: 20px;
@@ -415,13 +392,14 @@ export default {
     }
   }
 }
+
 .back {
   display: flex;
   margin-right: 50px;
   cursor: pointer;
 }
-.back .img {
-}
+
+.back .img {}
 
 .section {
   width: 100%;
@@ -430,6 +408,7 @@ export default {
 
   display: flex;
   position: relative;
+
   .pull {
     width: 100%;
     height: 100%;
@@ -446,6 +425,7 @@ export default {
     //   width: 100%;
     // }
   }
+
   .left {
     width: 13.5%;
     background-color: white;
@@ -455,6 +435,7 @@ export default {
     // scrollbar-color: #e5e5e5 #f7f7f9;
     // -webkit-scrollbar-width: none;
   }
+
   .right {
     width: 16%;
     background-color: white;
@@ -465,37 +446,46 @@ export default {
     // scrollbar-color: #e5e5e5 #f7f7f9;
     scrollbar-width: none !important;
   }
+
   .secRight {
     overflow: auto;
   }
 }
+
 /deep/.el-tabs__item {
   font-size: 20px;
   color: #ffffff;
   // padding-bottom: 70px;
   // border-bottom: #ddd;
 }
+
 /deep/.el-tabs__item:hover {
   color: #ffffff;
 }
+
 /deep/.el-tabs__item.is-active {
   // font-weight: bold;
   font-size: 22px;
   color: white;
 }
+
 /deep/.el-tabs__nav-wrap::after {
   background: #2348a3;
 }
+
 /deep/.el-tabs__nav-wrap {
   top: 15px;
 }
+
 /deep/.el-breadcrumb__item:last-child .el-breadcrumb__inner {
   color: #5474e8;
   font-weight: 700;
 }
+
 /deep/.el-breadcrumb__inner.is-link {
   color: #9aabad;
 }
+
 // /deep/.el-tabs__active-bar {
 //   background: white;
 //   bottom: -5px;
@@ -585,18 +575,22 @@ export default {
     height: 0px !important;
   }
 }
+
 .helped {
   right: 25px !important;
 }
+
 .dialog /deep/ .el-dialog__body {
   flex-direction: column !important;
 }
+
 .el-dialog__wrapper {
   width: 100vw;
   height: 100vh;
   display: flex;
   justify-content: center;
   flex-direction: column;
+
   /deep/ .el-dialog {
     margin-top: 0 !important;
   }

src/views/reserveRecord/index.vue

@@ -11,7 +11,7 @@
           <div :class="isActive === index ? 'confenceActive' : ''" class="confence"
             v-for="(item, index, key) in confenceList" :key="item.conferenceId" @click="getOneConfence(item, index)">
             <div class="process" v-if="item.type == 1">审</div>
-            <div class="confence_name">{{ item.conferenceName }}{{ item.conferenceName.length }}</div>
+            <div class="confence_name">{{ item.conferenceName }}</div>
             <div :class="[item.conferenceName.length > 8 ? 'hover_name' : 'none_hover']">{{ item.conferenceName }}</div>
             <div class="box"></div>
           </div>
@@ -585,6 +585,10 @@ export default {
                 border: none;
                 color: #5474e8;
                 text-align: right;
+
+                &::placeholder {
+                  color: #778ca2;
+                }
               }
 
               .el-input__inner:focus {
@@ -595,7 +599,10 @@ export default {
                 display: flex;
                 align-items: center;
               }
+
+
             }
+
           }
 
           .reserveConference_select {

src/views/system/confenceLibrary.vue

@@ -33,7 +33,7 @@
       <el-table :data="tableData" stripe ref="table" height="100%" class="template_table" v-loading="loading"
         style="width: 100%">
         <el-table-column prop="id" v-if="false" label="id"></el-table-column>
-        <el-table-column prop="unitName" label="所属单位"></el-table-column>
+        <el-table-column prop="unitName" label="所属单位" v-if="!disFlag"></el-table-column>
         <el-table-column prop="name" label="会议室名称" width="300">
           <!-- {{tableData.templateType}} -->
         </el-table-column>
@@ -58,10 +58,10 @@
       </div>
     </div>
     <!-- 编辑|新增会议室 -->
-    <el-dialog :title="disFlag ? '新增|编辑' : '新增|编辑公用会议室（超管专用）'" :visible.sync="dialogVisible" :before-close="handleClose"
+    <el-dialog :title="disFlag ? '新增|编辑' : '新增|编辑公用会议室'" :visible.sync="dialogVisible" :before-close="handleClose"
       width="30%" append-to-body>
       <el-form ref="forms" :rules="ruleForm" :model="forms" label-width="140px">
-        <el-form-item label="所属单位:" prop="unitName" v-if="disFlag">
+        <el-form-item label="所属单位:" prop="unitName" v-if="!disFlag">
           <div>{{ forms.unitName }}</div>
         </el-form-item>
         <el-form-item label="会议室名称:" prop="name">
@@ -134,13 +134,13 @@ export default {
       // console.log(val);
       let obj = ''
       switch (val) {
-        case 0:
+        case 1:
           obj = '小型会议室'
           break
-        case 1:
+        case 2:
           obj = '中型会议室'
           break
-        case 2:
+        case 3:
           obj = '大型会议室'
           break
       }
@@ -206,9 +206,9 @@ export default {
       cnName: '',
       organList: [],
       options: [
-        { label: '小型会议室', value: 0 },
-        { label: '中型会议室', value: 1 },
-        { label: '大型会议室', value: 2 },
+        { label: '小型会议室', value: 1 },
+        { label: '中型会议室', value: 2 },
+        { label: '大型会议室', value: 3 },
       ],
       sysRoles: '',
     }
@@ -220,8 +220,11 @@ export default {
     console.log(sessionStorage.getItem('sysRoles'));
     if (this.cnName !== '超级管理员' && sessionStorage.getItem('sysRoles') !== 'ROLE_HUIYISHIADMIN') {
       this.forms.unitId = sessionStorage.getItem('unitId')
+      console.log('false');
       this.disFlag = true
       this.forms.unitName = sessionStorage.getItem('unitName')
+    } else if (sessionStorage.getItem('sysRoles') == 'ROLE_HUIYISHIADMIN') {
+      this.disFlag = true
     }
     //查询所有数据
     this.getTaList()

src/views/system/index.vue

@@ -180,7 +180,7 @@ export default {
     // this.fetchConf();
     this.path = this.$route.matched
     this.path = this.path.filter((item, index) => item.meta.title !== '')
-    // console.log(this.path)
+    console.log(this.path)
     let sysRoles = sessionStorage.getItem('sysRoles')
     switch (sysRoles) {
       case 'ROLE_SUPERADMIN':
@@ -221,6 +221,7 @@ export default {
     /*****路由跳转时更新面包屑********/
     this.path = to.matched
     this.path = this.path.filter((item, index) => item.meta.title !== '')
+    console.log('path12313132', this.path);
     /****************************/
     switch (sysRoles) {
       case 'ROLE_SUPERADMIN':

src/views/system/jurisdiction.vue

@@ -40,8 +40,8 @@
     <!-- 表格 -->
     <div class="content">
       <el-table :data="tableData" stripe style="width: 100%" height="100%" class="template_table"
-        @sort-change="sortChange" :header-cell-style="{ 'text-align': 'left' }" :cell-style="{ 'text-align': 'left' }"
-        v-loading="loading">
+        :default-sort="{ order: 'index' }" @sort-change="sortChange" :header-cell-style="{ 'text-align': 'left' }"
+        :cell-style="{ 'text-align': 'left' }" v-loading="loading">
         <el-table-column type="index" label="序号" width="80"></el-table-column>
         <el-table-column prop="username" label="账号"></el-table-column>
         <el-table-column prop="cnName" label="姓名"></el-table-column>
@@ -537,4 +537,5 @@ export default {
       color: #778ca2;
     }
   }
-}</style>
+}
+</style>

src/views/system/personLabel.vue

@@ -71,7 +71,7 @@
       <div class="table_list">
         <!-- 按参会人员 -->
         <el-table v-if="personOrUnit == 1" :data="tableData" style="width: 100%" height="100%" stripe
-          :default-sort="{ prop: 'updateTime' }">
+          :default-sort="{ order: 'customUserNum' }">
           <el-table-column prop="customUserNum" label="序号"></el-table-column>
           <el-table-column prop="customUserName" label="姓名"></el-table-column>
           <el-table-column prop="customUserPosition" label="职务" width="180"></el-table-column>
@@ -92,8 +92,8 @@
         </el-table>
         <!-- 按参会单位 -->
         <el-table v-if="personOrUnit == 2" :data="tableData" style="width: 100%" height="100%" stripe
-          :default-sort="{ prop: 'updateTime' }">
-          <el-table-column prop="sortNum" label="序号">
+          :default-sort="{ order: 'sortNum' }">
+          <el-table-column prop="sortNum" sortable label="序号">
 
           </el-table-column>
           <el-table-column prop="unitName" label="参会单位（平台）">
@@ -121,14 +121,8 @@
         layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
     </div>
     <!-- 选择人员 -->
-    <BatchAddDialog :changeFlags="3" 
-    :batchAddFlag.sync="batchAddFlag"
-     :selectPerson="selectPerson" 
-     :nextShow="nextShow"
-      :returnSelect="returnSelect" 
-      @addBatchPeople="addBatchPeople" 
-      @sureChange="sureChange" 
-      @cancleFlag="cancleFlag"
+    <BatchAddDialog :changeFlags="3" :batchAddFlag.sync="batchAddFlag" :selectPerson="selectPerson" :nextShow="nextShow"
+      :returnSelect="returnSelect" @addBatchPeople="addBatchPeople" @sureChange="sureChange" @cancleFlag="cancleFlag"
       @getPerson="getPerson">
     </BatchAddDialog>
     <dialogTable :dialogTableVisible.sync="dialogTableVisible" :dialogTableData="dialogTableData" @back="back"
@@ -146,7 +140,7 @@
         <el-button type="primary" class="btn" @click="addLabel()">新增标签</el-button>
       </div>
       <div v-if="labelList.length > 0">
-        <div class="unit" v-for="(item, index) in labelList" :key="labelList.length + index">
+        <div class="unit" v-for="(      item, index      ) in       labelList      " :key="labelList.length + index">
           <div class="tips_num">权限专用单位：</div>
           <el-input v-model="item.customOrgName" />
           <!-- <div>{{item.unitName}}</div> -->
@@ -202,7 +196,7 @@
           <!-- <el-input v-model="editPersonObj.sysUnitName" ></el-input>
           -->
           <el-select v-model="editPersonObj.sysUnitId" placeholder="请选择参会单位">
-            <el-option v-for="item in unitOptions" :key="item.unitId" :label="item.unitName"
+            <el-option v-for="      item       in       unitOptions      " :key="item.unitId" :label="item.unitName"
               :value="item.unitId"></el-option>
           </el-select>
         </el-form-item>
@@ -414,7 +408,10 @@ export default {
       this.$axios.moveUpOrDownCustomUser(params).then((res) => {
         // console.log(res)
         if (res.data.code == 200) {
-          this.findLabelIdPerson(this.formData)
+          this.$nextTick(() => {
+            this.findLabelIdPerson(this.formData)
+          })
+
         }
       })
     },
@@ -700,9 +697,10 @@ export default {
     // 根据自定义分类编号查询按参会人员展示自定义人员（ly）
     findLabelIdPerson(params) {
       this.$axios.baseCustomOrgIdPerson(params).then((res) => {
-        console.log('按参会人员', res)
+        console.log('按参会人员', res.data.data)
         if (res.data.data.customUserShowVoList) {
           this.tableData = res.data.data.customUserShowVoList
+
         } else {
           this.tableData = []
         }
@@ -743,6 +741,7 @@ export default {
       if (val == 1) {
         this.personOrUnit = 1
         this.findLabelIdPerson(obj)
+
       } else {
         this.personOrUnit = 2
         this.findLabelUnit(obj)

src/views/system/personLabel/dialogTable.vue

 <template>
   <div>
-    <el-dialog
-      title="关联参会单位"
-      :visible.sync="visible "
-      :close-on-click-modal="false"
-      :before-close="dialogTableHandleClose"
-      class="table_dialog"
-      width="900px"
-    >
+    <el-dialog title="关联参会单位" :visible.sync="visible" :close-on-click-modal="false"
+      :before-close="dialogTableHandleClose" class="table_dialog" width="900px">
       <div class="top">
-        <div>已选人员：{{dialogTableData.length}}人</div>
+        <div>已选人员：{{ dialogTableData.length }}人</div>
         <div>说明，为参会人员关联参会单位</div>
       </div>
       <div class="table_wai">
@@ -19,15 +13,11 @@
           <el-table-column property="govEmpPosJob" label="职务"></el-table-column>
           <el-table-column property="organizationName" label="单位"></el-table-column>
           <el-table-column property="organizationName" label="浙政钉ID"></el-table-column>
-          <el-table-column property="address" label="参会平台">
+          <el-table-column property="address" label="参会单位">
             <template slot-scope="scope">
               <el-select v-model="scope.row.sysUnitId" @change="sysUnitChange(scope.row)">
-                <el-option
-                  v-for="item in options"
-                  :key="item.unitId"
-                  :label="item.unitName"
-                  :value="item.unitId"
-                ></el-option>
+                <el-option v-for="item in options" :key="item.unitId" :label="item.unitName"
+                  :value="item.unitId"></el-option>
               </el-select>
             </template>
           </el-table-column>
@@ -82,11 +72,11 @@ export default {
       console.log(this.dialogTableData)
       if (bloon) {
         this.$emit('update:dialogTableVisible', false)
-        this.$emit('submitTable', this.dialogTableData,1)
+        this.$emit('submitTable', this.dialogTableData, 1)
       }
     },
     dialogTableHandleClose() {
-      this.$emit('closeTableDialog',false)
+      this.$emit('closeTableDialog', false)
     },
     back() {
       console.log('back')
@@ -105,7 +95,7 @@ export default {
       this.$axios.getUnitAuthPerson(params).then((res) => {
         console.log('resresres', res)
         this.options = res.data.data.sysUnitAuthPersonList
-        
+
       })
     },
   },

src/views/system/unitEmpower.vue

@@ -9,14 +9,8 @@
           <el-input v-model="formData.personName" placeholder="请输入"></el-input>
         </el-form-item>
         <el-form-item label="更新时间:">
-          <el-date-picker
-            v-model="timeData"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd "
-          ></el-date-picker>
+          <el-date-picker v-model="timeData" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期" value-format="yyyy-MM-dd "></el-date-picker>
         </el-form-item>
 
         <el-form-item class="button_wrap">
@@ -29,16 +23,10 @@
     <div class="unitTable">
       <div class="unitNum">
         <div>参会单位</div>
-        <div>{{total}}家</div>
+        <div>{{ total }}家</div>
       </div>
       <div class="tableList">
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          height="100%"
-          stripe
-          :default-sort="{prop: 'updateTime'}"
-        >
+        <el-table :data="tableData" style="width: 100%" height="100%" stripe :default-sort="{ order: 'sortNum' }">
           <el-table-column prop="sortNum" label="序号" width="180"></el-table-column>
           <el-table-column prop="unitName" label="参会单位（权限专用）" width="180"></el-table-column>
           <el-table-column prop="personName" label="单位联系人" width="180"></el-table-column>
@@ -56,39 +44,18 @@
           </el-table-column>
         </el-table>
       </div>
-      <el-pagination
-        class="fenye"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="formData.currentPage"
-        :page-sizes="[10, 20, 30, 40]"
-        :page-size="formData.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      ></el-pagination>
+      <el-pagination class="fenye" @size-change="handleSizeChange" @current-change="handleCurrentChange"
+        :current-page="formData.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="formData.pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
     </div>
     <!-- 新增/编辑参会单位授权 -->
-    <el-dialog
-      title="新增|编辑参会单位授权"
-      :visible.sync="dialogFormVisible"
-      :close-on-click-modal="false"
-      :before-close="handleClose"
-      class="addUnit_dialog"
-    >
+    <el-dialog title="新增|编辑参会单位授权" :visible.sync="dialogFormVisible" :close-on-click-modal="false"
+      :before-close="handleClose" class="addUnit_dialog">
       <el-form :model="addForm" label-width="350px" :rules="addFormRules" ref="addForm">
         <el-form-item label="选择单位（平台）：" prop="unitId">
-          <el-select
-            v-model="addForm.unitId"
-            @change="unitNameChange(addForm.unitId)"
-            placeholder="模糊输入（单位名称）"
-            filterable
-          >
-            <el-option
-              v-for="item in unitList"
-              :key="item.id"
-              :label="item.unitName"
-              :value="item.id"
-            ></el-option>
+          <el-select v-model="addForm.unitId" @change="unitNameChange(addForm.unitId)" placeholder="模糊输入（单位名称）"
+            filterable>
+            <el-option v-for="item in unitList" :key="item.id" :label="item.unitName" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="选择联系人员（浙政钉）：" class="personName" prop="personName">
@@ -110,17 +77,12 @@
       </div>
     </el-dialog>
     <!-- 删除单位二次确认 -->
-    <el-dialog
-      title="删除参会单位授权"
-      :visible.sync="delDialog"
-      :close-on-click-modal="false"
-      :before-close="delHandleClose"
-      class="delUnit_dialog"
-    >
+    <el-dialog title="删除参会单位授权" :visible.sync="delDialog" :close-on-click-modal="false" :before-close="delHandleClose"
+      class="delUnit_dialog">
       <div class="content">
         <div>
           参会单位授权：
-          <span class="unitName">{{delUnitObj.unitName}}</span>
+          <span class="unitName">{{ delUnitObj.unitName }}</span>
         </div>
         <div>确认删除？</div>
       </div>
@@ -130,29 +92,24 @@
       </div>
     </el-dialog>
     <!-- 查看参会单位详细信息 -->
-    <el-dialog
-      title="参会单位授权信息"
-      :visible.sync="checkDialog"
-      :close-on-click-modal="false"
-      :before-close="checkHandleClose"
-      class="checkUnit_dialog"
-    >
+    <el-dialog title="参会单位授权信息" :visible.sync="checkDialog" :close-on-click-modal="false" :before-close="checkHandleClose"
+      class="checkUnit_dialog">
       <div class="body">
         <div class="row">
           <div class="title">参会单位名称：</div>
-          <div>{{checkUnitObj.unitName}}</div>
+          <div>{{ checkUnitObj.unitName }}</div>
         </div>
         <div class="row">
           <div class="title">单位联系人姓名：</div>
-          <div>{{checkUnitObj.personName}}</div>
+          <div>{{ checkUnitObj.personName }}</div>
         </div>
         <div class="row">
           <div class="title">单位联系人浙政钉：</div>
-          <div>{{checkUnitObj.dingId}}</div>
+          <div>{{ checkUnitObj.dingId }}</div>
         </div>
         <div class="row">
           <div class="title">单位联系电话：</div>
-          <div>{{checkUnitObj.unitTel}}</div>
+          <div>{{ checkUnitObj.unitTel }}</div>
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -160,15 +117,9 @@
       </div>
     </el-dialog>
     <!-- 选择人员 -->
-    <batch-add-dialog
-      :changeFlags="2"
-      :batchAddFlag.sync="batchAddFlag"
-      :selectPerson="selectPerson"
-      @addBatchPeople="addBatchPeople"
-      @sureChange="sureChange"
-      @cancleFlag="cancleFlag"
-      @getPerson="getPerson"
-    ></batch-add-dialog>
+    <batch-add-dialog :changeFlags="2" :batchAddFlag.sync="batchAddFlag" :selectPerson="selectPerson"
+      @addBatchPeople="addBatchPeople" @sureChange="sureChange" @cancleFlag="cancleFlag"
+      @getPerson="getPerson"></batch-add-dialog>
   </div>
 </template>
 <script>
@@ -336,7 +287,7 @@ export default {
     cancleFlag() {
       this.dialogVisible = true
     },
-    sureChange() {},
+    sureChange() { },
     addBatchPeople(data) {
       console.log(data)
       this.addForm = {
@@ -364,6 +315,7 @@ export default {
         if (res.data.code == 200) {
           // this.loading = false
           console.log(res)
+
           this.unitList = res.data.data
         }
       })
@@ -445,19 +397,23 @@ export default {
   height: calc(100% - 66px);
   background-color: #fff;
   padding: 24px;
+
   .topInput {
     height: 60px;
+
     .el-form {
-      .el-form-item {
-      }
+      .el-form-item {}
+
       .from_button_item {
         margin-left: 40px;
       }
     }
   }
+
   .maring_left {
     margin-left: 20px;
   }
+
   .addUnit {
     width: 180px;
     height: 40px;
@@ -471,9 +427,11 @@ export default {
     cursor: pointer;
     margin-bottom: 20px;
   }
+
   .unitTable {
     width: 100%;
     height: calc(100% - 80px);
+
     // background-color: red;
     .unitNum {
       width: 170px;
@@ -481,37 +439,45 @@ export default {
       display: flex;
       align-items: center;
     }
+
     .tableList {
       width: 100%;
       height: calc(100% - 110px);
       margin-bottom: 15px;
     }
+
     .fenye {
       height: 60px;
       float: right;
       line-height: 60px;
     }
   }
+
   /deep/.addUnit_dialog {
     // background-color: red;
     .el-form-item__content {
       width: 300px;
+
       .el-select {
         // width: 85%;
         width: 250px;
       }
     }
+
     .personName {
       .el-form-item__content {
         display: flex;
         // align-items: center;
         width: 400px;
+
         .el-input {
           width: 260px;
+
           .el-input__inner {
             width: 100%;
           }
         }
+
         .xuanze {
           width: 125px;
           margin-left: 25px;
@@ -520,31 +486,37 @@ export default {
         }
       }
     }
+
     .unitTel,
     .dingId {
       .el-form-item__content {
         width: 50%;
+
         .el-input {
           width: 250px;
         }
       }
     }
   }
+
   /deep/.delUnit_dialog {
     .content {
       display: flex;
       flex-direction: column;
       align-items: center;
+
       .unitName {
         font-size: 20px;
       }
     }
   }
+
   /deep/.checkUnit_dialog {
     .body {
       .row {
         display: flex;
         margin-bottom: 20px;
+
         .title {
           width: 180px;
           text-align: right;