Skip to content

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

fc

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