diff --git a/src/views/modules/events/borad/boradReplyRoute.vue b/src/views/modules/events/borad/boradReplyRoute.vue
new file mode 100644
index 0000000..0af494a
--- /dev/null
+++ b/src/views/modules/events/borad/boradReplyRoute.vue
@@ -0,0 +1,32 @@
+<template>
+  <keep-alive include="MessageBoradReply">
+    <component :is="selectComponent"></component>
+  </keep-alive>
+</template>
+
+<script>
+import MessageBoradReply from './messageboradreply'
+import MessageBoradReplyDetail from './messageboradreplyDetail'
+
+export default {
+  name: 'boradReplyRoute',
+  data () {
+    return {
+      selectComponent: MessageBoradReply
+    }
+  },
+  components: {
+    MessageBoradReply,
+    MessageBoradReplyDetail
+  },
+  methods: {
+    init () {
+      this.selectComponent = MessageBoradReply
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/modules/events/borad/messageboradreply-add-or-update.vue b/src/views/modules/events/borad/messageboradreply-add-or-update.vue
index 6a8a4f6..9764bb4 100644
--- a/src/views/modules/events/borad/messageboradreply-add-or-update.vue
+++ b/src/views/modules/events/borad/messageboradreply-add-or-update.vue
@@ -19,18 +19,7 @@
           <el-form-item label="乐观锁" prop="revision">
           <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
       </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
+
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
diff --git a/src/views/modules/events/borad/messageboradreply.vue b/src/views/modules/events/borad/messageboradreply.vue
index e038e03..89e774e 100644
--- a/src/views/modules/events/borad/messageboradreply.vue
+++ b/src/views/modules/events/borad/messageboradreply.vue
@@ -2,36 +2,50 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__messageboradreply}">
       <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 label="所属机构" label-width="90px">
+          <el-cascader
+              v-model="ids"
+              :options="options"
+              :props="{ checkStrictly: true }"
+              clearable
+          >
+          </el-cascader>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-form-item label="状态" label-width="90px">
+          <el-select v-model="dataForm.boradType" placeholder="留言状态" style="width:250px;">
+            <el-option v-for="item in boradType" :key="item.value" :label="item.typeName" :value="item.value" >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:messageboradreply:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="success" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('news:messageboradreply:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button  type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</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="id" label="主键id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="boradId" label="留言ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userId" label="用户id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userName" label="用户名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="replyContent" label="回复内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="逻辑删除" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="community" 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="userName" label="提问人" header-align="center" align="center"></el-table-column>
+        <el-table-column  label="问题描述" header-align="center" align="center">
+          <template slot-scope="scope">
+            <el-button  type="text"
+                       @click="childHandle(scope.row)">查看详情</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="state" label="状态" :formatter = "stateFormat" 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:messageboradreply:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('news:messageboradreply:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="scope.row.state == '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">回复</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -58,18 +72,73 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/messageboradreply/page',
+        getDataListURL: '/events/borad/page',
         getDataListIsPage: true,
         deleteURL: '/news/messageboradreply',
         deleteIsBatch: true
       },
       dataForm: {
-        id: ''
+        boradType: '',
+        deptId: ''
+      },
+      ids: [],
+      options: [],
+      boradType: [
+        {
+          typeName:"全部",
+          value:""
+        },
+        {
+          typeName:"待回复",
+          value:"0"
+        },
+        {
+          typeName:"回复",
+          value:"1"
+        }
+      ],
+      stateFormat (row, column) {
+        if (row.state === '0') {
+          return '已回复'
+        } else {
+          return '待回复'
+        }
       }
     }
   },
   components: {
     AddOrUpdate
+  },
+  created: function () {
+    this.getOptions()
+  },
+  watch: {
+    ids: function (val) {
+      if (val.length === 0) {
+        this.dataForm.deptId = ''
+      } else {
+        this.dataForm.deptId = this.ids[val.length - 1]
+      }
+    }
+  },
+  methods: {
+    getOptions () {
+      var paa = {deptType:'party'}
+      this.$http
+          .post(`/sys/user/deptOptions/getByLoginUserNew`,paa)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
+            }
+            this.options = res.data.options
+          })
+          .catch(() => {})
+    },
+    addOrUpdateHandle (id, disabled) {
+      this.$parent.selectComponent = 'MessageBoradReplyDetail'
+      this.$router.push({ path: '/events-borad-boradReplyRoute', query: { id: id, disabled: disabled } })
+    }
+
   }
 }
 </script>
