From 8744c566e3de241826c96b0b3ef06fd9c9993170 Mon Sep 17 00:00:00 2001
From: gupeng <gupeng@elink-cn.com>
Date: Fri, 29 Nov 2019 18:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B0=E9=97=BB=E5=92=8Cba?=
 =?UTF-8?q?nner=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/news/banner-add-or-update.vue     | 25 ++++++++++++++--
 src/views/modules/news/news-add-or-update.vue | 25 ++++++++++++++--
 src/views/modules/news/news-publish.vue       | 25 ++++++++++++++--
 src/views/modules/news/news.vue               | 30 +++++++++++++++++--
 src/views/modules/news/newsdraft.vue          | 30 +++++++++++++++++--
 5 files changed, 122 insertions(+), 13 deletions(-)

diff --git a/src/views/modules/news/banner-add-or-update.vue b/src/views/modules/news/banner-add-or-update.vue
index 904e9430..b17dcf3a 100644
--- a/src/views/modules/news/banner-add-or-update.vue
+++ b/src/views/modules/news/banner-add-or-update.vue
@@ -23,7 +23,15 @@
                   show-word-limit
                   placeholder="标题"></el-input>
       </el-form-item>
-      <el-form-item label="所属街道"
+      <el-form-item label="所属机构">
+        <el-cascader
+                v-model="dataForm.allDeptIdsShow"
+                :options="options"
+                :props="{ checkStrictly: true }"
+                clearable
+        ></el-cascader>
+      </el-form-item>
+      <!--<el-form-item label="所属街道"
                     prop="streetId">
         <el-select v-model="dataForm.streetId"
                    @change="changeStreet"
@@ -56,7 +64,7 @@
                      :value="item.id">
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="banner类型"
                     prop="bannerType">
         <el-select v-model="dataForm.bannerType"
@@ -122,12 +130,14 @@ export default {
         community: '',
         gridId: '',
         grid: '',
-        position: '0'
+        position: '0',
+        allDeptIdsShow: []
       },
       bannerOptions: [],
       streetList: [],
       communityList: [],
       gridList: [],
+      options: [],
       uploadUrl: '',
       positionList: [],
       loading: false
@@ -159,6 +169,15 @@ export default {
   },
   created () {
     // 1169154711480528897 为市北区部门ID
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
     this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListFromDict('bannerType')
     this.getListFromDict('bannerPosition')
diff --git a/src/views/modules/news/news-add-or-update.vue b/src/views/modules/news/news-add-or-update.vue
index fd79cd18..63639188 100644
--- a/src/views/modules/news/news-add-or-update.vue
+++ b/src/views/modules/news/news-add-or-update.vue
@@ -9,7 +9,15 @@
              ref="dataForm"
              @keyup.enter.native="dataFormSubmitHandle()"
              :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-      <el-form-item label="所属街道"
+      <el-form-item label="所属机构">
+        <el-cascader
+          v-model="dataForm.allDeptIdsShow"
+          :options="options"
+          :props="{ checkStrictly: true }"
+          clearable
+        ></el-cascader>
+      </el-form-item>
+      <!--<el-form-item label="所属街道"
                     prop="streetId">
         <el-select v-model="dataForm.streetId"
                    @change="changeStreet"
@@ -42,7 +50,7 @@
                      :value="item.id">
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="类别"
                     prop="newsCateroryId">
         <el-select v-model="dataForm.newsCateroryId"
@@ -148,12 +156,14 @@ export default {
         newsReleaseStartTime: '',
         newsReleaseEndTime: '',
         newsContent: '',
-        newsImageUrl: ''
+        newsImageUrl: '',
+        allDeptIdsShow: []
       },
       time: [],
       streetList: [],
       communityList: [],
       gridList: [],
+      options: [],
       categorys: [],
       loading: false,
       // 富文本
@@ -180,6 +190,15 @@ export default {
     }
   },
   created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
     this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListCategory()
     this.visible = true
