Skip to content

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

fc

上级 e90a0495
隐藏空白字符变更
内嵌 并排
正在显示 包含 453 行增加 和 184 行删除
src/axios/services.js
浏览文件 @ e1bd061d
...@@ -1364,12 +1364,12 @@ saveScheduleAddress(data){ ...@@ -1364,12 +1364,12 @@ saveScheduleAddress(data){
data data
}) })
}, },
exportCustomUser(params) { // exportCustomUser(params) {
return axios('/person/exportCustomUser', { // return axios('/person/exportCustomUser', {
method: 'get', // method: 'get',
params // params
}) // })
}, // },
postImportPerson(data, params) {//导入人员信息 postImportPerson(data, params) {//导入人员信息
return axios('/person/importCustomUser', { return axios('/person/importCustomUser', {
method: 'post', method: 'post',
...@@ -1655,7 +1655,13 @@ findUnitByCustomOrgId(data){ ...@@ -1655,7 +1655,13 @@ findUnitByCustomOrgId(data){
return axios('/ConferenceProcessNoticePart/findSendNoticePartByProcessId?processId=' + data,{ return axios('/ConferenceProcessNoticePart/findSendNoticePartByProcessId?processId=' + data,{
method:'get' method:'get'
}) })
},
//主页面-重新预定会议时间
rescheduleMeeting(data){
return axios('/conferenceProcess/rescheduleMeeting?processId='+data,{
method:'get',
})
} }
} }
export default server export default server
src/views/meeting/componets/MeetingItem.vue
浏览文件 @ e1bd061d
...@@ -121,33 +121,15 @@ export default { ...@@ -121,33 +121,15 @@ export default {
methods: { methods: {
modifyDate(e, val) { modifyDate(e, val) {
this.flash = false this.flash = false
console.log(val) this.$emit('getData')
let data = { setTimeout(() => {
id: val.id, this.flash = true
startDate: e, }, 500)
} this.$message({
this.$axios type: 'error',
.postDelayConf(data) message: res.data.data,
.then((res) => { })
if (res.data.code == 200) { this.flash = true
this.$message({
type: 'success',
message: '修改成功',
})
val.processDate = e
this.$emit('getData')
setTimeout(() => {
this.flash = true
}, 500)
} else {
this.$message({
type: 'error',
message: res.data.data,
})
this.flash = true
}
})
.catch((err) => {})
}, },
openAddDialog() { openAddDialog() {
this.$emit('newConference') this.$emit('newConference')
......
src/views/meeting/componets/TimeCountDown.vue
浏览文件 @ e1bd061d
<template> <template>
<div class="count_down_wrap"> <div class="count_down_wrap">
<span><span v-if="tagFlag">倒计时 </span>{{countDown}} <span>
<span v-if="tagFlag">倒计时</span>
{{countDown}}
<span v-if="over" class="overdue"> <span v-if="over" class="overdue">
<i class="overdue_icon" v-if="edit"></i> <i class="overdue_icon" v-if="edit" @click="selectTime()"></i>
<el-date-picker
v-if="edit" <!-- <el-date-picker
:picker-options="pickerOptions0" v-if="edit"
v-model="time" :picker-options="pickerOptions0"
@change="handleChange" v-model="time"
value-format="yyyy-MM-dd HH:mm:ss" @change="handleChange"
type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"> type="datetime"
</el-date-picker> placeholder="选择日期时间"
></el-date-picker>-->
</span> </span>
</span> </span>
<el-dialog
title="修改过期会议"
:visible.sync="dialogFormVisible"
:before-close="handleClose"
class="selectTimeDialog"
width="1500px"
v-if="item
"
>
<div class="conferenceName">会议名称：{{item.processName}}</div>
<div class="dialog_top">
<div class="name">{{currentConfenrenceObj.conferenceName}}</div>
<div v-for="(i,index) in item.data" :key="index" class="content">
<div v-if="i.key!=='来源'" class="key">{{i.key }}:</div>
<div v-if="i.key!=='来源'" class="value">{{ i.value }}</div>
</div>
</div>
<div class="dayTime">
<div>预计使用时间：</div>
<el-date-picker
v-model="dayTime"
:picker-options="pickerOptions"
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
@change="dayTimeChange()"
></el-date-picker>
</div>
<div class="timeList">
<timeList
:canClick="canClick"
:conferenceProcessReservationRecordList="conferenceProcessReservationRecordList"
:isHover="false
"
@getTimeRange="getTimeRange"
></timeList>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="handleClose()">取 消</el-button>
<el-button type="primary" @click="submit()">确 定</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import axios from '../../../axios'
import timeList from '../operation/chooseModule/timeList.vue'
export default { export default {
components: { timeList },
data() { data() {
return { return {
date: "", date: '',
edit:true, edit: true,
hour: "", hour: '',
minute: "", minute: '',
second: "", second: '',
time:'', time: '',
over:false, over: false,
pickerOptions0: { pickerOptions0: {
disabledDate: (time) => { disabledDate: (time) => {
return time.getTime() < Date.now() - 8.64e7; return time.getTime() < Date.now() - 8.64e7
},
},
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 24 * 3600 * 1000
}, },
}, },
}; dayTime: this.getDate(),
dialogFormVisible: false,
conferenceProcessReservationRecordList: [],
canClick: true,
currentConfenrenceObj: {},
}
}, },
mounted() { mounted() {
this.countTime(); this.countTime()
},
props: ['endTime', 'tagFlag', 'item'],
watch: {
// item() {
// console.log(this.item)
// },
}, },
props: ["endTime","tagFlag","item"],
methods: { methods: {
modify(){ handleClose() {
this.$emit('modifyDate',this.item) this.dialogFormVisible = false
this.currentConfenrenceObj = {}
},
dayTimeChange() {
// console.log(this.dayTime)
this.currentConfenrenceObj.reservationEndTime = this.dayTime + ' ' + this.currentConfenrenceObj.reservationEndTime.split(' ')[1]
this.currentConfenrenceObj.reservationStartTime = this.dayTime + ' ' + this.currentConfenrenceObj.reservationEndTime.split(' ')[1]
// console.log(this.currentConfenrenceObj)
},
submit() {
console.log(this.currentConfenrenceObj)
let data = {
endDate: this.currentConfenrenceObj.reservationEndTime,
id: this.item.id,
startDate: this.currentConfenrenceObj.reservationStartTime,
}
console.log(data)
this.$axios.postDelayConf(data).then((res) => {
console.log(res)
if (res.data.code == 200) {
this.handleClose()
this.$message.success('修改成功')
this.$emit('modifyDate')
} else {
this.$message.error(`${res.data.data}`)
}
})
// console.log(this.currentConfenrenceObj)
}, },
handleChange(e){ getDate() {
this.$emit('modifyDate',e,this.item) let y = new Date().getFullYear()
let m = new Date().getMonth() + 1
let d = new Date().getDate()
if (m < 10) {
m = '0' + m
}
if (d < 10) {
d = '0' + d
}
console.log(y + '-' + m + '-' + d)
return y + '-' + m + '-' + d
},
selectTime() {
console.log(this.item)
this.$axios.rescheduleMeeting(this.item.id).then((res) => {
console.log('res', res)
this.currentConfenrenceObj = res.data.data
})
this.dialogFormVisible = true
}, },
//子组件返回的值
getTimeRange(value) {
console.log(this.dayTime)
console.log(value)
this.currentConfenrenceObj.reservationEndTime = this.dayTime + ' ' + value.reservationEndTime
this.currentConfenrenceObj.reservationStartTime = this.dayTime + ' ' + value.reservationStartTime
console.log(this.currentConfenrenceObj)
},
// modify() {
// this.$emit('modifyDate', this.item)
// },
// handleChange(e) {
// this.$emit('modifyDate', e, this.item)
// },
countTime() { countTime() {
//获取当前时间 //获取当前时间
let date = new Date(); let date = new Date()
let now = date.getTime(); let now = date.getTime()
//设置截止时间 //设置截止时间
let str = this.endTime; let str = this.endTime
let endDate = new Date(str); let endDate = new Date(str)
let end = endDate.getTime(); let end = endDate.getTime()
//时间差 //时间差
let leftTime = end - now; let leftTime = end - now
if (leftTime < 0) { if (leftTime < 0) {
this.date = "00天"; this.date = '00天'
this.hour = "00时"; this.hour = '00时'
this.minute = "00分"; this.minute = '00分'
this.second = "00秒"; this.second = '00秒'
} else { } else {
//定义变量 d,h,m,s保存倒计时的时间 //定义变量 d,h,m,s保存倒计时的时间
let d, h, m, s; let d, h, m, s
if (leftTime >= 0) { if (leftTime >= 0) {
d = this.checkedZero(Math.floor(leftTime / 1000 / 60 / 60 / 24)); d = this.checkedZero(Math.floor(leftTime / 1000 / 60 / 60 / 24))
h = this.checkedZero(Math.floor((leftTime / 1000 / 60 / 60) % 24)); h = this.checkedZero(Math.floor((leftTime / 1000 / 60 / 60) % 24))
m = this.checkedZero(Math.floor((leftTime / 1000 / 60) % 60)); m = this.checkedZero(Math.floor((leftTime / 1000 / 60) % 60))
s = this.checkedZero(Math.floor((leftTime / 1000) % 60)); s = this.checkedZero(Math.floor((leftTime / 1000) % 60))
} }
this.date = d + "天"; this.date = d + '天'
this.hour = h + "时"; this.hour = h + '时'
this.minute = m + "分"; this.minute = m + '分'
this.second = s + "秒"; this.second = s + '秒'
} }
}, },
checkedZero(number) { checkedZero(number) {
//补0 //补0
if (number <= 9) { if (number <= 9) {
// eslint-disable-next-line no-param-reassign // eslint-disable-next-line no-param-reassign
number = `0${number}`; number = `0${number}`
} }
return number; return number
}, },
}, },
computed: { computed: {
countDown() { countDown() {
//递归每秒调用countTime方法，显示动态时间效果 //递归每秒调用countTime方法，显示动态时间效果
setTimeout(this.countTime, 1000); setTimeout(this.countTime, 1000)
if ( if (this.date == '00天' && this.hour == '00时' && this.minute == '00分' && this.second == '00秒') {
this.date == "00天" && if (this.$route.meta.title === 'confList') {
this.hour == "00时" && this.edit = true
this.minute == "00分" && } else {
this.second == "00秒" this.edit = false
) { }
if(this.$route.meta.title === 'confList'){
this.edit = true
}else{
this.edit = false
}
this.over = true this.over = true
return '已过期' return '已过期'
} else { } else {
this.over = false this.over = false
return this.date + this.hour + this.minute + this.second; return this.date + this.hour + this.minute + this.second
} }
// console.log(this.date + this.hour + this.minute + this.second); // console.log(this.date + this.hour + this.minute + this.second);
}, },
}, },
}; }
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.count_down_wrap { .count_down_wrap {
...@@ -119,22 +237,72 @@ export default { ...@@ -119,22 +237,72 @@ export default {
} }
.overdue { .overdue {
position: relative; position: relative;
.el-date-editor--datetime{ .el-date-editor--datetime {
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
} }
.el-date-editor.el-input, /deep/ .el-input__inner{ .el-date-editor.el-input,
/deep/ .el-input__inner {
width: 20px; width: 20px;
height: 20px; height: 20px;
opacity: 0; opacity: 0;
} }
/deep/ .el-input--prefix .el-input__inner{ /deep/ .el-input--prefix .el-input__inner {
padding-left: 0; padding-left: 0;
} }
/deep/ .el-input--suffix .el-input__inner{ /deep/ .el-input--suffix .el-input__inner {
padding-right: 0; padding-right: 0;
} }
} }
/deep/.selectTimeDialog {
.el-dialog {
.el-dialog__body {
display: flex !important;
flex-direction: column;
.conferenceName {
width: 100%;
margin-bottom: 10px;
}
.dialog_top {
width: 100%;
display: flex;
// text-align: left;
height: 32px;
line-height: 32px;
padding-left: 15px;
background-color: rgba(118, 144, 237, 0.2);
.name {
color: #5474e8;
margin-right: 45px;
}
.content {
display: flex;
margin-right: 45px;
.key {
color: #778ca2;
}
.value {
color: #3a3c4b;
}
}
}
.dayTime {
width: 100%;
height: 48px;
line-height: 48px;
display: flex;
align-items: center;
margin-top: 20px;
margin-bottom: 15px;
.el-date-editor {
width: 150px;
height: 100%;
opacity: 1;
}
}
}
}
}
</style> </style>
\ No newline at end of file
src/views/meeting/operation/chooseModule/index.vue
浏览文件 @ e1bd061d
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</div>--> </div>-->
<div class="module_title"> <div class="module_title">
<div class="title_reserve"> <div class="title_reserve">
<!-- @click="switchOperation(1)" --> <!-- @click="switchOperation(1)" -->
<div :class="isActive===1?'fontCor':''">预定会议室</div> <div :class="isActive===1?'fontCor':''">预定会议室</div>
<div :class="isActive===1?'line':''"></div> <div :class="isActive===1?'line':''"></div>
</div> </div>
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
type="date" type="date"
placeholder="选择日期" placeholder="选择日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@change="pickerChange()"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="容纳人数：" class="sort"> <el-form-item label="容纳人数：" class="sort">
...@@ -115,6 +116,7 @@ ...@@ -115,6 +116,7 @@
</div> </div>
</div>--> </div>-->
<time-list <time-list
ref="timeList"
:canClick="canClick" :canClick="canClick"
:conferenceProcessReservationRecordList="conferenceProcessReservationRecordList" :conferenceProcessReservationRecordList="conferenceProcessReservationRecordList"
:isHover="false :isHover="false
...@@ -123,7 +125,7 @@ ...@@ -123,7 +125,7 @@
></time-list> ></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> -->
</div> </div>
</div> </div>
<div v-if="isActive==2"> <div v-if="isActive==2">
...@@ -340,36 +342,21 @@ export default { ...@@ -340,36 +342,21 @@ export default {
}, },
methods: { methods: {
selectConfence() { pickerChange() {
this.getConferenceList(this.ruleForm) this.currentConfenrence.reservationStartTime =
this.ruleForm.reservationStartTime + ' ' + this.currentConfenrence.reservationStartTime.split(' ')[1]
this.currentConfenrence.reservationEndTime =
this.ruleForm.reservationStartTime + ' ' + this.currentConfenrence.reservationEndTime.split(' ')[1]
}, },
//获取布局 // 上一步
getCvans(data) { lastSet() {
this.$axios.findConferenceLayOut(data).then((res) => { this.isActive = 1
console.log(res) this.$emit('getPredetermine', this.isActive)
if (res.data.code == 200) { this.getConferenceList(this.ruleForm)
this.moduleList = res.data.data.confLayoutList
this.moduleId = res.data.data.confLayoutList[0].id
this.confenceObj = {
conferenceAddress: res.data.data.conferenceAddress,
time: res.data.data.reservationStartTime + '-' + res.data.data.reservationEndTime.split(' ')[1],
}
}
})
},
getDate() {
let y = new Date().getFullYear()
let m = new Date().getMonth() + 1
let d = new Date().getDate()
if (m < 10) {
m = '0' + m
}
console.log(y + '-' + m + '-' + d)
return y + '-' + m + '-' + d
}, },
//预定会议室 //下一步
yuding() { nextSet() {
// console.log(333333)
this.currentConfenrence.processId = this.$route.query.processId this.currentConfenrence.processId = this.$route.query.processId
console.log(this.ruleForm) console.log(this.ruleForm)
...@@ -385,7 +372,7 @@ export default { ...@@ -385,7 +372,7 @@ export default {
this.$axios.reservationConference(this.currentConfenrence).then((res) => { this.$axios.reservationConference(this.currentConfenrence).then((res) => {
console.log(res) console.log(res)
if (res.data.code == 200) { if (res.data.code == 200) {
this.$message.success('会议预定成功') this.$message.success('预定成功')
this.isActive = 2 this.isActive = 2
this.getCvans(this.currentConfenrence) this.getCvans(this.currentConfenrence)
// this.predetermine = // this.predetermine =
...@@ -403,16 +390,58 @@ export default { ...@@ -403,16 +390,58 @@ export default {
this.$message.error('请选择会议室具体使用时间') this.$message.error('请选择会议室具体使用时间')
} }
}, },
selectConfence() {
this.getConferenceList(this.ruleForm)
},
//获取布局
getCvans(data) {
this.$axios.findConferenceLayOut(data).then((res) => {
console.log(res)
if (res.data.code == 200) {
this.moduleList = res.data.data.confLayoutList
this.moduleId = res.data.data.confLayoutList[0].id
this.confenceObj = {
conferenceAddress: res.data.data.conferenceAddress,
time: res.data.data.reservationStartTime + '-' + res.data.data.reservationEndTime.split(' ')[1],
}
}
})
},
getDate() {
let y = new Date().getFullYear()
let m = new Date().getMonth() + 1
let d = new Date().getDate()
if (m < 10) {
m = '0' + m
}
if (d < 10) {
d = '0' + d
}
console.log(y + '-' + m + '-' + d)
return y + '-' + m + '-' + d
},
//查询会议室 //查询会议室
getConferenceList(data) { getConferenceList(data) {
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(this.trueList)
this.dataLists = res.data.data this.dataLists = res.data.data
if (res.data.data.conferenceName) {
this.choosePei(this.radio) for (let i in this.trueList) {
if (res.data.data.conferenceName == this.trueList[i].conferenceName) {
this.chooseConfs(this.trueList[i])
this.$refs.timeList.selectRange(res.data.data.reservationStartTime.split(' ')[1])
this.$refs.timeList.selectRange(res.data.data.reservationEndTime.split(' ')[1])
}
}
} else {
this.choosePei(this.radio)
}
} }
}) })
// this.$forceUpdate() // this.$forceUpdate()
...@@ -426,12 +455,18 @@ export default { ...@@ -426,12 +455,18 @@ export default {
console.log(this.currentConfenrence) console.log(this.currentConfenrence)
}, },
switchOperation(val) { switchOperation(val) {
console.log(val)
console.log('currentConfenrence', this.currentConfenrence)
if (val === 1) { if (val === 1) {
this.isActive = 1 this.isActive = 1
this.getConferenceList(this.ruleForm) this.getConferenceList(this.ruleForm)
} else { } else {
this.isActive = 2 this.$message.error('进入下一步请点击屏幕下方"下一步"按钮!')
this.getCvans(this.currentConfenrence) // if (!this.currentConfenrence.reservationStartTime) {
// this.$message.error('请先选择会议使用时间')
// } else {
// }
} }
}, },
checkImg(item) { checkImg(item) {
...@@ -564,7 +599,7 @@ export default { ...@@ -564,7 +599,7 @@ export default {
this.$message.success('保存成功！') this.$message.success('保存成功！')
loading.close() loading.close()
this.$router.push({ this.$router.push({
path: '/operation/divideArea', path: '/operation/noticeMeeting',
query: { query: {
processId: this.$route.query.processId, processId: this.$route.query.processId,
isProcess: this.$route.query.isProcess, isProcess: this.$route.query.isProcess,
...@@ -655,7 +690,7 @@ export default { ...@@ -655,7 +690,7 @@ export default {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
font-size: 18px; font-size: 18px;
cursor: pointer; // cursor: pointer;
.line { .line {
width: 120%; width: 120%;
height: 4px; height: 4px;
...@@ -1001,7 +1036,27 @@ export default { ...@@ -1001,7 +1036,27 @@ export default {
// font-family: "PangMenZhengDao"; // font-family: "PangMenZhengDao";
margin-right: 36px; margin-right: 36px;
cursor: pointer; cursor: pointer;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
.confItemHover {
display: none;
}
} }
// .confItem:hover {
// position: relative;
// // overflow: visible;
// // text-overflow: ellipsis;
// // white-space: nowrap;
// .confItemHover {
// display: inline-block;
// position: absolute;
// top: -20px;
// right: 0;
// // transform: translate(-50%);
// z-index: 15000;
// }
// }
.choose { .choose {
background-image: url('../../../../assets/meetingPalce/paiwei/conf.png') !important; background-image: url('../../../../assets/meetingPalce/paiwei/conf.png') !important;
background-repeat: no-repeat; background-repeat: no-repeat;
......
src/views/meeting/operation/chooseModule/timeList.vue
浏览文件 @ e1bd061d
...@@ -157,6 +157,7 @@ export default { ...@@ -157,6 +157,7 @@ export default {
}, },
//选中的时间区间 //选中的时间区间
selectRange(item, index) { selectRange(item, index) {
console.log('item', item)
if (this.timeSelectObj.reservationStartTime && this.timeSelectObj.reservationEndTime) { if (this.timeSelectObj.reservationStartTime && this.timeSelectObj.reservationEndTime) {
this.timeSelectObj.reservationStartTime = item this.timeSelectObj.reservationStartTime = item
this.timeSelectObj.reservationEndTime = '' this.timeSelectObj.reservationEndTime = ''
......
src/views/meeting/operation/divideArea/index.vue
浏览文件 @ e1bd061d
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
</div> </div>
<div class="header"> <div class="header">
<div> <div>
<el-dropdown v-show="$store.state.rcSendStatus == 2"> <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>
...@@ -136,13 +136,7 @@ ...@@ -136,13 +136,7 @@
type="primary" type="primary"
@click="rcSendFlag = true" @click="rcSendFlag = true"
>{{ rcName }}</el-button> >{{ rcName }}</el-button>
<div class="all_choose_box">
<el-checkbox
v-if="!allPersonFlag && $store.state.rcSendStatus == 2"
v-model="checkAll"
@change="handleCheckAllChange"
>全选</el-checkbox>
</div>
<!-- <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
v-if="allPersonFlag && $store.state.rcSendStatus == 2" v-if="allPersonFlag && $store.state.rcSendStatus == 2"
...@@ -168,6 +162,13 @@ ...@@ -168,6 +162,13 @@
:disabled="checkList.length == 0" :disabled="checkList.length == 0"
@click="batchDel()" @click="batchDel()"
>批量删除</el-button> >批量删除</el-button>
<div class="all_choose_box">
<el-checkbox
v-if="!allPersonFlag && $store.state.rcSendStatus == 2"
v-model="checkAll"
@change="handleCheckAllChange"
>全选</el-checkbox>
</div>
<!-- <el-button @click="saveArea()" :class="disableFlag ? 'not_allowed_but' : ''">保存排序</el-button>--> <!-- <el-button @click="saveArea()" :class="disableFlag ? 'not_allowed_but' : ''">保存排序</el-button>-->
</div> </div>
...@@ -175,15 +176,22 @@ ...@@ -175,15 +176,22 @@
<div> <div>
<div class="select_text">查询：</div> <div class="select_text">查询：</div>
<el-input <el-input
class="select_input"
placeholder="请输入姓名、单位、职务" placeholder="请输入姓名、单位、职务"
v-model="info" v-model="info"
clearable clearable
@clear="clearSearch()" @clear="clearSearch()"
@change="search()" @change="search()"
@keyup.enter.native="search()"
></el-input> ></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 v-model="infoSelect" placeholder="请选标签" @change="selectAreaChange()"> <el-select
v-model="infoSelect"
clearable
placeholder="请选标签"
@change="selectAreaChange()"
>
<el-option <el-option
v-for="item in customOrgList" v-for="item in customOrgList"
:label="item.customOrgName" :label="item.customOrgName"
...@@ -640,7 +648,7 @@ export default { ...@@ -640,7 +648,7 @@ export default {
background: 'rgba(0, 0, 0, 0.7)', background: 'rgba(0, 0, 0, 0.7)',
}, },
colorLists: [ colorLists: [
'#a50fbd', '#247AEF',
'#36BEAC', '#36BEAC',
'#F28A68', '#F28A68',
'#9398F7', '#9398F7',
...@@ -2272,6 +2280,7 @@ export default { ...@@ -2272,6 +2280,7 @@ export default {
div { div {
display: flex; display: flex;
align-items: center; align-items: center;
width: 500px;
.el-button { .el-button {
margin-left: 10px; margin-left: 10px;
} }
...@@ -2280,6 +2289,12 @@ export default { ...@@ -2280,6 +2289,12 @@ export default {
width: 80px; width: 80px;
margin-left: 15px; margin-left: 15px;
} }
.el-select {
width: 200px;
}
.select_input {
width: 300px;
}
.all_choose_box { .all_choose_box {
line-height: 77px; line-height: 77px;
/deep/.el-checkbox { /deep/.el-checkbox {
......
src/views/meeting/operation/noticeMeeting/index.vue
浏览文件 @ e1bd061d
...@@ -1153,7 +1153,7 @@ export default { ...@@ -1153,7 +1153,7 @@ export default {
console.log(res) console.log(res)
if (res.data.code == 200) { if (res.data.code == 200) {
this.noticeHandleClose() this.noticeHandleClose()
this.noticeVisileLoading = true this.noticeVisileLoading = false
this.$message.success('发送通知成功') this.$message.success('发送通知成功')
this.init(this.activeIndex) this.init(this.activeIndex)
} else { } else {
......
src/views/meeting/operation/operation.vue
浏览文件 @ e1bd061d
...@@ -143,9 +143,9 @@ ...@@ -143,9 +143,9 @@
v-for="(item, index) of meetingForm" v-for="(item, index) of meetingForm"
:key="index" :key="index"
> >
<span class="row_item_label">{{ 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> <span class="row_item_text" v-else>{{ item.value }}</span>
...@@ -240,11 +240,22 @@ ...@@ -240,11 +240,22 @@
<!-- >--> <!-- >-->
<!-- 返回--> <!-- 返回-->
<!-- </div>--> <!-- </div>-->
<div
v-if="$route.meta.title === 'chooseModule' && yuding==1"
class="but normal_but"
@click="nextSet()"
>下一步</div>
<div
v-if="$route.meta.title === 'chooseModule' && yuding==2"
class="but normal_but"
@click="lastSet()"
>上一步</div>
<div <div
v-if="$route.meta.title === 'chooseModule' && yuding==2" v-if="$route.meta.title === 'chooseModule' && yuding==2"
class="but normal_but" class="but normal_but"
@click="nextStep()" @click="nextStep()"
>确定</div> >保存</div>
<div class="but quit_but" @click="quit">回首页</div> <div class="but quit_but" @click="quit">回首页</div>
</div> </div>
...@@ -563,6 +574,14 @@ export default { ...@@ -563,6 +574,14 @@ export default {
nextStep() { nextStep() {
this.$refs['select_wrap'].toSortSeat() this.$refs['select_wrap'].toSortSeat()
}, },
nextSet() {
console.log('下一步')
this.$refs['select_wrap'].nextSet()
},
lastSet() {
console.log('上一步')
this.$refs['select_wrap'].lastSet()
},
addDialogClose() { addDialogClose() {
this.dialogVisible = false this.dialogVisible = false
}, },
...@@ -620,30 +639,46 @@ export default { ...@@ -620,30 +639,46 @@ export default {
// console.log('333333') // console.log('333333')
this.$store.commit('changeRcSendStatus', res.data.data.rcSendStatus) this.$store.commit('changeRcSendStatus', res.data.data.rcSendStatus)
this.meetingData = res.data.data this.meetingData = res.data.data
this.meetingForm = [ if (this.$route.path == '/operation/chooseModule') {
{ this.meetingForm = [
key: '时间', {
value: this.meetingData.startDate ? this.meetingData.startDate : '暂无信息', key: '单位',
}, value: this.meetingData.unitName ? this.meetingData.unitName : '暂无信息',
{ },
key: '倒计时', {
value: this.meetingData.startDate ? this.meetingData.startDate : '暂无信息', key: '联系人',
}, value: this.meetingData.processPerson
{ ? this.meetingData.processPerson + (this.meetingData.processPhone ? '(' + this.meetingData.processPhone + ')' : '')
key: '地址', : '暂无信息',
value: this.meetingData.address ? this.meetingData.address : '暂无信息', },
}, ]
{ } else {
key: '单位', this.meetingForm = [
value: this.meetingData.unitName ? this.meetingData.unitName : '暂无信息', {
}, key: '时间',
{ value: this.meetingData.startDate ? this.meetingData.startDate : '暂无信息',
key: '联系人', },
value: this.meetingData.processPerson {
? this.meetingData.processPerson + (this.meetingData.processPhone ? '(' + this.meetingData.processPhone + ')' : '') key: '倒计时',
: '暂无信息', value: this.meetingData.startDate ? this.meetingData.startDate : '暂无信息',
}, },
] {
key: '地址',
value: this.meetingData.address ? this.meetingData.address : '暂无信息',
},
{
key: '单位',
value: this.meetingData.unitName ? this.meetingData.unitName : '暂无信息',
},
{
key: '联系人',
value: this.meetingData.processPerson
? this.meetingData.processPerson + (this.meetingData.processPhone ? '(' + this.meetingData.processPhone + ')' : '')
: '暂无信息',
},
]
}
this.countFlag = true this.countFlag = true
this.status = this.meetingData.processStatus this.status = this.meetingData.processStatus
// console.log(this.meetingData) // console.log(this.meetingData)
......
src/views/reserveRecord/allConfence.vue
浏览文件 @ e1bd061d
...@@ -109,7 +109,12 @@ export default { ...@@ -109,7 +109,12 @@ export default {
if (month + 1 < 10) { if (month + 1 < 10) {
month = '0' + (month + 1) month = '0' + (month + 1)
} }
let date = new Date().getFullYear() + '-' + month + '-' + new Date().getDate() let day = new Date().getDate()
if (day < 10) {
day = '0' + day
}
let date = new Date().getFullYear() + '-' + month + '-' + day
// let date = new Date().getFullYear() + '-' + month + '-' + new Date().getDate()
if (new Date(item.date).getTime() == new Date(date).getTime()) { if (new Date(item.date).getTime() == new Date(date).getTime()) {
// console.log('等于') // console.log('等于')
return 'blue' return 'blue'
......
src/views/reserveRecord/index.vue
浏览文件 @ e1bd061d
...@@ -245,7 +245,7 @@ export default { ...@@ -245,7 +245,7 @@ export default {
} }
let day = new Date().getDate() let day = new Date().getDate()
if (day < 10) { if (day < 10) {
day = '0' + (day + 1) day = '0' + day
} }
let date = new Date().getFullYear() + '-' + month + '-' + day let date = new Date().getFullYear() + '-' + month + '-' + day
console.log('data', date) console.log('data', date)
......
src/views/system/index.vue
浏览文件 @ e1bd061d
...@@ -142,11 +142,11 @@ export default { ...@@ -142,11 +142,11 @@ export default {
// path: "/system/bankMangager/range", // path: "/system/bankMangager/range",
// Rindex: 4 - 3, // Rindex: 4 - 3,
// }, // },
// { {
// name: '模板库管理', name: '模板库管理',
// path: '/system/bankMangager/templateLibrary', path: '/system/bankMangager/templateLibrary',
// Rindex: 4 - 4, Rindex: 4 - 4,
// }, },
// { // {
// name: '单位库管理', // name: '单位库管理',
// path: '/system/bankMangager/unitLibrary', // path: '/system/bankMangager/unitLibrary',
......
src/views/system/personLabel.vue
浏览文件 @ e1bd061d
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
<div>{{editPersonObj.customUserUnit}}</div> <div>{{editPersonObj.customUserUnit}}</div>
</el-form-item> </el-form-item>
<el-form-item label="浙政钉ID："> <el-form-item label="浙政钉ID：">
<div>{{editPersonObj.id}}</div> <div>{{editPersonObj.customUserDingId}}</div>
</el-form-item> </el-form-item>
<el-form-item label="参会单位（平台）：" prop="sysUnitId"> <el-form-item label="参会单位（平台）：" prop="sysUnitId">
<!-- <el-input v-model="editPersonObj.sysUnitName" ></el-input> <!-- <el-input v-model="editPersonObj.sysUnitName" ></el-input>
...@@ -702,6 +702,7 @@ export default { ...@@ -702,6 +702,7 @@ export default {
//导出 //导出
exportLabel() { exportLabel() {
console.log('exportLabel') console.log('exportLabel')
console.log(this.formData)
this.$axios.exportCustomUser(this.formData.customOrgId).then((res) => { this.$axios.exportCustomUser(this.formData.customOrgId).then((res) => {
console.log(res) console.log(res)
if (res.data.code == 200) { if (res.data.code == 200) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论