diff --git a/src/views/modules/events/borad/messageboradreplyDetail.vue b/src/views/modules/events/borad/messageboradreplyDetail.vue
new file mode 100644
index 0000000..b6691fe
--- /dev/null
+++ b/src/views/modules/events/borad/messageboradreplyDetail.vue
@@ -0,0 +1,300 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <el-form v-if="pove" :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
+      <el-form-item label="留言人"  label-width="100px">
+        <el-input
+            :rows="3"
+            v-model="dataForm.boradName"
+            style="width:50%">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="留言时间"  label-width="100px">
+        <el-input
+            :rows="3"
+            v-model="dataForm.createTime"
+            style="width:50%">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="留言人所属网格"  label-width="100px">
+        <div>{{dataForm.dept}}</div>
+      </el-form-item>
+      <el-form-item label="留言内容" prop="content" label-width="100px">
+        <el-input
+            type="textarea"
+            :rows="3"
+            placeholder="请输入会议内容，2000字以内"
+            v-model="dataForm.content"
+            maxlength="2000"
+            style="width:50%">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="留言图片" v-loading="loading" prop="images" label-width="100px">
+        <el-upload
+            ref="upload"
+            :action="uploadUrl"
+            :class="{hide:hideUpload}"
+            list-type="picture-card"
+            :file-list="dataForm.images"
+            :limit=3
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove"
+            :on-success="handleAvatarSuccess"
+            :on-error="handelError"
+            :before-upload="beforeAvatarUpload"
+            style="width:480px">
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+        <div><font color="gray">1~3张图</font></div>
+      </el-form-item>
+    </el-form>
+    <el-form v-if="replyState" :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
+      <el-form-item label="回复内容" prop="content" label-width="100px">
+        <el-input
+            type="textarea"
+            :rows="3"
+            placeholder="请输入会议内容，2000字以内"
+            v-model="dataForm.replyContent"
+            maxlength="2000"
+            style="width:50%">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="回复图片" v-loading="loading" prop="images" label-width="100px">
+        <el-upload
+            ref="upload"
+            :action="uploadUrl"
+            :class="{hide:hideUpload}"
+            list-type="picture-card"
+            :file-list="dataForm.replyimages"
+            :limit=3
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove"
+            :on-success="handleAvatarSuccess"
+            :on-error="handelError"
+            :before-upload="beforeAvatarUpload"
+            style="width:480px">
+          <i class="el-icon-plus"></i>
+        </el-upload>
+        <el-dialog :visible.sync="dialogVisible">
+          <img width="100%" :src="dialogImageUrl" alt="">
+        </el-dialog>
+        <div><font color="gray">1~3张图</font></div>
+      </el-form-item>
+      <el-form-item v-if="isAble" label="回复人"  label-width="100px">
+        <div>{{dataForm.replyName}}</div>
+      </el-form-item>
+      <el-form-item v-if="isAble" label="回复时间"  label-width="100px">
+        <div>{{dataForm.replyTime}}</div>
+      </el-form-item>
+    </el-form>
+
+    <el-form>
+      <el-form-item style="margin-left:35px;">
+        <el-button type="primary" @click="backToUserRelationList">{{"返回"}}</el-button>
+        <el-button v-if="!pageDisabled" type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      </el-form-item>
+    </el-form>
+  </el-card>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+import Cookies from 'js-cookie'
+export default {
+  data () {
+    return {
+      visible: false,
+      pove: false,
+      dataForm: {
+        id: '',
+        userId: '',
+        boradName: '',
+        dept: '',
+        deptId: '',
+        content: '',
+        images: [],
+        replyimages: [],
+        createTime: '',
+        replyContent: '',
+        replyName: '',
+        replyTime: ''
+      },
+      isAble: false,
+      replyState: true,
+      meetTypeArr: [],
+      dailyTypeArr: [],
+      hideUpload: false,
+      pageDisabled: false,
+      // imgUrlArr: [],
+      mapSelectVisible: false,
+      uploadUrl: '',
+      loading: false,
+      dialogImageUrl: '',
+      dialogVisible: false,
+      options: []
+    }
+  },
+  created: function () {
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadImg?token=${Cookies.get('token')}`
+  },
+  computed: {
+    dataRule () {
+      return {
+        boradId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        userName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        replyContent: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  mounted () {
+    debugger
+    this.pageDisabled = this.$route.query.disabled
+    this.hideUpload = this.$route.query.disabled
+    if (this.$route.query.id !== '' && this.$route.query.id != null) {
+      this.dataForm.id = this.$route.query.id
+      this.getInfo()
+    } else {
+      // 随手记下拉框赋值
+      this.getInfo()
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/news/messageboradreply/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/messageboradreply/', 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 }),
+
+    handleAvatarSuccess (res, file) {
+      this.loading = false
+      this.isAble = false
+      if (res === null || res.data === null || res.data.imgUrl === null) {
+        this.$message.error('文件上传失败！')
+        this.handleErrorRemove(file)
+        return false
+      }
+      this.dataForm.images.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 1 })
+      this.hideUpload = this.dataForm.images.length >= 3
+    },
+    handleErrorRemove (file) {
+      // 实现缩略图模板时删除文件
+      let fileList = this.$refs.upload.uploadFiles
+      for (var i = 0; i < fileList.length; i++) {
+        let item = fileList[i]
+        if (item.url === file.url) {
+          fileList.splice(i, 1)
+        }
+      }
+    },
+    handelError () {
+      this.loading = false
+      this.isAble = false
+      this.$message.error('上传文件失败!')
+    },
+    handlePictureCardPreview (file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleRemove (file, fileList) {
+      for (var i = 0; i < this.dataForm.images.length; i++) {
+        let item = this.dataForm.images[i]
+        if (item.url === file.url) {
+          this.dataForm.images.splice(i, 1)
+        }
+      }
+      this.hideUpload = this.dataForm.images.length >= 9
+    },
+    beforeAvatarUpload (file) {
+      if (this.dataForm.images.length === 3) {
+        this.$message.error('最多上传3张图片!')
+        return false
+      }
+      this.loading = true
+      this.isAble = true
+      const isJPG = file.type === 'image/jpeg'
+      const isPNG = file.type === 'image/png'
+      // const isLt1M = file.size / 1024 / 1024 < 1
+      // 判断是否符合格式要求
+      if (!isJPG && !isPNG) {
+        this.$message.error('上传文件必须是jpg、png格式!')
+        this.loading = false
+        this.isAble = false
+        return false
+      }
+    },
+    // 返回按钮点击事件
+    backToUserRelationList () {
+      this.$emit('MessageBoradReply')
+      this.$parent.selectComponent = 'MessageBoradReply'
+      this.$router.push({ path: '/events-borad-boradReplyRoute' })
+    },
+  }
+}
+</script>