Skip to content

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

合并分支 'fc' 到 'master'

Fc 查看合并请求 !7
上级 c0171b62 e90a0495
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 221 行增加 和 132 行删除
src/axios/index.js
浏览文件 @ 8139e5d2
...@@ -23,8 +23,8 @@ const env = { ...@@ -23,8 +23,8 @@ const env = {
// API_TEST_ORIGIN: 'http://172.18.27.190:8080/confhd', // API_TEST_ORIGIN: 'http://172.18.27.190:8080/confhd',
// API_BASE_ORIGIN: 'http://192.168.102.146:6888', //越越 // API_BASE_ORIGIN: 'http://192.168.102.146:6888', //越越
// API_TEST_ORIGIN: 'http://192.168.102.146:6888', // API_TEST_ORIGIN: 'http://192.168.102.146:6888',
API_BASE_ORIGIN: 'http://192.168.102.235:6888', //越越 API_BASE_ORIGIN: 'http://192.168.102.238:6888', //越越
API_TEST_ORIGIN: 'http://192.168.102.235:6888', API_TEST_ORIGIN: 'http://192.168.102.238:6888',
}, },
development_ssj: { development_ssj: {
// API_BASE_ORIGIN: 'http://192.168.100.248:6888', // API_BASE_ORIGIN: 'http://192.168.100.248:6888',
......
src/axios/services.js
浏览文件 @ 8139e5d2
...@@ -1649,8 +1649,13 @@ findUnitByCustomOrgId(data){ ...@@ -1649,8 +1649,13 @@ findUnitByCustomOrgId(data){
method:'post', method:'post',
data data
}) })
},
// 通知参会-根据会议id查询发送通知草稿
findSendNoticePartByProcessId(data){
return axios('/ConferenceProcessNoticePart/findSendNoticePartByProcessId?processId=' + data,{
method:'get'
})
} }
} }
export default server export default server
src/views/home.vue
浏览文件 @ 8139e5d2
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
" "
> >
<div class="app_header_left" @click="toHome"> <div class="app_header_left" @click="toHome">
<img src="../assets/img/logo.png" alt /> <img src="../assets/img/header_img.png" alt />
<span>市委在线办会</span> <span>会议智能管理系统</span>
</div> </div>
<div class="header_router"> <div class="header_router">
<router-link <router-link
...@@ -316,8 +316,8 @@ to { ...@@ -316,8 +316,8 @@ to {
letter-spacing: 2px; letter-spacing: 2px;
img { img {
margin-left: 20px; margin-left: 20px;
width: 86px; width: 36px;
height: 40px; height: 36px;
margin-right: 16px; margin-right: 16px;
} }
} }
......
src/views/meeting/operation/Administration/components/BatchAddDialog.vue
浏览文件 @ 8139e5d2
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
width="86%" width="86%"
:before-close="handleClose" :before-close="handleClose"
:modal-append-to-body="false" :modal-append-to-body="false"
:title="changeFlags == 2 ? '更换人员' :changeFlags == 3?'关联参会人员': '批量补录人员'" :title="changeFlags == 2 ? '新增参会单位授权' :changeFlags == 3?'关联参会人员': '批量补录人员'"
:visible.sync="visible" :visible.sync="visible"
:close-on-click-modal="false" :close-on-click-modal="false"
@close="handleClose" @close="handleClose"
......
src/views/meeting/operation/chooseModule/index.vue
浏览文件 @ 8139e5d2
...@@ -67,6 +67,10 @@ ...@@ -67,6 +67,10 @@
<div>操作说明：初次点击"时间块"选择起点时间，再次点击选择结束时间；深灰色时间块：为已预定时间段。</div> <div>操作说明：初次点击"时间块"选择起点时间，再次点击选择结束时间；深灰色时间块：为已预定时间段。</div>
</div> </div>
</div> </div>
<div class="content" v-if="isActive==2">
<div class="content_div">地址：{{ confenceObj.conferenceAddress }}</div>
<div class="content_div">时间：{{ confenceObj.time }}</div>
</div>
<div class="confs" v-if="isActive==1"> <div class="confs" v-if="isActive==1">
<div class="zuo" :class="{ showZuo: listIndex > 0 }" @click="showConfLeft()"></div> <div class="zuo" :class="{ showZuo: listIndex > 0 }" @click="showConfLeft()"></div>
<div class="items"> <div class="items">
...@@ -113,11 +117,13 @@ ...@@ -113,11 +117,13 @@
<time-list <time-list
:canClick="canClick" :canClick="canClick"
:conferenceProcessReservationRecordList="conferenceProcessReservationRecordList" :conferenceProcessReservationRecordList="conferenceProcessReservationRecordList"
:isHover="false
"
@getTimeRange="getTimeRange" @getTimeRange="getTimeRange"
></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">
...@@ -167,6 +173,7 @@ ...@@ -167,6 +173,7 @@
import { Loading } from 'element-ui' import { Loading } from 'element-ui'
import timeList from './timeList.vue' import timeList from './timeList.vue'
import axios from '../../../../axios' import axios from '../../../../axios'
import { time } from 'echarts'
export default { export default {
components: { timeList }, components: { timeList },
watch: { watch: {
...@@ -307,6 +314,7 @@ export default { ...@@ -307,6 +314,7 @@ export default {
], ],
canClick: true, canClick: true,
currentConfenrence: {}, currentConfenrence: {},
confenceObj: {},
// currentConfenrence // currentConfenrence
} }
}, },
...@@ -342,6 +350,10 @@ export default { ...@@ -342,6 +350,10 @@ export default {
if (res.data.code == 200) { if (res.data.code == 200) {
this.moduleList = res.data.data.confLayoutList this.moduleList = res.data.data.confLayoutList
this.moduleId = res.data.data.confLayoutList[0].id 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],
}
} }
}) })
}, },
...@@ -361,29 +373,35 @@ export default { ...@@ -361,29 +373,35 @@ export default {
this.currentConfenrence.processId = this.$route.query.processId this.currentConfenrence.processId = this.$route.query.processId
console.log(this.ruleForm) console.log(this.ruleForm)
if (!this.currentConfenrence.reservationEndTime.split(' ')[1]) { // if()
this.currentConfenrence.reservationEndTime = this.currentConfenrence.reservationStartTime
}
console.log(this.currentConfenrence) console.log(this.currentConfenrence)
this.$refs['ruleForm'].validate((valid) => { if (this.currentConfenrence.reservationStartTime) {
if (valid) { if (!this.currentConfenrence.reservationEndTime.split(' ')[1]) {
this.$axios.reservationConference(this.currentConfenrence).then((res) => { this.currentConfenrence.reservationEndTime = this.currentConfenrence.reservationStartTime
console.log(res)
if (res.data.code == 200) {
this.$message.success('会议预定成功')
this.isActive = 2
this.getCvans(this.currentConfenrence)
// this.predetermine =
this.$emit('getPredetermine', this.isActive)
} else {
this.$message.error(`${res.data.data}`)
}
})
} else {
console.log('error submit!!')
return false
} }
}) console.log(this.currentConfenrence)
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
this.$axios.reservationConference(this.currentConfenrence).then((res) => {
console.log(res)
if (res.data.code == 200) {
this.$message.success('会议预定成功')
this.isActive = 2
this.getCvans(this.currentConfenrence)
// this.predetermine =
this.$emit('getPredetermine', this.isActive)
} else {
this.$message.error(`${res.data.data}`)
}
})
} else {
console.log('error submit!!')
return false
}
})
} else {
this.$message.error('请选择会议室具体使用时间')
}
}, },
//查询会议室 //查询会议室
getConferenceList(data) { getConferenceList(data) {
...@@ -766,6 +784,21 @@ export default { ...@@ -766,6 +784,21 @@ export default {
} }
} }
} }
.content {
width: 90%;
margin: 0 auto;
display: flex;
align-items: center;
height: 32px;
// background: #edeff2;
border-radius: 0px 0px 0px 0px;
opacity: 1;
position: relative;
margin-bottom: 24px;
.content_div {
margin-right: 15px;
}
}
.confMain { .confMain {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
src/views/meeting/operation/chooseModule/timeList.vue
浏览文件 @ 8139e5d2
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
> >
<div <div
class="boxHover" class="boxHover"
v-if="selectFuc(item,index)?'selectTrue':'' " v-if="isHover && selectFuc(item,index)?'selectTrue':'' "
:id="index" :id="index"
:class="rightOrLeft(item)" :class="rightOrLeft(item)"
> >
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<script> <script>
export default { export default {
props: ['conferenceProcessReservationRecordList', 'canClick'], props: ['conferenceProcessReservationRecordList', 'canClick', 'isHover'],
data() { data() {
return { return {
hours: [ hours: [
...@@ -110,7 +110,6 @@ export default { ...@@ -110,7 +110,6 @@ export default {
}, },
methods: { methods: {
rightOrLeft(item) { rightOrLeft(item) {
console.log(item == '12:00:00')
if ( if (
item == '07:00:00' || item == '07:00:00' ||
item == '07:15:00' || item == '07:15:00' ||
......
src/views/meeting/operation/divideArea/index.vue
浏览文件 @ 8139e5d2
...@@ -72,12 +72,12 @@ ...@@ -72,12 +72,12 @@
<div <div
class="edit" class="edit"
@click.stop="editArea(item)" @click.stop="editArea(item)"
v-if="$store.state.rcSendStatus == 2 && noticeStatus==2" v-if="$store.state.rcSendStatus == 2 && noticeStatus==2 && item.areaName!=='未分区'"
></div> ></div>
<div <div
class="close" class="close"
@click.stop="delArea(item)" @click.stop="delArea(item)"
v-if="$store.state.rcSendStatus == 2 && noticeStatus==2" v-if="$store.state.rcSendStatus == 2 && noticeStatus==2 && item.areaName!=='未分区'"
></div> ></div>
<!-- <div <!-- <div
class="outnumber" class="outnumber"
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<!-- <div class="zhezhao" v-show="$store.state.rcSendStatus == 1"></div> --> <!-- <div class="zhezhao" v-show="$store.state.rcSendStatus == 1"></div> -->
<div class="data_right" :class="'data_right_normal'"> <div class="data_right" :class="'data_right_normal'">
<div v-if="!allPersonFlag"> <div v-if="!allPersonFlag">
<span>{{ chosenArea.areaName }}参会范围</span> <span>{{ chosenArea.areaName }}</span>
<span>参会人员：{{ showPersonData.length }}人</span> <span>参会人员：{{ showPersonData.length }}人</span>
</div> </div>
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
<div class="sort_number">{{ index + 1 }}</div> <div class="sort_number">{{ index + 1 }}</div>
</div> </div>
<div class="text_wrap"> <div class="text_wrap">
<div class="name">{{ item.name }}{{noticeStatus}}</div> <div class="name">{{ item.name }}</div>
<div class="position">{{ item.position }}</div> <div class="position">{{ item.position }}</div>
</div> </div>
</div> </div>
...@@ -818,8 +818,8 @@ export default { ...@@ -818,8 +818,8 @@ export default {
} else if (this.noticeStatus == 2) { } else if (this.noticeStatus == 2) {
this.noticeStatus = 1 this.noticeStatus = 1
} }
this.init(this.activeIndex)
this.init() // this.
} else { } else {
this.$message.error(`${res.data.data}`) this.$message.error(`${res.data.data}`)
} }
...@@ -1715,7 +1715,8 @@ export default { ...@@ -1715,7 +1715,8 @@ export default {
} }
}, },
batchAskLeave() { batchAskLeave() {
if (this.multipleSelection.length !== 0) { console.log(this.showPersonData)
if (this.checkList.length !== 0) {
this.$confirm('是否确认已选人员全部请假?', '提示', { this.$confirm('是否确认已选人员全部请假?', '提示', {
customClass: 'message', customClass: 'message',
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -1723,8 +1724,15 @@ export default { ...@@ -1723,8 +1724,15 @@ export default {
type: 'warning', type: 'warning',
}) })
.then(() => { .then(() => {
let arr = this.showPersonData.filter((item, index) => {
for (let i in this.checkList) {
if (item.id == this.checkList[i]) {
return item
}
}
})
this.$axios this.$axios
.postBatchAskLeave(this.multipleSelection) .postBatchAskLeave(arr)
.then((res) => { .then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
this.$message({ this.$message({
...@@ -1732,7 +1740,7 @@ export default { ...@@ -1732,7 +1740,7 @@ export default {
message: res.data.data, message: res.data.data,
type: 'success', type: 'success',
}) })
this.init() this.init(this.activeIndex)
} }
}) })
.catch((err) => {}) .catch((err) => {})
...@@ -1740,7 +1748,7 @@ export default { ...@@ -1740,7 +1748,7 @@ export default {
.catch(() => { .catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消删除', message: '已取消请假',
}) })
}) })
} }
...@@ -1798,7 +1806,7 @@ export default { ...@@ -1798,7 +1806,7 @@ export default {
// console.log('chosenArea',this.chosenArea); // console.log('chosenArea',this.chosenArea);
this.checkList = [] //切换分区时清空多选列表 this.checkList = [] //切换分区时清空多选列表
this.checkAll = false //清空全选标记 this.checkAll = false //清空全选标记
this.multipleSelection = [] //清空全部人员页面的多选 // this.multipleSelection = [] //清空全部人员页面的多选
this.saveArea() this.saveArea()
}, // 选择分区 }, // 选择分区
savePromise() { savePromise() {
......
src/views/meeting/operation/noticeMeeting/index.vue
浏览文件 @ 8139e5d2
...@@ -280,8 +280,8 @@ ...@@ -280,8 +280,8 @@
<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="noticeStatus" type="noticeStatus"
label="筛选通知状态" label="通知状态"
width="130" width="100"
:filters="[ :filters="[
{ text:'未发送 ', value: 0 }, { text:'未发送 ', value: 0 },
{ text:'发送成功', value: 1 }, { text:'发送成功', value: 1 },
...@@ -298,8 +298,8 @@ ...@@ -298,8 +298,8 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
type="feedbackStatus" type="feedbackStatus"
label="筛选反馈状态" label="反馈状态"
width="130" width="100"
:filters="[ :filters="[
{ text: '未反馈 ', value: 0 }, { text: '未反馈 ', value: 0 },
{ text: '确认参会', value: 1 }, { text: '确认参会', value: 1 },
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
<el-table-column prop="partUnitName" label="参会单位" width="120"></el-table-column> <el-table-column prop="partUnitName" label="参会单位" width="120"></el-table-column>
<el-table-column prop="personName" label="单位联系人" width="120"></el-table-column> <el-table-column prop="personName" label="单位联系人" width="120"></el-table-column>
<el-table-column prop="dingId" label="联系人浙政钉" width="120"></el-table-column> <el-table-column prop="dingId" label="联系人浙政钉" width="120"></el-table-column>
<el-table-column prop="unitTel" label="单位联系电话" width="120"></el-table-column> <el-table-column prop="unitTel" label="单位电话" width="100"></el-table-column>
<el-table-column prop="isPart" label="是否参会" width="120"> <el-table-column prop="isPart" label="是否参会" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.isPart==1">是</span> <span v-if="scope.row.isPart==1">是</span>
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="sendTime" label="发送时间" width="120" sortable></el-table-column> <el-table-column prop="sendTime" label="发送时间" width="120" sortable></el-table-column>
<el-table-column prop="feedbackTime" label="反馈时间" width="120" sortable></el-table-column> <el-table-column prop="feedbackTime" label="反馈时间" width="120" sortable></el-table-column>
<el-table-column prop="urgeReadNum" label="催阅" sortable></el-table-column> <el-table-column prop="urgeReadNum" label="催阅" width="80" sortable></el-table-column>
<!-- <el-table-column prop="unit" label="单位"> <!-- <el-table-column prop="unit" label="单位">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
prop="areaName" prop="areaName"
:filters="areaFilter" :filters="areaFilter"
:filter-method="filterHandler" :filter-method="filterHandler"
width="180px" width="120px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div <div
...@@ -368,7 +368,7 @@ ...@@ -368,7 +368,7 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
width="50" width="60"
v-if="$store.state.rcSendStatus == 2" v-if="$store.state.rcSendStatus == 2"
fixed="right" fixed="right"
> >
...@@ -432,6 +432,7 @@ ...@@ -432,6 +432,7 @@
height="800px" height="800px"
append-to-body append-to-body
:before-close="noticeHandleClose" :before-close="noticeHandleClose"
v-loading="noticeVisileLoading"
> >
<div class="noticeVisileForm"> <div class="noticeVisileForm">
<el-form ref="form" :model="sendNoticePartForm" label-width="80px"> <el-form ref="form" :model="sendNoticePartForm" label-width="80px">
...@@ -462,7 +463,7 @@ ...@@ -462,7 +463,7 @@
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="noticeHandleClose()">取 消</el-button> <el-button @click="noticeHandleClose()">取 消</el-button>
<el-button @click="saveDraft()">保存草稿</el-button> <el-button :disabled="saveDraftDisabled" @click="saveDraft()">保存草稿</el-button>
<el-button type="primary" @click="sureTongzhi()">发送通知</el-button> <el-button type="primary" @click="sureTongzhi()">发送通知</el-button>
</span> </span>
</el-dialog> </el-dialog>
...@@ -798,6 +799,8 @@ export default { ...@@ -798,6 +799,8 @@ export default {
noticeFilePath: '', noticeFilePath: '',
processId: '', processId: '',
}, },
noticeVisileLoading: false,
saveDraftDisabled: false,
quillOption: { quillOption: {
theme: 'snow', // 主题 theme: 'snow', // 主题
placeholder: '', placeholder: '',
...@@ -856,6 +859,7 @@ export default { ...@@ -856,6 +859,7 @@ export default {
if (this.$store.state.rcSendStatus == 2) { if (this.$store.state.rcSendStatus == 2) {
this.rcName = '开启同步' this.rcName = '开启同步'
} }
this.init() this.init()
}, },
destroyed() { destroyed() {
...@@ -910,6 +914,12 @@ export default { ...@@ -910,6 +914,12 @@ export default {
this.$emit('getNoticeStatus', newVal) this.$emit('getNoticeStatus', newVal)
}, },
'sendNoticePartForm.noticeContent': {
handler(newVal, oldVal) {
this.saveDraftDisabled = false
},
deep: true,
},
// confData: { // confData: {
// handler (newValue, oldValue) { // handler (newValue, oldValue) {
// console.log(newValue, oldValue) // console.log(newValue, oldValue)
...@@ -951,7 +961,6 @@ export default { ...@@ -951,7 +961,6 @@ export default {
//开启或关闭通知参会 //开启或关闭通知参会
openOrCloseNotice(val) { openOrCloseNotice(val) {
console.log(val)
if (val !== this.noticeStatus) { if (val !== this.noticeStatus) {
this.openOrCloseNoticeVisible = true this.openOrCloseNoticeVisible = true
} }
...@@ -1054,6 +1063,7 @@ export default { ...@@ -1054,6 +1063,7 @@ export default {
if (res.data.code == 200) { if (res.data.code == 200) {
this.$message.success('批量催阅成功') this.$message.success('批量催阅成功')
this.batchReviewHandleClose() this.batchReviewHandleClose()
this.init(this.activeIndex)
} else { } else {
this.$message.error(`${res.data.data}`) this.$message.error(`${res.data.data}`)
} }
...@@ -1093,6 +1103,13 @@ export default { ...@@ -1093,6 +1103,13 @@ export default {
//打开发送通知弹框 //打开发送通知弹框
sendNotification() { sendNotification() {
this.noticeVisile = true this.noticeVisile = true
console.log(this.sendNoticePartForm)
this.$axios.findSendNoticePartByProcessId(this.$route.query.processId).then((res) => {
console.log(res)
if (res.data.code == 200 && res.data.data) {
this.sendNoticePartForm = res.data.data
}
})
}, },
noticeHandleClose() { noticeHandleClose() {
this.sendNoticePartForm = { this.sendNoticePartForm = {
...@@ -1109,14 +1126,13 @@ export default { ...@@ -1109,14 +1126,13 @@ export default {
let list = this.multipleSelection.map((item) => { let list = this.multipleSelection.map((item) => {
return item.id return item.id
}) })
console.log('list', list) console.log('this.sendNoticePartForm,', this.sendNoticePartForm)
let data = { this.sendNoticePartForm.processId = this.$route.query.processId
noticePartIdList: list, // console.log('data', data)
sendNoticePart: this.sendNoticePartForm, this.$axios.sendNoticeSaveDraft(this.sendNoticePartForm).then((res) => {
}
this.$axios.sendNoticeSaveDraft(data).then((res) => {
if (res.data.code == 200) { if (res.data.code == 200) {
this.$message.success('保存草稿成功') this.$message.success('保存草稿成功')
this.saveDraftDisabled = true
} else { } else {
this.$message.error(`${res.data.data}`) this.$message.error(`${res.data.data}`)
} }
...@@ -1131,12 +1147,15 @@ export default { ...@@ -1131,12 +1147,15 @@ export default {
noticePartIdList: list, noticePartIdList: list,
sendNoticePart: this.sendNoticePartForm, sendNoticePart: this.sendNoticePartForm,
} }
console.log('list', data) data.sendNoticePart.processId = this.$route.query.processId
this.noticeVisileLoading = true
this.$axios.sendNotification(data).then((res) => { this.$axios.sendNotification(data).then((res) => {
console.log(res) console.log(res)
if (res.data.code == 200) { if (res.data.code == 200) {
this.noticeHandleClose() this.noticeHandleClose()
this.noticeVisileLoading = true
this.$message.success('发送通知成功') this.$message.success('发送通知成功')
this.init(this.activeIndex)
} else { } else {
this.$message.error(`${res.data.data}`) this.$message.error(`${res.data.data}`)
} }
...@@ -1437,6 +1456,7 @@ export default { ...@@ -1437,6 +1456,7 @@ export default {
// this.personData = this.allPersonData.slice(0,20) // this.personData = this.allPersonData.slice(0,20)
// console.log('persondata', this.personData) // console.log('persondata', this.personData)
if (val) { if (val) {
// console.log('val',val);
this.chooseArea(this.confData.confPersonAreaVos[val], val) this.chooseArea(this.confData.confPersonAreaVos[val], val)
} else { } else {
this.chooseAll() this.chooseAll()
...@@ -1674,33 +1694,33 @@ export default { ...@@ -1674,33 +1694,33 @@ export default {
processId: this.processId, processId: this.processId,
confPersonAreaVos: this.areaList, confPersonAreaVos: this.areaList,
} }
this.savePromise() // this.savePromise()
.then(() => { // .then(() => {
this.$axios this.$axios
.postManageArea(data) .postManageArea(data)
.then((res) => { .then((res) => {
console.log(res) console.log(res)
if (res.data.code === 200) { if (res.data.code === 200) {
this.$message({ this.$message({
showClose: true, showClose: true,
message: res.data.data, message: res.data.data,
type: 'success', type: 'success',
})
this.init()
this.handleManageClose()
} else {
this.$message({
showClose: true,
message: res.data.data,
type: 'error',
})
}
}) })
.catch((error) => { this.init()
loading.close() this.handleManageClose()
} else {
this.$message({
showClose: true,
message: res.data.data,
type: 'error',
}) })
}
}) })
.catch((err) => {}) .catch((error) => {
loading.close()
})
// })
// .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}`)
...@@ -2158,11 +2178,13 @@ export default { ...@@ -2158,11 +2178,13 @@ 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), (data.processId = this.$router.query.processId)
console.log('saceSort', data)
this.$axios this.$axios
.postSaveAreaSort(data) .postSaveAreaSort(data)
.then((res) => { .then((res) => {
// console.log(res) console.log('sortres', res)
if (res.data.code === 200) { if (res.data.code === 200) {
this.disableFlag = true this.disableFlag = true
this.$store.commit('changeSaveFlag', true) this.$store.commit('changeSaveFlag', true)
...@@ -2743,11 +2765,14 @@ export default { ...@@ -2743,11 +2765,14 @@ export default {
border: 1px solid; border: 1px solid;
padding: 0 10px; padding: 0 10px;
//min-width: 100px; //min-width: 100px;
width: 150px; width: 100px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
text-align: center; text-align: center;
margin-right: 26px; margin-right: 26px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
/deep/.el-checkbox { /deep/.el-checkbox {
.is-indeterminate { .is-indeterminate {
......
src/views/meeting/operation/operation.vue
浏览文件 @ 8139e5d2
...@@ -41,13 +41,11 @@ ...@@ -41,13 +41,11 @@
<div class="header_top_wrap" v-show="!$store.state.isAllScreen"> <div class="header_top_wrap" v-show="!$store.state.isAllScreen">
<div class="header_top_bg_wrap"> <div class="header_top_bg_wrap">
<!-- <img--> <img class="header_top_left_img" src="../../../assets/img/title_left.png" />
<!-- class="header_top_left_img"-->
<!-- src="../../../assets/img/title_left.png"-->
<!-- />-->
<div class="header_top_left_img"> <div class="header_top_left_img">
<img src="../../../assets/img/logo_b.png" /> <!-- <img src="../../../assets/img/title_left.png" /> -->
<span>市委在线办会</span>
<!-- <span>会议智能管理系统</span> -->
</div> </div>
<span class="titles">{{ meetingData.processName }}</span> <span class="titles">{{ meetingData.processName }}</span>
<i class="edit_icon" @click="openEditDialog()" v-if="$route.query.isProcess == 1"></i> <i class="edit_icon" @click="openEditDialog()" v-if="$route.query.isProcess == 1"></i>
...@@ -146,6 +144,7 @@ ...@@ -146,6 +144,7 @@
:key="index" :key="index"
> >
<span class="row_item_label">{{ item.key }}：</span> <span class="row_item_label">{{ 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>
...@@ -431,7 +430,7 @@ export default { ...@@ -431,7 +430,7 @@ export default {
} }
}, },
beforeDestroy() { beforeDestroy() {
console.log('结束', 1111) // console.log('结束', 1111)
sessionStorage.removeItem('createType') sessionStorage.removeItem('createType')
}, },
mounted() { mounted() {
...@@ -441,7 +440,7 @@ export default { ...@@ -441,7 +440,7 @@ export default {
info: '', info: '',
} }
this.$axios.getPersonList(data, this.$route.query.processId).then((res) => { this.$axios.getPersonList(data, this.$route.query.processId).then((res) => {
console.log(res) // console.log(res)
let allData = res.data.data let allData = res.data.data
//计算每个tag下的人数 //计算每个tag下的人数
let butInfo = [{ num: 0 }, { num: 0 }, { num: 0 }, { num: 0 }] let butInfo = [{ num: 0 }, { num: 0 }, { num: 0 }, { num: 0 }]
...@@ -614,26 +613,26 @@ export default { ...@@ -614,26 +613,26 @@ export default {
this.$axios this.$axios
.getConfDetail(id, this.$route.query.isProcess) .getConfDetail(id, this.$route.query.isProcess)
.then((res) => { .then((res) => {
console.log(res) // console.log(res)
// console.log("ssj", res.data.data); // console.log("ssj", res.data.data);
sessionStorage.setItem('createType', res.data.data.createType) sessionStorage.setItem('createType', res.data.data.createType)
this.oneself = res.data.data.createType this.oneself = res.data.data.createType
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 = [ this.meetingForm = [
// { {
// key: '时间', key: '时间',
// value: this.meetingData.startDate ? this.meetingData.startDate : '暂无信息', value: this.meetingData.startDate ? this.meetingData.startDate : '暂无信息',
// }, },
// { {
// key: '倒计时', key: '倒计时',
// value: this.meetingData.startDate ? this.meetingData.startDate : '暂无信息', value: this.meetingData.startDate ? this.meetingData.startDate : '暂无信息',
// }, },
// { {
// key: '地址', key: '地址',
// value: this.meetingData.address ? this.meetingData.address : '暂无信息', value: this.meetingData.address ? this.meetingData.address : '暂无信息',
// }, },
{ {
key: '单位', key: '单位',
value: this.meetingData.unitName ? this.meetingData.unitName : '暂无信息', value: this.meetingData.unitName ? this.meetingData.unitName : '暂无信息',
...@@ -647,7 +646,7 @@ export default { ...@@ -647,7 +646,7 @@ export default {
] ]
this.countFlag = true this.countFlag = true
this.status = this.meetingData.processStatus this.status = this.meetingData.processStatus
console.log(this.meetingData) // console.log(this.meetingData)
}) })
.catch((err) => {}) .catch((err) => {})
}, },
...@@ -1273,6 +1272,7 @@ export default { ...@@ -1273,6 +1272,7 @@ export default {
top: 0; top: 0;
height: 100%; height: 100%;
width: auto; width: auto;
display: flex;
} }
.header_top_left_img { .header_top_left_img {
...@@ -1287,8 +1287,8 @@ export default { ...@@ -1287,8 +1287,8 @@ export default {
img { img {
position: absolute; position: absolute;
top: 10px; top: 10px;
width: 86px; width: 36px;
height: 40px; height: 36px;
} }
} }
......
src/views/meeting/operation/overview/index.vue
浏览文件 @ 8139e5d2
...@@ -466,7 +466,12 @@ export default { ...@@ -466,7 +466,12 @@ export default {
}, },
methods: { methods: {
yulan() { yulan() {
window.open(this.schedulePath, '_blank') console.log(this.schedulePath)
if (this.schedulePath) {
window.open(this.schedulePath, '_blank')
} else {
this.$message.error('请输入日程地址后再预览！')
}
}, },
submitArea() { submitArea() {
let data = { let data = {
......
src/views/meeting/state/beforeMeeting/index.vue
浏览文件 @ 8139e5d2
...@@ -234,7 +234,7 @@ export default { ...@@ -234,7 +234,7 @@ export default {
if (item.processShowStatus == 1) { if (item.processShowStatus == 1) {
path = '/operation/chooseModule' path = '/operation/chooseModule'
} else { } else {
path = '/operation/divideArea' path = '/operation/noticeMeeting'
} }
this.$router.push({ this.$router.push({
......
src/views/reserveRecord/allConfence.vue
浏览文件 @ 8139e5d2
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
</div> </div>
<itmeList <itmeList
class="timeList" class="timeList"
:isHover="true"
:conferenceProcessReservationRecordList="item.conferenceProcessReservationRecordList" :conferenceProcessReservationRecordList="item.conferenceProcessReservationRecordList"
:canClick="canClick" :canClick="canClick"
></itmeList> ></itmeList>
......
src/views/reserveRecord/index.vue
浏览文件 @ 8139e5d2
...@@ -164,14 +164,14 @@ export default { ...@@ -164,14 +164,14 @@ export default {
reservationDate: this.checkDate, reservationDate: this.checkDate,
type: 1, type: 1,
} }
console.log('params', params)
this.getConfenceInformationFnc(params, 1) this.getConfenceInformationFnc(params, 1)
}, },
//点击某一个会议室获取数据 //点击某一个会议室获取数据
getOneConfence(item, index) { getOneConfence(item, index) {
this.isActive = index this.isActive = index
this.isOnce = true this.isOnce = true
console.log(item) // console.log('日期', this.checkDate)
console.log('日期', this.checkDate)
let params = { let params = {
conferenceId: item.conferenceId, conferenceId: item.conferenceId,
reservationDate: this.checkDate, reservationDate: this.checkDate,
...@@ -181,10 +181,10 @@ export default { ...@@ -181,10 +181,10 @@ export default {
}, },
getConfenceInformationFnc(data, val) { getConfenceInformationFnc(data, val) {
this.$axios.getConfenceInformation(data).then((res) => { this.$axios.getConfenceInformation(data).then((res) => {
console.log(res) // console.log(res)
if (val == 1) { if (val == 1) {
this.allConfenceList = res.data.data this.allConfenceList = res.data.data
console.log('所有会议室', this.allConfenceList) // console.log('所有会议室', this.allConfenceList)
} else { } else {
// console.log('单个会议室') // console.log('单个会议室')
this.conferenceObj = res.data.data[0] this.conferenceObj = res.data.data[0]
...@@ -200,8 +200,8 @@ export default { ...@@ -200,8 +200,8 @@ export default {
//单机日期 //单机日期
getCheckDate(data, val) { getCheckDate(data, val) {
this.checkDate = data this.checkDate = data
console.log('isActive', this.isActive, typeof this.isActive) // console.log('isActive', this.isActive, typeof this.isActive)
console.log('confenceList', this.confenceList) // console.log('confenceList', this.confenceList)
// let date = // let date =
console.log(Date(this.checkDate)) console.log(Date(this.checkDate))
let params = {} let params = {}
...@@ -218,6 +218,7 @@ export default { ...@@ -218,6 +218,7 @@ export default {
type: 2, type: 2,
} }
} }
console.log(params)
this.getConfenceInformationFnc(params, val) this.getConfenceInformationFnc(params, val)
}, },
//获取上一周的日期 //获取上一周的日期
...@@ -242,8 +243,15 @@ export default { ...@@ -242,8 +243,15 @@ 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 + 1)
}
let date = new Date().getFullYear() + '-' + month + '-' + day
console.log('data', date)
for (let i in this.dateList) { for (let i in this.dateList) {
console.log(new Date(this.dateList[i].date).getTime(), new Date(date).getTime())
// if(this.data)
if (new Date(this.dateList[i].date).getTime() == new Date(date).getTime()) { if (new Date(this.dateList[i].date).getTime() == new Date(date).getTime()) {
console.log(this.dateList[i].date) console.log(this.dateList[i].date)
this.checkDate = this.dateList[i].date this.checkDate = this.dateList[i].date
...@@ -399,7 +407,9 @@ export default { ...@@ -399,7 +407,9 @@ export default {
transform: translate(-50%); transform: translate(-50%);
width: 150px; width: 150px;
border-radius: 4px; border-radius: 4px;
background-color: skyblue; background-color: rgba(90, 100, 124, 0.5);
// opacity: 0.5;
color: #ffffff;
} }
} }
.confenceActive { .confenceActive {
......
src/views/system/index.vue
浏览文件 @ 8139e5d2
...@@ -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
浏览文件 @ 8139e5d2
...@@ -306,6 +306,7 @@ export default { ...@@ -306,6 +306,7 @@ export default {
computed: { computed: {
downLoadUrl() { downLoadUrl() {
let url = '/conf/template' + '/分类人员.xlsx' let url = '/conf/template' + '/分类人员.xlsx'
// console.log();
return baseUrl.API_BASE_ORIGIN + url return baseUrl.API_BASE_ORIGIN + url
}, },
}, },
...@@ -417,7 +418,8 @@ export default { ...@@ -417,7 +418,8 @@ export default {
this.$message.success('上传成功！') this.$message.success('上传成功！')
this.importHandleClose() this.importHandleClose()
this.findLabelIdPerson(this.formData) this.findLabelIdPerson(this.formData)
// console.log('file',this.fileList) } else {
this.$message.error(`${res.data.data}`)
} }
}) })
}, },
......
src/views/system/unitEmpower.vue
浏览文件 @ 8139e5d2
...@@ -97,8 +97,8 @@ ...@@ -97,8 +97,8 @@
<!-- <el-select v-model="addForm.personName" placeholder="模糊输入（姓名）" filterable> --> <!-- <el-select v-model="addForm.personName" placeholder="模糊输入（姓名）" filterable> -->
<!-- </el-select> --> <!-- </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="联系人浙政钉："> <el-form-item label="联系人浙政钉：" class="dingId">
<div>{{addForm.dingId}}</div> <el-input v-model="addForm.dingId" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="单位联系电话：" filterable class="unitTel" prop="unitTel"> <el-form-item label="单位联系电话：" filterable class="unitTel" prop="unitTel">
<el-input v-model="addForm.unitTel" /> <el-input v-model="addForm.unitTel" />
...@@ -517,7 +517,8 @@ export default { ...@@ -517,7 +517,8 @@ export default {
} }
} }
} }
.unitTel { .unitTel,
.dingId {
.el-form-item__content { .el-form-item__content {
width: 50%; width: 50%;
.el-input { .el-input {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论