diff --git a/src/views/modules/workRecord/monthrecordinfo.vue b/src/views/modules/workRecord/monthrecordinfo.vue
index a963096e..0ffd9438 100644
--- a/src/views/modules/workRecord/monthrecordinfo.vue
+++ b/src/views/modules/workRecord/monthrecordinfo.vue
@@ -2,40 +2,79 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__monthrecordinfo}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item> -->
+        <div>
+        <el-form-item label="月报内容" prop="content" label-width="90px">
+          <el-input v-model="dataForm.content" placeholder="月报内容" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:200px"></el-input>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-form-item label="发布人" prop="nickName" label-width="90px">
+          <el-input v-model="dataForm.nickName" placeholder="发布人" clearable maxlength="10" @keyup.native="btKeyUpNickName" style="width:200px"></el-input>
+        </el-form-item>
+        </div>
+        <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 label="发布时间" prop="startTime" label-width="90px">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至" prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
+          <el-button @click="getDataListOverWrite()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
           <el-button v-if="$hasPermission('news:monthrecordinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item> -->
+        <el-form-item>
+          <el-button type="primary" @click="addHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:monthrecordinfo: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="id" label="主键" 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="nickName" label="用户姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="userFace" label="头像" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptId" label="部门Id" 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="nickName" label="发布人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="startDate" label="统计开始时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="endDate" label="统计结束时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="content" label="内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="state" label="月报状态：0为提交，1已提交" 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="delFlag" 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 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="startDate" label="统计开始时间" header-align="center" align="center" :formatter="dateFormat"></el-table-column>
+        <el-table-column prop="endDate" label="统计结束时间" header-align="center" align="center" :formatter="dateFormat"></el-table-column>
+        <el-table-column prop="content" label="内容" header-align="center" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="state" 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:monthrecordinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="addHandle(scope.row.id,false)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="addHandle(scope.row.id,true)">{{ '查看' }}</el-button>
             <el-button v-if="$hasPermission('news:monthrecordinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
@@ -63,18 +102,93 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/monthrecordinfo/page',
+        getDataListURL: '/workRecord/monthrecordinfo/page',
         getDataListIsPage: true,
-        deleteURL: '/news/monthrecordinfo',
-        deleteIsBatch: true
+        deleteURL: '/workRecord/monthrecordinfo',
+        deleteIsBatch: true,
+        exportURL: '/workRecord/monthrecordinfo/export'
       },
       dataForm: {
-        id: ''
-      }
+        id: '',
+        content: '',
+        nickName: ''
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      ids: [],
+      options: []
     }
   },
   components: {
     AddOrUpdate
+  },
+  watch: {
+    ids: function (val) {
+      if (val.length === 0) {
+        this.dataForm.deptId = ''
+      } else {
+        this.dataForm.deptId = this.ids[val.length - 1]
+      }
+    }
+  },
+  created: function () {
+    this.getDataList()
+    this.getOptions()
+  },
+  methods: {
+    addHandle (id, disabled) {
+      this.$parent.selectComponent = 'MonthrecordinfoDetail'
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: id, disabled: disabled } })
+    },
+    getOptions () {
+      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(() => {})
+    },
+    dateFormat (row, column) {
+      let date = row[column.property]
+      return date.length >= 10 ? date.substring(0, 10) : date
+    },
+    getDataListOverWrite () {
+      this.page = 1
+      this.getDataList()
+    },
+    btKeyUpContent (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.content = e.target.value
+    },
+    btKeyUpNickName (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.nickName = e.target.value
+    }
   }
 }
 </script>
