From 36847c8b70fcb4bcdcebf18f531fb869c412a904 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 8 Sep 2022 18:17:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/events/item-deal-detail-view.vue | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue index cf801219..2136a71b 100644 --- a/src/views/modules/events/item-deal-detail-view.vue +++ b/src/views/modules/events/item-deal-detail-view.vue @@ -385,7 +385,6 @@ import 'quill/dist/quill.snow.css' export default { name: 'itemDealDetailView', data () { - return { idea: '', isWhistle: true, // 吹哨按钮 @@ -539,13 +538,13 @@ export default { computed: { dataRule () { var checkPhone = (rule, value, callback) => { - let moblie=/^1(3|4|5|6|7|8|9)\d{9}$/; let tel=/^(0[0-9]{2,3}\-)([2-9][0-9]{4,7})+(\-[0-9]{1,4})?$/; - if (!moblie.test(this.postDataForm.handlePeopleMobile) && !tel.test(this.postDataForm.handlePeopleMobile)) { - return callback(new Error('请输入正确的手机号或座机号！')); - }else{ - callback(); + let moblie = /^1(3|4|5|6|7|8|9)\d{9}$/; let tel = /^(0[0-9]{2,3}\-)([2-9][0-9]{4,7})+(\-[0-9]{1,4})?$/ + if (!moblie.test(this.postDataForm.handlePeopleMobile) && !tel.test(this.postDataForm.handlePeopleMobile)) { + return callback(new Error('请输入正确的手机号或座机号！')) + } else { + callback() } - }; + } return { handleAdvice: [ { @@ -628,7 +627,7 @@ export default { 'postDataForm.handleAdviceRadios': function (val) { this.postDataForm.handleAdvice = val }, - + 'postDataForm.outHandleAdvice': function (val) { this.dataForm.outHandleAdvice = val }, @@ -641,12 +640,10 @@ export default { 'postDataForm.handleCategoryShow': function (val) { if (this.typeKey == 'community_party') { if (val == 6) { - this.isShowDeal = true this.showAdvice = false this.isWhistle = false this.postDataForm.handleAdviceRadios = '历史遗留暂不具备解决条件的事项' - this.postDataForm.handleAdvice = '历史遗留暂不具备解决条件的事项' } else { this.isShowDeal = false this.showAdvice = true @@ -720,9 +717,9 @@ export default { }/oss/file/uploadImg?token=${Cookies.get('token')}` }, methods: { - cc(){ - console.log(this.dataForm); - console.log(this.postDataForm) + cc () { + console.log(this.dataForm) + console.log(this.postDataForm) }, refreshProgress () { this.timeloading = true @@ -1158,7 +1155,6 @@ export default { return this.$message.error('项目处理意见不能为空') } if (this.postDataForm.handleAdvice.length > 500) { - return this.$message.error('项目处理意见不能超过500字') } if (this.evaluateDeptDTOSVisible) { @@ -1211,8 +1207,7 @@ export default { item.uid = item.uid + '77000' }) this.postDataForm.outHandleImagesPC = imagesAttr - - + this.postDataForm.outHandleImages = this.postDataForm.handleImages console.log(this.postDataForm) From abbfecc9edf8ac036eccab0a6bc2995d5ca21807 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 8 Sep 2022 18:31:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=9A=E6=82=A8=E7=9A=84=E8=AF=89=E6=B1=82,=20=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E6=AD=A3=E5=9C=A8=E5=85=A8=E5=8A=9B=E5=8A=9E=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/events/item-deal-detail-view.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue index 2136a71b..208ee373 100644 --- a/src/views/modules/events/item-deal-detail-view.vue +++ b/src/views/modules/events/item-deal-detail-view.vue @@ -926,10 +926,11 @@ export default { this.checkParentName = res.data.parentDeptName if (res.data.typeKey == 'grid_party') { - this.postDataForm.outHandleAdvice = '您的诉求, ' + res.data.parentDeptName + '正在全力办理' + // this.postDataForm.outHandleAdvice = '您的诉求, ' + res.data.parentDeptName + '正在全力办理' + this.postDataForm.outHandleAdvice = '您的诉求, 社区正在全力办理' } else { - this.postDataForm.outHandleAdvice = - '您的诉求, ' + res.data.parentDeptName + '正在协调办理，请您耐心等待' + // this.postDataForm.outHandleAdvice = '您的诉求, ' + res.data.parentDeptName + '正在协调办理，请您耐心等待' + this.postDataForm.outHandleAdvice = '您的诉求, 街道正在协调办理，请您耐心等待' } this.dataForm.handleResultDTOS = res.data.handleResultDTOS this.typeKey = res.data.typeKey From d887fe055241f68af3180d53fd92a666f7e3281f Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 8 Sep 2022 18:43:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=BC=E5=BC=8F---?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/events/item-deal-detail-view.vue | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue index 208ee373..ccdfc3ce 100644 --- a/src/views/modules/events/item-deal-detail-view.vue +++ b/src/views/modules/events/item-deal-detail-view.vue @@ -934,13 +934,9 @@ export default { } this.dataForm.handleResultDTOS = res.data.handleResultDTOS this.typeKey = res.data.typeKey - if ( - res.data.handleResultDTOS && - res.data.handleResultDTOS.length > 0 && - res.data.typeKey == 'grid_party' + if (res.data.handleResultDTOS && res.data.handleResultDTOS.length > 0 && res.data.typeKey == 'grid_party' ) { - this.postDataForm.handleCategoryShow = - res.data.handleResultDTOS[0].processResult + this.postDataForm.handleCategoryShow = res.data.handleResultDTOS[0].processResult } this.dataForm.deptResultDTOS = res.data.deptResultDTOS this.dataForm.evaluateDeptDTOS = res.data.evaluateDeptDTOS From 415292e481c7ec8df75b7fcd5f44614472d55dbb Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 8 Sep 2022 18:49:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=EF=BC=9A?= =?UTF-8?q?=EF=BC=9A=E6=82=A8=E7=9A=84=E8=AF=89=E6=B1=82,=20=E8=A1=97?= =?UTF-8?q?=E9=81=93=E6=AD=A3=E5=9C=A8=E5=8D=8F=E8=B0=83=E5=8A=9E=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E6=82=A8=E8=80=90=E5=BF=83=E7=AD=89=E5=BE=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/events/item-deal-detail-view.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue index ccdfc3ce..b39b211d 100644 --- a/src/views/modules/events/item-deal-detail-view.vue +++ b/src/views/modules/events/item-deal-detail-view.vue @@ -928,7 +928,7 @@ export default { if (res.data.typeKey == 'grid_party') { // this.postDataForm.outHandleAdvice = '您的诉求, ' + res.data.parentDeptName + '正在全力办理' this.postDataForm.outHandleAdvice = '您的诉求, 社区正在全力办理' - } else { + } else if (res.data.typeKey == 'community_party') { // this.postDataForm.outHandleAdvice = '您的诉求, ' + res.data.parentDeptName + '正在协调办理，请您耐心等待' this.postDataForm.outHandleAdvice = '您的诉求, 街道正在协调办理，请您耐心等待' } From 9095ec61bc0fe939ab6f1bc370d6b3bc40a9e7bc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 8 Sep 2022 19:08:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=EF=BC=9A?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/events/item-deal-detail-view.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue index b39b211d..66c9abde 100644 --- a/src/views/modules/events/item-deal-detail-view.vue +++ b/src/views/modules/events/item-deal-detail-view.vue @@ -639,6 +639,7 @@ export default { }, 'postDataForm.handleCategoryShow': function (val) { if (this.typeKey == 'community_party') { + // 不予受理申请 if (val == 6) { this.isShowDeal = true this.showAdvice = false