From 7c82d773a22fc741c82dde497cfd9213422b1750 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 19 Nov 2020 10:49:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E3=80=91=E6=89=80=E6=9C=89=E7=BD=91=E6=A0=BC=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=94=B9=E4=B8=BA=E5=85=9A=E6=94=AF=E9=83=A8?= =?UTF-8?q?-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-11-19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/workRecord/dailyrecordinfoDetail.vue | 12 +++++++++++- .../workRecord/monthexcellentgridDetail.vue | 12 +++++++++++- .../workRecord/monthexcellentpersonDetail.vue | 4 ++-- .../modules/workRecord/monthgridsortDetail.vue | 14 ++++++++++++-- src/views/modules/workRecord/monthrecordinfo.vue | 12 ++++++------ .../modules/workRecord/monthrecordinfoDetail.vue | 12 ++++++------ 6 files changed, 48 insertions(+), 18 deletions(-) diff --git a/src/views/modules/workRecord/dailyrecordinfoDetail.vue b/src/views/modules/workRecord/dailyrecordinfoDetail.vue index da68576..44d2095 100644 --- a/src/views/modules/workRecord/dailyrecordinfoDetail.vue +++ b/src/views/modules/workRecord/dailyrecordinfoDetail.vue @@ -187,8 +187,18 @@ export default { }, methods: { 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(() => {}) + var paa = {deptType:'party'} this.$http - .get(`/sys/user/deptOptions/getDeptAuthByUser`) + .post(`/sys/user/deptOptions/getByLoginUserNew`,paa) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue index ba796b5..62ed61b 100644 --- a/src/views/modules/workRecord/monthexcellentgridDetail.vue +++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue @@ -329,8 +329,18 @@ export default { }) }, 1000, { 'leading': true, 'trailing': false }), 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(() => {}) + var paa = {deptType:'party'} this.$http - .get(`/sys/user/deptOptions/getDeptAuthByUser`) + .post(`/sys/user/deptOptions/getByLoginUserNew`,paa) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) diff --git a/src/views/modules/workRecord/monthexcellentpersonDetail.vue b/src/views/modules/workRecord/monthexcellentpersonDetail.vue index d5eb3e1..199b67d 100644 --- a/src/views/modules/workRecord/monthexcellentpersonDetail.vue +++ b/src/views/modules/workRecord/monthexcellentpersonDetail.vue @@ -9,10 +9,10 @@ - + - + { + // if (res.code !== 0) { + // return this.$message.error(res.msg) + // } + // this.options = res.data.options + // }) + // .catch(() => {}) + var paa = {deptType:'party'} this.$http - .get(`/sys/user/deptOptions/getDeptAuthByUser`) + .post(`/sys/user/deptOptions/getByLoginUserNew`,paa) .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -190,7 +200,7 @@ export default { return value === deptId }) if (data) { - this.$message.error('第' + (j + 1) + '名：' + deptName + '已存在，请更换网格！') + this.$message.error('第' + (j + 1) + '名：' + deptName + '已存在，请更换党支部！') return false } deptIdArr.push(this.dataForm.sortList[j].deptId) diff --git a/src/views/modules/workRecord/monthrecordinfo.vue b/src/views/modules/workRecord/monthrecordinfo.vue index 0431819..4612f44 100644 --- a/src/views/modules/workRecord/monthrecordinfo.vue +++ b/src/views/modules/workRecord/monthrecordinfo.vue @@ -79,8 +79,8 @@
- {{ '示范网格' }} - {{ '网格排序' }} + {{ '示范党支部' }} + {{ '党支部排序' }}
- {{ '修改月报' }} - {{ '查看月报' }} + {{ '修改月报' }} + {{ '查看月报' }}
@@ -167,9 +167,9 @@ export default { this.getOptions() }, methods: { - addHandle (id, disabled, caseId, deptId, personId, isHaveSort) { + addHandle (id, disabled, caseId, gridId, personId, isHaveSort) { this.$parent.selectComponent = 'MonthrecordinfoDetail' - this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: id, disabled: disabled, caseId: caseId, deptId: deptId, personId: personId, isHaveSort: isHaveSort } }) + this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: id, disabled: disabled, caseId: caseId, gridId: gridId, personId: personId, isHaveSort: isHaveSort } }) }, addCaseHandle (infoId, disabled) { this.$parent.selectComponent = 'MonthexcellentcaseDetail' diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue index 7d92014..1678d26 100644 --- a/src/views/modules/workRecord/monthrecordinfoDetail.vue +++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue @@ -4,9 +4,9 @@ {{ '优秀案例' }} - {{ '示范网格' }} + {{ '示范党支部' }} {{ '身边榜样' }} - {{ '网格排序' }} + {{ '党支部排序' }} @@ -112,7 +112,7 @@ export default { isShowPersonBtn: false, isShowSortBtn: false, caseId: '', - deptId: '', + gridId: '', personId: '', queryDisabled: '' } @@ -155,10 +155,10 @@ export default { this.isShowCaseBtn = true this.caseId = this.$route.query.caseId } - if (this.$route.query.deptId !== '' && this.$route.query.deptId != null) { + if (this.$route.query.gridId !== '' && this.$route.query.gridId != null) { // 展示示范网格跳转按钮 this.isShowGridBtn = true - this.deptId = this.$route.query.deptId + this.gridId = this.$route.query.gridId } if (this.$route.query.personId !== '' && this.$route.query.personId != null) { // 展示身边榜样跳转按钮 @@ -177,7 +177,7 @@ export default { }, goToGridHandle () { this.$parent.selectComponent = 'MonthexcellentgridDetail' - this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.deptId, disabled: this.queryDisabled, infoId: this.dataForm.id } }) + this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.gridId, disabled: this.queryDisabled, infoId: this.dataForm.id } }) }, goToPersonHandle () { this.$parent.selectComponent = 'MonthexcellentpersonDetail'