From 15e6f935ef66d140978df66cc7821eb880a679e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Sat, 1 Feb 2020 17:24:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=20=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E6=9C=BA=E6=9E=84=E6=9F=A5=E8=AF=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/news/allnews-add-or-update.vue    |  3 ++
 src/views/modules/news/allnews.vue            |  8 +++-
 .../modules/news/allnotice-add-or-update.vue  |  1 +
 src/views/modules/news/allnotice.vue          | 39 ++++++++++++++++---
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/views/modules/news/allnews-add-or-update.vue b/src/views/modules/news/allnews-add-or-update.vue
index 1bf0c08b..bbf3e989 100644
--- a/src/views/modules/news/allnews-add-or-update.vue
+++ b/src/views/modules/news/allnews-add-or-update.vue
@@ -44,6 +44,7 @@
                     v-loading="loading"
                     prop="newsImageUrl">
         <el-upload class="avatar-uploader"
+                    disabled="true"
                    :action="uploadUrl"
                    :show-file-list="false"
                    :on-success="handleAvatarSuccess"
@@ -61,6 +62,7 @@
                     prop="newsReleaseStartTime">
         <el-date-picker @change='setRegistTime'
                         v-model="time"
+                        readonly="true"
                         value-format="yyyy-MM-dd"
                         type="daterange"
                         range-separator="至"
@@ -278,6 +280,7 @@ export default {
         modules: {
           toolbar: this.quillEditorToolbarOptions
         },
+        readOnly: true,
         theme: 'snow'
       })
       this.quillEditor.container.style.height = `${300}px`
diff --git a/src/views/modules/news/allnews.vue b/src/views/modules/news/allnews.vue
index ac71f629..46e04e13 100644
--- a/src/views/modules/news/allnews.vue
+++ b/src/views/modules/news/allnews.vue
@@ -5,12 +5,12 @@
       <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>
         <!--<el-form-item label="所属街道"
                       prop="deptId">
           <el-select v-model="dataForm.streetId"
@@ -117,6 +117,10 @@
                          label="不支持数"
                          header-align="center"
                          align="center"></el-table-column>
+        <el-table-column prop="allDeptNames"
+                         label="所属网格"
+                         header-align="center"
+                         align="center"></el-table-column>
         <el-table-column prop="createdTime"
                          label="提交时间"
                          header-align="center"
diff --git a/src/views/modules/news/allnotice-add-or-update.vue b/src/views/modules/news/allnotice-add-or-update.vue
index d5d0efc8..65acb1af 100644
--- a/src/views/modules/news/allnotice-add-or-update.vue
+++ b/src/views/modules/news/allnotice-add-or-update.vue
@@ -128,6 +128,7 @@ export default {
         modules: {
           toolbar: this.quillEditorToolbarOptions
         },
+        readOnly: true,
         theme: 'snow'
       })
       // // 自定义上传图片功能 (使用element upload组件)
diff --git a/src/views/modules/news/allnotice.vue b/src/views/modules/news/allnotice.vue
index 3eb563f4..9dc2c1a4 100644
--- a/src/views/modules/news/allnotice.vue
+++ b/src/views/modules/news/allnotice.vue
@@ -5,6 +5,12 @@
       <el-form :inline="true"
                :model="dataForm"
                @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable></el-cascader>
+        </el-form-item>       
         <el-form-item>
           <el-input v-model="dataForm.noticeTitle"
                     placeholder="通知标题"
@@ -68,11 +74,11 @@
                          fixed="right"
                          header-align="center"
                          align="center"
-                         width="300">
+                         width="100">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('news:notice:update')"
-                       type="primary"
-                       size="mini"
+                       type="text"
+                       size="small"
                        @click="addOrUpdateHandle(scope.row.id)">查看</el-button>
           </template>
         </el-table-column>
@@ -107,8 +113,11 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        noticeTitle: ''
-      }
+        noticeTitle: '',
+        gridId: ''
+      },
+      options: [],
+      deptIdList: []
     }
   },
   components: {
@@ -154,6 +163,26 @@ export default {
         return row.street
       }
     }
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length !== 0) {
+        this.dataForm.gridId = val[val.length - 1]
+      } else {
+        this.dataForm.gridId = ''
+      }
+    }
+  },
+  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(() => { })
   }
 }
 </script>