Skip to content

C
conferenceLy
提交 d56b605b authored 作者: FC's avatar FC
浏览文件
操作

审核

上级 1a63d321
隐藏空白字符变更
内嵌 并排
正在显示 包含 754 行增加 和 804 行删除
public/config.js
浏览文件 @ d56b605b
// const urlConfig = { // const urlConfig = {
// production_url: 'http://172.18.27.190:8080/confhd',//接口环境 // production_url: 'http://172.18.27.190:8080/confhd',//接口环境
// jump_url: 'http://hypz.hzswb.cn/confphone/#/',//跳转移动端路径 // jump_url: 'http://hypz.hzswb.cn/confphone/#/',//跳转移动端路径
// unitAbbrevia_url:'http://172.18.27.190:8080/demo' // 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 = { const urlConfig = {
production_url: 'https://lyfydp.longyou.gov.cn:9443/meeting/api/man',//接口环境 production_url: 'https://lyfydp.longyou.gov.cn:9443/meeting/api/h5',//接口环境
jump_url: 'https://lyfydp.longyou.gov.cn:9443/meeting/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
浏览文件 @ d56b605b
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
</div> </div>
</div> </div>
<div class="meeting_item item" :class="[ <div class="meeting_item item" :class="[
{ green_item: item.processStatus === 1 }, { green_item: item.processStatus === 1 },
{ orange_item: item.processStatus === 2 }, { orange_item: item.processStatus === 2 },
{ blue_item: item.processStatus === 3 }, { blue_item: item.processStatus === 3 },
]" v-for="(item, index) of meetingLists" :key="index" @click="enterConf(item)"> ]" v-for="(item, index) of meetingLists " :key="index" @click="enterConf(item)">
<div class="meeting_item_part1"> <div class="meeting_item_part1">
<div class="meeting_item_text" v-if="flash"> <div class="meeting_item_text" v-if="flash">
<el-tooltip :content="item.processName" effect="light" placement="bottom" <el-tooltip :content="item.processName" effect="light" placement="bottom"
...@@ -22,17 +22,15 @@ ...@@ -22,17 +22,15 @@
<div class="time_record" @click.stop v-if="item.processStatus === 3"> <div class="time_record" @click.stop v-if="item.processStatus === 3">
<time-record :startTime="item.processDate" :tagFlag="true"></time-record> <time-record :startTime="item.processDate" :tagFlag="true"></time-record>
</div> </div>
<div class="time_record" :class=" <div class="time_record" :class="new Date(item.processDate).getTime() - new Date().getTime() < 0
new Date(item.processDate).getTime() - new Date().getTime() < 0
? 'overdue' ? 'overdue'
: '' : ''
" @click.stop v-else> " @click.stop v-else>
<time-count-down :endTime="item.processDate" @modifyDate="modifyDate" :item="item" :tagFlag=" <time-count-down :endTime="item.processDate" @modifyDate="modifyDate" :item="item" :tagFlag="new Date(item.processDate).getTime() - new Date().getTime() < 0
new Date(item.processDate).getTime() - new Date().getTime() < 0
? false ? false
: true : true
"></time-count-down> "></time-count-down>
</div> </div>
</div> </div>
<div class="publish_tag"> <div class="publish_tag">
...@@ -53,16 +51,17 @@ ...@@ -53,16 +51,17 @@
<div class="meeting_item_part2"> <div class="meeting_item_part2">
<div class="meeting_item_text" v-show="(msg.key !== '来源' && msg.key !== '联系人')" v-for="(msg, index) of item.data" <div class="meeting_item_text" v-show="(msg.key !== '来源' && msg.key !== '联系人')" v-for="(msg, index) of item.data"
:key="index"> :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-if="msg.key !== '预定状态'">{{ msg.value }}</span>
<span class="text_value" v-else>{{ msg.value == 0 ? '待审核' : msg.value == 1 ? '审核成功' : msg.value == 2 ? '审核不通过' : <span class="text_value" v-else>{{ msg.value == 0 ? '待审核' : msg.value == 1 ? '审核成功' : msg.value == 2 ? '审核不通过' :
'' '无需审核'
}}</span> }}</span>
<span class="address_des" v-if="msg.key === '地址' && (msg.value === '' || msg.value === null)">请在排座时选厅</span> <span class="address_des" v-if="msg.key === '地址' && (msg.value === '' || msg.value === null)">请在排座时选厅</span>
</div> </div>
</div> </div>
<div class="foot_but"> <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 class="but start_but" v-if="item.processStatus === 2" @click.stop="startConf(item)">
<div>开始会议</div> <div>开始会议</div>
</div> </div>
...@@ -183,6 +182,53 @@ export default { ...@@ -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) { endConf(item) {
this.$confirm(`会议主题：${item.processName} </br>确认”关闭“？`, '提示', { this.$confirm(`会议主题：${item.processName} </br>确认”关闭“？`, '提示', {
customClass: 'message_box', customClass: 'message_box',
...@@ -194,7 +240,7 @@ export default { ...@@ -194,7 +240,7 @@ export default {
this.loadingOptions.text = '正在关闭会议...' this.loadingOptions.text = '正在关闭会议...'
let loading = Loading.service(this.loadingOptions) let loading = Loading.service(this.loadingOptions)
this.$axios this.$axios
.getEndConf(item.id, 2) .getEndConf(item.id, 3)
.then((res) => { .then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
this.$message({ this.$message({
...@@ -377,6 +423,12 @@ export default { ...@@ -377,6 +423,12 @@ export default {
color: #e24f51; color: #e24f51;
} }
.end_but {
// background-color:
background: rgba(119, 140, 162, 0.12);
color: #778ca2;
}
.start_but { .start_but {
div { div {
width: 100%; width: 100%;
......
src/views/meeting/componets/TimeCountDown.vue
浏览文件 @ d56b605b
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<el-dialog title="修改过期会议" :visible.sync="dialogFormVisible" :before-close="handleClose" class="selectTimeDialog" <el-dialog title="修改过期会议" :visible.sync="dialogFormVisible" :before-close="handleClose" class="selectTimeDialog"
width="1500px" v-if="item width="1500px" v-if="item
"> ">
<div class="conferenceName">会议名称：{{ item.processName }}</div> <div class="conferenceName">会议名称：{{ item.processName }}</div>
<div class="dialog_top"> <div class="dialog_top">
<div class="name">{{ currentConfenrenceObj.conferenceName }}</div> <div class="name">{{ currentConfenrenceObj.conferenceName }}</div>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div class="timeList"> <div class="timeList">
<timeList :canClick="canClick" :conferenceProcessReservationRecordList="conferenceProcessReservationRecordList" <timeList :canClick="canClick" :conferenceProcessReservationRecordList="conferenceProcessReservationRecordList"
:isHover="false :isHover="false
" @getTimeRange="getTimeRange"></timeList> " @getTimeRange="getTimeRange"></timeList>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="handleClose()">取 消</el-button> <el-button @click="handleClose()">取 消</el-button>
...@@ -164,10 +164,11 @@ export default { ...@@ -164,10 +164,11 @@ export default {
return y + '-' + m + '-' + d return y + '-' + m + '-' + d
}, },
selectTime() { 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 let index = this.item.data.length - 1
if (this.item.data[index].key == '预定状态' && this.item.data[index].value == 2) { 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); // console.log(213113);
this.tipsDialogVisible = true this.tipsDialogVisible = true
} else { } else {
this.$axios.rescheduleMeeting(this.item.id).then((res) => { this.$axios.rescheduleMeeting(this.item.id).then((res) => {
...@@ -342,7 +343,7 @@ export default { ...@@ -342,7 +343,7 @@ export default {
.key { .key {
color: #778ca2; color: #778ca2;
width: 55px; max-width: 90px;
} }
.value { .value {
......
src/views/meeting/operation/chooseModule/index.vue
浏览文件 @ d56b605b
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<div class="box" v-if="trueList.length == 0"></div> <div class="box" v-if="trueList.length == 0"></div>
<time-list ref="timeList" class="time_list" :canClick="canClick" <time-list ref="timeList" class="time_list" :canClick="canClick"
:conferenceProcessReservationRecordList="conferenceProcessReservationRecordList" :isHover="false :conferenceProcessReservationRecordList="conferenceProcessReservationRecordList" :isHover="false
" @getTimeRange="getTimeRange"></time-list> " @getTimeRange="getTimeRange"></time-list>
<div class="time_bottom"> <div class="time_bottom">
<div class="time_tips">注：更换时间不换会议室，不影响已排座数据；同一时间段重复预定的，遇此情况请线下协商会议改期。</div> <div class="time_tips">注：更换时间不换会议室，不影响已排座数据；同一时间段重复预定的，遇此情况请线下协商会议改期。</div>
<!-- <div class="yuding" @click="yuding()">下一步</div> --> <!-- <div class="yuding" @click="yuding()">下一步</div> -->
...@@ -311,8 +311,14 @@ export default { ...@@ -311,8 +311,14 @@ export default {
this.getConferenceList(this.ruleForm) this.getConferenceList(this.ruleForm)
// console.log(); // console.log();
// console.log(new Date().toDateString()) // 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: { methods: {
...@@ -411,6 +417,8 @@ export default { ...@@ -411,6 +417,8 @@ export default {
isProcess: this.$route.query.isProcess, isProcess: this.$route.query.isProcess,
}, },
}) })
//重新获取头部数据
this.$emit('getTopData')
} else { } else {
loading.close() loading.close()
this.$message.error(res.data.data) this.$message.error(res.data.data)
...@@ -418,7 +426,7 @@ export default { ...@@ -418,7 +426,7 @@ export default {
}) })
} else { } else {
loading.close() loading.close()
this.$message.error(`${res.data.data}`) this.$message.error(`${response.data.data}`)
} }
}) })
...@@ -457,50 +465,52 @@ export default { ...@@ -457,50 +465,52 @@ export default {
//查询会议室 //查询会议室
getConferenceList(data, currentConfenrence) { getConferenceList(data, currentConfenrence) {
console.log('curr', this.currentConfenrence); console.log('curr', this.currentConfenrence);
console.log('123', this.conferenceId);
// console.log(); // console.log();
this.$axios.findReservationConference(data).then((res) => { this.$axios.findReservationConference(data).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
// console.log('resresresres', res) console.log('resresresres', res)
this.trueList = res.data.data.conferenceAndUseInfoVoList this.trueList = res.data.data.conferenceAndUseInfoVoList
// console.log(this.trueList) console.log('trueList', this.trueList)
this.dataLists = res.data.data this.dataLists = res.data.data
let boole = false let boole = false
if (res.data.data.conferenceName) { // if (res.data.data.conferenceName) {
for (let i in this.trueList) { for (let i in this.trueList) {
// console.log(33); console.log(this.trueList[i].conferenceId);
if (res.data.data.conferenceName == this.trueList[i].conferenceName) { if (this.currentConfenrence.conferenceId == this.trueList[i].conferenceId) {
console.log(132); console.log(132);
this.currentConfenrence = this.trueList[i] console.log(this.trueList[i]);
currentConfenrence = this.trueList[i] // this.currentConfenrence = this.trueList[i]
this.chooseConfs(this.trueList[i], this.trueList[i]) currentConfenrence = this.trueList[i]
// this.$nextTick(() => { this.chooseConfs(this.trueList[i], this.trueList[i])
// this.$refs.timeList.selectRange(res.data.data.reservationStartTime.split(' ')[1]) // this.$nextTick(() => {
// this.$refs.timeList.selectRange(res.data.data.reservationEndTime.split(' ')[1]) // 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)
// this.$nextTick(() => { // this.$nextTick(() => {
// this.$refs.timeList.selectRange(currentConfenrence.reservationStartTime.split(' ')[1]) // this.$refs.timeList.selectRange(currentConfenrence.reservationStartTime.split(' ')[1])
// this.$refs.timeList.selectRange(currentConfenrence.reservationEndTime.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) this.choosePei(this.radio, currentConfenrence)
} }
}) })
...@@ -687,6 +697,7 @@ export default { ...@@ -687,6 +697,7 @@ export default {
this.conferenceProcessReservationRecordList = item.conferenceProcessReservationRecordList this.conferenceProcessReservationRecordList = item.conferenceProcessReservationRecordList
let { reservationEndTime, reservationStartTime } = this.currentConfenrence let { reservationEndTime, reservationStartTime } = this.currentConfenrence
this.currentConfenrence = { ...item, reservationEndTime, reservationStartTime } this.currentConfenrence = { ...item, reservationEndTime, reservationStartTime }
// this.currentConfenrence.con
// this.currentConfenrence = item // this.currentConfenrence = item
console.log(this.currentConfenrence); console.log(this.currentConfenrence);
console.log(this.trueList); console.log(this.trueList);
......
src/views/meeting/operation/divideArea/index.vue
浏览文件 @ d56b605b
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
<div class="main_wrap"> <div class="main_wrap">
<!-------------------------新手引导----------------------------> <!-------------------------新手引导---------------------------->
<div class="new_help" @click="showDirection"></div> <div class="new_help" @click="showDirection"></div>
<div class="direction" :class=" <div class="direction" :class="dir === 1 ? 'direction1' : ''
dir === 1 ? 'direction1' : ''
" v-if="dir"> " v-if="dir">
<div class="but but1" @click="iKnow()"></div> <div class="but but1" @click="iKnow()"></div>
<!-- <div class="but but2" @click="next()"></div> <!-- <div class="but but2" @click="next()"></div>
...@@ -16,8 +15,8 @@ ...@@ -16,8 +15,8 @@
<div class="notice"> <div class="notice">
<!-- 参会总人数： <!-- 参会总人数：
<span>{{ confData.personnels.length }}人</span>--> <span>{{ confData.personnels.length }}人</span>-->
<div :class="noticeStatus==1?'active':''" @click="openOrCloseNotice(1)">通知开启</div> <div :class="noticeStatus == 1 ? 'active' : ''" @click="openOrCloseNotice(1)">通知开启</div>
<div :class="noticeStatus==2?'active':''" @click="openOrCloseNotice(2)">通知关闭</div> <div :class="noticeStatus == 2 ? 'active' : ''" @click="openOrCloseNotice(2)">通知关闭</div>
</div> </div>
</div> </div>
<div class="area_display"> <div class="area_display">
...@@ -31,31 +30,17 @@ ...@@ -31,31 +30,17 @@
> >
<div class="area_text">全部人员/{{ confData.personnels.length }}人</div> <div class="area_text">全部人员/{{ confData.personnels.length }}人</div>
</div>--> </div>-->
<draggable <draggable :setData="() => { }" class="selection_right_but_wrap" v-model="confData.confPersonAreaVos"
:setData="() => {}" :options="dragOptions" :move="areaMove" @start="areaStart" @end="areaEnd"
class="selection_right_but_wrap" :disabled="$store.state.rcSendStatus == 1">
v-model="confData.confPersonAreaVos" <div class="area" :class="[
:options="dragOptions"
:move="areaMove"
@start="areaStart"
@end="areaEnd"
:disabled="$store.state.rcSendStatus == 1"
>
<div
class="area"
:class="[
{ activeArea: activeIndex === index }, { activeArea: activeIndex === index },
{ normalArea: activeIndex !== index }, { normalArea: activeIndex !== index },
{ outnumberArea: item.areaPersonnelExpectNum > item.seatNum }, { outnumberArea: item.areaPersonnelExpectNum > item.seatNum },
]" ]" :style="`backgroundColor:${activeIndex === index ? item.areaColour : '#fff'
:style="`backgroundColor:${ };
activeIndex === index ? item.areaColour : '#fff' --yf-border-color:${item.areaColour}`"
}; v-for="(item, index) of confData.confPersonAreaVos" @click="chooseArea(item, index)" :id="item.id">
--yf-border-color:${item.areaColour}`"
v-for="(item, index) of confData.confPersonAreaVos"
@click="chooseArea(item, index)"
:id="item.id"
>
<!-- <div--> <!-- <div-->
<!-- class="outnumber"--> <!-- class="outnumber"-->
<!-- v-if="item.personData.length - item.seatNum > 0"--> <!-- v-if="item.personData.length - item.seatNum > 0"-->
...@@ -69,16 +54,10 @@ ...@@ -69,16 +54,10 @@
<!-- <span class="seatUnit">{{ item.personData.length }}人/{{ item.seatNum }}座</span> --> <!-- <span class="seatUnit">{{ item.personData.length }}人/{{ item.seatNum }}座</span> -->
</div> </div>
<div class="rot" v-if="item.personData.length - item.seatNum > 0"></div> <div class="rot" v-if="item.personData.length - item.seatNum > 0"></div>
<div <div class="edit" @click.stop="editArea(item)"
class="edit" v-if="$store.state.rcSendStatus == 2 && noticeStatus == 2 && item.areaName !== '未分区'"></div>
@click.stop="editArea(item)" <div class="close" @click.stop="delArea(item)"
v-if="$store.state.rcSendStatus == 2 && noticeStatus==2 && item.areaName!=='未分区'" v-if="$store.state.rcSendStatus == 2 && noticeStatus == 2 && item.areaName !== '未分区'"></div>
></div>
<div
class="close"
@click.stop="delArea(item)"
v-if="$store.state.rcSendStatus == 2 && noticeStatus==2 && item.areaName!=='未分区'"
></div>
<!-- <div <!-- <div
class="outnumber" class="outnumber"
v-if="item.personData.length - item.seatNum > 0" v-if="item.personData.length - item.seatNum > 0"
...@@ -105,15 +84,15 @@ ...@@ -105,15 +84,15 @@
<div class="data_detail"> <div class="data_detail">
说明：{{ 说明：{{
allPersonFlag allPersonFlag
? "按单位树展示人员信息，支持增加人员、批量分区、批量删除、批量请假、编辑人员等。" ? "按单位树展示人员信息，支持增加人员、批量分区、批量删除、批量请假、编辑人员等。"
: '按名片展示人员信息，支持增加人员；单击拖动名片批量换区、调整排序；双击名片更换人员；拖动左侧"区域"调整排序。' : '按名片展示人员信息，支持增加人员；单击拖动名片批量换区、调整排序；双击名片更换人员；拖动左侧"区域"调整排序。'
}} }}
</div> </div>
</div> </div>
<div class="header"> <div class="header">
<div> <div>
<el-dropdown v-show="$store.state.rcSendStatus == 2 " :disabled="noticeStatus == 1"> <el-dropdown v-show="$store.state.rcSendStatus == 2" :disabled="noticeStatus == 1">
<el-button class="but_2" size="medium" type="primary" :disabled="noticeStatus == 1"> <el-button class="but_2" size="medium" type="primary" :disabled="noticeStatus == 1">
新增人员 新增人员
<i class="arrow-down-icon"></i> <i class="arrow-down-icon"></i>
...@@ -130,12 +109,8 @@ ...@@ -130,12 +109,8 @@
>--> >-->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button <el-button v-show="$route.query.isProcess == 1 && getItems()" size="medium" type="primary"
v-show="$route.query.isProcess == 1 && getItems()" @click="rcSendFlag = true">{{ rcName }}</el-button>
size="medium"
type="primary"
@click="rcSendFlag = true"
>{{ rcName }}</el-button>
<!-- <el-button v-if="checkList.length" size="medium" @click="batchChange()">批量换区</el-button>--> <!-- <el-button v-if="checkList.length" size="medium" @click="batchChange()">批量换区</el-button>-->
<!-- <el-button <!-- <el-button
...@@ -147,28 +122,13 @@ ...@@ -147,28 +122,13 @@
@click="batchDivide()" @click="batchDivide()"
>批量分区</el-button >批量分区</el-button
>--> >-->
<el-button <el-button v-if="$store.state.rcSendStatus == 2" class="but_2" size="medium" type="primary"
v-if=" $store.state.rcSendStatus == 2" :disabled="checkList.length == 0" @click="batchAskLeave()">批量请假</el-button>
class="but_2" <el-button v-if="$store.state.rcSendStatus == 2" size="medium" type="danger"
size="medium" :disabled="checkList.length == 0" @click="batchDel()">批量删除</el-button>
type="primary"
:disabled="checkList.length == 0"
@click="batchAskLeave()"
>批量请假</el-button>
<el-button
v-if=" $store.state.rcSendStatus == 2"
size="medium"
type="danger"
:disabled="checkList.length == 0"
@click="batchDel()"
>批量删除</el-button>
<div class="all_choose_box"> <div class="all_choose_box">
<el-checkbox <el-checkbox v-if="!allPersonFlag && $store.state.rcSendStatus == 2" v-model="checkAll"
v-if="!allPersonFlag && $store.state.rcSendStatus == 2" @change="handleCheckAllChange" :disabled="noticeStatus == 1">全选</el-checkbox>
v-model="checkAll"
@change="handleCheckAllChange"
:disabled="noticeStatus==1"
>全选</el-checkbox>
</div> </div>
<!-- <el-button @click="saveArea()" :class="disableFlag ? 'not_allowed_but' : ''">保存排序</el-button>--> <!-- <el-button @click="saveArea()" :class="disableFlag ? 'not_allowed_but' : ''">保存排序</el-button>-->
...@@ -176,66 +136,28 @@ ...@@ -176,66 +136,28 @@
<div> <div>
<div class="select_text">查询：</div> <div class="select_text">查询：</div>
<el-input <el-input class="select_input" placeholder="请输入姓名、单位、职务" v-model="info" clearable @clear="clearSearch()"
class="select_input" @change="search()" @keyup.enter.native="search()"></el-input>
placeholder="请输入姓名、单位、职务"
v-model="info"
clearable
@clear="clearSearch()"
@change="search()"
@keyup.enter.native="search()"
></el-input>
<!-- <el-button type="primary" size="medium" @click="search()">查询</el-button> --> <!-- <el-button type="primary" size="medium" @click="search()">查询</el-button> -->
<div class="select_text">排序:</div> <div class="select_text">排序:</div>
<el-select <el-select v-model="infoSelect" clearable placeholder="请选标签" :disabled="noticeStatus == 1"
v-model="infoSelect" @change="selectAreaChange()">
clearable <el-option v-for="item in customOrgList" :label="item.customOrgName" :key="item.id"
placeholder="请选标签" :value="item.id"></el-option>
:disabled="noticeStatus==1"
@change="selectAreaChange()"
>
<el-option
v-for="item in customOrgList"
:label="item.customOrgName"
:key="item.id"
:value="item.id"
></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
<el-checkbox-group <el-checkbox-group class="person_display" v-if="!allPersonFlag" @change="checkChange" v-model="checkList">
class="person_display"
v-if="!allPersonFlag"
@change="checkChange"
v-model="checkList"
>
<div class="zhezhao" v-show="$store.state.rcSendStatus == 1"></div> <div class="zhezhao" v-show="$store.state.rcSendStatus == 1"></div>
<draggable <draggable class="drag_wrap" :setData="() => { }" v-model="showPersonData" :options="dragOptions"
class="drag_wrap" @start="personStart" :move="personMove" @end="personEnd">
:setData="() => {}" <div class="person" :class="{ active: checkList.includes(item.id) }"
v-model="showPersonData" @dblclick="noticeStatus == 1 ? '' : dbClickPerson(item)"
:options="dragOptions" @click="noticeStatus == 1 ? '' : checkClick(item)" v-for="(item, index) of showPersonData" :key="index">
@start="personStart" <el-checkbox v-if="noticeStatus == 2" :label="item.id" @change="(e) => {
:move="personMove" clickBox(e, item);
@end=" personEnd" }
> "></el-checkbox>
<div
class="person"
:class="{ active: checkList.includes(item.id) }"
@dblclick="noticeStatus==1?'':dbClickPerson(item)"
@click="noticeStatus==1?'':checkClick(item)"
v-for="(item, index) of showPersonData"
:key="index"
>
<el-checkbox
v-if="noticeStatus==2"
:label="item.id"
@change="
(e) => {
clickBox(e, item);
}
"
></el-checkbox>
<div class="leave_tag" v-if="item.signStatus === 5"> <div class="leave_tag" v-if="item.signStatus === 5">
<img src="../../../../assets/meetingPalce/paiwei/qingjia.png" /> <img src="../../../../assets/meetingPalce/paiwei/qingjia.png" />
</div> </div>
...@@ -266,52 +188,27 @@ ...@@ -266,52 +188,27 @@
></el-tree> ></el-tree>
</div>--> </div>-->
<div class="list_wrap list_n"> <div class="list_wrap list_n">
<el-table <el-table :data="personData" ref="multipleTable" stripe style="width: 100%" @row-click="handleRowChange"
:data="personData" @selection-change="handleSelectionChange">
ref="multipleTable"
stripe
style="width: 100%"
@row-click="handleRowChange"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50"></el-table-column> <el-table-column type="selection" width="50"></el-table-column>
<el-table-column type="index" label="序号" width="58"></el-table-column> <el-table-column type="index" label="序号" width="58"></el-table-column>
<el-table-column <el-table-column type="feedBack" label="筛选状态" width="100" :filters="[
type="feedBack"
label="筛选状态"
width="100"
:filters="[
{ text: '已请假', value: '1' }, { text: '已请假', value: '1' },
{ text: '未反馈', value: '2' }, { text: '未反馈', value: '2' },
{ text: '确认反馈', value: '3' }, { text: '确认反馈', value: '3' },
{ text: '补录', value: '4' }, { text: '补录', value: '4' },
]" ]" :filter-method="filterTag" column-key="feedBack">
:filter-method="filterTag"
column-key="feedBack"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span class="leaveTag" v-if="scope.row.signStatus === 5">已请假</span> <span class="leaveTag" v-if="scope.row.signStatus === 5">已请假</span>
<span <span class="weifankuiTag" v-if="scope.row.signStatus !== 5 && scope.row.feedBack == 1
class="weifankuiTag" ">未反馈</span>
v-if=" <span class="yifankuiTag" v-if="scope.row.signStatus !== 5 && scope.row.feedBack == 2
scope.row.signStatus !== 5 && scope.row.feedBack == 1 ">确认反馈</span>
" <span class="yifankuiTag" v-if="scope.row.signStatus !== 5 &&
>未反馈</span> (scope.row.insertType == 2 ||
<span scope.row.insertType == 3 ||
class="yifankuiTag" scope.row.insertType == 4)
v-if=" ">补录</span>
scope.row.signStatus !== 5 && scope.row.feedBack == 2
"
>确认反馈</span>
<span
class="yifankuiTag"
v-if="
scope.row.signStatus !== 5 &&
(scope.row.insertType == 2 ||
scope.row.insertType == 3 ||
scope.row.insertType == 4)
"
>补录</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="姓名" width="120"> <el-table-column prop="name" label="姓名" width="120">
...@@ -330,11 +227,7 @@ ...@@ -330,11 +227,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span> <span>
{{ scope.row.unit }} {{ scope.row.unit }}
<i <i class="edit_icon" @click="editUnit(scope.row)" v-if="$store.state.rcSendStatus == 2"></i>
class="edit_icon"
@click="editUnit(scope.row)"
v-if="$store.state.rcSendStatus == 2"
></i>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -353,17 +246,10 @@ ...@@ -353,17 +246,10 @@
<!-- prop="orderInOrganization"--> <!-- prop="orderInOrganization"-->
<!-- width="50">--> <!-- width="50">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column <el-table-column label="筛选分区" prop="areaName" :filters="areaFilter" :filter-method="filterHandler">
label="筛选分区"
prop="areaName"
:filters="areaFilter"
:filter-method="filterHandler"
>
<template slot-scope="scope"> <template slot-scope="scope">
<div <div class="tag" :style="`--yf-border-color:${scope.row.areaColour};color:${scope.row.areaColour}`">{{
class="tag" scope.row.areaName }}</div>
:style="`--yf-border-color:${scope.row.areaColour};color:${scope.row.areaColour}`"
>{{ scope.row.areaName }}</div>
<!-- <el-select v-model="scope.row.areaName" @change="(e) => handleChange(e, scope.row) ">--> <!-- <el-select v-model="scope.row.areaName" @change="(e) => handleChange(e, scope.row) ">-->
<!-- <el-option--> <!-- <el-option-->
...@@ -394,14 +280,8 @@ ...@@ -394,14 +280,8 @@
</div> </div>
</div> </div>
<el-dialog <el-dialog title="提示" :visible.sync="rcSendFlag" class="saveCon" width="500px" append-to-body
title="提示" :before-close="handleClose">
:visible.sync="rcSendFlag"
class="saveCon"
width="500px"
append-to-body
:before-close="handleClose"
>
<div class="main"> <div class="main">
<div v-if="$store.state.rcSendStatus == 1">关闭同步将不再同步OA数据！</div> <div v-if="$store.state.rcSendStatus == 1">关闭同步将不再同步OA数据！</div>
<div v-else>开启同步将会清空之前手工调整，以OA数据为准！</div> <div v-else>开启同步将会清空之前手工调整，以OA数据为准！</div>
...@@ -413,60 +293,29 @@ ...@@ -413,60 +293,29 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog width="33%" :modal-append-to-body="false" :close-on-click-modal="false" @close="handleClose" title="批量分区"
width="33%" :visible.sync="areaDialog" :before-close="handleClose">
:modal-append-to-body="false"
:close-on-click-modal="false"
@close="handleClose"
title="批量分区"
:visible.sync="areaDialog"
:before-close="handleClose"
>
<el-select v-model="areaSelect" placeholder="请选择"> <el-select v-model="areaSelect" placeholder="请选择">
<el-option <el-option v-for="item in confData.confPersonAreaVos" :key="item.id" :label="item.areaName" :value="item.id"
v-for="item in confData.confPersonAreaVos" :disabled="item.disabled"></el-option>
:key="item.id"
:label="item.areaName"
:value="item.id"
:disabled="item.disabled"
></el-option>
</el-select> </el-select>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button plain @click="handleClose">取消</el-button> <el-button plain @click="handleClose">取消</el-button>
<el-button type="primary" @click="confirmArea()">确定</el-button> <el-button type="primary" @click="confirmArea()">确定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog width="33%" :modal-append-to-body="false" :close-on-click-modal="false" @close="handleUnitClose"
width="33%" title="修改单位" :visible.sync="unitDialog" :before-close="handleUnitClose">
:modal-append-to-body="false"
:close-on-click-modal="false"
@close="handleUnitClose"
title="修改单位"
:visible.sync="unitDialog"
:before-close="handleUnitClose"
>
<el-select v-model="unitSelect" placeholder="请选择"> <el-select v-model="unitSelect" placeholder="请选择">
<el-option <el-option v-for="item in unitList" :key="item.unitId" :label="item.unitName" :value="item.unitId"></el-option>
v-for="item in unitList"
:key="item.unitId"
:label="item.unitName"
:value="item.unitId"
></el-option>
</el-select> </el-select>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button plain @click="handleUnitClose">取消</el-button> <el-button plain @click="handleUnitClose">取消</el-button>
<el-button type="primary" @click="confirmUnit()">确定</el-button> <el-button type="primary" @click="confirmUnit()">确定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog width="33%" :modal-append-to-body="false" :close-on-click-modal="false" @close="handleManageClose"
width="33%" title="编辑分区" :visible.sync="manageDialog" :before-close="handleManageClose">
:modal-append-to-body="false"
:close-on-click-modal="false"
@close="handleManageClose"
title="编辑分区"
:visible.sync="manageDialog"
:before-close="handleManageClose"
>
<div class="area_dialog"> <div class="area_dialog">
<!-- <el-button class="new_add_area" size="medium" @click="newAddArea()">新增分区</el-button>--> <!-- <el-button class="new_add_area" size="medium" @click="newAddArea()">新增分区</el-button>-->
<!-- <div class="area_list">--> <!-- <div class="area_list">-->
...@@ -484,13 +333,8 @@ ...@@ -484,13 +333,8 @@
maxlength="30" maxlength="30"
show-word-limit show-word-limit
></el-input>--> ></el-input>-->
<el-autocomplete <el-autocomplete v-model="editData.areaName" :fetch-suggestions="querySearchAsync" placeholder="请输入内容"
v-model="editData.areaName" @focus="searchFocus" @select="handleSelect"></el-autocomplete>
:fetch-suggestions="querySearchAsync"
placeholder="请输入内容"
@focus="searchFocus"
@select="handleSelect"
></el-autocomplete>
</div> </div>
</div> </div>
</div> </div>
...@@ -500,59 +344,23 @@ ...@@ -500,59 +344,23 @@
<el-button type="primary" @click="confirmManage()">确定</el-button> <el-button type="primary" @click="confirmManage()">确定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<person-dialog <person-dialog :personFlag.sync="personFlag" :title="dialogTitle" :singlePerson.sync="singlePerson"
:personFlag.sync="personFlag" :allPersonFlag="allPersonFlag" :areaId="chosenArea.id" @init="init(activeIndex)" @changePerson="changePerson"
:title="dialogTitle" @addPerson="addPerson" @updateQingjia="updateQingjia"></person-dialog>
:singlePerson.sync="singlePerson" <batch-add-dialog :batchAddFlag.sync="batchAddFlag" :areaId="chosenArea.id" :allPersonFlag="allPersonFlag"
:allPersonFlag="allPersonFlag" :changeFlags="changeFlags" :personId="personId" :selectPerson="selectPerson" :returnSelect="returnSelect"
:areaId="chosenArea.id" @init="init" @addBatchPeople="addBatchPeople" @sureChange="sureChange"></batch-add-dialog>
@init="init(activeIndex)" <batch-import-dialog :areaId="chosenArea.id" :allPersonFlag="allPersonFlag" :dialogTitle="importDialogTitle"
@changePerson="changePerson" :batchAImportFlag.sync="batchAImportFlag" :fileType="fileType" @init="init"
@addPerson="addPerson" @bacthImport="bacthImport"></batch-import-dialog>
@updateQingjia="updateQingjia"
></person-dialog>
<batch-add-dialog
:batchAddFlag.sync="batchAddFlag"
:areaId="chosenArea.id"
:allPersonFlag="allPersonFlag"
:changeFlags="changeFlags"
:personId="personId"
:selectPerson="selectPerson"
:returnSelect="returnSelect"
@init="init"
@addBatchPeople="addBatchPeople"
@sureChange="sureChange"
></batch-add-dialog>
<batch-import-dialog
:areaId="chosenArea.id"
:allPersonFlag="allPersonFlag"
:dialogTitle="importDialogTitle"
:batchAImportFlag.sync="batchAImportFlag"
:fileType="fileType"
@init="init"
@bacthImport="bacthImport"
></batch-import-dialog>
<!-- 开启或关闭通知 --> <!-- 开启或关闭通知 -->
<el-dialog <el-dialog width="33%" :modal-append-to-body="false" :close-on-click-modal="false" @close="handleClose" title="提示"
width="33%" :visible.sync="openOrCloseNoticeVisible" :before-close="openOrCloseNoticeHandleClose">
:modal-append-to-body="false" <div v-if="noticeStatus == 2" style="height:36px;display:flex;flex-direction: column;align-items: center">
:close-on-click-modal="false"
@close="handleClose"
title="提示"
:visible.sync="openOrCloseNoticeVisible"
:before-close="openOrCloseNoticeHandleClose"
>
<div
v-if="noticeStatus==2"
style="height:36px;display:flex;flex-direction: column;align-items: center"
>
<div>开启“通知参会”功能？</div> <div>开启“通知参会”功能？</div>
<div>注：确认开启后，手工排座数据将清空，按浙政钉数据同步更新。</div> <div>注：确认开启后，手工排座数据将清空，按浙政钉数据同步更新。</div>
</div> </div>
<div <div v-if="noticeStatus == 1" style="height:36px;display:flex;flex-direction: column;align-items: center">
v-if="noticeStatus==1"
style="height:36px;display:flex;flex-direction: column;align-items: center"
>
<div>关闭“通知参会”功能？</div> <div>关闭“通知参会”功能？</div>
<div>注：确认关闭后，系统不再接收反馈更新参会人员。</div> <div>注：确认关闭后，系统不再接收反馈更新参会人员。</div>
</div> </div>
...@@ -726,7 +534,7 @@ export default { ...@@ -726,7 +534,7 @@ export default {
.then((res) => { .then((res) => {
next(true) next(true)
}) })
.catch((err) => {}) .catch((err) => { })
} else { } else {
next(true) next(true)
} }
...@@ -1143,7 +951,7 @@ export default { ...@@ -1143,7 +951,7 @@ export default {
sessionStorage.setItem('userNDirection1', 2) sessionStorage.setItem('userNDirection1', 2)
} }
}) })
.catch((err) => {}) .catch((err) => { })
// } // }
}, },
opTree() { opTree() {
...@@ -1239,7 +1047,7 @@ export default { ...@@ -1239,7 +1047,7 @@ export default {
}) })
} }
}) })
.catch((error) => {}) .catch((error) => { })
}, },
confirmArea() { confirmArea() {
this.loadingOptions.text = '保存中，请稍候...' this.loadingOptions.text = '保存中，请稍候...'
...@@ -1303,7 +1111,7 @@ export default { ...@@ -1303,7 +1111,7 @@ export default {
loading.close() loading.close()
}) })
}) })
.catch((err) => {}) .catch((err) => { })
}) })
.catch(() => { .catch(() => {
this.$message({ this.$message({
...@@ -1351,7 +1159,7 @@ export default { ...@@ -1351,7 +1159,7 @@ export default {
loading.close() loading.close()
}) })
}) })
.catch((err) => {}) .catch((err) => { })
}, },
computedArea(num) { computedArea(num) {
let area = this.confData.confPersonAreaVos.filter((item, index) => item.areaName === `区域${num}`) let area = this.confData.confPersonAreaVos.filter((item, index) => item.areaName === `区域${num}`)
...@@ -1403,7 +1211,7 @@ export default { ...@@ -1403,7 +1211,7 @@ export default {
loading.close() loading.close()
}) })
}) })
.catch((err) => {}) .catch((err) => { })
}, },
handleClose() { handleClose() {
this.areaDialog = false this.areaDialog = false
...@@ -1674,7 +1482,7 @@ export default { ...@@ -1674,7 +1482,7 @@ export default {
// this.init(); // this.init();
// } // }
}) })
.catch((err) => {}) .catch((err) => { })
this.unitDialog = true this.unitDialog = true
}, },
batchDivide() { batchDivide() {
...@@ -1715,7 +1523,7 @@ export default { ...@@ -1715,7 +1523,7 @@ export default {
this.checkList = [] this.checkList = []
} }
}) })
.catch((err) => {}) .catch((err) => { })
}) })
.catch(() => { .catch(() => {
this.$message({ this.$message({
...@@ -1754,7 +1562,7 @@ export default { ...@@ -1754,7 +1562,7 @@ export default {
this.init(this.activeIndex) this.init(this.activeIndex)
} }
}) })
.catch((err) => {}) .catch((err) => { })
}) })
.catch(() => { .catch(() => {
this.$message({ this.$message({
...@@ -1825,7 +1633,7 @@ export default { ...@@ -1825,7 +1633,7 @@ export default {
this.loadingOptions.text = '保存中，请稍候...' this.loadingOptions.text = '保存中，请稍候...'
let loading = Loading.service(this.loadingOptions) let loading = Loading.service(this.loadingOptions)
let data = this.confData let data = this.confData
;(data.isProcess = this.$route.query.isProcess), console.log(data) ; (data.isProcess = this.$route.query.isProcess), console.log(data)
this.$axios this.$axios
.postSaveAreaSort(data) .postSaveAreaSort(data)
.then((res) => { .then((res) => {
...@@ -1843,7 +1651,7 @@ export default { ...@@ -1843,7 +1651,7 @@ export default {
reject() reject()
} }
}) })
.catch((err) => {}) .catch((err) => { })
}) })
}, //保存并离开 }, //保存并离开
saveArea() { saveArea() {
...@@ -1854,7 +1662,7 @@ export default { ...@@ -1854,7 +1662,7 @@ export default {
this.loadingOptions.text = '保存中，请稍候...' this.loadingOptions.text = '保存中，请稍候...'
let loading = Loading.service(this.loadingOptions) let loading = Loading.service(this.loadingOptions)
let data = this.confData let data = this.confData
;(data.isProcess = this.$route.query.isProcess), console.log(data) ; (data.isProcess = this.$route.query.isProcess), console.log(data)
this.$axios this.$axios
.postSaveAreaSort(data) .postSaveAreaSort(data)
.then((res) => { .then((res) => {
...@@ -1874,7 +1682,7 @@ export default { ...@@ -1874,7 +1682,7 @@ export default {
loading.close() loading.close()
} }
}) })
.catch((err) => {}) .catch((err) => { })
}, //保存分区与排序 }, //保存分区与排序
deepClone(target) { deepClone(target) {
// 定义一个变量 // 定义一个变量
...@@ -1916,38 +1724,47 @@ export default { ...@@ -1916,38 +1724,47 @@ export default {
from { from {
width: calc(100% - 300px - 20px); width: calc(100% - 300px - 20px);
} }
to { to {
width: 100%; width: 100%;
} }
} }
@keyframes TableShrink { @keyframes TableShrink {
from { from {
width: 100%; width: 100%;
} }
to { to {
width: calc(100% - 300px - 20px); width: calc(100% - 300px - 20px);
} }
} }
@keyframes TreeExpend { @keyframes TreeExpend {
from { from {
width: 0; width: 0;
} }
to { to {
width: 300px; width: 300px;
} }
} }
@keyframes TreeShrink { @keyframes TreeShrink {
from { from {
width: 300px; width: 300px;
} }
to { to {
width: 0; width: 0;
} }
} }
.main_wrap { .main_wrap {
height: 100%; height: 100%;
padding: 24px; padding: 24px;
position: relative; position: relative;
.new_help { .new_help {
cursor: pointer; cursor: pointer;
width: 34px; width: 34px;
...@@ -1959,6 +1776,7 @@ export default { ...@@ -1959,6 +1776,7 @@ export default {
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
.direction { .direction {
position: fixed; position: fixed;
top: 0; top: 0;
...@@ -1966,6 +1784,7 @@ export default { ...@@ -1966,6 +1784,7 @@ export default {
z-index: 10000; z-index: 10000;
width: 1920px; width: 1920px;
height: 100vh; height: 100vh;
.but { .but {
position: absolute; position: absolute;
width: 179px; width: 179px;
...@@ -1976,56 +1795,69 @@ export default { ...@@ -1976,56 +1795,69 @@ export default {
bottom: 81px; bottom: 81px;
} }
} }
.direction1 { .direction1 {
background-image: url('../../../../assets/img/renyuanyingdao.png'); background-image: url('../../../../assets/img/renyuanyingdao.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
.but1 { .but1 {
display: block; display: block;
// background-color: red; // background-color: red;
left: 870px; left: 870px;
} }
.but2 { .but2 {
display: block; display: block;
left: 1001px; left: 1001px;
} }
.but3 { .but3 {
display: none; display: none;
} }
} }
.direction2 { .direction2 {
background-image: url('../../../../assets/img/dir2.png'); background-image: url('../../../../assets/img/dir2.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
.but1 { .but1 {
display: block; display: block;
left: 681px; left: 681px;
} }
.but3 { .but3 {
display: block; display: block;
left: 921px; left: 921px;
} }
.but2 { .but2 {
display: block; display: block;
left: 1161px; left: 1161px;
} }
} }
.direction3 { .direction3 {
background-image: url('../../../../assets/img/dir3.png'); background-image: url('../../../../assets/img/dir3.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
.but1 { .but1 {
display: block; display: block;
left: 1001px; left: 1001px;
} }
.but3 { .but3 {
display: block; display: block;
left: 741px; left: 741px;
} }
.but2 { .but2 {
display: none; display: none;
} }
} }
.body_content_wrap { .body_content_wrap {
height: calc(100% - 18px); height: calc(100% - 18px);
margin-top: 18px; margin-top: 18px;
...@@ -2045,11 +1877,13 @@ export default { ...@@ -2045,11 +1877,13 @@ export default {
line-height: 50px; line-height: 50px;
border-top: 1px solid #e9eef3; border-top: 1px solid #e9eef3;
border-bottom: 1px solid #e9eef3; border-bottom: 1px solid #e9eef3;
.notice { .notice {
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
display: flex; display: flex;
align-items: center; align-items: center;
div { div {
width: 110px; width: 110px;
height: 36px; height: 36px;
...@@ -2058,12 +1892,14 @@ export default { ...@@ -2058,12 +1892,14 @@ export default {
background: #ffffff; background: #ffffff;
cursor: pointer; cursor: pointer;
} }
.active { .active {
color: #fff; color: #fff;
background-color: rgba(84, 116, 232, 0.9); background-color: rgba(84, 116, 232, 0.9);
} }
} }
} }
.data_right { .data_right {
border: 1px solid #e9eef3; border: 1px solid #e9eef3;
height: 50px; height: 50px;
...@@ -2072,9 +1908,11 @@ export default { ...@@ -2072,9 +1908,11 @@ export default {
padding-left: 27px; padding-left: 27px;
color: #778ca2; color: #778ca2;
position: relative; position: relative;
span { span {
margin-right: 20px; margin-right: 20px;
} }
.data_detail { .data_detail {
position: absolute; position: absolute;
right: 10px; right: 10px;
...@@ -2082,17 +1920,22 @@ export default { ...@@ -2082,17 +1920,22 @@ export default {
font-size: 14px; font-size: 14px;
} }
} }
.data_right_normal { .data_right_normal {
background: #f5f6f6; background: #f5f6f6;
.exceed_tag { .exceed_tag {
display: none; display: none;
} }
} }
.data_right_exceed { .data_right_exceed {
background: rgba(245, 100, 102, 0.08); background: rgba(245, 100, 102, 0.08);
/deep/.el-input-number .el-input__inner { /deep/.el-input-number .el-input__inner {
color: #f56466; color: #f56466;
} }
.exceed_tag { .exceed_tag {
display: inline; display: inline;
padding: 2px 8px; padding: 2px 8px;
...@@ -2104,12 +1947,15 @@ export default { ...@@ -2104,12 +1947,15 @@ export default {
margin-right: 20px; margin-right: 20px;
} }
} }
.area_person_display { .area_person_display {
height: 100%; height: 100%;
display: flex; display: flex;
.area_display_wrap { .area_display_wrap {
height: 100%; height: 100%;
} }
.area_display { .area_display {
position: relative; position: relative;
z-index: 9; z-index: 9;
...@@ -2118,6 +1964,7 @@ export default { ...@@ -2118,6 +1964,7 @@ export default {
padding: 20px 20px 0 20px; padding: 20px 20px 0 20px;
border-left: 1px solid #e9eef3; border-left: 1px solid #e9eef3;
border-right: 1px solid #e9eef3; border-right: 1px solid #e9eef3;
.all_person { .all_person {
width: 210px; width: 210px;
height: 60px; height: 60px;
...@@ -2126,14 +1973,17 @@ export default { ...@@ -2126,14 +1973,17 @@ export default {
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
} }
.all_person.no_area { .all_person.no_area {
background-color: #62757e; background-color: #62757e;
color: #fff; color: #fff;
} }
.all_person.activeNoArea { .all_person.activeNoArea {
background: #247aef; background: #247aef;
color: #fff; color: #fff;
} }
.selection_right_but_wrap { .selection_right_but_wrap {
height: calc(100% - 80px - 35px); height: calc(100% - 80px - 35px);
overflow-y: auto; overflow-y: auto;
...@@ -2144,12 +1994,14 @@ export default { ...@@ -2144,12 +1994,14 @@ export default {
align-items: center; align-items: center;
padding: 20px 0; padding: 20px 0;
} }
.area_manage_wrap { .area_manage_wrap {
width: 100%; width: 100%;
height: 120px; height: 120px;
background: rgba(226, 226, 226, 0.24); background: rgba(226, 226, 226, 0.24);
padding-top: 10px; padding-top: 10px;
} }
.area_manage { .area_manage {
cursor: pointer; cursor: pointer;
width: 164px; width: 164px;
...@@ -2163,9 +2015,11 @@ export default { ...@@ -2163,9 +2015,11 @@ export default {
border: 2px #d1d6e6 dashed; border: 2px #d1d6e6 dashed;
border-radius: 2px; border-radius: 2px;
} }
.area.activeArea { .area.activeArea {
color: white; color: white;
} }
.area { .area {
cursor: pointer; cursor: pointer;
width: 172px; width: 172px;
...@@ -2193,12 +2047,14 @@ export default { ...@@ -2193,12 +2047,14 @@ export default {
box-shadow: 0px 2px 6px 0px rgba(196, 55, 57, 0.35); box-shadow: 0px 2px 6px 0px rgba(196, 55, 57, 0.35);
border-radius: 50%; border-radius: 50%;
} }
.outnumber { .outnumber {
background-color: #fff; background-color: #fff;
padding: 2px 6px; padding: 2px 6px;
border-radius: 2px; border-radius: 2px;
color: #f56466; color: #f56466;
} }
//.outnumber { //.outnumber {
// position: absolute; // position: absolute;
// left: 120px; // left: 120px;
...@@ -2219,6 +2075,7 @@ export default { ...@@ -2219,6 +2075,7 @@ export default {
text-align: center; text-align: center;
} }
} }
.area:hover { .area:hover {
.close { .close {
position: absolute; position: absolute;
...@@ -2230,6 +2087,7 @@ export default { ...@@ -2230,6 +2087,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.edit { .edit {
position: absolute; position: absolute;
top: 8px; top: 8px;
...@@ -2240,25 +2098,30 @@ export default { ...@@ -2240,25 +2098,30 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.close:hover { .close:hover {
background-image: url('../../../../assets/meetingPalce/paiwei/delred.png'); background-image: url('../../../../assets/meetingPalce/paiwei/delred.png');
} }
} }
.area.activeArea:hover { .area.activeArea:hover {
.close { .close {
background-image: url('../../../../assets/meetingPalce/paiwei/delFFF.png'); background-image: url('../../../../assets/meetingPalce/paiwei/delFFF.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.edit { .edit {
background-image: url('../../../../assets/img/edit_img_b.png'); background-image: url('../../../../assets/img/edit_img_b.png');
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.close:hover { .close:hover {
background-image: url('../../../../assets/meetingPalce/paiwei/delred.png'); background-image: url('../../../../assets/meetingPalce/paiwei/delred.png');
} }
} }
.normalArea:hover { .normalArea:hover {
background: #fff !important; background: #fff !important;
border: 1px solid #f28a68; border: 1px solid #f28a68;
...@@ -2267,6 +2130,7 @@ export default { ...@@ -2267,6 +2130,7 @@ export default {
/*border-radius: 2px;*/ /*border-radius: 2px;*/
} }
} }
.person_display_wrap { .person_display_wrap {
width: calc(100% - 250px); width: calc(100% - 250px);
height: 100%; height: 100%;
...@@ -2280,30 +2144,38 @@ export default { ...@@ -2280,30 +2144,38 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: 20px; padding: 20px;
div { div {
display: flex; display: flex;
align-items: center; align-items: center;
width: 500px; width: 500px;
.el-button { .el-button {
margin-left: 10px; margin-left: 10px;
} }
} }
.select_text { .select_text {
width: 80px; width: 80px;
margin-left: 15px; margin-left: 15px;
} }
.el-select { .el-select {
width: 200px; width: 200px;
} }
.select_input { .select_input {
width: 300px; width: 300px;
} }
.all_choose_box { .all_choose_box {
line-height: 77px; line-height: 77px;
/deep/.el-checkbox { /deep/.el-checkbox {
margin-left: 20px; margin-left: 20px;
} }
} }
.el-button { .el-button {
box-shadow: none !important; box-shadow: none !important;
...@@ -2311,24 +2183,30 @@ export default { ...@@ -2311,24 +2183,30 @@ export default {
color: #fff !important; color: #fff !important;
} }
} }
.all_person_display { .all_person_display {
width: 100%; width: 100%;
height: calc(100% - 40px - 85px); height: calc(100% - 40px - 85px);
display: flex; display: flex;
.no_tree { .no_tree {
animation: TreeShrink 0.2s linear; animation: TreeShrink 0.2s linear;
width: 0; width: 0;
.el-tree { .el-tree {
display: none; display: none;
} }
} }
.tree { .tree {
width: 300px; width: 300px;
animation: TreeExpend 0.2s linear; animation: TreeExpend 0.2s linear;
.el-tree { .el-tree {
display: block; display: block;
} }
} }
.tree_wrap { .tree_wrap {
position: relative; position: relative;
height: 100%; height: 100%;
...@@ -2336,6 +2214,7 @@ export default { ...@@ -2336,6 +2214,7 @@ export default {
background: #f5f6f6; background: #f5f6f6;
padding: 10px 0; padding: 10px 0;
z-index: 1000; z-index: 1000;
.arrow { .arrow {
cursor: pointer; cursor: pointer;
top: 20px; top: 20px;
...@@ -2345,56 +2224,69 @@ export default { ...@@ -2345,56 +2224,69 @@ export default {
height: 44px; height: 44px;
z-index: 9; z-index: 9;
} }
.arrow_l { .arrow_l {
background-image: url('../../../../assets/img/left.png'); background-image: url('../../../../assets/img/left.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
.arrow_r { .arrow_r {
background-image: url('../../../../assets/img/right.png'); background-image: url('../../../../assets/img/right.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
} }
/deep/ .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
/deep/ .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
background-color: #e5e5e5 !important; background-color: #e5e5e5 !important;
font-weight: bold; // 字体加粗 font-weight: bold; // 字体加粗
} }
.el-tree { .el-tree {
overflow-y: auto; overflow-y: auto;
overflow-x: auto; overflow-x: auto;
background: #f5f6f6; background: #f5f6f6;
padding-right: 10px; padding-right: 10px;
/deep/ .el-tree-node__content:hover, /deep/ .el-tree-node__content:hover,
/deep/ .el-upload-list__item:hover { /deep/ .el-upload-list__item:hover {
background-color: #e5e5e5; background-color: #e5e5e5;
} }
} }
.el-tree { .el-tree {
height: 100%; height: 100%;
} }
} }
to { to {
height: 10px; height: 10px;
} }
.list_w { .list_w {
animation: TableExpend 0.2s linear; animation: TableExpend 0.2s linear;
width: 100%; width: 100%;
} }
.list_n { .list_n {
animation: TableShrink 0.2s linear; animation: TableShrink 0.2s linear;
// width: calc(100% - 300px - 20px); // width: calc(100% - 300px - 20px);
width: calc(100% - 20px); width: calc(100% - 20px);
} }
.list_wrap { .list_wrap {
height: 100%; height: 100%;
margin-left: 20px; margin-left: 20px;
.el-table { .el-table {
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
i { i {
margin-left: 10px; margin-left: 10px;
cursor: pointer; cursor: pointer;
} }
.tag { .tag {
border: 1px solid; border: 1px solid;
padding: 0 10px; padding: 0 10px;
...@@ -2405,6 +2297,7 @@ export default { ...@@ -2405,6 +2297,7 @@ export default {
text-align: center; text-align: center;
margin-right: 26px; margin-right: 26px;
} }
/deep/.el-checkbox { /deep/.el-checkbox {
.is-indeterminate { .is-indeterminate {
.el-checkbox__inner { .el-checkbox__inner {
...@@ -2412,6 +2305,7 @@ export default { ...@@ -2412,6 +2305,7 @@ export default {
} }
} }
} }
/deep/.cell { /deep/.cell {
.is-checked { .is-checked {
.el-checkbox__inner { .el-checkbox__inner {
...@@ -2420,24 +2314,29 @@ export default { ...@@ -2420,24 +2314,29 @@ export default {
} }
} }
} }
.el-pagination { .el-pagination {
height: 50px; height: 50px;
} }
.edit_but { .edit_but {
color: #409eff; color: #409eff;
cursor: pointer; cursor: pointer;
} }
} }
} }
.person_display { .person_display {
// border: 1px solid red; // border: 1px solid red;
position: relative; position: relative;
.zhezhao { .zhezhao {
position: absolute; position: absolute;
width: 95%; width: 95%;
height: 100%; height: 100%;
z-index: 9999; z-index: 9999;
} }
.drag_wrap { .drag_wrap {
width: 100%; width: 100%;
max-height: 100%; max-height: 100%;
...@@ -2447,14 +2346,17 @@ export default { ...@@ -2447,14 +2346,17 @@ export default {
align-content: flex-start; align-content: flex-start;
overflow-y: auto; overflow-y: auto;
} }
max-height: calc(100% - 40px - 77px); max-height: calc(100% - 40px - 77px);
overflow-y: auto; overflow-y: auto;
width: calc(100% + 20px); width: calc(100% + 20px);
padding-left: 8px; padding-left: 8px;
margin-top: 12px; margin-top: 12px;
.person.active { .person.active {
border: 1px solid #5474e8; border: 1px solid #5474e8;
} }
.person { .person {
position: relative; position: relative;
width: 240px; width: 240px;
...@@ -2467,22 +2369,26 @@ export default { ...@@ -2467,22 +2369,26 @@ export default {
padding: 18px 12px 18px 24px; padding: 18px 12px 18px 24px;
display: flex; display: flex;
cursor: pointer; cursor: pointer;
.el-checkbox { .el-checkbox {
position: absolute; position: absolute;
top: 0px; top: 0px;
left: 6px; left: 6px;
/deep/.is-checked { /deep/.is-checked {
.el-checkbox__inner { .el-checkbox__inner {
background-color: #7690ed; background-color: #7690ed;
} }
} }
} }
/deep/ .el-checkbox__inner { /deep/ .el-checkbox__inner {
// border: 1px solid rgba(190, 192, 197, 0.8); // border: 1px solid rgba(190, 192, 197, 0.8);
width: 14px; width: 14px;
height: 14px; height: 14px;
// background-color: #7690ed; // background-color: #7690ed;
} }
/deep/ .el-checkbox__label { /deep/ .el-checkbox__label {
display: none; display: none;
} }
...@@ -2513,6 +2419,7 @@ export default { ...@@ -2513,6 +2419,7 @@ export default {
top: 0; top: 0;
right: 0; right: 0;
} }
.leave_tag { .leave_tag {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
...@@ -2525,12 +2432,14 @@ export default { ...@@ -2525,12 +2432,14 @@ export default {
top: 0; top: 0;
right: 6px; right: 6px;
} }
.portrait_number { .portrait_number {
width: 44px; width: 44px;
height: 44px; height: 44px;
background-color: #778ca2; background-color: #778ca2;
opacity: 0.24; opacity: 0.24;
border-radius: 8px; border-radius: 8px;
.sort_number { .sort_number {
width: 40px; width: 40px;
line-height: 44px; line-height: 44px;
...@@ -2541,6 +2450,7 @@ export default { ...@@ -2541,6 +2450,7 @@ export default {
color: #ffffff; color: #ffffff;
} }
} }
.portrait { .portrait {
width: 44px; width: 44px;
height: 44px; height: 44px;
...@@ -2548,11 +2458,13 @@ export default { ...@@ -2548,11 +2458,13 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.text_wrap { .text_wrap {
width: 178px; width: 178px;
height: 44px; height: 44px;
display: inline; display: inline;
padding-left: 14px; padding-left: 14px;
.name { .name {
font-size: 16px; font-size: 16px;
color: #3a3c4b; color: #3a3c4b;
...@@ -2560,11 +2472,13 @@ export default { ...@@ -2560,11 +2472,13 @@ export default {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.position, .position,
.require { .require {
font-size: 12px; font-size: 12px;
color: #778ca2; color: #778ca2;
} }
.position { .position {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -2577,6 +2491,7 @@ export default { ...@@ -2577,6 +2491,7 @@ export default {
} }
} }
} }
.color_icon { .color_icon {
width: 100%; width: 100%;
// border-color: transparent transparent #222 transparent; // border-color: transparent transparent #222 transparent;
...@@ -2588,6 +2503,7 @@ export default { ...@@ -2588,6 +2503,7 @@ export default {
height: 8px; height: 8px;
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
} }
//.color_icon_1 { //.color_icon_1 {
// background: url("../../../../assets/img/colorList/color_i (1).png"); // background: url("../../../../assets/img/colorList/color_i (1).png");
//} //}
...@@ -2666,6 +2582,7 @@ export default { ...@@ -2666,6 +2582,7 @@ export default {
.areaDraged { .areaDraged {
border: 1px solid #5474e8; border: 1px solid #5474e8;
} }
.not_allowed_but { .not_allowed_but {
background: rgba(194, 198, 202, 0.8) !important; background: rgba(194, 198, 202, 0.8) !important;
border: none !important; border: none !important;
...@@ -2673,17 +2590,20 @@ export default { ...@@ -2673,17 +2590,20 @@ export default {
cursor: not-allowed; cursor: not-allowed;
color: #fff !important; color: #fff !important;
} }
.cancles {
} .cancles {}
.area_dialog { .area_dialog {
width: 90%; width: 90%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.new_add_area { .new_add_area {
align-self: flex-start; align-self: flex-start;
margin-left: 20px; margin-left: 20px;
} }
.area_list { .area_list {
width: 100%; width: 100%;
max-height: 500px; max-height: 500px;
...@@ -2691,16 +2611,20 @@ export default { ...@@ -2691,16 +2611,20 @@ export default {
margin-top: 20px; margin-top: 20px;
display: flex; display: flex;
justify-content: center; justify-content: center;
.item { .item {
display: flex; display: flex;
line-height: 40px; line-height: 40px;
margin: 20px 0; margin: 20px 0;
.label { .label {
min-width: 68px; min-width: 68px;
} }
i { i {
cursor: pointer; cursor: pointer;
} }
.el-input { .el-input {
width: 300px; width: 300px;
margin: 0 10px; margin: 0 10px;
...@@ -2708,30 +2632,37 @@ export default { ...@@ -2708,30 +2632,37 @@ export default {
} }
} }
} }
.leaveTag { .leaveTag {
margin-left: 10px; margin-left: 10px;
color: #faa023; color: #faa023;
} }
.weifankuiTag { .weifankuiTag {
margin-left: 10px; margin-left: 10px;
color: #c20003; color: #c20003;
} }
.yifankuiTag { .yifankuiTag {
margin-left: 10px; margin-left: 10px;
color: #5474e8; color: #5474e8;
} }
.el-icon-close { .el-icon-close {
line-height: 40px; line-height: 40px;
} }
.dialog /deep/ .el-dialog__body { .dialog /deep/ .el-dialog__body {
flex-direction: column !important; flex-direction: column !important;
} }
.el-dialog__wrapper { .el-dialog__wrapper {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
display: flex; display: flex;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
/deep/ .el-dialog { /deep/ .el-dialog {
margin-top: 0 !important; margin-top: 0 !important;
} }
...@@ -2741,9 +2672,11 @@ export default { ...@@ -2741,9 +2672,11 @@ export default {
.el-message-box__content { .el-message-box__content {
padding: 0 60px !important; padding: 0 60px !important;
} }
.el-message-box__message { .el-message-box__message {
/*width: 60%;*/ /*width: 60%;*/
} }
.el-message-box__status { .el-message-box__status {
font-size: 30px !important; font-size: 30px !important;
} }
......
src/views/meeting/operation/noticeMeeting/addNoticeUnitDialog.vue
浏览文件 @ d56b605b
<template> <template>
<div> <div>
<el-dialog <el-dialog title="增加通知单位" :visible.sync="visible" :before-close="dialogTableHandleClose" append-to-body
title="增加通知单位" class="table_dialog" width="1100px">
:visible.sync="visible "
:before-close="dialogTableHandleClose"
append-to-body
class="table_dialog"
width="1100px"
>
<div class="body"> <div class="body">
<div class="top"> <div class="top">
<el-form ref="form" :model="form" label-width="110px" :inline="true"> <el-form ref="form" :model="form" label-width="110px" :inline="true">
<el-form-item label="选择参会单位："> <el-form-item label="选择参会单位：">
<el-select <el-select v-model="form.unitId" placeholder="模糊输入（权限单位）" filterable @change="unitNameChange()">
v-model="form.unitId" <el-option v-for="item in options" :key="item.unitId" :label="item.unitName"
placeholder="模糊输入（权限单位）" :value="item.unitId"></el-option>
filterable
@change="unitNameChange()"
>
<el-option
v-for="item in options"
:key="item.unitId"
:label="item.unitName"
:value="item.unitId"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -33,7 +18,7 @@ ...@@ -33,7 +18,7 @@
</div> </div>
<div class="table_wai"> <div class="table_wai">
<div class="tips"> <div class="tips">
<div>已选单位：{{tableData.length}}家</div> <div>已选单位：{{ tableData.length }}家</div>
<!-- <div>批量删除</div> --> <!-- <div>批量删除</div> -->
</div> </div>
<el-table :data="tableData" height="100%" stripe> <el-table :data="tableData" height="100%" stripe>
...@@ -54,15 +39,10 @@ ...@@ -54,15 +39,10 @@
<el-button @click="dialogTableHandleClose()">取消</el-button> <el-button @click="dialogTableHandleClose()">取消</el-button>
<el-button @click="submitTable()">确认</el-button> <el-button @click="submitTable()">确认</el-button>
</div> </div>
<el-dialog <el-dialog width="30%" title="提示" :visible.sync="confirmDelVisible" :before-close="confirmDelHandleClose"
width="30%" append-to-body>
title="提示"
:visible.sync="confirmDelVisible"
:before-close="confirmDelHandleClose"
append-to-body
>
<div style="display:flex;flex-direction: column;align-items: center;}"> <div style="display:flex;flex-direction: column;align-items: center;}">
<div>参会单位：{{currentDelObj.unitName}}</div> <div>参会单位：{{ currentDelObj.unitName }}</div>
<div>确认删除？</div> <div>确认删除？</div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -74,7 +54,7 @@ ...@@ -74,7 +54,7 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
addNoticeUnitVisible: { addNoticeUnitVisible: {
...@@ -102,21 +82,26 @@ export default { ...@@ -102,21 +82,26 @@ export default {
//提交选好的单位 //提交选好的单位
submitTable() { submitTable() {
console.log(this.chosenArea) console.log(this.chosenArea)
let params = { if (this.tableData.length !== 0) {
processId: this.$route.query.processId, let params = {
sysUnitAuthPersonShowVoList: [...this.tableData], processId: this.$route.query.processId,
areaId: this.chosenArea.id, sysUnitAuthPersonShowVoList: [...this.tableData],
} // console.log(this.$route.query.processId) areaId: this.chosenArea.id,
this.$axios.addNoticeUnit(params).then((res) => { } // console.log(this.$route.query.processId)
console.log(res) this.$axios.addNoticeUnit(params).then((res) => {
if (res.data.code == 200) { console.log(res)
this.$message.success('新增成功') if (res.data.code == 200) {
this.$emit('getInit') this.$message.success('新增成功')
this.dialogTableHandleClose() this.$emit('getInit')
} else { this.dialogTableHandleClose()
this.$message.error(`${res.data.data}`) } else {
} this.$message.error(`${res.data.data}`)
}) }
})
} else {
this.$message.warning('请增加通知单位后再确认')
}
}, },
dialogTableHandleClose() { dialogTableHandleClose() {
...@@ -204,6 +189,7 @@ export default { ...@@ -204,6 +189,7 @@ export default {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.top { .top {
// width: 100%; // width: 100%;
...@@ -213,8 +199,10 @@ export default { ...@@ -213,8 +199,10 @@ export default {
justify-content: space-between; justify-content: space-between;
} }
} }
.table_wai { .table_wai {
height: 400px; height: 400px;
.tips { .tips {
height: 38px; height: 38px;
line-height: 38px; line-height: 38px;
......
src/views/meeting/operation/noticeMeeting/lableTable.vue
浏览文件 @ d56b605b
<template> <template>
<div> <div>
<el-dialog <el-dialog title="增加通知单位" :visible.sync="visible" :before-close="lableTableHandleClose" append-to-body
title="增加通知单位" class="table_dialog" width="1000px">
:visible.sync="visible "
:before-close="lableTableHandleClose"
append-to-body
class="table_dialog"
width="900px"
>
<div class="body"> <div class="body">
<div class="left"> <div class="left">
<div class="tips">标签：{{AllLabelObj.customOrgNum}}个</div> <div class="tips">标签：{{ AllLabelObj.customOrgNum }}个</div>
<div class="label_list"> <div class="label_list">
<div <div v-for="(item, index) in AllLabelObj.noticeCustomOrgVoList" :key="index"
v-for="(item,index) in AllLabelObj.noticeCustomOrgVoList" :class="active == index ? 'active' : ''" @click="checkLabel(item, index)"><span class="name">{{
:key="index" item.customOrgName }}</span> /{{ item.unitNum }}家</div>
:class="active==index?'active':''"
@click="checkLabel(item,index)"
>{{ item.customOrgName}}/{{item.unitNum}}家</div>
</div> </div>
</div> </div>
<div class="table_wai"> <div class="table_wai">
<div class="tips"> <div class="tips">
<div>已选单位：{{selectArr.length}}家</div> <div>已选单位：{{ selectArr.length }}家</div>
<!-- <div>批量删除</div> --> <!-- <div>批量删除</div> -->
</div> </div>
<el-table <el-table ref="tableDom" :data="tableData" height="100%" stripe @selection-change="handleSelectionChange"
:data="tableData" @row-click="toggleSelection">
height="100%"
stripe
@selection-change="handleSelectionChange"
>
<!-- :row-key="getRowKeys" --> <!-- :row-key="getRowKeys" -->
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column property="unitName" label="参会单位"></el-table-column> <el-table-column property="unitName" label="参会单位"></el-table-column>
...@@ -51,13 +38,8 @@ ...@@ -51,13 +38,8 @@
<el-button @click="qvxiaoHandleClose()">取消</el-button> <el-button @click="qvxiaoHandleClose()">取消</el-button>
<el-button @click="submitTable()">确认</el-button> <el-button @click="submitTable()">确认</el-button>
</div> </div>
<el-dialog <el-dialog width="30%" title="提示" :visible.sync="confirmDelVisible" :before-close="confirmDelHandleClose"
width="30%" append-to-body>
title="提示"
:visible.sync="confirmDelVisible"
:before-close="confirmDelHandleClose"
append-to-body
>
<div style="display:flex;flex-direction: column;align-items: center;}"> <div style="display:flex;flex-direction: column;align-items: center;}">
<!-- <div>参会单位：{{currentDelObj.unitName}}</div> --> <!-- <div>参会单位：{{currentDelObj.unitName}}</div> -->
<div>确认删除？</div> <div>确认删除？</div>
...@@ -71,7 +53,7 @@ ...@@ -71,7 +53,7 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
labelTableVisible: { labelTableVisible: {
...@@ -113,13 +95,27 @@ export default { ...@@ -113,13 +95,27 @@ export default {
// } // }
// }, // },
handleSelectionChange(val) { handleSelectionChange(val) {
// console.log(val) console.log(val)
this.selectArr = val // if() this.selectArr = val // if()
// console.log(this.currentLabelObj) // console.log(this.currentLabelObj)
// this.$set(this.selectArrObj, `${this.currentLabelObj.customOrgId}`, val) // this.$set(this.selectArrObj, `${this.currentLabelObj.customOrgId}`, val)
// console.log(this.selectArrObj) // console.log(this.selectArrObj)
// console.log(this.currentLabelObj) // 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) { getUnit(data) {
this.$axios.findUnitByCustomOrgId(data).then((res) => { this.$axios.findUnitByCustomOrgId(data).then((res) => {
...@@ -195,7 +191,7 @@ export default { ...@@ -195,7 +191,7 @@ export default {
console.log(item) console.log(item)
}, },
//选择标签 //选择标签
selectTable() {}, selectTable() { },
//模糊搜索 //模糊搜索
findSysUnitAuthPerson(data) { findSysUnitAuthPerson(data) {
// console.log(data) // console.log(data)
...@@ -235,8 +231,10 @@ export default { ...@@ -235,8 +231,10 @@ export default {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
.left { .left {
width: 200px; width: 200px;
.tips { .tips {
width: 100%; width: 100%;
height: 40px; height: 40px;
...@@ -246,6 +244,7 @@ export default { ...@@ -246,6 +244,7 @@ export default {
color: black; color: black;
} }
.label_list { .label_list {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -255,6 +254,9 @@ export default { ...@@ -255,6 +254,9 @@ export default {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
overflow: hidden; overflow: hidden;
div { div {
width: 150px; width: 150px;
height: 60px; height: 60px;
...@@ -264,17 +266,31 @@ export default { ...@@ -264,17 +266,31 @@ export default {
margin-top: 20px; margin-top: 20px;
border-radius: 8px; border-radius: 8px;
cursor: pointer; cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
} }
.active { .active {
background: #5474e8; background: #5474e8;
color: #fff; color: #fff;
} }
.name {
display: inline-block;
max-width: 100px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
} }
} }
.table_wai { .table_wai {
width: calc(100% - 195px); width: calc(100% - 195px);
height: 600px; height: 600px;
margin-left: 5px; margin-left: 5px;
.tips { .tips {
height: 38px; height: 38px;
line-height: 38px; line-height: 38px;
......
src/views/meeting/operation/operation.vue
浏览文件 @ d56b605b
...@@ -108,11 +108,11 @@ ...@@ -108,11 +108,11 @@
<!-- 人员排座--> <!-- 人员排座-->
<!-- </div>--> <!-- </div>-->
<div :class="[ <div :class="[
{ activeBut: $route.path === item.path }, { activeBut: $route.path === item.path },
{ qiehuanBut: $route.path !== item.path }, { qiehuanBut: $route.path !== item.path },
{ clickBoole: (auditStatus == 0 || auditStatus == 2) && item.name == '智能排座' } { clickBoole: (auditStatus == 0 || auditStatus == 2) && item.name == '智能排座' }
]" class="but" v-for="(item, index) of butList" @click="toPath(item)" v-show="$route.meta.title !== 'chooseModule' && ]" 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)"> ((index != 3 && $route.query.isProcess == 2) || $route.query.isProcess == 1)">
<div class="rot" v-if="item.name === '人员准备' && $store.state.updateF === true"></div> <div class="rot" v-if="item.name === '人员准备' && $store.state.updateF === true"></div>
{{ item.name }} {{ item.name }}
</div> </div>
...@@ -120,15 +120,16 @@ ...@@ -120,15 +120,16 @@
<div class="row_wrap row_font_size20" v-if="$route.query.isProcess == 1"> <div class="row_wrap row_font_size20" v-if="$route.query.isProcess == 1">
<div class="row_item" :class="[ <div class="row_item" :class="[
{ condition: item.key === '联系人' }, { condition: item.key === '联系人' },
{ count: item.key === '倒计时' }, { count: item.key === '倒计时' },
]" v-for="(item, index) of meetingForm" :key="index"> ]" v-for="(item, index) of meetingForm" :key="index">
<span class="row_item_label" v-if="item.key !== '倒计时'">{{ item.key }}：</span> <span class="row_item_label" v-if="item.key !== '倒计时'">{{ item.key }}：</span>
<span class="row_item_text" v-if="item.key === '倒计时'"> <span class="row_item_text" v-if="item.key === '倒计时'">
<time-count-down :endTime="item.value"></time-count-down> <time-count-down :endTime="item.value"></time-count-down>
</span> </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" <span v-if="item.key === '地址'" class="processBoole"
:class="auditStatus == 0 ? 'yellow' : auditStatus == 1 ? 'blue' : auditStatus == 2 ? 'red' : ''" :class="auditStatus == 0 ? 'yellow' : auditStatus == 1 ? 'blue' : auditStatus == 2 ? 'red' : ''"
...@@ -136,9 +137,8 @@ ...@@ -136,9 +137,8 @@
auditStatus == 1 ? '审核通过' : auditStatus == 2 ? '未通过' : '' }}</span> auditStatus == 1 ? '审核通过' : auditStatus == 2 ? '未通过' : '' }}</span>
</span> </span>
<!-- <span class="row_item_text_hover">{{ item.value }}</span> --> <!-- <span class="row_item_text_hover">{{ item.value }}</span> -->
<span class="address_des" v-if=" <span class="address_des" v-if="item.key === '地址' && (item.value === '' || item.value === null)
item.key === '地址' && (item.value === '' || item.value === null) ">请在排座时选厅</span>
">请在排座时选厅</span>
</div> </div>
</div> </div>
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
<div class="but fabu_but" :class="auditStatus == 0 || auditStatus == 2 ? 'notShowPu' : ''" <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 === '会议配置') @click="auditStatus == 0 || auditStatus == 2 ? '' : showPublish()" v-if="($route.meta.title === '会议查看' || $route.meta.title === '会议配置')
&& this.$route.query.isProcess == 1 && this.$route.query.isProcess == 1
">发布</div> ">发布</div>
<!-- <div--> <!-- <div-->
<!-- class="but normal_but"--> <!-- class="but normal_but"-->
...@@ -221,13 +221,13 @@ ...@@ -221,13 +221,13 @@
</div> </div>
</div> </div>
<div class="router_view_wrap" :class="{ <div class="router_view_wrap" :class="{
router_view_wraps: $route.meta.title === '会议查看', router_view_wraps: $route.meta.title === '会议查看',
isAllScreens: $store.state.isAllScreen, isAllScreens: $store.state.isAllScreen,
}"> }">
<div class="content"> <div class="content">
<router-view ref="select_wrap" @judgeStatus="judgeStatus" @updateData="updateData" <router-view ref="select_wrap" @judgeStatus="judgeStatus" @updateData="updateData"
@getNoticeStatus="getNoticeStatus" @getPredetermine="getPredetermine" :oneself="oneself" @getNoticeStatus="getNoticeStatus" @getPredetermine="getPredetermine" :oneself="oneself"
:auditStatus="auditStatus" :status="status"></router-view> :auditStatus="auditStatus" :status="status" @getTopData="getTopData"></router-view>
</div> </div>
</div> </div>
<!-- </div>--> <!-- </div>-->
...@@ -465,6 +465,8 @@ export default { ...@@ -465,6 +465,8 @@ export default {
this.getData() this.getData()
this.dontshows() this.dontshows()
} }
}, },
destroyed() { destroyed() {
//离开页面清除监听 //离开页面清除监听
...@@ -483,6 +485,12 @@ export default { ...@@ -483,6 +485,12 @@ export default {
} }
}, },
methods: { methods: {
//重新获取头部数据
getTopData() {
console.log('getDate');
this.getData()
},
processHandleClose() { processHandleClose() {
this.processDialogVisible = false this.processDialogVisible = false
}, },
...@@ -547,6 +555,8 @@ export default { ...@@ -547,6 +555,8 @@ export default {
query: { processId: this.$route.query.processId }, query: { processId: this.$route.query.processId },
}) })
this.getData() //重新人员准备需要重新获取头部信息 this.getData() //重新人员准备需要重新获取头部信息
} else {
this.$message.error(`${res.data.data}`)
} }
}) })
}, },
...@@ -652,7 +662,6 @@ export default { ...@@ -652,7 +662,6 @@ export default {
}, },
] ]
} else { } else {
this.meetingForm = [ this.meetingForm = [
{ {
key: '时间', key: '时间',
...@@ -1507,8 +1516,22 @@ export default { ...@@ -1507,8 +1516,22 @@ export default {
.row_item_text { .row_item_text {
color: #3a3c4b; color: #3a3c4b;
margin-right: 36px; 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 { .row_item_text_hover {
...@@ -1574,18 +1597,14 @@ export default { ...@@ -1574,18 +1597,14 @@ export default {
.condition { .condition {
.row_item_text { .row_item_text {
width: 200px; max-width: 200px;
/* 不换行 */ /* 不换行 */
white-space: nowrap; white-space: nowrap;
/* 隐藏超出部分 */ /* 隐藏超出部分 */
overflow: hidden; overflow: hidden;
/* 显示省略号 */ /* 显示省略号 */
text-overflow: ellipsis; text-overflow: ellipsis;
} }
} }
.count { .count {
......
src/views/meeting/operation/overview/index.vue
浏览文件 @ d56b605b
...@@ -32,12 +32,11 @@ ...@@ -32,12 +32,11 @@
<div class="row_item line_hight_32"> <div class="row_item line_hight_32">
<div class="row_item_label">会议管理人：</div> <div class="row_item_label">会议管理人：</div>
<div class="person_select_show"> <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' && role === 'ROLE_HUIYIADMIN' &&
userId !== overviewData.processSponsorUuid userId !== overviewData.processSponsorUuid
) )
">{{ tag.cnName }}</el-tag> ">{{ tag.cnName }}</el-tag>
<el-button class="authorize_but" size="small" type="primary" @click="applyAdmin">授 <el-button class="authorize_but" size="small" type="primary" @click="applyAdmin">授
权</el-button> 权</el-button>
</div> </div>
...@@ -225,17 +224,17 @@ ...@@ -225,17 +224,17 @@
</div> </div>
<div class="main"> <div class="main">
<el-time-select placeholder="起始时间" v-model="item.agendaBeginHour" :picker-options="{ <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', start: '08:00',
step: '00:15', step: '00:15',
end: '18:30', end: '18:30',
minTime: item.agendaBeginHour, }" @change="changYi(item)"></el-time-select>至
}"></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> </div>
</div> </div>
...@@ -533,7 +532,7 @@ export default { ...@@ -533,7 +532,7 @@ export default {
if (res.data.code == 200) { if (res.data.code == 200) {
this.noteTableData = res.data.data this.noteTableData = res.data.data
for (let i in this.noteTableData) { 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
浏览文件 @ d56b605b
...@@ -151,6 +151,7 @@ export default { ...@@ -151,6 +151,7 @@ export default {
this.processId = id this.processId = id
}, },
init() { init() {
console.log('meetingLists', this.meetingLists);
this.meetingLists.forEach((item, index) => { this.meetingLists.forEach((item, index) => {
// 字数限制30字,超出不显示 // 字数限制30字,超出不显示
console.log(item) console.log(item)
...@@ -161,9 +162,9 @@ export default { ...@@ -161,9 +162,9 @@ export default {
item.showName = item.processName item.showName = item.processName
} }
//没选会议室 auditStatus=null //没选会议室 auditStatus=null
if (item.auditStatus == 0 || item.auditStatus == 1 || item.auditStatus == 2) { // if (item.auditStatus) {
item.data.push({ key: '预定状态', value: item.auditStatus }) item.data.push({ key: '预定状态', value: item.auditStatus })
} // }
this.$forceUpdate() this.$forceUpdate()
}) })
......
src/views/meetingPlace/components/areaList/areaList.vue
浏览文件 @ d56b605b
...@@ -7,42 +7,30 @@ ...@@ -7,42 +7,30 @@
人员清单 人员清单
</div>--> </div>-->
<div class="tops"> <div class="tops">
<div <div class="confs" @click="changeArea(-1)" :style="{
class="confs" backgroundColor: bgColor,
@click="changeArea(-1)" boxShadow: boxshad,
:style="{ color: topColor,
backgroundColor: bgColor, }">
boxShadow: boxshad,
color: topColor,
}"
>
<div class="conf">{{ confName }}</div> <div class="conf">{{ confName }}</div>
<div class="count"> <div class="count">
{{ $store.state.personAndSeatCount.people }}人/{{ {{ $store.state.personAndSeatCount.people }}人/{{
$store.state.personAndSeatCount.seat $store.state.personAndSeatCount.seat
}}座 }}座
</div> </div>
<div class="change" @click.stop="changeConfs">更换会议室</div> <div class="change" v-if="auditStatus !== 1" @click.stop="changeConfs">更换会议室</div>
</div> </div>
</div> </div>
<div class="areas"> <div class="areas">
<!-- <div class="tooltip" v-show="showTip">{{ tipName }}</div> --> <!-- <div class="tooltip" v-show="showTip">{{ tipName }}</div> -->
<div <div class="item" v-for="(item, index) of $store.state.areaList" :key="index" @click="changeArea(index, item)"
class="item" :style="`--yf-border-color:${showColor[index]
v-for="(item, index) of $store.state.areaList" };backgroundColor:${showStyle1(item, index)};boxShadow:${showStyle2(
:key="index" item,
@click="changeArea(index, item)" index
:style="`--yf-border-color:${ )}`" :class="{ choosess: item.id == $store.state.blockId }" @mouseover="hoverIndex = index"
showColor[index] @mouseout="hoverIndex = -1">
};backgroundColor:${showStyle1(item, index)};boxShadow:${showStyle2(
item,
index
)}`"
:class="{ choosess: item.id == $store.state.blockId }"
@mouseover="hoverIndex = index"
@mouseout="hoverIndex = -1"
>
<div class="delete" @click.prevent.stop="deleteArea(index)" v-show="hoverIndex == index"></div> <div class="delete" @click.prevent.stop="deleteArea(index)" v-show="hoverIndex == index"></div>
<div class="circle" v-show="item.fillFlag ? item.fillFlag : false"></div> <div class="circle" v-show="item.fillFlag ? item.fillFlag : false"></div>
<div class="bianjis" @click.stop="changeAreaName(index, item)"> <div class="bianjis" @click.stop="changeAreaName(index, item)">
...@@ -50,82 +38,42 @@ ...@@ -50,82 +38,42 @@
</div> </div>
<div class="areaName">{{ item.areaName }}</div> <div class="areaName">{{ item.areaName }}</div>
<div class="count">{{ item.areaPersonnelNum }}人/{{ item.seatNum }}座</div> <div class="count">{{ item.areaPersonnelNum }}人/{{ item.seatNum }}座</div>
<div <div v-show="item.fillFlag ? item.fillFlag : false" class="weiLairen"
v-show="item.fillFlag ? item.fillFlag : false" :class="{ chooseWeiPai: item.id == $store.state.blockId }">{{ item.weiPerson }}人未排座</div>
class="weiLairen"
:class="{ chooseWeiPai: item.id == $store.state.blockId }"
>{{ item.weiPerson }}人未排座</div>
<div class="btns"> <div class="btns">
<div class="iocns"> <div class="iocns">
<div <div class="tiao" @click.prevent.stop="changeSigned(index, 1, item.id)" :class="{
class="tiao" actives: item.xiRule == 1,
@click.prevent.stop="changeSigned(index, 1, item.id)" actived: item.id == $store.state.blockId,
:class="{ active: item.id == $store.state.blockId && item.xiRule != 1,
actives: item.xiRule == 1, }">
actived: item.id == $store.state.blockId, <img src="../../../../assets/meetingPalce/images/person_blue.png" alt v-show="(item.id == $store.state.blockId && item.xiRule == 1) ||
active: item.id == $store.state.blockId && item.xiRule != 1, (item.id != $store.state.blockId && item.xiRule != 1)
}" " />
> <img src="../../../../assets/meetingPalce/images/person_white.png" alt v-show="(item.id == $store.state.blockId && item.xiRule != 1) ||
<img (item.id != $store.state.blockId && item.xiRule == 1)
src="../../../../assets/meetingPalce/images/person_blue.png" " />
alt
v-show="
(item.id == $store.state.blockId && item.xiRule == 1) ||
(item.id != $store.state.blockId && item.xiRule != 1)
"
/>
<img
src="../../../../assets/meetingPalce/images/person_white.png"
alt
v-show="
(item.id == $store.state.blockId && item.xiRule != 1) ||
(item.id != $store.state.blockId && item.xiRule == 1)
"
/>
</div> </div>
<div <div class="tiao" @click.prevent.stop="changeSigned(index, 2, item.id)" :class="{
class="tiao"
@click.prevent.stop="changeSigned(index, 2, item.id)"
:class="{
actives: item.xiRule == 2, actives: item.xiRule == 2,
actived: item.id == $store.state.blockId, actived: item.id == $store.state.blockId,
active: item.id == $store.state.blockId && item.xiRule != 2, active: item.id == $store.state.blockId && item.xiRule != 2,
}" }">
> <img src="../../../../assets/meetingPalce/images/unit_blue.png" alt v-show="(item.id == $store.state.blockId && item.xiRule == 2) ||
<img (item.id != $store.state.blockId && item.xiRule != 2)
src="../../../../assets/meetingPalce/images/unit_blue.png" " />
alt <img src="../../../../assets/meetingPalce/images/unit_white.png" alt v-show="(item.id == $store.state.blockId && item.xiRule != 2) ||
v-show=" (item.id != $store.state.blockId && item.xiRule == 2)
(item.id == $store.state.blockId && item.xiRule == 2) || " />
(item.id != $store.state.blockId && item.xiRule != 2)
"
/>
<img
src="../../../../assets/meetingPalce/images/unit_white.png"
alt
v-show="
(item.id == $store.state.blockId && item.xiRule != 2) ||
(item.id != $store.state.blockId && item.xiRule == 2)
"
/>
</div> </div>
</div> </div>
<div class="selected" :class="{ selectes: item.id == $store.state.blockId }"> <div class="selected" :class="{ selectes: item.id == $store.state.blockId }">
<el-select v-model="item.paiRule" placeholder="请选择规则" @change="sureAreaRule(index)"> <el-select v-model="item.paiRule" placeholder="请选择规则" @change="sureAreaRule(index)">
<el-option <el-option v-for="item in seatOption" :key="item.value" :label="item.label" :value="item.value"></el-option>
v-for="item in seatOption"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
<div <div class="svg" v-show="$store.state.blockId != item.id" :style="{ backgroundColor: areaColors[index] }">
class="svg"
v-show="$store.state.blockId != item.id"
:style="{ backgroundColor: areaColors[index] }"
>
<!-- <svg <!-- <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink"
...@@ -149,13 +97,7 @@ ...@@ -149,13 +97,7 @@
<img src="../../../../assets/meetingPalce/paiwei/addModule.png" /> <img src="../../../../assets/meetingPalce/paiwei/addModule.png" />
新增区域 新增区域
</div> </div>
<el-dialog <el-dialog title="自定义席签" :visible.sync="signName" width="30%" append-to-body :before-close="handleClose">
title="自定义席签"
:visible.sync="signName"
width="30%"
append-to-body
:before-close="handleClose"
>
<div class="signs"> <div class="signs">
<div style="width: 50px">席签:</div> <div style="width: 50px">席签:</div>
<div> <div>
...@@ -168,26 +110,14 @@ ...@@ -168,26 +110,14 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog title="更换会议室" :visible.sync="changeConf" width="30%" append-to-body :before-close="handleClose">
title="更换会议室"
:visible.sync="changeConf"
width="30%"
append-to-body
:before-close="handleClose"
>
<div class="signs">更换会议室将会重置现在已完成的操作，是否确认要更换会议室？</div> <div class="signs">更换会议室将会重置现在已完成的操作，是否确认要更换会议室？</div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="cancleChange()">取 消</el-button> <el-button @click="cancleChange()">取 消</el-button>
<el-button type="primary" @click="confChange()">确 定</el-button> <el-button type="primary" @click="confChange()">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog title="删除区域" :visible.sync="deleteAreas" width="30%" append-to-body :before-close="handleClose">
title="删除区域"
:visible.sync="deleteAreas"
width="30%"
append-to-body
:before-close="handleClose"
>
<div class="signs">删除区域将会清空对应区域的座位和人员，是否确定删除区域？</div> <div class="signs">删除区域将会清空对应区域的座位和人员，是否确定删除区域？</div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClose()">取 消</el-button> <el-button @click="handleClose()">取 消</el-button>
...@@ -195,24 +125,13 @@ ...@@ -195,24 +125,13 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog title="编辑" :visible.sync="areaNameFlag" width="30%" append-to-body :before-close="handleClose">
title="编辑"
:visible.sync="areaNameFlag"
width="30%"
append-to-body
:before-close="handleClose"
>
<div> <div>
<div class="signs areaNames"> <div class="signs areaNames">
<div class="titles">区域名称:</div> <div class="titles">区域名称:</div>
<div> <div>
<el-autocomplete <el-autocomplete v-model="areaName" :fetch-suggestions="querySearchAsync" placeholder="请输入内容"
v-model="areaName" @focus="searchFocus" @select="handleSelect"></el-autocomplete>
:fetch-suggestions="querySearchAsync"
placeholder="请输入内容"
@focus="searchFocus"
@select="handleSelect"
></el-autocomplete>
</div> </div>
</div> </div>
...@@ -238,12 +157,7 @@ ...@@ -238,12 +157,7 @@
<div class="titles">预留规则:</div> <div class="titles">预留规则:</div>
<div> <div>
<el-select v-model="zhanValue" placeholder="请选择规则" @change="chooseRule(2)"> <el-select v-model="zhanValue" placeholder="请选择规则" @change="chooseRule(2)">
<el-option <el-option v-for="item in zhanOption" :key="item.value" :label="item.label" :value="item.value"></el-option>
v-for="item in zhanOption"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
...@@ -277,7 +191,7 @@ ...@@ -277,7 +191,7 @@
<script> <script>
export default { export default {
name: 'area', name: 'area',
props: { confName: String }, props: { confName: String, auditStatus: Number },
data() { data() {
return { return {
bgColor: '#4786fb', bgColor: '#4786fb',
...@@ -499,7 +413,7 @@ export default { ...@@ -499,7 +413,7 @@ export default {
} }
}, },
watch: {}, watch: {},
mounted() {}, mounted() { },
methods: { methods: {
searchFocus() { searchFocus() {
let data = { let data = {
...@@ -643,6 +557,7 @@ export default { ...@@ -643,6 +557,7 @@ export default {
query: { query: {
processId: this.$route.query.processId, processId: this.$route.query.processId,
isProcess: this.$route.query.isProcess, isProcess: this.$route.query.isProcess,
yudingStatus: 1
}, },
}) })
} }
...@@ -816,7 +731,8 @@ export default { ...@@ -816,7 +731,8 @@ export default {
-o-user-select: none; -o-user-select: none;
user-select: none; user-select: none;
} }
.arealist > .back {
.arealist>.back {
width: 100%; width: 100%;
color: #fff; color: #fff;
background-color: #2348a3; background-color: #2348a3;
...@@ -826,6 +742,7 @@ export default { ...@@ -826,6 +742,7 @@ export default {
margin-bottom: 24px; margin-bottom: 24px;
cursor: pointer; cursor: pointer;
} }
.btns { .btns {
display: flex; display: flex;
font-size: 14px; font-size: 14px;
...@@ -836,13 +753,16 @@ export default { ...@@ -836,13 +753,16 @@ export default {
margin-top: 10px; margin-top: 10px;
justify-content: space-between; justify-content: space-between;
.selected { .selected {
width: 80px; width: 80px;
height: 26px; height: 26px;
// border: 1px solid red; // border: 1px solid red;
/deep/.el-select { /deep/.el-select {
width: 80px !important; width: 80px !important;
height: 26px !important; height: 26px !important;
input { input {
width: 80px !important; width: 80px !important;
height: 26px !important; height: 26px !important;
...@@ -853,6 +773,7 @@ export default { ...@@ -853,6 +773,7 @@ export default {
border: none !important; border: none !important;
color: #5474e8 !important; color: #5474e8 !important;
} }
.el-select__caret { .el-select__caret {
width: 15px !important; width: 15px !important;
display: flex; display: flex;
...@@ -863,13 +784,16 @@ export default { ...@@ -863,13 +784,16 @@ export default {
} }
} }
} }
.selectes { .selectes {
width: 80px; width: 80px;
height: 26px; height: 26px;
// border: 1px solid red; // border: 1px solid red;
/deep/.el-select { /deep/.el-select {
width: 80px !important; width: 80px !important;
height: 26px !important; height: 26px !important;
input { input {
width: 80px !important; width: 80px !important;
height: 26px !important; height: 26px !important;
...@@ -880,6 +804,7 @@ export default { ...@@ -880,6 +804,7 @@ export default {
border: none !important; border: none !important;
color: #ffffff !important; color: #ffffff !important;
} }
.el-select__caret { .el-select__caret {
width: 15px !important; width: 15px !important;
display: flex; display: flex;
...@@ -890,6 +815,7 @@ export default { ...@@ -890,6 +815,7 @@ export default {
} }
} }
} }
.iocns { .iocns {
display: flex; display: flex;
width: 52px; width: 52px;
...@@ -897,6 +823,7 @@ export default { ...@@ -897,6 +823,7 @@ export default {
// align-items:center; // align-items:center;
} }
.tiao { .tiao {
width: 50%; width: 50%;
height: 100%; height: 100%;
...@@ -916,6 +843,7 @@ export default { ...@@ -916,6 +843,7 @@ export default {
.actived { .actived {
background-color: rgba(255, 255, 255, 0.9) !important; background-color: rgba(255, 255, 255, 0.9) !important;
} }
.active { .active {
background-color: rgba(33, 37, 40, 0.2) !important; background-color: rgba(33, 37, 40, 0.2) !important;
} }
...@@ -927,6 +855,7 @@ export default { ...@@ -927,6 +855,7 @@ export default {
// background-color: rgba(255, 255, 255, 1); // background-color: rgba(255, 255, 255, 1);
// } // }
} }
.tooltip { .tooltip {
position: absolute; position: absolute;
font-size: 12px; font-size: 12px;
...@@ -935,6 +864,7 @@ export default { ...@@ -935,6 +864,7 @@ export default {
color: #fff; color: #fff;
z-index: 33; z-index: 33;
} }
.bianjis { .bianjis {
position: absolute; position: absolute;
width: 15px; width: 15px;
...@@ -943,6 +873,7 @@ export default { ...@@ -943,6 +873,7 @@ export default {
top: 2px; top: 2px;
display: none; display: none;
} }
.circle { .circle {
position: absolute; position: absolute;
width: 12px; width: 12px;
...@@ -953,7 +884,8 @@ export default { ...@@ -953,7 +884,8 @@ export default {
right: -8px; right: -8px;
top: -8px; top: -8px;
} }
.arealist > .tops {
.arealist>.tops {
width: 172px; width: 172px;
margin: 0 auto; margin: 0 auto;
margin-top: 20px; margin-top: 20px;
...@@ -961,7 +893,8 @@ export default { ...@@ -961,7 +893,8 @@ export default {
border-bottom: 1px solid rgba(229, 235, 239, 0.7); border-bottom: 1px solid rgba(229, 235, 239, 0.7);
padding-bottom: 14px; padding-bottom: 14px;
} }
.arealist > .tops > .confs {
.arealist>.tops>.confs {
width: 172px; width: 172px;
padding: 20px 0; padding: 20px 0;
margin: 0 auto; margin: 0 auto;
...@@ -974,28 +907,34 @@ export default { ...@@ -974,28 +907,34 @@ export default {
border: 1px solid rgba(0, 0, 0, 0); border: 1px solid rgba(0, 0, 0, 0);
border-radius: 2px; border-radius: 2px;
} }
.arealist > .tops > .confs > .conf {
.arealist>.tops>.confs>.conf {
font-size: 22px; font-size: 22px;
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
-o-user-select: none; -o-user-select: none;
user-select: none; user-select: none;
} }
.signs { .signs {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
.titles { .titles {
width: 80px; width: 80px;
} }
} }
.areaNames { .areaNames {
// border: 1px solid red; // border: 1px solid red;
/deep/.el-input { /deep/.el-input {
width: 217px !important; width: 217px !important;
// border: 1px solid red; // border: 1px solid red;
} }
} }
.arealist .change { .arealist .change {
height: 22px; height: 22px;
font-size: 14px; font-size: 14px;
...@@ -1011,7 +950,8 @@ export default { ...@@ -1011,7 +950,8 @@ export default {
-o-user-select: none; -o-user-select: none;
user-select: none; user-select: none;
} }
.arealist > .areas {
.arealist>.areas {
// margin-left: 14px; // margin-left: 14px;
// border: 1px solid red; // border: 1px solid red;
height: calc(100% - 260px); height: calc(100% - 260px);
...@@ -1021,17 +961,18 @@ export default { ...@@ -1021,17 +961,18 @@ export default {
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
} }
.arealist > .tops > .confs:hover {
.arealist>.tops>.confs:hover {
border: 1px solid #4786fb; border: 1px solid #4786fb;
} }
.arealist > .areas > .item:hover { .arealist>.areas>.item:hover {
border: 1px solid #f28a68; border: 1px solid #f28a68;
border-color: var(--yf-border-color) !important; border-color: var(--yf-border-color) !important;
box-sizing: border-box; box-sizing: border-box;
} }
.arealist > .areas > .item { .arealist>.areas>.item {
box-sizing: border-box; box-sizing: border-box;
width: 172px; width: 172px;
padding-top: 20px; padding-top: 20px;
...@@ -1069,6 +1010,7 @@ export default { ...@@ -1069,6 +1010,7 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.chooseDelete { .chooseDelete {
background-image: url('../../../../assets/meetingPalce/paiwei/chooseClose.png'); background-image: url('../../../../assets/meetingPalce/paiwei/chooseClose.png');
position: absolute; position: absolute;
...@@ -1081,9 +1023,11 @@ export default { ...@@ -1081,9 +1023,11 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.delete:hover { .delete:hover {
background-image: url('../../../../assets/meetingPalce/paiwei/delred.png'); background-image: url('../../../../assets/meetingPalce/paiwei/delred.png');
} }
.svg { .svg {
position: absolute; position: absolute;
bottom: 0px; bottom: 0px;
...@@ -1092,24 +1036,30 @@ export default { ...@@ -1092,24 +1036,30 @@ export default {
height: 8px; height: 8px;
border-radius: 0 0 2px 2px; border-radius: 0 0 2px 2px;
} }
.areaName { .areaName {
font-size: 18px; font-size: 18px;
} }
.count { .count {
font-size: 16px; font-size: 16px;
} }
position: relative; position: relative;
.weiLairen { .weiLairen {
color: red; color: red;
font-size: 14px; font-size: 14px;
margin-top: 5px; margin-top: 5px;
} }
.chooseWeiPai { .chooseWeiPai {
background: #ffffff; background: #ffffff;
box-shadow: 0px -1px 3px 0px rgba(245, 100, 102, 0.05); box-shadow: 0px -1px 3px 0px rgba(245, 100, 102, 0.05);
padding: 2px 7px; padding: 2px 7px;
border-radius: 2px; border-radius: 2px;
} }
.outnumber { .outnumber {
position: absolute; position: absolute;
right: -50px; right: -50px;
...@@ -1126,8 +1076,10 @@ export default { ...@@ -1126,8 +1076,10 @@ export default {
background-repeat: no-repeat; background-repeat: no-repeat;
} }
} }
.arealist > .areas > .choosess {
.arealist>.areas>.choosess {
position: relative; position: relative;
.delete { .delete {
position: absolute; position: absolute;
right: 5px; right: 5px;
...@@ -1140,11 +1092,13 @@ export default { ...@@ -1140,11 +1092,13 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.delete:hover { .delete:hover {
background-size: 100% 100%; background-size: 100% 100%;
background-image: url('../../../../assets/meetingPalce/paiwei/delred.png'); background-image: url('../../../../assets/meetingPalce/paiwei/delred.png');
} }
} }
.arealist { .arealist {
.addArea { .addArea {
width: 172px; width: 172px;
...@@ -1157,17 +1111,20 @@ export default { ...@@ -1157,17 +1111,20 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: #778ca2; color: #778ca2;
img { img {
margin-right: 5px; margin-right: 5px;
} }
} }
.guize { .guize {
/deep/.el-select { /deep/.el-select {
width: 88%; width: 88%;
} }
} }
} }
.arealist > .areas > .item > .guize {
.arealist>.areas>.item>.guize {
position: absolute; position: absolute;
top: 80px; top: 80px;
width: 172px; width: 172px;
...@@ -1178,23 +1135,28 @@ export default { ...@@ -1178,23 +1135,28 @@ export default {
color: #778ca2; color: #778ca2;
font-size: 14px; font-size: 14px;
} }
.arealist > .areas > .item > .guize > div {
.arealist>.areas>.item>.guize>div {
margin-top: 16px; margin-top: 16px;
margin-left: 14px; margin-left: 14px;
} }
.arealist > .areas > .item > .guize > div {
/deep/.el-input > input { .arealist>.areas>.item>.guize>div {
/deep/.el-input>input {
height: 30px; height: 30px;
} }
/deep/.el-input { /deep/.el-input {
.el-input__suffix { .el-input__suffix {
height: 30px; height: 30px;
.is-reverse { .is-reverse {
height: 30px; height: 30px;
position: relative; position: relative;
top: -4px !important; top: -4px !important;
// border: 1px solid red; // border: 1px solid red;
} }
.el-input__icon { .el-input__icon {
height: 30px; height: 30px;
position: relative; position: relative;
......
src/views/meetingPlace/components/test.vue
浏览文件 @ d56b605b
<template> <template>
<div id="appMain" v-loading="loading"> <div id="appMain" v-loading="loading">
<div <div class="helps" :class="{ helped: !alls }" @click="showHelp" v-show="!$store.state.showImageFlag">
class="helps"
:class="{ helped: !alls }"
@click="showHelp"
v-show="!$store.state.showImageFlag"
>
<img src="../../../assets/meetingPalce/paiwei/help.png" alt="" /> <img src="../../../assets/meetingPalce/paiwei/help.png" alt="" />
</div> </div>
<div class="section"> <div class="section">
<div class="left" v-show="alls" id="lefts"> <div class="left" v-show="alls" id="lefts">
<areaList <areaList :auditStatus="auditStatus" :confName="confName" @createArea="createArea" @custom="custom"
:confName="confName" @blockId="blockId" @changeC="changeC" @changeSigns="changeSigns" @chooseRules="chooseRules"
@createArea="createArea" @deleteAreaId="deleteAreaId" @changeAreaName="changeAreaName"></areaList>
@custom="custom"
@blockId="blockId"
@changeC="changeC"
@changeSigns="changeSigns"
@chooseRules="chooseRules"
@deleteAreaId="deleteAreaId"
@changeAreaName="changeAreaName"
></areaList>
</div> </div>
<div class="pull"> <div class="pull">
<HelloWorld <HelloWorld ref="secRight" :checkeds="checkeds" :blockIds="blockIds" :choosePersons="choosePersons"
ref="secRight" :chooseFlag="chooseFlag" :changeCon="changeCon" :chaSign="chaSign" :chooseR="chooseR" :hideFlags="hideFlags"
:checkeds="checkeds" :areasId="areasId" :signNames="signNames" :changeAreaNames="changeAreaNames" :changeSignNames="changeSignNames"
:blockIds="blockIds" :autoSorts="autoSorts" :changeDatas="changeDatas" :sortFlag="sortFlag" :createAreas="createAreas"
:choosePersons="choosePersons" :deleteAreaIds="deleteAreaIds" :areaId="areaId" @clickPerson="clickPerson" @showLoading="showLoading"
:chooseFlag="chooseFlag" @clearAllFlag="clearAllFlag" @foos="foos" @sureLoad="sureLoad" @screenAlls="screenAlls"
:changeCon="changeCon" @conferenceName="conferenceName" />
: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>
<div class="right" v-show="alls" id="lefts"> <div class="right" v-show="alls" id="lefts">
<PeopleList <PeopleList @checked="checked" @choosePer="choosePer" @changeSignName="changeSignName" @autoSort="autoSort"
@checked="checked" @changeData="changeData" :clickPersons="clickPersons" :clearNums="clearNums" :blockIds="blockIds"
@choosePer="choosePer" @startFlag="startFlag" :fooFlag="fooFlag" @sorts="sorts" @hideBox="hideBox"></PeopleList>
@changeSignName="changeSignName"
@autoSort="autoSort"
@changeData="changeData"
:clickPersons="clickPersons"
:clearNums="clearNums"
:blockIds="blockIds"
@startFlag="startFlag"
:fooFlag="fooFlag"
@sorts="sorts"
@hideBox="hideBox"
></PeopleList>
</div> </div>
</div> </div>
</div> </div>
...@@ -80,6 +35,8 @@ import Banner from "../pages/banner.vue"; ...@@ -80,6 +35,8 @@ import Banner from "../pages/banner.vue";
import Rumb from "../pages/first/rumb.vue"; import Rumb from "../pages/first/rumb.vue";
export default { export default {
name: "tes", name: "tes",
props: ['auditStatus'],
data() { data() {
return { return {
//获取会议名称和时间 //获取会议名称和时间
...@@ -168,8 +125,10 @@ export default { ...@@ -168,8 +125,10 @@ export default {
sessionStorage.setItem("sysRoles", details.sysRoles[0]); sessionStorage.setItem("sysRoles", details.sysRoles[0]);
} }
this.$store.commit("changeId", 0); this.$store.commit("changeId", 0);
// console.log(this.auditStatus);
// console.log("userNDirection2", sessionStorage.getItem("userNDirection2")); // console.log("userNDirection2", sessionStorage.getItem("userNDirection2"));
}, },
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
setTimeout(() => { setTimeout(() => {
...@@ -306,25 +265,30 @@ export default { ...@@ -306,25 +265,30 @@ export default {
// overflow: hidden; // overflow: hidden;
} }
#banner { #banner {
width: 100%; width: 100%;
// min-width: 1920px; // min-width: 1920px;
background-color: #e6edf4; background-color: #e6edf4;
} }
.breadcrumb { .breadcrumb {
margin-left: 35px; margin-left: 35px;
margin-top: 15px; margin-top: 15px;
} }
/deep/.el-breadcrumb { /deep/.el-breadcrumb {
font-size: 18px; font-size: 18px;
color: #5474e8; color: #5474e8;
} }
.topNav { .topNav {
height: 80px; height: 80px;
width: 100%; width: 100%;
background-color: #2348a3; background-color: #2348a3;
display: flex; display: flex;
box-shadow: 0px 3px 5px rgba(84, 116, 235, 0.2); box-shadow: 0px 3px 5px rgba(84, 116, 235, 0.2);
.title { .title {
margin-left: 40px; margin-left: 40px;
display: flex; display: flex;
...@@ -334,27 +298,33 @@ export default { ...@@ -334,27 +298,33 @@ export default {
font-weight: bold; font-weight: bold;
flex: 1; flex: 1;
margin-top: -15px; margin-top: -15px;
.content { .content {
margin-left: 15px; margin-left: 15px;
} }
} }
.tabitem { .tabitem {
flex: 3; flex: 3;
position: relative; position: relative;
top: 5px; top: 5px;
} }
.manager { .manager {
display: flex; display: flex;
align-items: center; align-items: center;
color: #e8ebf9; color: #e8ebf9;
img { img {
margin-right: 15px; margin-right: 15px;
} }
.content { .content {
margin-right: 30px; margin-right: 30px;
} }
} }
} }
.helps { .helps {
position: fixed; position: fixed;
top: 16%; top: 16%;
...@@ -368,6 +338,7 @@ export default { ...@@ -368,6 +338,7 @@ export default {
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
} }
.header { .header {
width: 95.5%; width: 95.5%;
height: 60px; height: 60px;
...@@ -378,15 +349,18 @@ export default { ...@@ -378,15 +349,18 @@ export default {
margin: 40px 0px 10px 29px; margin: 40px 0px 10px 29px;
display: flex; display: flex;
align-items: center; align-items: center;
.confName { .confName {
display: flex; display: flex;
font-size: 20px; font-size: 20px;
color: #778ca2; color: #778ca2;
span { span {
color: #3a3c4b; color: #3a3c4b;
padding-left: 16px; padding-left: 16px;
padding-right: 80px; padding-right: 80px;
} }
img { img {
padding-left: 20px; padding-left: 20px;
width: 18px; width: 18px;
...@@ -394,16 +368,19 @@ export default { ...@@ -394,16 +368,19 @@ export default {
vertical-align: middle; vertical-align: middle;
} }
} }
.confTime { .confTime {
display: flex; display: flex;
font-size: 20px; font-size: 20px;
color: #778ca2; color: #778ca2;
span { span {
color: #3a3c4b; color: #3a3c4b;
padding-left: 16px; padding-left: 16px;
padding-right: 80px; padding-right: 80px;
} }
} }
.confAddress { .confAddress {
display: flex; display: flex;
font-size: 20px; font-size: 20px;
...@@ -415,13 +392,14 @@ export default { ...@@ -415,13 +392,14 @@ export default {
} }
} }
} }
.back { .back {
display: flex; display: flex;
margin-right: 50px; margin-right: 50px;
cursor: pointer; cursor: pointer;
} }
.back .img {
} .back .img {}
.section { .section {
width: 100%; width: 100%;
...@@ -430,6 +408,7 @@ export default { ...@@ -430,6 +408,7 @@ export default {
display: flex; display: flex;
position: relative; position: relative;
.pull { .pull {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -446,6 +425,7 @@ export default { ...@@ -446,6 +425,7 @@ export default {
// width: 100%; // width: 100%;
// } // }
} }
.left { .left {
width: 13.5%; width: 13.5%;
background-color: white; background-color: white;
...@@ -455,6 +435,7 @@ export default { ...@@ -455,6 +435,7 @@ export default {
// scrollbar-color: #e5e5e5 #f7f7f9; // scrollbar-color: #e5e5e5 #f7f7f9;
// -webkit-scrollbar-width: none; // -webkit-scrollbar-width: none;
} }
.right { .right {
width: 16%; width: 16%;
background-color: white; background-color: white;
...@@ -465,37 +446,46 @@ export default { ...@@ -465,37 +446,46 @@ export default {
// scrollbar-color: #e5e5e5 #f7f7f9; // scrollbar-color: #e5e5e5 #f7f7f9;
scrollbar-width: none !important; scrollbar-width: none !important;
} }
.secRight { .secRight {
overflow: auto; overflow: auto;
} }
} }
/deep/.el-tabs__item { /deep/.el-tabs__item {
font-size: 20px; font-size: 20px;
color: #ffffff; color: #ffffff;
// padding-bottom: 70px; // padding-bottom: 70px;
// border-bottom: #ddd; // border-bottom: #ddd;
} }
/deep/.el-tabs__item:hover { /deep/.el-tabs__item:hover {
color: #ffffff; color: #ffffff;
} }
/deep/.el-tabs__item.is-active { /deep/.el-tabs__item.is-active {
// font-weight: bold; // font-weight: bold;
font-size: 22px; font-size: 22px;
color: white; color: white;
} }
/deep/.el-tabs__nav-wrap::after { /deep/.el-tabs__nav-wrap::after {
background: #2348a3; background: #2348a3;
} }
/deep/.el-tabs__nav-wrap { /deep/.el-tabs__nav-wrap {
top: 15px; top: 15px;
} }
/deep/.el-breadcrumb__item:last-child .el-breadcrumb__inner { /deep/.el-breadcrumb__item:last-child .el-breadcrumb__inner {
color: #5474e8; color: #5474e8;
font-weight: 700; font-weight: 700;
} }
/deep/.el-breadcrumb__inner.is-link { /deep/.el-breadcrumb__inner.is-link {
color: #9aabad; color: #9aabad;
} }
// /deep/.el-tabs__active-bar { // /deep/.el-tabs__active-bar {
// background: white; // background: white;
// bottom: -5px; // bottom: -5px;
...@@ -585,18 +575,22 @@ export default { ...@@ -585,18 +575,22 @@ export default {
height: 0px !important; height: 0px !important;
} }
} }
.helped { .helped {
right: 25px !important; right: 25px !important;
} }
.dialog /deep/ .el-dialog__body { .dialog /deep/ .el-dialog__body {
flex-direction: column !important; flex-direction: column !important;
} }
.el-dialog__wrapper { .el-dialog__wrapper {
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;
display: flex; display: flex;
justify-content: center; justify-content: center;
flex-direction: column; flex-direction: column;
/deep/ .el-dialog { /deep/ .el-dialog {
margin-top: 0 !important; margin-top: 0 !important;
} }
......
src/views/reserveRecord/index.vue
浏览文件 @ d56b605b
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div :class="isActive === index ? 'confenceActive' : ''" class="confence" <div :class="isActive === index ? 'confenceActive' : ''" class="confence"
v-for="(item, index, key) in confenceList" :key="item.conferenceId" @click="getOneConfence(item, index)"> 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="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="[item.conferenceName.length > 8 ? 'hover_name' : 'none_hover']">{{ item.conferenceName }}</div>
<div class="box"></div> <div class="box"></div>
</div> </div>
...@@ -585,6 +585,10 @@ export default { ...@@ -585,6 +585,10 @@ export default {
border: none; border: none;
color: #5474e8; color: #5474e8;
text-align: right; text-align: right;
&::placeholder {
color: #778ca2;
}
} }
.el-input__inner:focus { .el-input__inner:focus {
...@@ -595,7 +599,10 @@ export default { ...@@ -595,7 +599,10 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
} }
} }
} }
.reserveConference_select { .reserveConference_select {
......
src/views/system/confenceLibrary.vue
浏览文件 @ d56b605b
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<el-table :data="tableData" stripe ref="table" height="100%" class="template_table" v-loading="loading" <el-table :data="tableData" stripe ref="table" height="100%" class="template_table" v-loading="loading"
style="width: 100%"> style="width: 100%">
<el-table-column prop="id" v-if="false" label="id"></el-table-column> <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"> <el-table-column prop="name" label="会议室名称" width="300">
<!-- {{tableData.templateType}} --> <!-- {{tableData.templateType}} -->
</el-table-column> </el-table-column>
...@@ -58,10 +58,10 @@ ...@@ -58,10 +58,10 @@
</div> </div>
</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> width="30%" append-to-body>
<el-form ref="forms" :rules="ruleForm" :model="forms" label-width="140px"> <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> <div>{{ forms.unitName }}</div>
</el-form-item> </el-form-item>
<el-form-item label="会议室名称:" prop="name"> <el-form-item label="会议室名称:" prop="name">
...@@ -134,13 +134,13 @@ export default { ...@@ -134,13 +134,13 @@ export default {
// console.log(val); // console.log(val);
let obj = '' let obj = ''
switch (val) { switch (val) {
case 0: case 1:
obj = '小型会议室' obj = '小型会议室'
break break
case 1: case 2:
obj = '中型会议室' obj = '中型会议室'
break break
case 2: case 3:
obj = '大型会议室' obj = '大型会议室'
break break
} }
...@@ -206,9 +206,9 @@ export default { ...@@ -206,9 +206,9 @@ export default {
cnName: '', cnName: '',
organList: [], organList: [],
options: [ options: [
{ label: '小型会议室', value: 0 }, { label: '小型会议室', value: 1 },
{ label: '中型会议室', value: 1 }, { label: '中型会议室', value: 2 },
{ label: '大型会议室', value: 2 }, { label: '大型会议室', value: 3 },
], ],
sysRoles: '', sysRoles: '',
} }
...@@ -220,8 +220,11 @@ export default { ...@@ -220,8 +220,11 @@ export default {
console.log(sessionStorage.getItem('sysRoles')); console.log(sessionStorage.getItem('sysRoles'));
if (this.cnName !== '超级管理员' && sessionStorage.getItem('sysRoles') !== 'ROLE_HUIYISHIADMIN') { if (this.cnName !== '超级管理员' && sessionStorage.getItem('sysRoles') !== 'ROLE_HUIYISHIADMIN') {
this.forms.unitId = sessionStorage.getItem('unitId') this.forms.unitId = sessionStorage.getItem('unitId')
console.log('false');
this.disFlag = true this.disFlag = true
this.forms.unitName = sessionStorage.getItem('unitName') this.forms.unitName = sessionStorage.getItem('unitName')
} else if (sessionStorage.getItem('sysRoles') == 'ROLE_HUIYISHIADMIN') {
this.disFlag = true
} }
//查询所有数据 //查询所有数据
this.getTaList() this.getTaList()
......
src/views/system/index.vue
浏览文件 @ d56b605b
...@@ -180,7 +180,7 @@ export default { ...@@ -180,7 +180,7 @@ export default {
// this.fetchConf(); // this.fetchConf();
this.path = this.$route.matched this.path = this.$route.matched
this.path = this.path.filter((item, index) => item.meta.title !== '') this.path = this.path.filter((item, index) => item.meta.title !== '')
// console.log(this.path) console.log(this.path)
let sysRoles = sessionStorage.getItem('sysRoles') let sysRoles = sessionStorage.getItem('sysRoles')
switch (sysRoles) { switch (sysRoles) {
case 'ROLE_SUPERADMIN': case 'ROLE_SUPERADMIN':
...@@ -221,6 +221,7 @@ export default { ...@@ -221,6 +221,7 @@ export default {
/*****路由跳转时更新面包屑********/ /*****路由跳转时更新面包屑********/
this.path = to.matched this.path = to.matched
this.path = this.path.filter((item, index) => item.meta.title !== '') this.path = this.path.filter((item, index) => item.meta.title !== '')
console.log('path12313132', this.path);
/****************************/ /****************************/
switch (sysRoles) { switch (sysRoles) {
case 'ROLE_SUPERADMIN': case 'ROLE_SUPERADMIN':
......
src/views/system/jurisdiction.vue
浏览文件 @ d56b605b
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
<!-- 表格 --> <!-- 表格 -->
<div class="content"> <div class="content">
<el-table :data="tableData" stripe style="width: 100%" height="100%" class="template_table" <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' }" :default-sort="{ order: 'index' }" @sort-change="sortChange" :header-cell-style="{ 'text-align': 'left' }"
v-loading="loading"> :cell-style="{ 'text-align': 'left' }" v-loading="loading">
<el-table-column type="index" label="序号" width="80"></el-table-column> <el-table-column type="index" label="序号" width="80"></el-table-column>
<el-table-column prop="username" label="账号"></el-table-column> <el-table-column prop="username" label="账号"></el-table-column>
<el-table-column prop="cnName" label="姓名"></el-table-column> <el-table-column prop="cnName" label="姓名"></el-table-column>
...@@ -537,4 +537,5 @@ export default { ...@@ -537,4 +537,5 @@ export default {
color: #778ca2; color: #778ca2;
} }
} }
}</style> }
</style>
src/views/system/personLabel.vue
浏览文件 @ d56b605b
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<div class="table_list"> <div class="table_list">
<!-- 按参会人员 --> <!-- 按参会人员 -->
<el-table v-if="personOrUnit == 1" :data="tableData" style="width: 100%" height="100%" stripe <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="customUserNum" label="序号"></el-table-column>
<el-table-column prop="customUserName" label="姓名"></el-table-column> <el-table-column prop="customUserName" label="姓名"></el-table-column>
<el-table-column prop="customUserPosition" label="职务" width="180"></el-table-column> <el-table-column prop="customUserPosition" label="职务" width="180"></el-table-column>
...@@ -92,8 +92,8 @@ ...@@ -92,8 +92,8 @@
</el-table> </el-table>
<!-- 按参会单位 --> <!-- 按参会单位 -->
<el-table v-if="personOrUnit == 2" :data="tableData" style="width: 100%" height="100%" stripe <el-table v-if="personOrUnit == 2" :data="tableData" style="width: 100%" height="100%" stripe
:default-sort="{ prop: 'updateTime' }"> :default-sort="{ order: 'sortNum' }">
<el-table-column prop="sortNum" label="序号"> <el-table-column prop="sortNum" sortable label="序号">
</el-table-column> </el-table-column>
<el-table-column prop="unitName" label="参会单位（平台）"> <el-table-column prop="unitName" label="参会单位（平台）">
...@@ -121,14 +121,8 @@ ...@@ -121,14 +121,8 @@
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination> layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div> </div>
<!-- 选择人员 --> <!-- 选择人员 -->
<BatchAddDialog :changeFlags="3" <BatchAddDialog :changeFlags="3" :batchAddFlag.sync="batchAddFlag" :selectPerson="selectPerson" :nextShow="nextShow"
:batchAddFlag.sync="batchAddFlag" :returnSelect="returnSelect" @addBatchPeople="addBatchPeople" @sureChange="sureChange" @cancleFlag="cancleFlag"
:selectPerson="selectPerson"
:nextShow="nextShow"
:returnSelect="returnSelect"
@addBatchPeople="addBatchPeople"
@sureChange="sureChange"
@cancleFlag="cancleFlag"
@getPerson="getPerson"> @getPerson="getPerson">
</BatchAddDialog> </BatchAddDialog>
<dialogTable :dialogTableVisible.sync="dialogTableVisible" :dialogTableData="dialogTableData" @back="back" <dialogTable :dialogTableVisible.sync="dialogTableVisible" :dialogTableData="dialogTableData" @back="back"
...@@ -146,7 +140,7 @@ ...@@ -146,7 +140,7 @@
<el-button type="primary" class="btn" @click="addLabel()">新增标签</el-button> <el-button type="primary" class="btn" @click="addLabel()">新增标签</el-button>
</div> </div>
<div v-if="labelList.length > 0"> <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> <div class="tips_num">权限专用单位：</div>
<el-input v-model="item.customOrgName" /> <el-input v-model="item.customOrgName" />
<!-- <div>{{item.unitName}}</div> --> <!-- <div>{{item.unitName}}</div> -->
...@@ -202,7 +196,7 @@ ...@@ -202,7 +196,7 @@
<!-- <el-input v-model="editPersonObj.sysUnitName" ></el-input> <!-- <el-input v-model="editPersonObj.sysUnitName" ></el-input>
--> -->
<el-select v-model="editPersonObj.sysUnitId" placeholder="请选择参会单位"> <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> :value="item.unitId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -414,7 +408,10 @@ export default { ...@@ -414,7 +408,10 @@ export default {
this.$axios.moveUpOrDownCustomUser(params).then((res) => { this.$axios.moveUpOrDownCustomUser(params).then((res) => {
// console.log(res) // console.log(res)
if (res.data.code == 200) { if (res.data.code == 200) {
this.findLabelIdPerson(this.formData) this.$nextTick(() => {
this.findLabelIdPerson(this.formData)
})
} }
}) })
}, },
...@@ -700,9 +697,10 @@ export default { ...@@ -700,9 +697,10 @@ export default {
// 根据自定义分类编号查询按参会人员展示自定义人员（ly） // 根据自定义分类编号查询按参会人员展示自定义人员（ly）
findLabelIdPerson(params) { findLabelIdPerson(params) {
this.$axios.baseCustomOrgIdPerson(params).then((res) => { this.$axios.baseCustomOrgIdPerson(params).then((res) => {
console.log('按参会人员', res) console.log('按参会人员', res.data.data)
if (res.data.data.customUserShowVoList) { if (res.data.data.customUserShowVoList) {
this.tableData = res.data.data.customUserShowVoList this.tableData = res.data.data.customUserShowVoList
} else { } else {
this.tableData = [] this.tableData = []
} }
...@@ -743,6 +741,7 @@ export default { ...@@ -743,6 +741,7 @@ export default {
if (val == 1) { if (val == 1) {
this.personOrUnit = 1 this.personOrUnit = 1
this.findLabelIdPerson(obj) this.findLabelIdPerson(obj)
} else { } else {
this.personOrUnit = 2 this.personOrUnit = 2
this.findLabelUnit(obj) this.findLabelUnit(obj)
......
src/views/system/personLabel/dialogTable.vue
浏览文件 @ d56b605b
<template> <template>
<div> <div>
<el-dialog <el-dialog title="关联参会单位" :visible.sync="visible" :close-on-click-modal="false"
title="关联参会单位" :before-close="dialogTableHandleClose" class="table_dialog" width="900px">
:visible.sync="visible "
:close-on-click-modal="false"
:before-close="dialogTableHandleClose"
class="table_dialog"
width="900px"
>
<div class="top"> <div class="top">
<div>已选人员：{{dialogTableData.length}}人</div> <div>已选人员：{{ dialogTableData.length }}人</div>
<div>说明，为参会人员关联参会单位</div> <div>说明，为参会人员关联参会单位</div>
</div> </div>
<div class="table_wai"> <div class="table_wai">
...@@ -19,15 +13,11 @@ ...@@ -19,15 +13,11 @@
<el-table-column property="govEmpPosJob" label="职务"></el-table-column> <el-table-column property="govEmpPosJob" label="职务"></el-table-column>
<el-table-column property="organizationName" 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="organizationName" label="浙政钉ID"></el-table-column>
<el-table-column property="address" label="参会平台"> <el-table-column property="address" label="参会单位">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.sysUnitId" @change="sysUnitChange(scope.row)"> <el-select v-model="scope.row.sysUnitId" @change="sysUnitChange(scope.row)">
<el-option <el-option v-for="item in options" :key="item.unitId" :label="item.unitName"
v-for="item in options" :value="item.unitId"></el-option>
:key="item.unitId"
:label="item.unitName"
:value="item.unitId"
></el-option>
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
...@@ -82,11 +72,11 @@ export default { ...@@ -82,11 +72,11 @@ export default {
console.log(this.dialogTableData) console.log(this.dialogTableData)
if (bloon) { if (bloon) {
this.$emit('update:dialogTableVisible', false) this.$emit('update:dialogTableVisible', false)
this.$emit('submitTable', this.dialogTableData,1) this.$emit('submitTable', this.dialogTableData, 1)
} }
}, },
dialogTableHandleClose() { dialogTableHandleClose() {
this.$emit('closeTableDialog',false) this.$emit('closeTableDialog', false)
}, },
back() { back() {
console.log('back') console.log('back')
...@@ -105,7 +95,7 @@ export default { ...@@ -105,7 +95,7 @@ export default {
this.$axios.getUnitAuthPerson(params).then((res) => { this.$axios.getUnitAuthPerson(params).then((res) => {
console.log('resresres', res) console.log('resresres', res)
this.options = res.data.data.sysUnitAuthPersonList this.options = res.data.data.sysUnitAuthPersonList
}) })
}, },
}, },
......
src/views/system/unitEmpower.vue
浏览文件 @ d56b605b
...@@ -9,14 +9,8 @@ ...@@ -9,14 +9,8 @@
<el-input v-model="formData.personName" placeholder="请输入"></el-input> <el-input v-model="formData.personName" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="更新时间:"> <el-form-item label="更新时间:">
<el-date-picker <el-date-picker v-model="timeData" type="daterange" range-separator="至" start-placeholder="开始日期"
v-model="timeData" end-placeholder="结束日期" value-format="yyyy-MM-dd "></el-date-picker>
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd "
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item class="button_wrap"> <el-form-item class="button_wrap">
...@@ -29,16 +23,10 @@ ...@@ -29,16 +23,10 @@
<div class="unitTable"> <div class="unitTable">
<div class="unitNum"> <div class="unitNum">
<div>参会单位</div> <div>参会单位</div>
<div>{{total}}家</div> <div>{{ total }}家</div>
</div> </div>
<div class="tableList"> <div class="tableList">
<el-table <el-table :data="tableData" style="width: 100%" height="100%" stripe :default-sort="{ order: 'sortNum' }">
:data="tableData"
style="width: 100%"
height="100%"
stripe
:default-sort="{prop: 'updateTime'}"
>
<el-table-column prop="sortNum" label="序号" width="180"></el-table-column> <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="unitName" label="参会单位（权限专用）" width="180"></el-table-column>
<el-table-column prop="personName" label="单位联系人" width="180"></el-table-column> <el-table-column prop="personName" label="单位联系人" width="180"></el-table-column>
...@@ -56,39 +44,18 @@ ...@@ -56,39 +44,18 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-pagination <el-pagination class="fenye" @size-change="handleSizeChange" @current-change="handleCurrentChange"
class="fenye" :current-page="formData.currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="formData.pageSize"
@size-change="handleSizeChange" layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
@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> </div>
<!-- 新增/编辑参会单位授权 --> <!-- 新增/编辑参会单位授权 -->
<el-dialog <el-dialog title="新增|编辑参会单位授权" :visible.sync="dialogFormVisible" :close-on-click-modal="false"
title="新增|编辑参会单位授权" :before-close="handleClose" class="addUnit_dialog">
: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 :model="addForm" label-width="350px" :rules="addFormRules" ref="addForm">
<el-form-item label="选择单位（平台）：" prop="unitId"> <el-form-item label="选择单位（平台）：" prop="unitId">
<el-select <el-select v-model="addForm.unitId" @change="unitNameChange(addForm.unitId)" placeholder="模糊输入（单位名称）"
v-model="addForm.unitId" filterable>
@change="unitNameChange(addForm.unitId)" <el-option v-for="item in unitList" :key="item.id" :label="item.unitName" :value="item.id"></el-option>
placeholder="模糊输入（单位名称）"
filterable
>
<el-option
v-for="item in unitList"
:key="item.id"
:label="item.unitName"
:value="item.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="选择联系人员（浙政钉）：" class="personName" prop="personName"> <el-form-item label="选择联系人员（浙政钉）：" class="personName" prop="personName">
...@@ -110,17 +77,12 @@ ...@@ -110,17 +77,12 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 删除单位二次确认 --> <!-- 删除单位二次确认 -->
<el-dialog <el-dialog title="删除参会单位授权" :visible.sync="delDialog" :close-on-click-modal="false" :before-close="delHandleClose"
title="删除参会单位授权" class="delUnit_dialog">
:visible.sync="delDialog"
:close-on-click-modal="false"
:before-close="delHandleClose"
class="delUnit_dialog"
>
<div class="content"> <div class="content">
<div> <div>
参会单位授权： 参会单位授权：
<span class="unitName">{{delUnitObj.unitName}}</span> <span class="unitName">{{ delUnitObj.unitName }}</span>
</div> </div>
<div>确认删除？</div> <div>确认删除？</div>
</div> </div>
...@@ -130,29 +92,24 @@ ...@@ -130,29 +92,24 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 查看参会单位详细信息 --> <!-- 查看参会单位详细信息 -->
<el-dialog <el-dialog title="参会单位授权信息" :visible.sync="checkDialog" :close-on-click-modal="false" :before-close="checkHandleClose"
title="参会单位授权信息" class="checkUnit_dialog">
:visible.sync="checkDialog"
:close-on-click-modal="false"
:before-close="checkHandleClose"
class="checkUnit_dialog"
>
<div class="body"> <div class="body">
<div class="row"> <div class="row">
<div class="title">参会单位名称：</div> <div class="title">参会单位名称：</div>
<div>{{checkUnitObj.unitName}}</div> <div>{{ checkUnitObj.unitName }}</div>
</div> </div>
<div class="row"> <div class="row">
<div class="title">单位联系人姓名：</div> <div class="title">单位联系人姓名：</div>
<div>{{checkUnitObj.personName}}</div> <div>{{ checkUnitObj.personName }}</div>
</div> </div>
<div class="row"> <div class="row">
<div class="title">单位联系人浙政钉：</div> <div class="title">单位联系人浙政钉：</div>
<div>{{checkUnitObj.dingId}}</div> <div>{{ checkUnitObj.dingId }}</div>
</div> </div>
<div class="row"> <div class="row">
<div class="title">单位联系电话：</div> <div class="title">单位联系电话：</div>
<div>{{checkUnitObj.unitTel}}</div> <div>{{ checkUnitObj.unitTel }}</div>
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -160,15 +117,9 @@ ...@@ -160,15 +117,9 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 选择人员 --> <!-- 选择人员 -->
<batch-add-dialog <batch-add-dialog :changeFlags="2" :batchAddFlag.sync="batchAddFlag" :selectPerson="selectPerson"
:changeFlags="2" @addBatchPeople="addBatchPeople" @sureChange="sureChange" @cancleFlag="cancleFlag"
:batchAddFlag.sync="batchAddFlag" @getPerson="getPerson"></batch-add-dialog>
:selectPerson="selectPerson"
@addBatchPeople="addBatchPeople"
@sureChange="sureChange"
@cancleFlag="cancleFlag"
@getPerson="getPerson"
></batch-add-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -336,7 +287,7 @@ export default { ...@@ -336,7 +287,7 @@ export default {
cancleFlag() { cancleFlag() {
this.dialogVisible = true this.dialogVisible = true
}, },
sureChange() {}, sureChange() { },
addBatchPeople(data) { addBatchPeople(data) {
console.log(data) console.log(data)
this.addForm = { this.addForm = {
...@@ -364,6 +315,7 @@ export default { ...@@ -364,6 +315,7 @@ export default {
if (res.data.code == 200) { if (res.data.code == 200) {
// this.loading = false // this.loading = false
console.log(res) console.log(res)
this.unitList = res.data.data this.unitList = res.data.data
} }
}) })
...@@ -445,19 +397,23 @@ export default { ...@@ -445,19 +397,23 @@ export default {
height: calc(100% - 66px); height: calc(100% - 66px);
background-color: #fff; background-color: #fff;
padding: 24px; padding: 24px;
.topInput { .topInput {
height: 60px; height: 60px;
.el-form { .el-form {
.el-form-item { .el-form-item {}
}
.from_button_item { .from_button_item {
margin-left: 40px; margin-left: 40px;
} }
} }
} }
.maring_left { .maring_left {
margin-left: 20px; margin-left: 20px;
} }
.addUnit { .addUnit {
width: 180px; width: 180px;
height: 40px; height: 40px;
...@@ -471,9 +427,11 @@ export default { ...@@ -471,9 +427,11 @@ export default {
cursor: pointer; cursor: pointer;
margin-bottom: 20px; margin-bottom: 20px;
} }
.unitTable { .unitTable {
width: 100%; width: 100%;
height: calc(100% - 80px); height: calc(100% - 80px);
// background-color: red; // background-color: red;
.unitNum { .unitNum {
width: 170px; width: 170px;
...@@ -481,37 +439,45 @@ export default { ...@@ -481,37 +439,45 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.tableList { .tableList {
width: 100%; width: 100%;
height: calc(100% - 110px); height: calc(100% - 110px);
margin-bottom: 15px; margin-bottom: 15px;
} }
.fenye { .fenye {
height: 60px; height: 60px;
float: right; float: right;
line-height: 60px; line-height: 60px;
} }
} }
/deep/.addUnit_dialog { /deep/.addUnit_dialog {
// background-color: red; // background-color: red;
.el-form-item__content { .el-form-item__content {
width: 300px; width: 300px;
.el-select { .el-select {
// width: 85%; // width: 85%;
width: 250px; width: 250px;
} }
} }
.personName { .personName {
.el-form-item__content { .el-form-item__content {
display: flex; display: flex;
// align-items: center; // align-items: center;
width: 400px; width: 400px;
.el-input { .el-input {
width: 260px; width: 260px;
.el-input__inner { .el-input__inner {
width: 100%; width: 100%;
} }
} }
.xuanze { .xuanze {
width: 125px; width: 125px;
margin-left: 25px; margin-left: 25px;
...@@ -520,31 +486,37 @@ export default { ...@@ -520,31 +486,37 @@ export default {
} }
} }
} }
.unitTel, .unitTel,
.dingId { .dingId {
.el-form-item__content { .el-form-item__content {
width: 50%; width: 50%;
.el-input { .el-input {
width: 250px; width: 250px;
} }
} }
} }
} }
/deep/.delUnit_dialog { /deep/.delUnit_dialog {
.content { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
.unitName { .unitName {
font-size: 20px; font-size: 20px;
} }
} }
} }
/deep/.checkUnit_dialog { /deep/.checkUnit_dialog {
.body { .body {
.row { .row {
display: flex; display: flex;
margin-bottom: 20px; margin-bottom: 20px;
.title { .title {
width: 180px; width: 180px;
text-align: right; text-align: right;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论