diff --git a/src/views/modules/news/notice-add-or-update.vue b/src/views/modules/news/notice-add-or-update.vue
new file mode 100644
index 00000000..9a2753d5
--- /dev/null
+++ b/src/views/modules/news/notice-add-or-update.vue
@@ -0,0 +1,266 @@
+<template>
+  <el-dialog :visible.sync="visible"
+             :title="!dataForm.id ? $t('add') : $t('update')"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
+    <el-form :model="dataForm"
+             :rules="dataRule"
+             ref="dataForm"
+             @keyup.enter.native="dataFormSubmitHandle()"
+             :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+      <el-form-item label="所属街道"
+                    prop="deptId">
+        <el-select v-model="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="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="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="noticeTitle">
+        <el-input v-model="dataForm.noticeTitle"
+                  placeholder="通知标题"></el-input>
+      </el-form-item>
+      <el-form-item prop="noticeContent"
+                    label="通知内容">
+        <!-- 富文本编辑器, 容器 -->
+        <div id="J_quillEditor"></div>
+        <!-- 自定义上传图片功能 (使用element upload组件) -->
+        <el-upload :action="uploadUrl"
+                   :show-file-list="false"
+                   :before-upload="uploadBeforeUploadHandle"
+                   :on-success="uploadSuccessHandle"
+                   style="display: none;">
+          <el-button ref="uploadBtn"
+                     type="primary"
+                     size="small">{{ $t('upload.button') }}</el-button>
+        </el-upload>
+      </el-form-item>
+    </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import Cookies from 'js-cookie'
+import debounce from 'lodash/debounce'
+import 'quill/dist/quill.snow.css'
+import Quill from 'quill'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        dept: '',
+        deptId: '',
+        noticeTitle: '',
+        noticeContent: ''
+      },
+      // 富文本
+      quillEditor: null,
+      quillEditorToolbarOptions: [
+        ['bold', 'italic', 'underline', 'strike'],
+        ['blockquote', 'code-block', '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': [] }],
+        [{ 'font': [] }],
+        [{ 'align': [] }],
+        ['clean']
+      ],
+      uploadUrl: '',
+      // 富文本end
+      streetId: '',
+      streetList: [],
+      communityId: '',
+      communityList: [],
+      gridId: '',
+      gridList: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        noticeTitle: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        noticeContent: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created () {
+    this.getDeptInfoList('street', '1169154711480528897')
+  },
+  methods: {
+    // 富文本编辑器
+    quillEditorHandle () {
+      this.quillEditor = new Quill('#J_quillEditor', {
+        modules: {
+          toolbar: this.quillEditorToolbarOptions
+        },
+        theme: 'snow'
+      })
+      // // 自定义上传图片功能 (使用element upload组件)
+      this.quillEditor.getModule('toolbar').addHandler('image', () => {
+        this.$refs.uploadBtn.$el.click()
+      })
+      // 监听内容变化，动态赋值
+      this.quillEditor.on('text-change', () => {
+        this.dataForm.noticeContent = this.quillEditor.root.innerHTML
+      })
+    },
+    // 上传图片之前 (富文本)
+    uploadBeforeUploadHandle (file) {
+      if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif') {
+        this.$message.error(this.$t('upload.tip', { 'format': 'jpg、png、gif' }))
+        return false
+      }
+    },
+    // 上传图片成功 (富文本)
+    uploadSuccessHandle (res, file, fileList) {
+      if (res.code !== 0) {
+        return this.$message.error(res.msg)
+      }
+      this.quillEditor.insertEmbed(this.quillEditor.getSelection().index, 'image', res.data.url)
+    },
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.communityId = this.streetId = this.gridId = null
+        // 富文本
+        this.hideUpload = false
+        this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+        if (this.quillEditor) {
+          this.quillEditor.deleteText(0, this.quillEditor.getLength())
+        } else {
+          this.quillEditorHandle()
+        }
+        // 富文本end
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/news/notice/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = res.data
+        this.quillEditor.root.innerHTML = res.data.noticeContent
+      }).catch(() => { })
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/notice/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
+      })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    // 获取部门列表
+    getDeptInfoList (dataReceiver, faDeptId) {
+      this.$http.get(`/sys/dept/sublist/` + faDeptId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        if (dataReceiver === 'street') {
+          this.streetList = res.data
+        } else if (dataReceiver === 'community') {
+          this.communityList = res.data
+        } else if (dataReceiver === 'grid') {
+          this.gridList = res.data
+        }
+      }).catch(() => { })
+    },
+    changeStreet (event) {
+      this.streetId = event
+      let choosenItem = this.streetList.filter(item => item.id === this.streetId)[0]
+      this.initDeptIdAndName(choosenItem)
+      this.communityId = this.gridId = null
+      this.communityList = this.gridList = []
+      this.getDeptInfoList('community', event)
+    },
+    changeCommunity (event) {
+      this.communityId = event
+      let choosenItem = this.communityList.filter(item => item.id === this.communityId)[0]
+      this.initDeptIdAndName(choosenItem)
+      this.gridId = null
+      this.gridList = []
+      this.getDeptInfoList('grid', event)
+    },
+    changeGrid (event) {
+      this.gridId = event
+      let choosenItem = this.gridList.filter(item => item.id === this.gridId)[0]
+      this.initDeptIdAndName(choosenItem)
+    },
+    initDeptIdAndName (choosenItem) {
+      this.dataForm.dept = choosenItem.name
+      this.dataForm.deptId = choosenItem.id
+    }
+
+  }
+}
+</script>
+<style>
+.richText {
+  height: 500px;
+}
+</style>
diff --git a/src/views/modules/news/notice.vue b/src/views/modules/news/notice.vue
new file mode 100644
index 00000000..b7b83114
--- /dev/null
+++ b/src/views/modules/news/notice.vue
@@ -0,0 +1,111 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-news__notice}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id"
+                    placeholder="id"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:notice:save')"
+                     type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:notice:delete')"
+                     type="danger"
+                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="noticeTitle"
+                         label="通知标题"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="dept"
+                         label="发布通知部门"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="readingAmount"
+                         label="阅读量"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="creatorName"
+                         label="创建人"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="创建时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('news:notice:update')"
+                       type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('news:notice:delete')"
+                       type="text"
+                       size="small"
+                       @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible"
+                     ref="addOrUpdate"
+                     @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './notice-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/news/notice/page',
+        getDataListIsPage: true,
+        deleteURL: '/news/notice',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>