From e322faf2078ab15579a04a1da9e9ee64d9cf355a Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Thu, 19 Sep 2019 20:23:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=92=8Cbanner=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/news/banner-add-or-update.vue |  4 ++--
 src/views/modules/news/notice-add-or-update.vue | 11 +++++------
 src/views/modules/news/notice.vue               |  1 -
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/news/banner-add-or-update.vue b/src/views/modules/news/banner-add-or-update.vue
index 15a43797..1899af92 100644
--- a/src/views/modules/news/banner-add-or-update.vue
+++ b/src/views/modules/news/banner-add-or-update.vue
@@ -160,11 +160,11 @@ export default {
       this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
       this.visible = true
       this.$nextTick(() => {
+        this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+        this.communityList = this.gridList = []
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           this.getInfo()
-        } else {
-          this.dataForm = []
         }
       })
     },
diff --git a/src/views/modules/news/notice-add-or-update.vue b/src/views/modules/news/notice-add-or-update.vue
index dcb32fe0..7f0f5609 100644
--- a/src/views/modules/news/notice-add-or-update.vue
+++ b/src/views/modules/news/notice-add-or-update.vue
@@ -20,7 +20,8 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="所属社区">
+      <el-form-item label="所属社区"
+                    prop="communityId">
         <el-select v-model="dataForm.communityId"
                    @change="changeCommunity"
                    placeholder="所属社区">
@@ -31,7 +32,8 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="所属网格">
+      <el-form-item label="所属网格"
+                    prop="gridId">
         <el-select v-model="dataForm.gridId"
                    @change="changeGrid"
                    placeholder="所属网格">
@@ -98,13 +100,11 @@ export default {
       quillEditor: null,
       quillEditorToolbarOptions: [
         ['bold', 'italic', 'underline', 'strike'],
-        // ['blockquote', 'code-block', 'image'],
         ['image'],
         [{ 'header': 1 }, { 'header': 2 }],
         [{ 'list': 'ordered' }, { 'list': 'bullet' }],
         [{ 'script': 'sub' }, { 'script': 'super' }],
         [{ 'indent': '-1' }, { 'indent': '+1' }],
-        // [{ 'direction': 'rtl' }],
         [{ 'size': ['small', false, 'large', 'huge'] }],
         [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
         [{ 'color': [] }, { 'background': [] }],
@@ -174,6 +174,7 @@ export default {
       this.visible = true
       this.$nextTick(() => {
         this.dataForm.communityId = this.dataForm.streetId = this.dataForm.gridId = null
+        this.communityList = this.gridList = []
         // 富文本
         this.hideUpload = false
         this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
@@ -186,8 +187,6 @@ export default {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
           this.getInfo()
-        } else {
-          this.dataForm = []
         }
       })
     },
diff --git a/src/views/modules/news/notice.vue b/src/views/modules/news/notice.vue
index e364e918..3de5d914 100644
--- a/src/views/modules/news/notice.vue
+++ b/src/views/modules/news/notice.vue
@@ -116,7 +116,6 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        id: '',
         noticeTitle: ''
       }
     }