diff --git a/src/views/modules/news/news-publish.vue b/src/views/modules/news/news-publish.vue
index 44d91954..04e78344 100644
--- a/src/views/modules/news/news-publish.vue
+++ b/src/views/modules/news/news-publish.vue
@@ -8,7 +8,15 @@
                ref="dataForm"
                :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
         <el-row>
-          <el-form-item label="所属街道"
+          <el-form-item label="所属机构">
+            <el-cascader
+              v-model="dataForm.allDeptIdsShow"
+              :options="options"
+              :props="{ checkStrictly: true }"
+              clearable
+            ></el-cascader>
+          </el-form-item>
+          <!--<el-form-item label="所属街道"
                         prop="streetId">
             <el-select v-model="dataForm.streetId"
                        @change="changeStreet"
@@ -41,7 +49,7 @@
                          :value="item.id">
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item>-->
         </el-row>
         <el-row>
           <el-form-item label="类别"
@@ -155,12 +163,14 @@ export default {
         street: '',
         community: null,
         grid: null,
-        newsProperty: ''
+        newsProperty: '',
+        allDeptIdsShow: []
       },
       time: [],
       streetList: [],
       communityList: [],
       gridList: [],
+      options: [],
       categorys: [],
       loading: false,
       // 富文本
@@ -190,6 +200,15 @@ export default {
     this.getListCategory()
   },
   created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
     this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListCategory()
     this.visible = true
diff --git a/src/views/modules/news/news.vue b/src/views/modules/news/news.vue
index 010f3166..4d8f85ed 100644
--- a/src/views/modules/news/news.vue
+++ b/src/views/modules/news/news.vue
@@ -5,7 +5,15 @@
       <el-form :inline="true"
                :model="dataForm"
                @keyup.enter.native="getDataList()">
-        <el-form-item label="所属街道"
+        <el-form-item label="所属机构">
+          <el-cascader
+            v-model="deptIdList"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
+        </el-form-item>
+        <!--<el-form-item label="所属街道"
                       prop="deptId">
           <el-select v-model="dataForm.streetId"
                      @change="changeStreet"
@@ -41,7 +49,7 @@
                        :value="item.id">
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item>-->
         <br>
         <span class="demonstration">提交时间</span>&nbsp;&nbsp;
         <el-date-picker @change='setRegistTime'
@@ -194,6 +202,8 @@ export default {
         category: ''
       },
       time: '',
+      options: [],
+      deptIdList: [],
       streetList: [],
       communityList: [],
       gridList: [],
@@ -205,6 +215,15 @@ export default {
     }
   },
   created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
     this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListCategory()
   },
@@ -374,6 +393,13 @@ export default {
   },
   components: {
     AddOrUpdate
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length !== 0) {
+        this.dataForm.gridId = val[val.length - 1]
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/modules/news/newsdraft.vue b/src/views/modules/news/newsdraft.vue
index 296ec1bb..46e2e510 100644
--- a/src/views/modules/news/newsdraft.vue
+++ b/src/views/modules/news/newsdraft.vue
@@ -5,7 +5,15 @@
       <el-form :inline="true"
                :model="dataForm"
                @keyup.enter.native="getDataList()">
-        <el-form-item label="所属街道"
+        <el-form-item label="所属机构">
+          <el-cascader
+            v-model="deptIdList"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
+        </el-form-item>
+        <!--<el-form-item label="所属街道"
                       prop="deptId">
           <el-select v-model="dataForm.streetId"
                      clearable
@@ -41,7 +49,7 @@
                        :value="item.id">
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item>-->
         <br>
         <span class="demonstration">提交时间</span>&nbsp;&nbsp;
         <el-date-picker @change='setRegistTime'
@@ -186,11 +194,22 @@ export default {
       streetList: [],
       communityList: [],
       gridList: [],
+      options: [],
+      deptIdList: [],
       categorys: [],
       id: ''
     }
   },
   created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
     this.getDeptInfoList('street', localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))
     this.getListCategory()
   },
@@ -331,6 +350,13 @@ export default {
   },
   components: {
     AddOrUpdate
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length !== 0) {
+        this.dataForm.gridId = val[val.length - 1]
+      }
+    }
   }
 }
 </script>