合并分支 'fc' 到 'master'

src/axios/services.js

@@ -111,6 +111,41 @@ const server = {
 			data
 		})
 	},
+  // 智能排座-查询可预定|更换的会议室(ly)
+ findReservationConference(data){
+  return axios('/conferenceProcess/findReservationConference',{
+    method:'post',
+    data
+  })
+ },
+ //智能排座-预定会议室(ly)
+reservationConference(data){
+  return axios('/conferenceProcess/reservationConference',{
+    method:'post',
+    data
+  })
+},
+// 智能排座-查询可选会议室布局(ly)
+findConferenceLayOut(data){
+  return axios('/conferenceProcess/findConferenceLayOut',{
+    method:'post',
+    data
+  })
+},
+// 智能排座-选择会议模板点确认(ly)
+chooseProcessTemp(data){
+  return axios('/conferenceProcess/chooseProcessTemp',{
+    method:'post',
+    data
+  })
+},
+// 、会议配置-保存日程地址（外挂）
+saveScheduleAddress(data){
+  return axios('/conferenceProcess/saveScheduleAddress',{
+    method:'post',
+    data
+  })
+},
 	//复制布局
 	copyConfLayout(id) {
 		return axios('/confLayout/copyConfLayout?id=' + id, {
@@ -1233,6 +1268,20 @@ const server = {
 			data
 		})
 	},
+  // (新)人员库-导入自定义人员(ly)
+  importPerson(data,params){
+    return axios('/person/importCustomUser',{
+      method:'post',
+      params,
+      data
+    })
+  },
+  //(新)人员库-导出自定义人员(ly)
+  exportCustomUser(data){
+    return axios('/person/exportCustomUser?customOrgId='+data,{
+      method:'get',
+    })
+  },
 	/*********************人员库接口************************/
 	postBatchSort(data) { //批量调整人员顺序
 		return axios(`/person/batchAdjustPersonSort`, {
@@ -1464,14 +1513,144 @@ const server = {
       data
     })
   },
-
+  //(新)人员库-删除关联参会人员信息以及参会单位（ly）
+  deleteCustomUser(data){
+    return axios('/person/deleteCustomUser?id=' + data,{
+      method:'get'
+    })
+  },
+  // (新)人员库-上移或下移关联参会人员（ly）
+  moveUpOrDownCustomUser(data){
+    return axios('/person/MoveUpOrDownCustomUser',{
+      method:'post',
+      data
+    })
+  },
+  // (新)人员库-按参会单位展示中查看详情(ly)
+  viewDetails(data){
+    return axios('/person/viewDetails',{
+      method:'post',
+      data
+    })
+  },
   //查询会议室预定记录日期条
   getConfenceDataBar(data){
     return axios('/conferenceProcessReservationRecord/findDateBar',{
       method:'post',
       data
     })
+  },
+
+  //查询可用会议室信息
+    getConference(){
+      return axios('/conferenceProcessReservationRecord/findConference',{
+        method:'get'
+      })
+    },
+    //查询会议室预定信息
+    getConfenceInformation(data){
+      return axios('/conferenceProcessReservationRecord/findConferenceProcessReservationRecord',{
+        method:'post',
+        data
+      })
+    },
+
+    // 通知参会-查询分区和通知参会信息
+    getAreaAndNoticePart(data){
+      return axios('/ConferenceProcessNoticePart/findAreaAndNoticePart',{
+        method:'post',
+        data
+      })
+    },
+
+    //通知参会-查询可以选择的参会单位授权
+    findSysUnitAuthPerson(data){
+      return axios('/ConferenceProcessNoticePart/findSysUnitAuthPerson',{
+        method:'post',
+        data
+      })
+    },
+    //通知参会-增加通知单位
+   addNoticeUnit(data){
+    return axios('/ConferenceProcessNoticePart/addNoticeUnit',{
+      method:'post',
+      data
+    })
+   },
+   //通知参会-批量分区
+   batchArea(data){
+    return axios('/ConferenceProcessNoticePart/batchArea',{
+      method:"post",
+      data
+    })
+   },
+  //  通知参会-发送通知上传附件
+  sendNoticeUpLoadFile(data){
+    return axios('/ConferenceProcessNoticePart/sendNoticeUpLoadFile',{
+      method:'post',
+      data
+    })
+  },
+  //通知参会-发送通知
+  sendNotification(data){
+    return axios('/ConferenceProcessNoticePart/sendNotice',{
+      method:'post',
+      data
+    })
+  },
+  //通知参会-发送通知保存草稿
+  sendNoticeSaveDraft(data){
+    return axios('/ConferenceProcessNoticePart/sendNoticeSaveDraft',{
+      method:'post',
+      data
+    })
+  },
+  // 通知参会-批量催阅
+  batchUrgeRead(data){
+    return axios('/ConferenceProcessNoticePart/batchUrgeRead?	noticePartIdList='+data,{
+      method:'get',
+
+    })
+  },
+  //通知参会-删除通知参会 
+  deleteNoticePart(data){
+    return axios('/ConferenceProcessNoticePart/deleteNoticePart?noticePartId='+data,{
+      method:'get'
+    })
+  },
+  // 通知参会-查看反馈
+  viewFeedback(data){
+    return axios('/ConferenceProcessNoticePart/viewFeedback?noticePartId='+data,{
+      method:'get'
+    })
+  },
+  //通知参会-通知开启或关闭
+  noticeOnOrClose(data){
+    return axios('/ConferenceProcessNoticePart/noticeOnOrClose',{
+      method:'post',
+      data
+    })
+  },
+  // 通知参会-查询可以选择的标签
+findCustomOrg(){
+  return axios('/ConferenceProcessNoticePart/findCustomOrg',{
+    method:'get'
+  })
+},
+//通知参会-根据标签id查询参会单位
+findUnitByCustomOrgId(data){
+  return axios('/ConferenceProcessNoticePart/findUnitByCustomOrgId?customOrgId='+data,{
+    method:'get'
+  })
+},
+  //人员管理-根据标签给单个区域的人员排序
+  personnelSortByCustomIdAndAreaId(data){
+    return axios('/conferenceProcess/personnelSortByCustomIdAndAreaId',{
+      method:'post',
+      data
+    })
   }
+  
 }
 
 export default server

src/views/meeting/componets/ConfDialog.vue

@@ -25,9 +25,9 @@
       </el-col>
       <el-col :span="24">
         <el-col :span="12">
-          <el-form-item label="单位:" prop="unitName" class="unit_select">
+          <el-form-item label="单位:" prop="unitId" class="unit_select">
             <el-select
-              v-model="formData.unitName"
+              v-model="formData.unitId"
               filterable
               :disabled="dialogTitle == '修改会议' || user == 'ROLE_HUIYIADMIN'"
               placeholder=" "
@@ -116,7 +116,7 @@ export default {
       rules: {
         unitId: [{ required: true, message: '请选择单位', trigger: 'blur' }],
         processName: [{ required: true, message: '请输入会议主题', trigger: 'blur' }],
-        unitName: [{ required: true, message: '请输入单位', trigger: 'blur' }],
+        unitId: [{ required: true, message: '请输入单位', trigger: 'blur' }],
         processPhone: [
           {
             required: false,

src/views/meeting/componets/MeetingItem.vue

@@ -71,8 +71,8 @@
       </div>
       <div class="meeting_item_part2">
         <div class="meeting_item_text" v-for="(msg, index) of item.data" :key="index">
-          <span class="text_key">{{ msg.key }}：</span>
-          <span class="text_value">{{ msg.value }}</span>
+          <span class="text_key" v-if="msg.key !=='来源' & msg.key !=='联系人'">{{ msg.key }}：</span>
+          <span class="text_value" v-if="msg.key !=='来源' & msg.key !=='联系人'">{{ msg.value }}</span>
           <span
             class="address_des"
             v-if="

src/views/meeting/operation/Administration/components/BatchAddDialog.vue

@@ -47,7 +47,7 @@
                 }}
               </template>
             </el-table-column>-->
-            <el-table-column prop="otherName" label="单位简称"></el-table-column>
+            <!-- <el-table-column prop="otherName" label="单位简称"></el-table-column> -->
             <el-table-column prop="organizationName" label="单位"></el-table-column>
             <el-table-column prop="govEmpPosJob" label="职务"></el-table-column>
             <!-- <el-table-column prop="isLeader" width="100" label="是否领导">
@@ -80,7 +80,7 @@
           </el-table>
         </div>
         <div class="person_wrap">
-          <div v-if="!selectPerson" class="title">已选人员：{{ chosenTags.length }}人</div>
+          <div v-if="!selectPerson && chosenTags" class="title">已选人员：{{ chosenTags.length }}人</div>
           <div v-if="selectPerson" class="title">已选人员</div>
           <div class="person">
             <el-tag
@@ -182,7 +182,9 @@ export default {
     dialogTableData: Array,
     returnSelect: Array,
   },
-  mounted() {},
+  mounted() {
+    console.log('thischsonsgfs', this.chosenTags)
+  },
   methods: {
     Next() {
       console.log('next')
@@ -206,6 +208,7 @@ export default {
       // console.log(arr)
     },
     handleRowClick(e) {
+      console.log('changeFlags', this.changeFlags)
       if (this.changeFlags == 1 || this.changeFlags == 3) {
         let arr = []
         if (this.chosenTags) {
@@ -421,6 +424,7 @@ export default {
   },
   watch: {
     batchAddFlag() {
+      console.log('batchAddFlag', this.batchAddFlag)
       this.visible = this.batchAddFlag
     },
     returnSelect(newVal, oldVal) {
@@ -495,6 +499,7 @@ export default {
         .table_wrap {
           width: calc(100% - 290px - 350px);
           padding: 0 20px;
+          text-align: left;
           .select_but {
             cursor: pointer;
             display: inline-block;

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="900px"
+    >
+      <div class="body">
+        <div class="top">
+          <el-form ref="form" :model="form" label-width="80px" :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>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="selectTable()">选择标签</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="table_wai">
+          <div class="tips">
+            <div>已选单位：{{tableData.length}}家</div>
+            <!-- <div>批量删除</div> -->
+          </div>
+          <el-table :data="tableData" height="100%" stripe>
+            <el-table-column property="unitName" label="参会单位（权限专用）"></el-table-column>
+            <el-table-column property="personName" label="单位联系人"></el-table-column>
+            <el-table-column property="dingId" label="联系人浙政钉"></el-table-column>
+            <el-table-column property="unitTel" label="单位联系电话"></el-table-column>
+            <el-table-column property="address" label="操作" class="caozuo">
+              <template slot-scope="scope">
+                <el-button type="text" size="small" @click="delPerson(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <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
+      >
+        <div style="display:flex;flex-direction: column;align-items: center;}">
+          <div>参会单位：{{currentDelObj.unitName}}</div>
+          <div>确认删除？</div>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="confirmDelHandleClose()">取消</el-button>
+          <el-button @click="submitDelUnit()">确认</el-button>
+        </div>
+      </el-dialog>
+    </el-dialog>
+  </div>
+</template>
+  
+  <script>
+export default {
+  props: {
+    addNoticeUnitVisible: {
+      default: false,
+    },
+    labelUnit: Array,
+    chosenArea: Object,
+    // tableData: Array,
+  },
+  data() {
+    return {
+      visible: this.addNoticeUnitVisible,
+      confirmDelVisible: false,
+      options: [],
+      form: {
+        unitId: '',
+      },
+      loading: false,
+      tableData: [],
+      currentDelObj: {},
+    }
+  },
+
+  methods: {
+    //提交选好的单位
+    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}`)
+        }
+      })
+    },
+
+    dialogTableHandleClose() {
+      this.tableData = []
+      this.$emit('closeTableDialog', false)
+    },
+    //确认删除
+    submitDelUnit() {
+      for (let i in this.tableData) {
+        if (this.currentDelObj.unitId == this.tableData[i].unitId) {
+          this.tableData.splice(i, 1)
+        }
+      }
+      this.confirmDelHandleClose()
+    },
+    confirmDelHandleClose() {
+      this.confirmDelVisible = false
+    },
+    delPerson(row) {
+      console.log(row)
+      this.confirmDelVisible = true
+      this.currentDelObj = row
+    },
+    //下拉选择shijian
+    unitNameChange() {
+      if (!this.tableData.some((item) => item.unitId == this.form.unitId)) {
+        for (let i in this.options) {
+          if (this.form.unitId == this.options[i].unitId) {
+            this.tableData.push(this.options[i])
+          }
+        }
+      } else {
+        this.$message.error('此单位已选,请选择其他单位')
+      }
+      this.form.unitId = ''
+      // this.findSysUnitAuthPerson(this.form)
+    },
+    //
+    selectUnit(item) {
+      console.log(item)
+    },
+    //选择标签
+    selectTable() {
+      // this.
+      this.$emit('openLableDiaolog')
+    },
+    //模糊搜索
+    findSysUnitAuthPerson(data) {
+      // console.log(data)
+      this.$axios.findSysUnitAuthPerson(data).then((res) => {
+        // console.log('可选的单位', res)
+        this.options = res.data.data
+      })
+    },
+    sysUnitChange(row) {
+      console.log(row)
+      console.log(this.options)
+      // this.
+    },
+  },
+  created() {
+    this.findSysUnitAuthPerson(this.form)
+  },
+  watch: {
+    addNoticeUnitVisible() {
+      console.log(123)
+      this.visible = this.addNoticeUnitVisible
+    },
+    labelUnit() {
+      this.tableData = this.tableData.concat(this.labelUnit)
+      let obj = {}
+      this.tableData = this.tableData.reduce(function (prev, elem) {
+        obj[elem.dingId] ? '' : (obj[elem.dingId] = true && prev.push(elem))
+        return prev
+      }, [])
+      console.log(this.tableData)
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.el-dialog {
+  .body {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    .top {
+      // width: 100%;
+
+      .el-form {
+        width: 100%;
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+    .table_wai {
+      height: 600px;
+      .tips {
+        height: 38px;
+        line-height: 38px;
+        display: flex;
+        justify-content: space-between;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file