合并分支 'fc' 到 'master'

src/axios/index.js

@@ -19,11 +19,11 @@ const env = {
 		// API_TEST_ORIGIN: 'http://192.168.102.110:6888'
 		// API_BASE_ORIGIN: 'http://192.168.1.104:6888',//越越
 		// API_TEST_ORIGIN: 'http://192.168.1.104:6888'
-		// API_BASE_ORIGIN: 'http://172.18.27.190:8080/confhd', //赵璐
+		// API_BASE_ORIGIN: 'http://172.18.27.190:8080/confhd', //
 		// API_TEST_ORIGIN: 'http://172.18.27.190:8080/confhd',
 		// API_BASE_ORIGIN: 'http://192.168.102.146:6888', //越越
 		// API_TEST_ORIGIN: 'http://192.168.102.146:6888',
-		API_BASE_ORIGIN: 'http://192.168.102.238:6888', //越越
+		API_BASE_ORIGIN: 'http://192.168.102.238:6888', //赵璐
 		API_TEST_ORIGIN: 'http://192.168.102.238:6888',
 	},
 	development_ssj: {

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

@@ -115,7 +115,11 @@
           ></div>
         </div>
       </div>-->
+
+      <div class="box" v-if="trueList.length==0"></div>
       <time-list
+        class="time_list"
+        v-if="trueList.length>0"
         ref="timeList"
         :canClick="canClick"
         :conferenceProcessReservationRecordList="conferenceProcessReservationRecordList"
@@ -233,7 +237,7 @@ export default {
       },
       options: [
         { label: '大于', value: 1 },
-        { label: '小于', vallue: 2 },
+        { label: '小于', value: 2 },
       ],
       hours: [
         '07:00',
@@ -391,6 +395,7 @@ export default {
       }
     },
     selectConfence() {
+      console.log('ruleFom', this.ruleForm)
       this.getConferenceList(this.ruleForm)
     },
     //获取布局
@@ -484,16 +489,17 @@ export default {
         this.confList = this.dataLists.conferenceAndUseInfoVoList
 
         console.log('confList', this.confList)
-        // this.conferenceId = this.confList[0]?.conferenceId
-        this.conferenceId = this.confList[0].conferenceId
-        // this.confList[]
-        let obj = [...this.confList[0].conferenceProcessReservationRecordList]
-        this.conferenceProcessReservationRecordList = this.confList[0].conferenceProcessReservationRecordList
-        // this.moduleId = this.confList[0]?.confLayoutVoList[0]?.conferenceId
-        this.moduleId = this.confList[0].conferenceId
 
-        this.currentConfenrence = this.confList[0]
-        // this.moduleList = this.confList[0]?.confLayoutTempChildVos;
+        // let obj = [...this.confList[0].conferenceProcessReservationRecordList]
+
+        if (this.confList.length > 0) {
+          this.conferenceProcessReservationRecordList = this.confList[0].conferenceProcessReservationRecordList
+          this.conferenceId = this.confList[0].conferenceId
+          this.moduleId = this.confList[0].conferenceId
+          this.currentConfenrence = this.confList[0]
+        } else {
+          this.currentConfenrence = {}
+        }
         if (this.confList.length > 7) {
           this.trueList = this.confList.slice(this.listIndex, 7)
           this.originModuleList = this.trueList[0].confLayoutVoList
@@ -739,6 +745,7 @@ export default {
     text-align: center;
     line-height: 40px;
     margin-left: 48px;
+    cursor: pointer;
   }
   .demo-ruleForm {
     .sort {
@@ -1089,6 +1096,13 @@ export default {
   .time_module {
     width: 88%;
     margin: 0 auto;
+    height: 380px;
+    .time_list {
+    }
+    .box {
+      width: 100%;
+      height: 100%;
+    }
     .time_bottom {
       position: relative;
       .time_tips {

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

@@ -167,6 +167,7 @@
                   v-if="!allPersonFlag && $store.state.rcSendStatus == 2"
                   v-model="checkAll"
                   @change="handleCheckAllChange"
+                  :disabled="noticeStatus==1"
                 >全选</el-checkbox>
               </div>
 
@@ -190,6 +191,7 @@
                 v-model="infoSelect"
                 clearable
                 placeholder="请选标签"
+                :disabled="noticeStatus==1"
                 @change="selectAreaChange()"
               >
                 <el-option
@@ -778,10 +780,10 @@ export default {
   },
   methods: {
     selectAreaChange() {
-      console.log()
-      console.log(this.infoSelect)
-      console.log(this.activeIndex)
-      console.log(this.confData.confPersonAreaVos[this.activeIndex])
+      // console.log()
+      // console.log(this.infoSelect)
+      // console.log(this.activeIndex)
+      // console.log(this.confData.confPersonAreaVos[this.activeIndex])
       // console.log(this.);
       let params = {
         areaId: this.confData.confPersonAreaVos[this.activeIndex].id,
@@ -791,7 +793,7 @@ export default {
       this.$axios.personnelSortByCustomIdAndAreaId(params).then((res) => {
         console.log(res)
         if (res.data.code == 200) {
-          this.init()
+          this.init(this.activeIndex)
         }
       })
     },
@@ -1709,7 +1711,8 @@ export default {
                     message: res.data.data,
                     type: 'success',
                   })
-                  this.init()
+                  this.init(this.activeIndex)
+                  this.checkList = []
                 }
               })
               .catch((err) => {})
@@ -1844,7 +1847,7 @@ export default {
       })
     }, //保存并离开
     saveArea() {
-      console.log(123)
+      // console.log(123)
       if (this.disableFlag) {
         return false
       }

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

@@ -134,10 +134,10 @@
                 class="but_2"
                 size="medium"
                 type="primary"
-                :disabled="multipleSelection.length == 0"
+                :disabled=" noticeStatus==2"
               >发送通知</el-button>
               <el-button
-                :disabled="multipleSelection.length == 0"
+                :disabled="multipleSelection.length == 0 ||  noticeStatus == 1"
                 class="but_2"
                 size="medium"
                 type="primary"
@@ -148,7 +148,7 @@
                 class="but_2"
                 size="medium"
                 type="primary"
-                :disabled="multipleSelection.length == 0"
+                :disabled=" noticeStatus==2"
               >批量催阅</el-button>
             </div>
             <!-- <div>
@@ -436,12 +436,12 @@
     >
       <div class="noticeVisileForm">
         <el-form ref="form" :model="sendNoticePartForm" label-width="80px">
-          <el-form-item label="已选单位">{{multipleSelection.length}}家</el-form-item>
-          <el-form-item label="通知内容" class="content">
+          <el-form-item label="已选单位:">{{multipleSelection.length}}家</el-form-item>
+          <el-form-item label="通知内容:" class="content">
             <quill-editor v-model="sendNoticePartForm.noticeContent" :options="quillOption" />
           </el-form-item>
 
-          <el-form-item label="附件">
+          <el-form-item label="附件:">
             <el-upload
               class="upload-demo"
               action
@@ -1149,6 +1149,7 @@ export default {
       }
       data.sendNoticePart.processId = this.$route.query.processId
       this.noticeVisileLoading = true
+      // console.log(data)
       this.$axios.sendNotification(data).then((res) => {
         console.log(res)
         if (res.data.code == 200) {
@@ -1157,6 +1158,7 @@ export default {
           this.$message.success('发送通知成功')
           this.init(this.activeIndex)
         } else {
+          this.noticeVisileLoading = false
           this.$message.error(`${res.data.data}`)
         }
       })

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

@@ -10,6 +10,16 @@
       <span class="num">{{ overviewData.noRowSeatNum }}人</span>
       <el-button type="primary" class="toongzhi" @click="noticeAdmin()">地址通知管理员</el-button>
       <el-button type="primary" class="daping" @click="checkScreen()">查看大屏</el-button>
+      <el-dropdown class="tongzhi">
+        <el-button class="but_2" size="medium" type="primary">
+          群发通知
+          <i class="arrow-down-icon"></i>
+        </el-button>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item @click.native="massNotification()">群发会议通知</el-dropdown-item>
+          <el-dropdown-item @click.native="notificationRecord()">通知记录</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
     </div>
     <div class="module_title">-会议授权-</div>
     <div class="overview_model_1">
@@ -381,6 +391,92 @@
         <el-button type="primary" @click="sureSend()">确 定</el-button>
       </span>
     </el-dialog>
+    <!-- 群发会议通知 -->
+    <el-dialog
+      title="群发会议通知"
+      :visible.sync="notification"
+      width="40%"
+      append-to-body
+      :before-close="notificationHandleClosed"
+    >
+      <el-form
+        style="width:80%"
+        :model="notificationForm"
+        ref="notificationForm"
+        label-width="100px"
+        :rules="notificationFormRules"
+      >
+        <el-form-item label="接收人员：" prop="person">
+          <div>{{notificationForm.person}}</div>
+        </el-form-item>
+        <el-form-item label="通知内容：" prop="content">
+          <el-input type="textarea" rows="9" v-model="notificationForm.content"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="notificationHandleClosed('notificationForm')">取 消</el-button>
+          <el-button type="primary" @click="sureNotification('notificationForm')">确 定</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+    <!-- 通知记录弹框 -->
+    <el-dialog
+      title="通知记录"
+      :visible.sync="noteListDialogVisible"
+      append-to-body
+      :before-close="noteClose"
+      class="noteListDialog"
+    >
+      <div class="listMain">
+        <el-table height="100%" :data="noteTableData" stripe style="width: 100%">
+          <el-table-column prop="createTime" label="序号" width="80"></el-table-column>
+          <el-table-column prop="sendMsg" label="发送内容"></el-table-column>
+          <el-table-column prop="successNum" label="发送结果" width="200"></el-table-column>
+          <el-table-column prop="errorNum" label="发送时间" width="150"></el-table-column>
+          <el-table-column label="操作" width="100">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="showResult(scope.row)">通知结果</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-dialog>
+    <!-- 通知结果 -->
+    <el-dialog
+      title="通知结果"
+      :visible.sync="notifyResultsDialogVisible"
+      append-to-body
+      :before-close="notifyResultsDialogVisibleClose"
+      class="notifyResultsDialog"
+    >
+      <div class="top">
+        <div class="title">
+          <div>标题：</div>
+          <div>XXX</div>
+        </div>
+        <div class="content">
+          <div>内容：</div>
+          <div>xxxx</div>
+        </div>
+        <div>发送时间：ccccc</div>
+      </div>
+      <div class="button">
+        <div>发送成功/10</div>
+        <div>发送失败/5</div>
+      </div>
+      <!-- <div class="listMain"> -->
+      <el-table height="100%" :data="noteTableData" stripe style="width: 100%">
+        <el-table-column prop="createTime" label="序号" width="80"></el-table-column>
+        <el-table-column prop="sendMsg" label="发送内容"></el-table-column>
+        <el-table-column prop="successNum" label="发送结果" width="200"></el-table-column>
+        <el-table-column prop="errorNum" label="发送时间" width="150"></el-table-column>
+        <el-table-column label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="showResult(scope.row)">通知结果</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- </div> -->
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -436,6 +532,20 @@ export default {
         },
       ], //手机端的参数设置
       schedulePath: '',
+      notification: false,
+      notificationForm: {
+        person: '全部参会人员',
+        content: '',
+      },
+      notificationFormRules: {
+        person: [{ required: true, message: '请填写通知内容', trigger: 'blur' }],
+        content: [{ required: true, message: '请填写通知内容', trigger: 'blur' }],
+      },
+
+      noteListDialogVisible: false,
+      noteTableData: [],
+      //通知结果
+      notifyResultsDialogVisible: false,
     }
   },
   computed: {
@@ -465,6 +575,40 @@ export default {
     },
   },
   methods: {
+    //群发通知
+    massNotification() {
+      this.notification = true
+    },
+    sureNotification(formName) {
+      this.$refs[formName].validate((valid) => {
+        console.log(valid)
+        if (valid) {
+        } else {
+        }
+      })
+    },
+    notificationHandleClosed() {
+      this.notification = false
+      this.notificationForm.content = ''
+    },
+    //查看通知
+    notificationRecord() {
+      this.noteListDialogVisible = true
+      // this.notifyResultsDialogVisible = true
+    },
+    noteClose() {
+      this.noteListDialogVisible = false
+      this.noteTableData = []
+    },
+    //通知结果
+    showResult(row) {
+      console.log(row)
+      this.notifyResultsDialogVisible = true
+    },
+
+    notifyResultsDialogVisibleClose() {
+      this.notifyResultsDialogVisible = false
+    },
     yulan() {
       console.log(this.schedulePath)
       if (this.schedulePath) {
@@ -916,6 +1060,11 @@ export default {
       position: absolute;
       right: 200px;
     }
+    .tongzhi {
+      height: 100%;
+      position: absolute;
+      right: 350px;
+    }
   }
   .module_title {
     height: 20px;
@@ -1433,6 +1582,66 @@ export default {
   }
 }
 
+.noteListDialog {
+  width: 100%;
+  height: 100%;
+
+  /deep/.el-dialog {
+    width: 50%;
+    // height: 100%;
+    // background-color: red;
+    .el-dialog__body {
+      width: 100%;
+      height: 100%;
+      .listMain {
+        width: 98%;
+        height: 500px;
+        .el-table {
+          width: 100%;
+          height: 100%;
+        }
+        /deep/.el-table__cell {
+          padding: 5px;
+        }
+      }
+    }
+  }
+}
+
+.notifyResultsDialog {
+  width: 100%;
+  height: 100%;
+  /deep/.el-dialog {
+    width: 50%;
+    // height: 80%;
+    .el-dialog__body {
+      width: 100%;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      // width: 100%;
+      .top {
+        width: 100%;
+        text-align: left;
+        .title,
+        .content {
+          display: flex;
+        }
+        .content {
+          // max-height: ;
+        }
+      }
+      .button {
+        width: 100%;
+        display: flex;
+      }
+      .el-table {
+        width: 100%;
+        height: 80%;
+      }
+    }
+  }
+}
 /**/
 .title_wrap {
   margin-bottom: 8px;

src/views/reserveRecord/allConfence.vue

@@ -22,6 +22,7 @@
       </div>
     </div>
     <div class="wai">
+      <div class="notConference" v-if="allConfenceList.length==0">当天无会议</div>
       <div class="confenceArea">
         <div class="confenceOnce" v-for="(item,index) in allConfenceList" :key="index">
           <div class="confence_title">
@@ -57,12 +58,17 @@ export default {
   props: { dateList: Array, checkDate: String, allConfenceList: Array },
   components: { itmeList },
   watch: {
-    // dateList: {
-    //   handler(newVal, oldVal) {
-    //     console.log(newVal)
-    //   },
-    //   deep: true,
-    // },
+    allConfenceList: {
+      handler(newVal, oldVal) {
+        console.log(newVal)
+        for (let i in newVal) {
+          if (newVal[i].conferenceProcessReservationRecordList.length == 0) {
+            newVal.splice(i, 1)
+          }
+        }
+      },
+      deep: true,
+    },
   },
 
   data() {
@@ -128,7 +134,7 @@ export default {
     },
   },
   created() {
-    // console.log(this.weekArr)
+    console.log(this.weekArr)
   },
 }
 </script>
@@ -211,7 +217,17 @@ export default {
     // width: 100%;
     height: calc(100% - 74px);
     overflow-x: hidden;
+    position: relative;
     // padding-left: -200px;
+    .notConference {
+      width: 100px;
+      position: absolute;
+      right: calc(50% - 50px);
+      top: 50%;
+      color: #a6b5c6;
+      // top: t;
+      // transform: translate(50%);
+    }
     .confenceArea {
       width: 100%;
       // height: calc(100% - 74px);

src/views/system/index.vue

@@ -95,7 +95,7 @@ export default {
           pic2: 'system_icon5',
           children: [
             {
-              name: '操作管理员-超管',
+              name: '操作管理员',
               path: '/system/power/jurisdiction',
               Rindex: 1 - 1,
             },

src/views/system/personLabel.vue

@@ -36,7 +36,7 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            value-format="yyyy-MM-dd "
+            value-format="yyyy-MM-dd"
           ></el-date-picker>
         </el-form-item>
 
@@ -80,6 +80,7 @@
           <el-table-column prop="customUserUnit" label="单位（浙政钉）"></el-table-column>
           <el-table-column prop="customUserDingId" label="浙政钉ID"></el-table-column>
           <el-table-column prop="sysUnitName" label="参会单位"></el-table-column>
+          <el-table-column prop="updateTime" sortable label="更新时间"></el-table-column>
           <el-table-column prop="address" label="操作">
             <template slot-scope="scope">
               <div>
@@ -94,7 +95,7 @@
                 <el-button
                   type="text"
                   size="small"
-                  v-if="scope.row.customUserNum!==tableData.length"
+                  v-if="scope.row.customUserNum!==overall.personNum"
                   @click="moverUpOrDown(scope.row,2)"
                 >下移</el-button>
               </div>
@@ -315,18 +316,22 @@ export default {
     timeData(newVal, oldVal) {
       console.log(newVal, oldVal)
       if (newVal) {
+        // console.log(new Date);
         this.formData.startDate = newVal[0]
         this.formData.endDate = newVal[1]
       } else {
         this.formData.startDate = ''
         this.formData.endDate = ''
       }
+
       console.log(this.formData)
+      console.log(typeof this.formData.startDate)
+      console.log(typeof this.formData.endDate)
       // this.getDataList(this.formData)
     },
     formData: {
       handler(newVal, oldVal) {
-        console.log('new', newVal, 'oldVal', oldVal)
+        // console.log('new', newVal, 'oldVal', oldVal)
         // this.
         this.dataObj.customOrgId = newVal.customOrgId
         // consolg.log()
@@ -394,6 +399,21 @@ export default {
     }
   },
   methods: {
+    reset() {
+      this.formData = {
+        customOrgName: this.formData.customOrgName, //自定义人员所属分类名
+        customOrgId: this.formData.customOrgId, //自定义人员所属分类编号
+        customUserName: '', //姓名
+        customUserUnit: '', //自定义人员单位
+        endDate: '', //结束时间
+        pageNum: 1, //当前页
+        pageSize: 10, //每页条数
+        startDate: '', //开始时间
+      }
+      this.timeData = ''
+      this.getDataList(this.formData)
+    },
+
     importHandleClose() {
       this.importVisible = false
       this.fileList = []
@@ -672,6 +692,7 @@ export default {
     },
     getDataList(val) {
       console.log(val)
+      console.log(typeof val.endDate)
       // personOrUnit==1:人员 2：单位
       if (this.personOrUnit == 1) {
         this.findLabelIdPerson(this.formData)
@@ -731,8 +752,12 @@ export default {
     // 根据自定义分类编号查询按参会人员展示自定义人员（ly）
     findLabelIdPerson(params) {
       this.$axios.baseCustomOrgIdPerson(params).then((res) => {
-        // console.log('按参会人员', res)
-        this.tableData = res.data.data.customUserShowVoList
+        console.log('按参会人员', res)
+        if (res.data.data.customUserShowVoList) {
+          this.tableData = res.data.data.customUserShowVoList
+        } else {
+          this.tableData = []
+        }
         this.overall.personNum = res.data.data.personNum
         this.overall.unitNum = res.data.data.unitNum
       })
@@ -753,12 +778,24 @@ export default {
     },
     //切换按单位还是按人员展示
     selectPersonOrUnit(val) {
+      let obj = {
+        customOrgName: '', //自定义人员所属分类名
+        customOrgId: '', //自定义人员所属分类编号
+        customUserName: '', //姓名
+        customUserUnit: '', //自定义人员单位
+        endDate: '', //结束时间
+        pageNum: 1, //当前页
+        pageSize: 10, //每页条数
+        startDate: '', //开始时间
+      }
+      obj.customOrgName = this.formData.customOrgName
+      obj.customOrgId = this.formData.customOrgId
       if (val == 1) {
         this.personOrUnit = 1
-        this.findLabelIdPerson(this.formData)
+        this.findLabelIdPerson(obj)
       } else {
         this.personOrUnit = 2
-        this.findLabelUnit(this.formData)
+        this.findLabelUnit(obj)
       }
     },
   },

src/views/system/unitEmpower.vue

@@ -98,7 +98,7 @@
           <!-- </el-select> -->
         </el-form-item>
         <el-form-item label="联系人浙政钉：" class="dingId">
-          <el-input v-model="addForm.dingId" ></el-input>
+          <el-input v-model="addForm.dingId"></el-input>
         </el-form-item>
         <el-form-item label="单位联系电话：" filterable class="unitTel" prop="unitTel">
           <el-input v-model="addForm.unitTel" />
@@ -188,6 +188,8 @@ export default {
         this.formData.endDate = ''
       }
       console.log(this.formData)
+      console.log(typeof this.formData.startDate)
+      console.log(typeof this.formData.endDate)
       // this.getDataList(this.formData)
     },
   },
@@ -413,6 +415,7 @@ export default {
         endDate: '', //结束时间
         unitName: '', //单位名称
       }
+      this.timeData = ''
       this.getDataList(this.formData)
     },
     handleClose() {