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

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

@@ -111,6 +111,13 @@ export default {
       if (val === 1) {
         this.deptResultDTOSVisible = true
         this.evaluateDeptDTOSVisible = false
+        console.log(this.dataForm.deptResultDTOS)
+        for (let index = 0; index < this.dataForm.deptResultDTOS.length; index++) {
+          const deptResultDTO = this.dataForm.deptResultDTOS[index]
+          if (deptResultDTO.selected === true) {
+            this.postDataForm.deptResultDTOS.push(deptResultDTO)
+          }
+        }
       } else if (val === 10) {
         if (this.dataForm.evaluateDeptDTOS.length === 0) {
           return

src/views/modules/news/news-add-or-update.vue

@@ -267,14 +267,14 @@ export default {
     changeStreet (event) {
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.dataForm.street = choosenItem.name
-      this.dataForm.communityId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.gridId = this.dataForm.community = this.dataForm.grid = null
       this.communityList = this.gridList = []
       this.getDeptInfoList('community', event)
     },
     changeCommunity (event) {
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.dataForm.community = choosenItem.name
-      this.dataForm.gridId = null
+      this.dataForm.gridId = this.dataForm.grid = null
       this.gridList = []
       this.getDeptInfoList('grid', event)
     },