From acfed2085845a711301bdc2ab2c7686d30242556 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 5 Aug 2020 10:19:33 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E3=80=91=E5=88=9D?= =?UTF-8?q?=E5=BF=83=E4=BA=92=E5=8A=A9=E6=B4=BB=E5=8A=A8=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E3=80=81=E9=9A=8F=E6=89=8B=E8=AE=B0=E5=8F=91=E5=B8=83=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=BF=9D=E8=A7=84=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= =?UTF-8?q?-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-08-05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/heart/actinfo-add-or-update.vue | 29 ++++++++++++++++--- .../workRecord/dailyrecordinfoDetail.vue | 28 +++++++++++++++--- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue index 89ac9f20..ffbb55a4 100644 --- a/src/views/modules/heart/actinfo-add-or-update.vue +++ b/src/views/modules/heart/actinfo-add-or-update.vue @@ -352,7 +352,8 @@ export default { reward: '', isBanner: '1', actUserDefaultState: '1', - bannerUrl: '' + bannerUrl: '', + isConReview: false }, isSignupEndTime: { disabledDate (time) { @@ -405,7 +406,8 @@ export default { return time.getTime() < new Date(EndDateVal).getTime() } } - } + }, + isFirst: true } }, created () { @@ -563,6 +565,7 @@ export default { }, init () { this.visible = true + this.dataForm.isConReview = false this.$nextTick(() => { this.$refs['dataForm'].resetFields() if (this.dataForm.id) { @@ -675,8 +678,26 @@ export default { } this.isAble = true this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actinfo/', this.dataForm).then(({ data: res }) => { - this.isAble = false - if (res.code !== 0) { + if (!this.isFirst && res.code === 533) { + // 不是第一次提交 并且 依然是违规内容 + this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'warning' + }).then(() => { + this.dataForm.isConReview = true + // 选择“是”继续提交，调用提交方法本身 + this.dataFormSubmitHandle() + }).catch(() => { + this.isAble = false + }) + return false + } else if (res.code === 533) { + this.isFirst = false + this.isAble = false + return this.$message.error(res.msg) + } else if (res.code !== 0) { + this.isAble = false return this.$message.error(res.msg) } this.$message({ diff --git a/src/views/modules/workRecord/dailyrecordinfoDetail.vue b/src/views/modules/workRecord/dailyrecordinfoDetail.vue index f69a76e7..a09cf98d 100644 --- a/src/views/modules/workRecord/dailyrecordinfoDetail.vue +++ b/src/views/modules/workRecord/dailyrecordinfoDetail.vue @@ -120,7 +120,8 @@ export default { address: '', joinNum: '', content: '', - images: [] + images: [], + isConReview: false }, isAble: false, meetTypeArr: [], @@ -133,7 +134,8 @@ export default { loading: false, dialogImageUrl: '', dialogVisible: false, - options: [] + options: [], + isFirst: true } }, computed: { @@ -227,6 +229,7 @@ export default { }, init () { this.dataForm.id = this.$route.query.id + this.dataForm.isConReview = false this.visible = true this.$nextTick(() => { this.$refs['dataForm'].resetFields() @@ -333,9 +336,26 @@ export default { return false } this.isAble = true - console.log(this.dataForm) this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/dailyrecordinfo/', this.dataForm).then(({ data: res }) => { - if (res.code !== 0) { + if (!this.isFirst && res.code === 533) { + // 不是第一次提交 并且 依然是违规内容 + this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'warning' + }).then(() => { + this.dataForm.isConReview = true + // 选择“是”继续提交，调用提交方法本身 + this.dataFormSubmitHandle() + }).catch(() => { + this.isAble = false + }) + return false + } else if (res.code === 533) { + this.isFirst = false + this.isAble = false + return this.$message.error(res.msg) + } else if (res.code !== 0) { this.isAble = false return this.$message.error(res.msg) } From 52c8f9ff5def7bf0577aa1b98d1a6d066cdd5bc8 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 5 Aug 2020 11:04:41 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E3=80=91=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=BF=9D=E8=A7=84=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= =?UTF-8?q?-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-08-05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workRecord/monthexcellentcaseDetail.vue | 25 +++++++++++++++-- .../workRecord/monthexcellentgridDetail.vue | 25 +++++++++++++++-- .../workRecord/monthexcellentpersonDetail.vue | 25 +++++++++++++++-- .../workRecord/monthrecordinfoDetail.vue | 27 ++++++++++++++++--- .../workRecord/weekrecordinfoDetail.vue | 27 ++++++++++++++++--- 5 files changed, 117 insertions(+), 12 deletions(-) diff --git a/src/views/modules/workRecord/monthexcellentcaseDetail.vue b/src/views/modules/workRecord/monthexcellentcaseDetail.vue index 1fd51df4..0b918c1f 100644 --- a/src/views/modules/workRecord/monthexcellentcaseDetail.vue +++ b/src/views/modules/workRecord/monthexcellentcaseDetail.vue @@ -86,7 +86,8 @@ export default { content: '', state: '', images: [], - files: [] + files: [], + isConReview: false }, isAble: false, hideUpload: false, @@ -99,6 +100,7 @@ export default { isAutoRemoveFile: true, fileloading: false, pageloading: true, + isFirst: true, isGoToInfo: '0' // 是否回到月报列表：0否；1是 } }, @@ -142,6 +144,7 @@ export default { methods: { init () { this.dataForm.id = this.$route.query.id + this.dataForm.isConReview = false this.visible = true this.$nextTick(() => { this.$refs['dataForm'].resetFields() @@ -278,7 +281,25 @@ export default { } this.isAble = true this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/monthexcellentcase/', this.dataForm).then(({ data: res }) => { - if (res.code !== 0) { + if (!this.isFirst && res.code === 533) { + // 不是第一次提交 并且 依然是违规内容 + this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'warning' + }).then(() => { + this.dataForm.isConReview = true + // 选择“是”继续提交，调用提交方法本身 + this.dataFormSubmitHandle() + }).catch(() => { + this.isAble = false + }) + return false + } else if (res.code === 533) { + this.isFirst = false + this.isAble = false + return this.$message.error(res.msg) + } else if (res.code !== 0) { this.isAble = false return this.$message.error(res.msg) } diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue index 77c4e4a4..91e47350 100644 --- a/src/views/modules/workRecord/monthexcellentgridDetail.vue +++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue @@ -99,7 +99,8 @@ export default { state: '', allDeptIds: '', images: [], - files: [] + files: [], + isConReview: false }, isAble: false, hideUpload: false, @@ -113,6 +114,7 @@ export default { fileloading: false, pageloading: true, options: [], + isFirst: true, isGoToInfo: '0' // 是否回到月报列表：0否；1是 } }, @@ -173,6 +175,7 @@ export default { }, init () { this.dataForm.id = this.$route.query.id + this.dataForm.isConReview = false this.visible = true this.$nextTick(() => { this.$refs['dataForm'].resetFields() @@ -309,7 +312,25 @@ export default { } this.isAble = true this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/monthexcellentgrid/', this.dataForm).then(({ data: res }) => { - if (res.code !== 0) { + if (!this.isFirst && res.code === 533) { + // 不是第一次提交 并且 依然是违规内容 + this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'warning' + }).then(() => { + this.dataForm.isConReview = true + // 选择“是”继续提交，调用提交方法本身 + this.dataFormSubmitHandle() + }).catch(() => { + this.isAble = false + }) + return false + } else if (res.code === 533) { + this.isFirst = false + this.isAble = false + return this.$message.error(res.msg) + } else if (res.code !== 0) { this.isAble = false return this.$message.error(res.msg) } diff --git a/src/views/modules/workRecord/monthexcellentpersonDetail.vue b/src/views/modules/workRecord/monthexcellentpersonDetail.vue index 30b2d244..54fee66d 100644 --- a/src/views/modules/workRecord/monthexcellentpersonDetail.vue +++ b/src/views/modules/workRecord/monthexcellentpersonDetail.vue @@ -93,7 +93,8 @@ export default { content: '', state: '', images: [], - files: [] + files: [], + isConReview: false }, partyFlagArr: [ { dictValue: '0', dictName: '居民' }, @@ -110,6 +111,7 @@ export default { isAutoRemoveFile: true, fileloading: false, pageloading: true, + isFirst: true, isGoToInfo: '0' // 是否回到月报列表：0否；1是 } }, @@ -163,6 +165,7 @@ export default { methods: { init () { this.dataForm.id = this.$route.query.id + this.dataForm.isConReview = false this.visible = true this.$nextTick(() => { this.$refs['dataForm'].resetFields() @@ -299,7 +302,25 @@ export default { } this.isAble = true this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/monthexcellentperson/', this.dataForm).then(({ data: res }) => { - if (res.code !== 0) { + if (!this.isFirst && res.code === 533) { + // 不是第一次提交 并且 依然是违规内容 + this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'warning' + }).then(() => { + this.dataForm.isConReview = true + // 选择“是”继续提交，调用提交方法本身 + this.dataFormSubmitHandle() + }).catch(() => { + this.isAble = false + }) + return false + } else if (res.code === 533) { + this.isFirst = false + this.isAble = false + return this.$message.error(res.msg) + } else if (res.code !== 0) { this.isAble = false return this.$message.error(res.msg) } diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue index 60e0123e..a055d4f2 100644 --- a/src/views/modules/workRecord/monthrecordinfoDetail.vue +++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue @@ -94,7 +94,8 @@ export default { content: '', state: '', images: [], - files: [] + files: [], + isConReview: false }, isAble: false, hideUpload: false, @@ -114,7 +115,8 @@ export default { caseId: '', gridId: '', personId: '', - queryDisabled: '' + queryDisabled: '', + isFirst: true } }, computed: { @@ -189,6 +191,7 @@ export default { }, init () { this.dataForm.id = this.$route.query.id + this.dataForm.isConReview = false this.visible = true this.$nextTick(() => { this.$refs['dataForm'].resetFields() @@ -324,7 +327,25 @@ export default { } this.isAble = true this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/monthrecordinfo/', this.dataForm).then(({ data: res }) => { - if (res.code !== 0) { + if (!this.isFirst && res.code === 533) { + // 不是第一次提交 并且 依然是违规内容 + this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'warning' + }).then(() => { + this.dataForm.isConReview = true + // 选择“是”继续提交，调用提交方法本身 + this.dataFormSubmitHandle() + }).catch(() => { + this.isAble = false + }) + return false + } else if (res.code === 533) { + this.isFirst = false + this.isAble = false + return this.$message.error(res.msg) + } else if (res.code !== 0) { this.isAble = false return this.$message.error(res.msg) } diff --git a/src/views/modules/workRecord/weekrecordinfoDetail.vue b/src/views/modules/workRecord/weekrecordinfoDetail.vue index 7bf864a7..8314f5be 100644 --- a/src/views/modules/workRecord/weekrecordinfoDetail.vue +++ b/src/views/modules/workRecord/weekrecordinfoDetail.vue @@ -95,7 +95,8 @@ export default { state: '', images: [], files: [], - totalConfigList: [] + totalConfigList: [], + isConReview: false }, isShowArr: [ { dictValue: '0', dictName: '否' }, @@ -113,7 +114,8 @@ export default { dialogVisible: false, pageloading: true, isAutoRemoveFile: true, - colspan: 6 + colspan: 6, + isFirst: true } }, computed: { @@ -170,6 +172,7 @@ export default { methods: { init () { this.dataForm.id = this.$route.query.id + this.dataForm.isConReview = false this.visible = true this.$nextTick(() => { this.$refs['dataForm'].resetFields() @@ -330,7 +333,25 @@ export default { } // 表单提交后台 this.$refs['dataForm'].validate((valid) => { - if (!valid) { + if (!this.isFirst && res.code === 533) { + // 不是第一次提交 并且 依然是违规内容 + this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'warning' + }).then(() => { + this.dataForm.isConReview = true + // 选择“是”继续提交，调用提交方法本身 + this.dataFormSubmitHandle() + }).catch(() => { + this.isAble = false + }) + return false + } else if (res.code === 533) { + this.isFirst = false + this.isAble = false + return this.$message.error(res.msg) + } else if (!valid) { return false } this.isAble = true From 5f8ab3aac765ae1ac69d076abb7c518780546363 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 5 Aug 2020 17:06:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF=E3=80=91-?= =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/8/5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/contentSecurity/checkrecords.vue | 7 ++++++- src/views/modules/contentSecurity/violationsrecords.vue | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/views/modules/contentSecurity/checkrecords.vue b/src/views/modules/contentSecurity/checkrecords.vue index 868eebca..bd7367e1 100644 --- a/src/views/modules/contentSecurity/checkrecords.vue +++ b/src/views/modules/contentSecurity/checkrecords.vue @@ -87,6 +87,9 @@ + + @@ -140,7 +143,9 @@ export default { startTime:'', endTime:'', suggestionCode:'', - systemStatus:'' + systemStatus:'', + deptName:'', + allDeptNames:'' }, suggestionList:[], handleVisible:false, diff --git a/src/views/modules/contentSecurity/violationsrecords.vue b/src/views/modules/contentSecurity/violationsrecords.vue index 9538b8be..6dff888e 100644 --- a/src/views/modules/contentSecurity/violationsrecords.vue +++ b/src/views/modules/contentSecurity/violationsrecords.vue @@ -78,6 +78,9 @@ + + @@ -128,7 +131,9 @@ export default { module:'', startTime:'', endTime:'', - mobile:'' + mobile:'', + deptName:'', + allDeptNames:'' }, pickerBeginDateBefore: { disabledDate: (time) => { From 7b9e4ef21debd518e7066a910d0e87c0dbca5a74 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 5 Aug 2020 17:43:06 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E3=80=91=E5=91=A8?= =?UTF-8?q?=E6=8A=A5=E8=BF=9D=E8=A7=84=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-08-05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/workRecord/weekrecordinfoDetail.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/modules/workRecord/weekrecordinfoDetail.vue b/src/views/modules/workRecord/weekrecordinfoDetail.vue index 8314f5be..f47547b3 100644 --- a/src/views/modules/workRecord/weekrecordinfoDetail.vue +++ b/src/views/modules/workRecord/weekrecordinfoDetail.vue @@ -333,7 +333,12 @@ export default { } // 表单提交后台 this.$refs['dataForm'].validate((valid) => { - if (!this.isFirst && res.code === 533) { + if (!valid) { + return false + } + this.isAble = true + this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/weekrecordinfo/', this.dataForm).then(({ data: res }) => { + if (!this.isFirst && res.code === 533) { // 不是第一次提交 并且 依然是违规内容 this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', { confirmButtonText: '是', @@ -351,12 +356,7 @@ export default { this.isFirst = false this.isAble = false return this.$message.error(res.msg) - } else if (!valid) { - return false - } - this.isAble = true - this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/weekrecordinfo/', this.dataForm).then(({ data: res }) => { - if (res.code !== 0) { + } else if (res.code !== 0) { this.isAble = false return this.$message.error(res.msg) } From 290140ec8e4fe268cfcbe7dc0ba756303345dd20 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 5 Aug 2020 18:51:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E3=80=91=E7=BE=A4?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E8=BF=9D=E8=A7=84=E6=A0=A1=E9=AA=8C=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-08?= =?UTF-8?q?-05?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/masternotice-add-or-update.vue | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/src/views/modules/master/masternotice-add-or-update.vue b/src/views/modules/master/masternotice-add-or-update.vue index ca37a8f6..7898d162 100755 --- a/src/views/modules/master/masternotice-add-or-update.vue +++ b/src/views/modules/master/masternotice-add-or-update.vue @@ -50,12 +50,14 @@ export default { createdTime: '', updatedBy: '', updatedTime: '', - fileList: '' + fileList: '', + isConReview: false }, url: '', num: 0, fileList: [], - btnAble: false + btnAble: false, + isFirst: true } }, computed: { @@ -72,8 +74,10 @@ export default { }, methods: { init () { - this.btnAble = false + this.dataForm.isConReview = false + this.isFirst = true this.visible = true + this.btnAble = false this.url = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}` this.num = 0 this.fileList = [] @@ -98,14 +102,32 @@ export default { }, // 表单提交 dataFormSubmitHandle: debounce(function () { - this.btnAble = true this.$refs['dataForm'].validate((valid) => { if (!valid) { - this.btnAble = false return false } + this.btnAble = true this.$http[!this.dataForm.id ? 'post' : 'put']('/cloudAnalysis/masternotice/', this.dataForm).then(({ data: res }) => { - if (res.code !== 0) { + if (!this.isFirst && res.code === 533) { + // 不是第一次提交 并且 依然是违规内容 + this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'warning' + }).then(() => { + this.dataForm.isConReview = true + // 选择“是”继续提交，调用提交方法本身 + this.dataFormSubmitHandle() + }).catch(() => { + this.btnAble = false + }) + return false + } else if (res.code === 533) { + this.isFirst = false + this.btnAble = false + return this.$message.error(res.msg) + } else if (res.code !== 0) { + this.btnAble = false return this.$message.error(res.msg) } this.$message({ @@ -114,7 +136,6 @@ export default { duration: 500, onClose: () => { this.visible = false - this.btnAble = false this.$emit('refreshDataList') } }) From 63c2c5a69499a1ea5374f3fcc09364cb842f5fe0 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 6 Aug 2020 10:07:28 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E3=80=90=E5=86=85=E5=AE=B9=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E3=80=91-=E3=80=90=E5=88=97=E8=A1=A8=E9=97=B4?= =?UTF-8?q?=E8=B7=9D=E8=B0=83=E6=95=B4=E3=80=91-=EF=BC=88=E7=8E=8B?= =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/8/6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/contentSecurity/checkrecords.vue | 2 +- src/views/modules/contentSecurity/violationsrecords.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/contentSecurity/checkrecords.vue b/src/views/modules/contentSecurity/checkrecords.vue index bd7367e1..b3ea94cf 100644 --- a/src/views/modules/contentSecurity/checkrecords.vue +++ b/src/views/modules/contentSecurity/checkrecords.vue @@ -87,7 +87,7 @@ - + diff --git a/src/views/modules/contentSecurity/violationsrecords.vue b/src/views/modules/contentSecurity/violationsrecords.vue index 6dff888e..3d487bda 100644 --- a/src/views/modules/contentSecurity/violationsrecords.vue +++ b/src/views/modules/contentSecurity/violationsrecords.vue @@ -78,7 +78,7 @@ - +