From 52424f39a56cbc1bb1a8fa6de6df8e4e5abfaa02 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 29 May 2020 15:50:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=20=E5=8F=AF=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E3=80=90=E6=89=80=E9=80=89=E6=9C=BA=E6=9E=84=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E9=80=BB=E8=BE=91=EF=BC=8C=E5=85=88=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=90=8E=E6=96=B0=E5=A2=9E=20=E6=96=B0=E9=97=BB=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/news/news-add-or-update.vue | 41 ++-----------------
 src/views/modules/news/news-publish.vue       | 39 ------------------
 src/views/modules/news/news.vue               |  2 +-
 3 files changed, 5 insertions(+), 77 deletions(-)

diff --git a/src/views/modules/news/news-add-or-update.vue b/src/views/modules/news/news-add-or-update.vue
index 429552a..911956b 100644
--- a/src/views/modules/news/news-add-or-update.vue
+++ b/src/views/modules/news/news-add-or-update.vue
@@ -11,43 +11,10 @@
       <el-form-item label="所属机构">
         <el-cascader v-model="dataForm.allDeptIdsShow"
                      :options="options"
-                     :props="{ checkStrictly: true }"
-                     clearable></el-cascader>
+                     :props="{ multiple: true }"
+                     clearable
+                     collapse-tags></el-cascader>
       </el-form-item>
-      <!--<el-form-item label="所属街道"
-                    prop="streetId">
-        <el-select v-model="dataForm.streetId"
-                   @change="changeStreet"
-                   placeholder="所属街道">
-          <el-option v-for="item in streetList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属社区">
-        <el-select v-model="dataForm.communityId"
-                   @change="changeCommunity"
-                   placeholder="所属社区">
-          <el-option v-for="item in communityList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="所属网格">
-        <el-select v-model="dataForm.gridId"
-                   @change="changeGrid"
-                   placeholder="所属网格">
-          <el-option v-for="item in gridList"
-                     :key="item.id"
-                     :label="item.name"
-                     :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>-->
       <el-form-item label="类别"
                     prop="newsCateroryId">
         <el-select v-model="dataForm.newsCateroryId"
@@ -188,7 +155,7 @@ export default {
   },
   created () {
     this.$http
-      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .get(`/sys/user/deptOptions/getAllByLoginUser`)
       .then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
diff --git a/src/views/modules/news/news-publish.vue b/src/views/modules/news/news-publish.vue
index efe3c86..c1a9fa2 100644
--- a/src/views/modules/news/news-publish.vue
+++ b/src/views/modules/news/news-publish.vue
@@ -15,40 +15,6 @@
                          clearable
                          collapse-tags></el-cascader>
           </el-form-item>
-          <!--<el-form-item label="所属街道"
-                        prop="streetId">
-            <el-select v-model="dataForm.streetId"
-                       @change="changeStreet"
-                       placeholder="所属街道">
-              <el-option v-for="item in streetList"
-                         :key="item.id"
-                         :label="item.name"
-                         :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="所属社区">
-            <el-select v-model="dataForm.communityId"
-                       @change="changeCommunity"
-                       placeholder="所属社区">
-              <el-option v-for="item in communityList"
-                         :key="item.id"
-                         :label="item.name"
-                         :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="所属网格">
-            <el-select v-model="dataForm.gridId"
-                       @change="changeGrid"
-                       placeholder="所属网格">
-              <el-option v-for="item in gridList"
-                         :key="item.id"
-                         :label="item.name"
-                         :value="item.id">
-              </el-option>
-            </el-select>
-          </el-form-item>-->
         </el-row>
         <el-row>
           <el-form-item label="类别"
@@ -198,11 +164,6 @@ export default {
     this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListCategory()
   },
-  watch: {
-    'dataForm.allDeptIdsShow': function (val) {
-        console.log(this.dataForm.allDeptIdsShow);
-    }
-  },
   created () {
     this.$http
       .get(`/sys/user/deptOptions/getAllByLoginUser`)
diff --git a/src/views/modules/news/news.vue b/src/views/modules/news/news.vue
index a7b07f4..8e6c247 100644
--- a/src/views/modules/news/news.vue
+++ b/src/views/modules/news/news.vue
@@ -214,7 +214,7 @@ export default {
   },
   created () {
     this.$http
-      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .get(`/sys/user/deptOptions/getAllByLoginUser`)
       .then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)