Merge branch 'release/epdc' of http://121.42.41.42:7070/r/esua-epdc-admin into release/epdc

src/views/modules/events/item-deal-detail-view.vue

@@ -388,7 +388,6 @@ import 'quill/dist/quill.snow.css'
 export default {
   name: 'itemDealDetailView',
   data () {
-
     return {
       idea: '',
       isWhistle: true, // 吹哨按钮
@@ -542,13 +541,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})?$/;
+        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)) {
+        if (!moblie.test(this.postDataForm.handlePeopleMobile) && !tel.test(this.postDataForm.handlePeopleMobile)) {
-          return callback(new Error('请输入正确的手机号或座机号！'));
+          return callback(new Error('请输入正确的手机号或座机号！'))
-        }else{
+        } else {
-          callback();
+          callback()
         }
-      };
+      }
       return {
         handleAdvice: [
           {
@@ -661,12 +660,12 @@ 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
@@ -740,9 +739,9 @@ export default {
     }/oss/file/uploadImg?token=${Cookies.get('token')}`
   },
   methods: {
-    cc(){
+    cc () {
-       console.log(this.dataForm);
+      console.log(this.dataForm)
-       console.log(this.postDataForm)
+      console.log(this.postDataForm)
     },
     refreshProgress () {
       this.timeloading = true
@@ -950,20 +949,17 @@ 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 + '正在全力办理'
-          } else {
+            this.postDataForm.outHandleAdvice = '您的诉求, 社区正在全力办理'
-            this.postDataForm.outHandleAdvice =
+          } else if (res.data.typeKey == 'community_party') {
-              '您的诉求, ' + res.data.parentDeptName + '正在协调办理，请您耐心等待'
+            // this.postDataForm.outHandleAdvice = '您的诉求, ' + res.data.parentDeptName + '正在协调办理，请您耐心等待'
+            this.postDataForm.outHandleAdvice = '您的诉求, 街道正在协调办理，请您耐心等待'
           }
           this.dataForm.handleResultDTOS = res.data.handleResultDTOS
           this.typeKey = res.data.typeKey
-          if (
+          if (res.data.handleResultDTOS && res.data.handleResultDTOS.length > 0 && res.data.typeKey == 'grid_party'
-            res.data.handleResultDTOS &&
-            res.data.handleResultDTOS.length > 0 &&
-            res.data.typeKey == 'grid_party'
           ) {
-            this.postDataForm.handleCategoryShow =
+            this.postDataForm.handleCategoryShow = res.data.handleResultDTOS[0].processResult
-              res.data.handleResultDTOS[0].processResult
           }
           this.dataForm.deptResultDTOS = res.data.deptResultDTOS
           this.dataForm.evaluateDeptDTOS = res.data.evaluateDeptDTOS
@@ -1179,7 +1175,6 @@ export default {
           return this.$message.error('项目处理意见不能为空')
         }
         if (this.postDataForm.handleAdvice.length > 500) {
-        
           return this.$message.error('项目处理意见不能超过500字')
         }
         if (this.evaluateDeptDTOSVisible) {
@@ -1233,7 +1228,6 @@ export default {
         })
         this.postDataForm.outHandleImagesPC = imagesAttr
 
-        
         this.postDataForm.outHandleImages = this.postDataForm.handleImages
         console.log(this.postDataForm)