From 4c4e7ce9ee55255d1aa1c22a14ac63ef0fb2a943 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Mon, 2 Nov 2020 17:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=B1=BB=E5=9E=8Bbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/news/notice-add-or-update.vue b/src/views/modules/news/notice-add-or-update.vue
index 028ffbe..a70ef58 100644
--- a/src/views/modules/news/notice-add-or-update.vue
+++ b/src/views/modules/news/notice-add-or-update.vue
@@ -36,7 +36,7 @@
       </el-row>
       <el-form-item label="所属模块" prop="noticeCategory">
         <div class="block">
-          <el-cascader v-model="noticeCategoryList" placeholder="试试搜索：一键服务" :props="optionProps" :options="moduleCategoryList" filterable></el-cascader>
+          <el-cascader v-model="noticeCategoryList" placeholder="试试搜索：一键服务" :props="optionProps" :options="moduleCategoryList" filterable clearable></el-cascader>
         </div>
     </el-form-item>
       <el-form-item label="通知标题"
@@ -158,6 +158,8 @@ export default {
     'noticeCategoryList': function (val) {
       if (val.length !== 0) {
         this.dataForm.noticeCategory = val[val.length - 1]
+      } else {
+        this.dataForm.noticeCategory = ''
       }
     }
   },
@@ -249,6 +251,7 @@ export default {
           this.getInfo()
         } else {
           this.dataForm = {}
+          this.noticeCategoryList = []
         }
       })
     },
@@ -380,7 +383,7 @@ export default {
       }).catch(() => {})
     },
     getModuleCategoryList () {
-      this.$http.get('/news/modulecategory/list').then(({ data: res }) => {
+      this.$http.get('/news/modulecategory/getListToShow').then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/news/notice.vue b/src/views/modules/news/notice.vue
index f94eaf8..bf70dbb 100644
--- a/src/views/modules/news/notice.vue
+++ b/src/views/modules/news/notice.vue
@@ -12,7 +12,7 @@
         </el-form-item>
         <el-form-item label="所属模块:" prop="noticeCategory">
           <div class="block">
-            <el-cascader v-model="noticeCategoryList" placeholder="试试搜索：一键服务" :props="optionProps" :options="moduleCategoryList" filterable></el-cascader>
+            <el-cascader v-model="noticeCategoryList" placeholder="试试搜索：一键服务" :props="optionProps" :options="moduleCategoryList" filterable clearable></el-cascader>
           </div>
         </el-form-item>
         <el-form-item>
@@ -135,6 +135,8 @@ export default {
     'noticeCategoryList': function (val) {
       if (val.length !== 0) {
         this.dataForm.noticeCategory = val[val.length - 1]
+      } else {
+        this.dataForm.noticeCategory = ''
       }
     }
   },
@@ -194,7 +196,7 @@ export default {
       }).catch(() => {})
     },
     getModuleCategoryList () {
-      this.$http.get('/news/modulecategory/list').then(({ data: res }) => {
+      this.$http.get('/news/modulecategory/getListToShow').then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }