diff --git a/src/views/modules/events/issue-process-detail-view.vue b/src/views/modules/events/issue-process-detail-view.vue index 1e57669a..71dfb672 100644 --- a/src/views/modules/events/issue-process-detail-view.vue +++ b/src/views/modules/events/issue-process-detail-view.vue @@ -96,6 +96,17 @@ style="width: 720px;" :model="dataForm" :rules="dataRule"> + + + + { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.options = res.data.options + }) + .catch(() => {}) + }, + changeHandle (value, selectedData) { + this.dataForm.handlerDept = this.$refs['name'].getCheckedNodes()[0].label + this.dataForm.handlerDeptId = this.$refs['name'].getCheckedNodes()[0].value + }, initBmap (latitude, longitude) { this.map = new BMap.Map('map') const point = new BMap.Point(longitude, latitude) diff --git a/src/views/modules/events/issue-review-detail-view.vue b/src/views/modules/events/issue-review-detail-view.vue index ff6f4e83..a71b1592 100644 --- a/src/views/modules/events/issue-review-detail-view.vue +++ b/src/views/modules/events/issue-review-detail-view.vue @@ -40,6 +40,17 @@
处理操作
+ + + + 审核通过 驳回 @@ -78,6 +89,7 @@ export default { nickName: '', categoryId: '', advice: '', + handlerDeptIdRule: '', eventState: '4' }, isAble: false, @@ -85,11 +97,13 @@ export default { previewImgList: [], categoryVisible: true, urls: [], - categoryOptions: [] + categoryOptions: [], + options: [] } }, mounted () { this.dataForm.id = this.$route.query.id + this.getOptions() this.init() }, computed: { @@ -103,6 +117,9 @@ export default { ], advice: [ { required: true, message: this.$t('validate.required'), trigger: 'blur' } + ], + handlerDeptIdRule: [ + { required: true, message: this.$t('validate.required'), trigger: 'blur' } ] } } @@ -128,6 +145,21 @@ export default { } }) }, + getOptions () { + this.$http + .get(`/sys/user/deptOptions/getDeptAuthByUser`) + .then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.options = res.data.options + }) + .catch(() => {}) + }, + changeHandle (value, selectedData) { + this.dataForm.handlerDept = this.$refs['name'].getCheckedNodes()[0].label + this.dataForm.handlerDeptId = this.$refs['name'].getCheckedNodes()[0].value + }, getCategoryList () { return this.$http.get('/events/category/list').then(({ data: res }) => { if (res.code !== 0) { @@ -176,7 +208,7 @@ export default { // 表单提交 dataFormSubmitHandle: debounce(function () { this.dataForm.categoryId = this.categoryIds[this.categoryIds.length - 1] - console.log(this.dataForm.categoryId) + console.log(this.dataForm) this.$refs['dataForm'].validate((valid) => { if (!valid) { return false diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue index 63eb2b45..8e112949 100644 --- a/src/views/modules/events/item-deal-detail-view.vue +++ b/src/views/modules/events/item-deal-detail-view.vue @@ -108,10 +108,20 @@ style="width: 720px;" :model="dataForm" :rules="dataRule"> + + + + + placeholder="请选择" @visible-change="visibleChange"> { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.options = res.data.options + }) + .catch(() => {}) + }, + visibleChange (val) { + if (this.dataForm.handleResultDTOS.length === 0 && this.dataForm.handlerDeptIdRule === '' && val === true) { + return this.$message.error('请先选择操作人部门!') + } + }, + changeHandle (value, selectedData) { + this.postDataForm.handlerDept = this.$refs['name'].getCheckedNodes()[0].label + this.postDataForm.handlerDeptId = this.$refs['name'].getCheckedNodes()[0].value + this.getHandleResultDTOS() + }, + // 获取处理项 + getHandleResultDTOS () { + this.$http.post(`/events/item/getHandleResultDTOS`, { itemId: this.dataForm.id, deptId: this.postDataForm.handlerDeptId }).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.dataForm.handleResultDTOS = res.data.handleResultDTOS + this.dataForm.deptResultDTOS = res.data.deptResultDTOS + this.dataForm.evaluateDeptDTOS = res.data.evaluateDeptDTOS + }).catch(() => { }) + }, initBmap (latitude, longitude) { this.map = new BMap.Map('map') const point = new BMap.Point(longitude, latitude) diff --git a/src/views/modules/master/masternotice.vue b/src/views/modules/master/masternotice.vue index 15ce6335..023ec644 100755 --- a/src/views/modules/master/masternotice.vue +++ b/src/views/modules/master/masternotice.vue @@ -62,7 +62,7 @@ 置顶 取消置顶 关闭 - 查看 + 查看 { }) }, + // 将当前登录人改为已读 + addBrowNum () { + this.$http.post(`/cloudAnalysis/masternotice/addBrowNum`, this.dataForm).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + // 获取已读未读信息 + this.getReadInfo(1) + }).catch(() => {}) + }, // 获取已读未读信息 getReadInfo (readFlag) { this.readForm.readFlag = readFlag diff --git a/src/views/modules/master/mastertopic.vue b/src/views/modules/master/mastertopic.vue index b9a9d95a..7468fe22 100755 --- a/src/views/modules/master/mastertopic.vue +++ b/src/views/modules/master/mastertopic.vue @@ -77,7 +77,7 @@ 置顶 取消置顶 关闭 - 查看 + 查看 @@ -152,6 +152,7 @@ export default { closeDialog: false, isTop: true, toGrey: false, + btnAble: false, orderByArr: [ { label: '总参与度', @@ -221,9 +222,17 @@ export default { return '进行中' } }, - manageHandle (topicId) { - this.$parent.selectComponent = 'Mastertopicdetail' - this.$router.push({ path: '/master-mastertopicroute', query: { topicId: topicId } }) + manageHandle (topicId, browseNum) { + this.btnAble = true + // 将当前登录人改为已读 + this.$http.post(`/cloudAnalysis/mastertopic/addBrowNum`, { id: topicId, browseNum: browseNum }).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + this.btnAble = false + this.$parent.selectComponent = 'Mastertopicdetail' + this.$router.push({ path: '/master-mastertopicroute', query: { topicId: topicId } }) + }).catch(() => {}) }, openToTopDialog (value, row) { this.toTopDialog = true