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

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

@@ -194,9 +194,15 @@ export default {
         this.dataForm = res.data
         this.quillEditor.root.innerHTML = res.data.noticeContent
         if (this.dataForm.streetId) {
+          if (this.dataForm.communityId === 0) {
+            this.dataForm.communityId = this.dataForm.gridId = null
+          }
           this.getDeptInfoList('community', this.dataForm.streetId)
         }
         if (this.dataForm.communityId) {
+          if (this.dataForm.gridId === 0) {
+            this.dataForm.gridId = null
+          }
           this.getDeptInfoList('grid', this.dataForm.communityId)
         }
       }).catch(() => { })
@@ -243,7 +249,7 @@ export default {
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.dataForm.street = choosenItem.name
       // 清空社区与网格的变量值
-      this.dataForm.communityId = this.dataForm.gridId = this.dataForm.community = this.grid = null
+      this.dataForm.communityId = this.dataForm.gridId = this.dataForm.community = this.dataForm.grid = null
       this.communityList = this.gridList = []
       // 获取街道下属社区
       this.getDeptInfoList('community', this.dataForm.streetId)

src/views/modules/news/notice.vue

@@ -41,7 +41,7 @@
                          label="发布通知部门"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="isPublish"
+        <el-table-column prop="noticeReleaseState"
                          label="已发布"
                          header-align="center"
                          :formatter="showIsPublishFormatter"
@@ -68,7 +68,7 @@
                        type="primary"
                        size="mini"
                        @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:notice:publish') && scope.row.isPublish === '0'"
+            <el-button v-if="$hasPermission('news:notice:publish') && scope.row.noticeReleaseState === '0'"
                        type="primary"
                        size="mini"
                        @click="noticePublishHandle(scope.row.id)">发布</el-button>
@@ -135,7 +135,7 @@ export default {
       }).catch(() => { })
     },
     showIsPublishFormatter: function (row, column) {
-      if (row.isPublish === '0') {
+      if (row.noticeReleaseState === '0') {
         return '否'
       }
       return '是'

src/views/modules/user/user.vue

@@ -418,7 +418,7 @@ export default {
   },
   methods: {
     getStreetList () {
-      this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
+      this.$http.get(`/sys/dept/sublist/1169154711480528897`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }