From bc5f5c20180bee814b539d53f78eabcf4944cc12 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 8 May 2020 16:53:31 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E4=B9=A6=E8=AE=B0=E5=9C=A8?=
=?UTF-8?q?=E7=BA=BF=E3=80=91-=E3=80=90=E6=9F=A5=E7=9C=8B=E6=97=B6?=
=?UTF-8?q?=E5=B0=86=E5=BD=93=E5=89=8D=E4=BA=BA=E5=91=98=E6=9B=B4=E6=96=B0?=
=?UTF-8?q?=E4=B8=BA=E5=B7=B2=E8=AF=BB=E7=8A=B6=E6=80=81=EF=BC=8C=E6=B5=8F?=
=?UTF-8?q?=E8=A7=88=E9=87=8F=E5=8A=A0=E4=B8=80=E3=80=91-=EF=BC=88?=
=?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=89-2020/05/08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/master/masternotice.vue | 6 +++---
.../modules/master/masternoticedetail.vue | 20 +++++++++++++------
2 files changed, 17 insertions(+), 9 deletions(-)
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 @@
置顶
取消置顶
关闭
- 查看
+ 查看
{
+ // 将当前登录人改为已读
+ this.$http.post(`/cloudAnalysis/masternotice/addBrowNum`, this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
- this.readFormList = res.data
- this.loading = false
- this.readFormList.tagIds = []
- }).catch(() => { })
+ // 将当前登录人改为已读后，获取已读未读信息
+ this.readForm.readFlag = readFlag
+ this.$http.post(`/cloudAnalysis/masternotice/getReadInfo`, this.readForm).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.readFormList = res.data
+ this.loading = false
+ this.readFormList.tagIds = []
+ }).catch(() => { })
+ }).catch(() => {})
},
backToDeptList () {
this.$emit('refreshDataList')
From b163840ec48255a9898660366476df4419ac3928 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 8 May 2020 18:00:57 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E4=B9=A6=E8=AE=B0=E5=9C=A8?=
=?UTF-8?q?=E7=BA=BF=E3=80=91=E3=80=90=E4=BC=98=E5=8C=96=E9=80=9A=E7=9F=A5?=
=?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=97=B6=EF=BC=8C=E5=B0=86=E5=BD=93=E5=89=8D?=
=?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BA=BA=E7=BD=AE=E4=B8=BA=E5=B7=B2=E8=AF=BB?=
=?UTF-8?q?=E4=BA=BA=E5=91=98=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-05?=
=?UTF-8?q?-08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/master/masternoticedetail.vue | 31 ++++++++++---------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/views/modules/master/masternoticedetail.vue b/src/views/modules/master/masternoticedetail.vue
index 1341847f..4449137e 100755
--- a/src/views/modules/master/masternoticedetail.vue
+++ b/src/views/modules/master/masternoticedetail.vue
@@ -72,8 +72,8 @@ export default {
this.dataForm.id = this.$route.query.noticeId
this.readForm.id = this.$route.query.noticeId
this.dataForm.browseNum = this.$route.query.browseNum
+ this.addBrowNum()
this.getInfo()
- this.getReadInfo(1)
},
methods: {
// 获取信息
@@ -89,25 +89,28 @@ export default {
this.dataForm.tagIds = []
}).catch(() => { })
},
- // 获取已读未读信息
- getReadInfo (readFlag) {
- // 将当前登录人改为已读
+ // 将当前登录人改为已读
+ addBrowNum () {
this.$http.post(`/cloudAnalysis/masternotice/addBrowNum`, this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
- // 将当前登录人改为已读后，获取已读未读信息
- this.readForm.readFlag = readFlag
- this.$http.post(`/cloudAnalysis/masternotice/getReadInfo`, this.readForm).then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg)
- }
- this.readFormList = res.data
- this.loading = false
- this.readFormList.tagIds = []
- }).catch(() => { })
+ // 获取已读未读信息
+ this.getReadInfo(1)
}).catch(() => {})
},
+ // 获取已读未读信息
+ getReadInfo (readFlag) {
+ this.readForm.readFlag = readFlag
+ this.$http.post(`/cloudAnalysis/masternotice/getReadInfo`, this.readForm).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ this.readFormList = res.data
+ this.loading = false
+ this.readFormList.tagIds = []
+ }).catch(() => { })
+ },
backToDeptList () {
this.$emit('refreshDataList')
this.$parent.selectComponent = 'Masternotice'
From 52f1974052e100099398889cc9b1299c72edd5a2 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 12 May 2020 09:35:44 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E4=B9=A6=E8=AE=B0=E5=9C=A8?=
=?UTF-8?q?=E7=BA=BF=E3=80=91=E3=80=90=E6=9F=A5=E7=9C=8B=E6=97=B6=E5=85=88?=
=?UTF-8?q?=E5=B0=86=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E4=BA=BA=E6=94=B9?=
=?UTF-8?q?=E4=B8=BA=E5=B7=B2=E8=AF=BB=E3=80=91-=E7=8E=8B=E5=85=AC?=
=?UTF-8?q?=E5=B3=B0-2020-05-12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/master/mastertopic.vue | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
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
From 11d1d1b2b8eff6eb50e8c16a16dd711a4eba79ea Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 15 May 2020 17:20:25 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
=?UTF-8?q?=E7=90=86=E8=AE=AE=E9=A2=98=E7=AE=A1=E7=90=86=E3=80=91=E3=80=90?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E4=BA=BA=E9=83=A8=E9=97=A8?=
=?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9=E3=80=91-=E7=8E=8B?=
=?UTF-8?q?=E5=85=AC=E5=B3=B0-2020-05-15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../events/issue-process-detail-view.vue | 34 +++++++++++-
.../events/issue-review-detail-view.vue | 36 ++++++++++++-
.../modules/events/item-deal-detail-view.vue | 54 +++++++++++++++++--
3 files changed, 118 insertions(+), 6 deletions(-)
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)