+<style>
+.el-tooltip__popper {
+  max-width: 80%;
+  color: #353434 !important;
+  background:#ffffff !important;
+  word-break:break-all;
+}
+</style>
diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue
new file mode 100644
index 00000000..2a9d480a
--- /dev/null
+++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue
@@ -0,0 +1,274 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__masteruserrelation}">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
+      <el-form-item label="会议内容" prop="content" label-width="100px">
+        <el-input
+          type="textarea"
+          :rows="6"
+          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="90px">
+          <el-upload
+            :action="uploadUrl"
+            :class="{hide:hideUpload}"
+            list-type="picture-card"
+            :file-list="dataForm.images"
+            :limit=9
+            :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~9张图</font></div>
+      </el-form-item>
+      <el-form-item label="添加文件" v-loading="fileloading" prop="files" label-width="90px">
+        <el-upload
+          class="upload-demo"
+          :action="uploadFileUrl"
+          :before-remove="beforeFileRemove"
+          :file-list="dataForm.files"
+          :before-upload="beforeAvatarFileUpload"
+          :on-remove="handleFileRemove"
+          :on-success="handleAvatarFileSuccess"
+          :on-error="handelError"
+          :on-preview="handleFileCardPreview"
+          style="width:480px">
+          <el-button size="small">点击上传</el-button>
+          <div slot="tip" class="el-upload__tip">支持.word、PDF、Excel文件</div>
+        </el-upload>
+      </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>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </div>
+  </el-card>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+import Cookies from 'js-cookie'
+import 'quill/dist/quill.snow.css'
+import MapSelect from './map-select'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        userId: '',
+        nickName: '',
+        userFace: '',
+        deptId: '',
+        deptName: '',
+        startDate: '',
+        endDate: '',
+        content: '',
+        state: '',
+        images: [],
+        files: []
+      },
+      isAble: false,
+      hideUpload: false,
+      pageDisabled: false,
+      uploadUrl: '',
+      uploadFileUrl: '',
+      loading: false,
+      dialogImageUrl: '',
+      dialogVisible: false,
+      isAutoRemoveFile: true,
+      fileloading: false
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        content: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created: function () {
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadImg?token=${Cookies.get('token')}`
+    this.uploadFileUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadAllFile?token=${Cookies.get('token')}`
+    // this.uploadUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadImg?token=${Cookies.get('token')}`
+    // this.uploadFileUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadAllFile?token=${Cookies.get('token')}`
+  },
+  components: {
+    MapSelect
+  },
+  mounted () {
+    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()
+    }
+  },
+  methods: {
+    init () {
+      this.dataForm.id = this.$route.query.id
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    beforeAvatarUpload (file) {
+      if (this.dataForm.length === 9) {
+        this.$message.error('最多上传9张图片!')
+        return false
+      }
+      this.loading = true
+      this.isAble = true
+      const isJPG = file.type === 'image/jpeg'
+      const isPNG = file.type === 'image/png'
+      // 判断是否符合格式要求
+      if (!isJPG && !isPNG) {
+        this.$message.error('上传文件必须是jpg、png格式!')
+        this.loading = false
+        return false
+      }
+    },
+    handleAvatarSuccess (res, file) {
+      this.loading = false
+      this.isAble = false
+      this.dataForm.images.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 1, recordType: 1, fileName: res.data.fileName })
+      this.hideUpload = this.dataForm.images.length >= 9
+    },
+    handelError () {
+      this.loading = false
+      this.fileloading = false
+      this.isAble = false
+      this.$message.error('上传文件失败!')
+    },
+    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
+    },
+    handlePictureCardPreview (file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    // --------------文件上传-----------------
+    handleFileCardPreview (file) {
+      window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${file.url}`
+      // window.location.href = `http://219.146.91.110:10000/epdc-api/oss/file/download?fileUrl=${file.url}`
+    },
+    beforeFileRemove (file, fileList) {
+      if (this.isAutoRemoveFile) {
+        return this.$confirm(`确定移除${file.name}？`)
+      }
+      this.isAutoRemoveFile = true
+    },
+    beforeAvatarFileUpload (file) {
+      this.fileloading = true
+      this.isAble = true
+      if (file.size === 0) {
+        this.isAutoRemoveFile = false
+        this.$message.error('文件为空文件，请上传非空文件！')
+        this.fileloading = false
+        this.isAble = false
+        return false
+      }
+    },
+    handleFileRemove (file, fileList) {
+      for (var i = 0; i < this.dataForm.files.length; i++) {
+        let item = this.dataForm.files[i]
+        if (item.url === file.url) {
+          this.dataForm.files.splice(i, 1)
+        }
+      }
+    },
+    handleAvatarFileSuccess (res, file) {
+      this.fileloading = false
+      this.isAble = false
+      if (res === null || res.data === null || res.data.imgUrl === null) {
+        this.$message.error('文件上传失败！')
+        return false
+      }
+      this.dataForm.files.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 2, recordType: 1, fileName: res.data.fileName, name: res.data.fileName })
+    },
+    // 返回按钮点击事件
+    backToUserRelationList () {
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'Monthrecordinfo'
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute' })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/workRecord/monthrecordinfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+        // 判断是否存在九张照片，九张照片隐藏上传操作按钮(非查看状态下)
+        if (!this.$route.query.disabled) {
+          this.hideUpload = this.dataForm.images.length >= 9
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.isAble = true
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/monthrecordinfo/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            this.isAble = false
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.isAble = false
+              this.visible = false
+              this.$emit('refreshDataList')
+              // 返回主列表
+              this.backToUserRelationList()
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
+<style>
+.hide .el-upload--picture-card {
+    display: none;
+}
+</style>
diff --git a/src/views/modules/workRecord/monthrecordinforoute.vue b/src/views/modules/workRecord/monthrecordinforoute.vue
new file mode 100644
index 00000000..c07e46ad
--- /dev/null
+++ b/src/views/modules/workRecord/monthrecordinforoute.vue
@@ -0,0 +1,29 @@
+<template>
+    <keep-alive include="monthrecordinfo">
+        <component :is="selectComponent"></component>
+    </keep-alive>
+</template>
+<script>
+import Monthrecordinfo from './monthrecordinfo'
+import MonthrecordinfoDetail from './monthrecordinfoDetail'
+export default {
+  data () {
+    return {
+      selectComponent: Monthrecordinfo
+    }
+  },
+  components: {
+    Monthrecordinfo,
+    MonthrecordinfoDetail
+  },
+  methods: {
+    init () {
+      this.selectComponent = Monthrecordinfo
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/src/views/modules/workRecord/weekrecordinfo.vue b/src/views/modules/workRecord/weekrecordinfo.vue
index 3d98f12a..fa6179ab 100644
--- a/src/views/modules/workRecord/weekrecordinfo.vue
+++ b/src/views/modules/workRecord/weekrecordinfo.vue
@@ -7,7 +7,7 @@
         </el-form-item> -->
         <div>
         <el-form-item label="周报内容" prop="content" label-width="90px">
-          <el-input v-model="dataForm.content" placeholder="会议内容" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:200px"></el-input>
+          <el-input v-model="dataForm.content" placeholder="周报内容" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:200px"></el-input>
         </el-form-item>
         <el-form-item label="发布人" prop="nickName" label-width="90px">
           <el-input v-model="dataForm.nickName" placeholder="发布人" clearable maxlength="10" @keyup.native="btKeyUpNickName" style="width:200px"></el-input>