Skip to content

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

合并分支 'fc' 到 'master'

Fc 查看合并请求 !8
上级 8139e5d2 aa85d0c7
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 217 行增加 和 117 行删除
src/axios/services.js
浏览文件 @ e5e17a90
......@@ -1364,12 +1364,12 @@ saveScheduleAddress(data){
data
})
},
exportCustomUser(params) {
return axios('/person/exportCustomUser', {
method: 'get',
params
})
},
// exportCustomUser(params) {
// return axios('/person/exportCustomUser', {
// method: 'get',
// params
// })
// },
postImportPerson(data, params) {//导入人员信息
return axios('/person/importCustomUser', {
method: 'post',
......@@ -1655,7 +1655,13 @@ findUnitByCustomOrgId(data){
return axios('/ConferenceProcessNoticePart/findSendNoticePartByProcessId?processId=' + data,{
method:'get'
})
},
//主页面-重新预定会议时间
rescheduleMeeting(data){
return axios('/conferenceProcess/rescheduleMeeting?processId='+data,{
method:'get',
})
}
}
export default server
src/views/meeting/componets/MeetingItem.vue
浏览文件 @ e5e17a90
......@@ -121,33 +121,15 @@ export default {
methods: {
modifyDate(e, val) {
this.flash = false
console.log(val)
let data = {
id: val.id,
startDate: e,
}
this.$axios
.postDelayConf(data)
.then((res) => {
if (res.data.code == 200) {
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) => {})
this.$emit('getData')
setTimeout(() => {
this.flash = true
}, 500)
this.$message({
type: 'error',
message: res.data.data,
})
this.flash = true
},
openAddDialog() {
this.$emit('newConference')
......
src/views/meeting/operation/chooseModule/index.vue
浏览文件 @ e5e17a90
......@@ -9,7 +9,7 @@
</div>-->
<div class="module_title">
<div class="title_reserve">
<!-- @click="switchOperation(1)" -->
<!-- @click="switchOperation(1)" -->
<div :class="isActive===1?'fontCor':''">预定会议室</div>
<div :class="isActive===1?'line':''"></div>
</div>
......@@ -36,6 +36,7 @@
type="date"
placeholder="选择日期"
value-format="yyyy-MM-dd"
@change="pickerChange()"
></el-date-picker>
</el-form-item>
<el-form-item label="容纳人数：" class="sort">
......@@ -115,6 +116,7 @@
</div>
</div>-->
<time-list
ref="timeList"
:canClick="canClick"
:conferenceProcessReservationRecordList="conferenceProcessReservationRecordList"
:isHover="false
......@@ -123,7 +125,7 @@
></time-list>
<div class="time_bottom">
<div class="time_tips">注：更换时间不换会议室，不影响已排座数据；同一时间段重复预定的，遇此情况请线下协商会议改期。</div>
<div class="yuding" @click="yuding()">下一步</div>
<!-- <div class="yuding" @click="yuding()">下一步</div> -->
</div>
</div>
<div v-if="isActive==2">
......@@ -340,36 +342,21 @@ export default {
},
methods: {
selectConfence() {
this.getConferenceList(this.ruleForm)
pickerChange() {
this.currentConfenrence.reservationStartTime =
this.ruleForm.reservationStartTime + ' ' + this.currentConfenrence.reservationStartTime.split(' ')[1]
this.currentConfenrence.reservationEndTime =
this.ruleForm.reservationStartTime + ' ' + this.currentConfenrence.reservationEndTime.split(' ')[1]
},
//获取布局
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
}
console.log(y + '-' + m + '-' + d)
return y + '-' + m + '-' + d
// 上一步
lastSet() {
this.isActive = 1
this.$emit('getPredetermine', this.isActive)
this.getConferenceList(this.ruleForm)
},
//预定会议室
yuding() {
//下一步
nextSet() {
// console.log(333333)
this.currentConfenrence.processId = this.$route.query.processId
console.log(this.ruleForm)
......@@ -385,7 +372,7 @@ export default {
this.$axios.reservationConference(this.currentConfenrence).then((res) => {
console.log(res)
if (res.data.code == 200) {
this.$message.success('会议预定成功')
this.$message.success('预定成功')
this.isActive = 2
this.getCvans(this.currentConfenrence)
// this.predetermine =
......@@ -403,16 +390,58 @@ export default {
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) {
this.$axios.findReservationConference(data).then((res) => {
if (res.data.code == 200) {
console.log('resresresres', res)
this.trueList = res.data.data.conferenceAndUseInfoVoList
console.log(this.trueList)
this.dataLists = res.data.data
this.choosePei(this.radio)
if (res.data.data.conferenceName) {
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()
......@@ -426,12 +455,18 @@ export default {
console.log(this.currentConfenrence)
},
switchOperation(val) {
console.log(val)
console.log('currentConfenrence', this.currentConfenrence)
if (val === 1) {
this.isActive = 1
this.getConferenceList(this.ruleForm)
} else {
this.isActive = 2
this.getCvans(this.currentConfenrence)
this.$message.error('进入下一步请点击屏幕下方"下一步"按钮!')
// if (!this.currentConfenrence.reservationStartTime) {
// this.$message.error('请先选择会议使用时间')
// } else {
// }
}
},
checkImg(item) {
......@@ -564,7 +599,7 @@ export default {
this.$message.success('保存成功！')
loading.close()
this.$router.push({
path: '/operation/divideArea',
path: '/operation/noticeMeeting',
query: {
processId: this.$route.query.processId,
isProcess: this.$route.query.isProcess,
......@@ -655,7 +690,7 @@ export default {
flex-direction: column;
align-items: center;
font-size: 18px;
cursor: pointer;
// cursor: pointer;
.line {
width: 120%;
height: 4px;
......@@ -1001,7 +1036,27 @@ export default {
// font-family: "PangMenZhengDao";
margin-right: 36px;
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 {
background-image: url('../../../../assets/meetingPalce/paiwei/conf.png') !important;
background-repeat: no-repeat;
......
src/views/meeting/operation/chooseModule/timeList.vue
浏览文件 @ e5e17a90
......@@ -157,6 +157,7 @@ export default {
},
//选中的时间区间
selectRange(item, index) {
console.log('item', item)
if (this.timeSelectObj.reservationStartTime && this.timeSelectObj.reservationEndTime) {
this.timeSelectObj.reservationStartTime = item
this.timeSelectObj.reservationEndTime = ''
......
src/views/meeting/operation/divideArea/index.vue
浏览文件 @ e5e17a90
......@@ -113,7 +113,7 @@
</div>
<div class="header">
<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">
新增人员
<i class="arrow-down-icon"></i>
......@@ -136,13 +136,7 @@
type="primary"
@click="rcSendFlag = true"
>{{ 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="allPersonFlag && $store.state.rcSendStatus == 2"
......@@ -168,6 +162,13 @@
:disabled="checkList.length == 0"
@click="batchDel()"
>批量删除</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>-->
</div>
......@@ -175,15 +176,22 @@
<div>
<div class="select_text">查询：</div>
<el-input
class="select_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> -->
<div class="select_text">排序:</div>
<el-select v-model="infoSelect" placeholder="请选标签" @change="selectAreaChange()">
<el-select
v-model="infoSelect"
clearable
placeholder="请选标签"
@change="selectAreaChange()"
>
<el-option
v-for="item in customOrgList"
:label="item.customOrgName"
......@@ -640,7 +648,7 @@ export default {
background: 'rgba(0, 0, 0, 0.7)',
},
colorLists: [
'#a50fbd',
'#247AEF',
'#36BEAC',
'#F28A68',
'#9398F7',
......@@ -2272,6 +2280,7 @@ export default {
div {
display: flex;
align-items: center;
width: 500px;
.el-button {
margin-left: 10px;
}
......@@ -2280,6 +2289,12 @@ export default {
width: 80px;
margin-left: 15px;
}
.el-select {
width: 200px;
}
.select_input {
width: 300px;
}
.all_choose_box {
line-height: 77px;
/deep/.el-checkbox {
......
src/views/meeting/operation/noticeMeeting/index.vue
浏览文件 @ e5e17a90
......@@ -1153,7 +1153,7 @@ export default {
console.log(res)
if (res.data.code == 200) {
this.noticeHandleClose()
this.noticeVisileLoading = true
this.noticeVisileLoading = false
this.$message.success('发送通知成功')
this.init(this.activeIndex)
} else {
......
src/views/meeting/operation/operation.vue
浏览文件 @ e5e17a90
......@@ -143,9 +143,9 @@
v-for="(item, index) of meetingForm"
: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>
</span>
<span class="row_item_text" v-else>{{ item.value }}</span>
......@@ -240,11 +240,22 @@
<!-- >-->
<!-- 返回-->
<!-- </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
v-if="$route.meta.title === 'chooseModule' && yuding==2"
class="but normal_but"
@click="nextStep()"
>确定</div>
>保存</div>
<div class="but quit_but" @click="quit">回首页</div>
</div>
......@@ -563,6 +574,14 @@ export default {
nextStep() {
this.$refs['select_wrap'].toSortSeat()
},
nextSet() {
console.log('下一步')
this.$refs['select_wrap'].nextSet()
},
lastSet() {
console.log('上一步')
this.$refs['select_wrap'].lastSet()
},
addDialogClose() {
this.dialogVisible = false
},
......@@ -620,30 +639,46 @@ export default {
// console.log('333333')
this.$store.commit('changeRcSendStatus', res.data.data.rcSendStatus)
this.meetingData = res.data.data
this.meetingForm = [
{
key: '时间',
value: this.meetingData.startDate ? this.meetingData.startDate : '暂无信息',
},
{
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 + ')' : '')
: '暂无信息',
},
]
if (this.$route.path == '/operation/chooseModule') {
this.meetingForm = [
{
key: '单位',
value: this.meetingData.unitName ? this.meetingData.unitName : '暂无信息',
},
{
key: '联系人',
value: this.meetingData.processPerson
? this.meetingData.processPerson + (this.meetingData.processPhone ? '(' + this.meetingData.processPhone + ')' : '')
: '暂无信息',
},
]
} else {
this.meetingForm = [
{
key: '时间',
value: this.meetingData.startDate ? this.meetingData.startDate : '暂无信息',
},
{
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.status = this.meetingData.processStatus
// console.log(this.meetingData)
......
src/views/reserveRecord/allConfence.vue
浏览文件 @ e5e17a90
......@@ -109,7 +109,12 @@ export default {
if (month + 1 < 10) {
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()) {
// console.log('等于')
return 'blue'
......
src/views/reserveRecord/index.vue
浏览文件 @ e5e17a90
......@@ -245,7 +245,7 @@ export default {
}
let day = new Date().getDate()
if (day < 10) {
day = '0' + (day + 1)
day = '0' + day
}
let date = new Date().getFullYear() + '-' + month + '-' + day
console.log('data', date)
......
src/views/system/index.vue
浏览文件 @ e5e17a90
......@@ -142,11 +142,11 @@ export default {
// path: "/system/bankMangager/range",
// Rindex: 4 - 3,
// },
// {
// name: '模板库管理',
// path: '/system/bankMangager/templateLibrary',
// Rindex: 4 - 4,
// },
{
name: '模板库管理',
path: '/system/bankMangager/templateLibrary',
Rindex: 4 - 4,
},
// {
// name: '单位库管理',
// path: '/system/bankMangager/unitLibrary',
......
src/views/system/personLabel.vue
浏览文件 @ e5e17a90
......@@ -243,7 +243,7 @@
<div>{{editPersonObj.customUserUnit}}</div>
</el-form-item>
<el-form-item label="浙政钉ID：">
<div>{{editPersonObj.id}}</div>
<div>{{editPersonObj.customUserDingId}}</div>
</el-form-item>
<el-form-item label="参会单位（平台）：" prop="sysUnitId">
<!-- <el-input v-model="editPersonObj.sysUnitName" ></el-input>
......@@ -702,6 +702,7 @@ export default {
//导出
exportLabel() {
console.log('exportLabel')
console.log(this.formData)
this.$axios.exportCustomUser(this.formData.customOrgId).then((res) => {
console.log(res)
if (res.data.code == 200) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论