diff --git a/src/views/modules/workRecord/dailyrecordinfo-add-or-update.vue b/src/views/modules/workRecord/dailyrecordinfo-add-or-update.vue
index 84af68b6..8fd27e53 100644
--- a/src/views/modules/workRecord/dailyrecordinfo-add-or-update.vue
+++ b/src/views/modules/workRecord/dailyrecordinfo-add-or-update.vue
@@ -1,59 +1,74 @@
 <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="用户ID" prop="userId">
-          <el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>
+      <!-- <el-form-item label="用户ID" prop="userId">
+        <el-input v-model="dataForm.userId" placeholder="用户ID"></el-input>
       </el-form-item>
-          <el-form-item label="用户姓名" prop="nickName">
-          <el-input v-model="dataForm.nickName" placeholder="用户姓名"></el-input>
+      <el-form-item label="用户姓名" prop="nickName">
+        <el-input v-model="dataForm.nickName" placeholder="用户姓名"></el-input>
       </el-form-item>
-          <el-form-item label="头像" prop="userFace">
-          <el-input v-model="dataForm.userFace" placeholder="头像"></el-input>
+      <el-form-item label="头像" prop="userFace">
+        <el-input v-model="dataForm.userFace" placeholder="头像"></el-input>
       </el-form-item>
-          <el-form-item label="部门名称" prop="deptName">
-          <el-input v-model="dataForm.deptName" placeholder="部门名称"></el-input>
+      <el-form-item label="部门名称" prop="deptName">
+        <el-input v-model="dataForm.deptName" placeholder="部门名称"></el-input>
       </el-form-item>
-          <el-form-item label="部门Id" prop="deptId">
-          <el-input v-model="dataForm.deptId" placeholder="部门Id"></el-input>
+      <el-form-item label="部门Id" prop="deptId">
+        <el-input v-model="dataForm.deptId" placeholder="部门Id"></el-input>
+      </el-form-item> -->
+      <el-form-item v-if="dailyTypeArr.length > 0" label="随手记" prop="dailyType">
+        <el-select v-model="dataForm.dailyType" placeholder="随手记类型" @change="selectModel($event)" clearable style="width:90%">
+          <el-option v-for="item in dailyTypeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+          </el-option>
+        </el-select>
       </el-form-item>
-          <el-form-item label="随手记类型" prop="dailyType">
-          <el-input v-model="dataForm.dailyType" placeholder="随手记类型"></el-input>
+      <el-form-item v-if="meetTypeArr.length > 0" label="会议类型" prop="meetType">
+        <el-select v-model="dataForm.meetType" placeholder="会议类型" clearable style="width:90%">
+          <el-option v-for="item in meetTypeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+          </el-option>
+        </el-select>
       </el-form-item>
-          <el-form-item label="会议类型" prop="meetType">
-          <el-input v-model="dataForm.meetType" placeholder="会议类型"></el-input>
+      <el-form-item label="会议时间" prop="dailyDate">
+          <el-date-picker v-model="dataForm.dailyDate"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm"
+                          format="yyyy-MM-dd HH:mm"
+                          :picker-options="isSignupEndTime"
+                          placeholder="选择日期时间" style="width:90%">
+          </el-date-picker>
       </el-form-item>
-          <el-form-item label="资源ID" prop="resourceId">
-          <el-input v-model="dataForm.resourceId" placeholder="资源ID"></el-input>
+      <el-form-item label="地址" prop="address">
+        <el-input v-model="dataForm.address" placeholder="地址" style="width:90%"></el-input>
+        <div><font color="gray">默认定位，可手动修改</font></div>
       </el-form-item>
-          <el-form-item label="会议时间" prop="dailyDate">
-          <el-input v-model="dataForm.dailyDate" placeholder="会议时间"></el-input>
+      <el-form-item label="参加人数" prop="joinNum">
+        <el-input-number v-model="dataForm.joinNum" @change="handleChange" :min="1" :max="100000000" label="参加人数" style="width:90%"></el-input-number>
       </el-form-item>
-          <el-form-item label="地址" prop="address">
-          <el-input v-model="dataForm.address" placeholder="地址"></el-input>
+      <el-form-item label="内容" prop="content">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="请输入内容，2000字以内"
+          v-model="dataForm.content"
+          maxlength="2000"
+          style="width:90%">
+        </el-input>
       </el-form-item>
-          <el-form-item label="参加人数" prop="joinNum">
-          <el-input v-model="dataForm.joinNum" placeholder="参加人数"></el-input>
-      </el-form-item>
-          <el-form-item label="内容" prop="content">
-          <el-input v-model="dataForm.content" placeholder="内容"></el-input>
-      </el-form-item>
-          <el-form-item label="逻辑删除标识" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="逻辑删除标识"></el-input>
-      </el-form-item>
-          <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 label="添加图片" v-loading="loading" prop="file">
+          <el-upload class="avatar-uploader"
+                      :action="uploadUrl"
+                      :show-file-list="false"
+                      :on-success="handleAvatarBannerSuccess"
+                      :on-error="handelError"
+                      :before-upload="beforeAvatarUpload">
+              <img v-if="dataForm.file"
+                    :src="dataForm.file"
+                    class="avatar">
+              <i v-else
+                  class="el-icon-plus avatar-uploader-icon"></i>
+              <div slot="tip"
+                    class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+          </el-upload>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -83,15 +98,21 @@ export default {
         address: '',
         joinNum: '',
         content: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: ''
-      }
+        file: ''
+      },
+      isSignupEndTime: {
+        disabledDate (time) {
+          return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天
+        }
+      },
+      meetTypeArr: [],
+      dailyTypeArr: [],
+      loading: false
     }
   },
+  created: function () {
+    this.getDailyTypeArrInfo('0')
+  },
   computed: {
     dataRule () {
       return {
@@ -130,24 +151,6 @@ export default {
         ],
         content: [
           { 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' }
         ]
       }
     }
@@ -162,9 +165,19 @@ export default {
         }
       })
     },
+    handleAvatarBannerSuccess (res, file) {
+      this.loading = false
+      this.dataForm.file = res.data.url
+    },
+    handelError () {
+      this.loading = false
+    },
+    beforeAvatarUpload (file) {
+      this.loading = true
+    },
     // 获取信息
     getInfo () {
-      this.$http.get(`/news/dailyrecordinfo/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/workRecord/dailyrecordinfo/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -180,7 +193,7 @@ export default {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/news/dailyrecordinfo/', this.dataForm).then(({ data: res }) => {
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/dailyrecordinfo/', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -195,7 +208,195 @@ export default {
           })
         }).catch(() => {})
       })
-    }, 1000, { 'leading': true, 'trailing': false })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    // 随手记类型取值变化事件
+    selectModel (event) {
+      this.$set(this.dataForm, 'meetType', '')
+      this.dailyTypeArr.find((item) => {
+        if (item.dictValue === event) {
+          this.getMeetTypeArrInfo(item.id)
+        }
+      })
+    },
+    // 获取随手记类型下拉信息
+    getDailyTypeArrInfo (pid) {
+      this.$http.get(`/workRecord/dailyrecordinfo/getDailyTypeArrInfo/` + pid).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dailyTypeArr = res.data
+      }).catch(() => {})
+    },
+    // 获取会议类型下拉信息
+    getMeetTypeArrInfo (id) {
+      this.$http.get(`/workRecord/dailyrecordinfo/getDailyTypeArrInfo/` + id).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.meetTypeArr = res.data
+      }).catch(() => {})
+    }
   }
 }
 </script>
+<style>
+    .avatar-uploader .el-upload {
+        border: 1px dashed #d9d9d9;
+        border-radius: 6px;
+        cursor: pointer;
+        position: relative;
+        overflow: hidden;
+    }
+    .avatar-uploader .el-upload:hover {
+        border-color: #409eff;
+    }
+    .avatar-uploader-icon {
+        font-size: 28px;
+        color: #8c939d;
+        width: 178px;
+        height: 178px;
+        line-height: 178px;
+        text-align: center;
+    }
+    .avatar {
+        width: 178px;
+        height: 178px;
+        display: block;
+    }
+</style>
+<style lang="scss">
+    .project-handle {
+        .el-timeline {
+            padding-left: 9px;
+            font-size: 13px;
+        }
+        .el-textarea {
+            width: 600px !important;
+        }
+        .el-input {
+            width: 600px !important;
+        }
+    }
+    .el-form-item__label {
+        font-weight: bold;
+    }
+</style>
+
+<style lang="scss" scoped>
+    .project-handle {
+        width: 100%;
+        height: calc(100vh - 120px);
+        background: #ffffff;
+        box-sizing: border-box;
+        padding: 10px;
+        .project-detail {
+            width: 100%;
+            height: 49%;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            padding: 10px;
+            padding-top: 20px;
+            float:left;
+            margin-bottom: 1%;
+            position:relative;
+            .project-detail-tip {
+                position: absolute;
+                top: 0;
+                left:0;
+                width: 80px;
+                height: 30px;
+                line-height: 30px;
+                color: #ffffff;
+                background: #4ac38b;
+                text-align:center;
+            }
+            .el-form {
+                width: 58%;
+                height: 100%;
+                float:left;
+                overflow-y:auto;
+                &::-webkit-scrollbar {
+                    width: 5px;
+                    height: 1px;
+                }
+                &::-webkit-scrollbar-thumb {
+                    border-radius: 5px;
+                    background: #ccc;
+                }
+                &::-webkit-scrollbar-track {
+                    border-radius: 10px;
+                    background: #fff;
+                }
+            }
+            .container {
+                width: 40%;
+                height: 100%;
+                float: right;
+                .location {
+                    height: 30px;
+                    line-height: 30px;
+                }
+                #map {
+                    width: 100%;
+                    height: calc(100% - 30px);
+                }
+            }
+        }
+        .project-progress {
+            width: 20%;
+            height: 100%;
+            float: right;
+            border: 2px solid #ccc;
+            box-sizing: border-box;
+            margin-left: 1%;
+            padding-top: 20px;
+            overflow-y:auto;
+            &::-webkit-scrollbar {
+                width: 5px;
+                height: 1px;
+            }
+            &::-webkit-scrollbar-thumb {
+                border-radius: 5px;
+                background: #aaa;
+            }
+            &::-webkit-scrollbar-track {
+                border-radius: 10px;
+                background: #ccc;
+            }
+        }
+        .handle-operation {
+            padding-top: 30px;
+            box-sizing: border-box;
+            width: 100%;
+            height: 49%;
+            box-sizing: border-box;
+            border: 2px solid #ccc;
+            float:left;
+            position: relative;
+            overflow-y:auto;
+            &::-webkit-scrollbar {
+                width: 5px;
+                height: 1px;
+            }
+            &::-webkit-scrollbar-thumb {
+                border-radius: 5px;
+                background: #aaa;
+            }
+            &::-webkit-scrollbar-track {
+                border-radius: 10px;
+                background: #ccc;
+            }
+            .handle-operation-tip {
+                position: absolute;
+                top: 0;
+                left:0;
+                width: 80px;
+                height: 30px;
+                line-height: 30px;
+                color: #ffffff;
+                background: #ff7600;
+                text-align:center;
+            }
+        }
+    }
+</style>
diff --git a/src/views/modules/workRecord/dailyrecordinfo.vue b/src/views/modules/workRecord/dailyrecordinfo.vue
index 86cc2cb1..93ea64e2 100644
--- a/src/views/modules/workRecord/dailyrecordinfo.vue
+++ b/src/views/modules/workRecord/dailyrecordinfo.vue
@@ -2,43 +2,83 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__dailyrecordinfo}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <div>
+        <el-form-item v-if="dailyTypeArr.length > 0" label="随手记类型" prop="dailyType">
+          <el-select v-model="dataForm.dailyType" placeholder="随手记类型" @change="selectModel($event)" clearable>
+            <el-option v-for="item in dailyTypeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-if="meetTypeArr.length > 0" label="会议类型" prop="meetType">
+          <el-select v-model="dataForm.meetType" placeholder="会议类型" clearable>
+            <el-option v-for="item in meetTypeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        </div>
+        <el-form-item label="内容" prop="content">
+          <el-input v-model="dataForm.content" placeholder="内容" clearable maxlength="20" @keyup.native="btKeyUpContent"></el-input>
+        </el-form-item>
+        <el-form-item label="发布人" prop="nickName">
+          <el-input v-model="dataForm.nickName" placeholder="发布人" clearable maxlength="10" @keyup.native="btKeyUpNickName"></el-input>
+        </el-form-item>
+        <el-form-item label="时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <!-- <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item> -->
         <el-form-item>
-          <el-button v-if="$hasPermission('news:dailyrecordinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:dailyrecordinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
+        <el-form-item>
+            <el-button type="primary" @click="exportHandle()">{{ $t('export') }}</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 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="userFace" 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="deptId" label="部门Id" header-align="center" align="center"></el-table-column>
         <el-table-column prop="dailyType" label="随手记类型" header-align="center" align="center"></el-table-column>
         <el-table-column prop="meetType" label="会议类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="resourceId" label="资源ID" header-align="center" align="center"></el-table-column>
         <el-table-column prop="dailyDate" label="会议时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="address" label="地址" header-align="center" align="center"></el-table-column>
         <el-table-column prop="joinNum" 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="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 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="content" 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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('news:dailyrecordinfo: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:dailyrecordinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
@@ -66,18 +106,84 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/news/dailyrecordinfo/page',
+        getDataListURL: '/workRecord/dailyrecordinfo/page',
         getDataListIsPage: true,
-        deleteURL: '/news/dailyrecordinfo',
-        deleteIsBatch: true
+        deleteURL: '/workRecord/dailyrecordinfo',
+        deleteIsBatch: true,
+        exportURL: '/workRecord/dailyrecordinfo/export'
+      },
+      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()
+          }
+        }
       },
       dataForm: {
         id: ''
-      }
+      },
+      meetTypeArr: [],
+      dailyTypeArr: []
     }
   },
   components: {
     AddOrUpdate
+  },
+  created: function () {
+    this.getDailyTypeArrInfo('0')
+    this.getDataList()
+  },
+  methods: {
+    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.createdBy = e.target.value
+    },
+    addHandle (id, disabled) {
+      this.$parent.selectComponent = 'DailyrecordinfoDetail'
+      this.$router.push({ path: '/workRecord-dailyrecordinforoute', query: { id: id, disabled: disabled } })
+    },
+    // 随手记类型取值变化事件
+    selectModel (event) {
+      this.$set(this.dataForm, 'meetType', '')
+      this.dailyTypeArr.find((item) => {
+        if (item.dictValue === event) {
+          this.getMeetTypeArrInfo(item.id)
+        } else {
+          this.meetTypeArr = []
+        }
+      })
+    },
+    // 获取随手记类型下拉信息
+    getDailyTypeArrInfo (pid) {
+      this.$http.get(`/workRecord/dailyrecordinfo/getDailyTypeArrInfo/` + pid).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dailyTypeArr = res.data
+      }).catch(() => {})
+    },
+    // 获取会议类型下拉信息
+    getMeetTypeArrInfo (id) {
+      this.$http.get(`/workRecord/dailyrecordinfo/getDailyTypeArrInfo/` + id).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.meetTypeArr = res.data
+      }).catch(() => {})
+    }
   }
 }
 </script>
diff --git a/src/views/modules/workRecord/dailyrecordinfoDetail.vue b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
new file mode 100644
index 00000000..4b2e00a0
--- /dev/null
+++ b/src/views/modules/workRecord/dailyrecordinfoDetail.vue
@@ -0,0 +1,326 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__masteruserrelation}">
+    <el-form>
+      <el-form-item>
+        <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-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
+      <el-form-item v-if="dailyTypeArr.length > 0" label="随手记" prop="dailyType">
+        <el-select v-model="dataForm.dailyType" placeholder="随手记类型" @change="selectModel($event)" clearable style="width:50%">
+          <el-option v-for="item in dailyTypeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="meetTypeArr.length > 0" label="会议类型" prop="meetType">
+        <el-select v-model="dataForm.meetType" placeholder="会议类型" @change="selectModelMeetType($event)" clearable style="width:50%">
+          <el-option v-for="item in meetTypeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="会议时间" prop="dailyDate">
+          <el-date-picker v-model="dataForm.dailyDate"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm"
+                          format="yyyy-MM-dd HH:mm"
+                          :picker-options="isSignupEndTime"
+                          placeholder="选择日期时间" style="width:50%">
+          </el-date-picker>
+      </el-form-item>
+      <el-form-item label="地址" prop="address">
+        <el-input v-model="dataForm.address" placeholder="地址" maxlength="60" style="width:50%"></el-input>
+        <div><font color="gray">默认定位，可手动修改</font></div>
+      </el-form-item>
+      <el-form-item label="参加人数" prop="joinNum">
+        <el-input-number v-model="dataForm.joinNum" :min="1" :max="100000000" label="参加人数" style="width:50%"></el-input-number>
+      </el-form-item>
+      <el-form-item label="内容" prop="content">
+        <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">
+        <!-- :action="uploadUrl" -->
+        <!-- action="https://jsonplaceholder.typicode.com/posts/" -->
+          <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:40%">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
+          </el-dialog>
+      </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'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        userId: '',
+        nickName: '',
+        userFace: '',
+        deptName: '',
+        deptId: '',
+        dailyType: '',
+        meetType: '',
+        resourceId: '',
+        dailyDate: '',
+        address: '',
+        joinNum: '',
+        content: '',
+        images: []
+      },
+      isSignupEndTime: {
+        disabledDate (time) {
+          return time < Date.now() - 8.64e7 // 8.64e7=1000*60*60*24一天
+        }
+      },
+      isAble: false,
+      meetTypeArr: [],
+      dailyTypeArr: [],
+      hideUpload: false,
+      pageDisabled: false,
+      // imgUrlArr: [],
+      uploadUrl: '',
+      loading: false,
+      dialogImageUrl: '',
+      dialogVisible: false
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        nickName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        dailyType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        meetType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        resourceId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        dailyDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        joinNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  created: function () {
+    // this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
+    this.uploadUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadImg?token=${Cookies.get('token')}`
+  },
+  mounted () {
+    console.log('this.$route.query.disabled:' + this.$route.query.disabled)
+    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.getDailyTypeArrInfo('0')
+    }
+  },
+  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
+      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格式!')
+        return false
+      }
+    },
+    handleAvatarSuccess (res, file) {
+      console.log('res:')
+      console.log(res)
+      console.log('file:')
+      console.log(file)
+      this.loading = false
+      // this.imgUrlArr.push({ url: file.url, thumbnail: file.url, fileType: 1 })
+      this.dataForm.images.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 1 })
+      console.log('++++++新增后+++++++')
+      console.log(this.dataForm.images)
+      this.hideUpload = this.dataForm.images.length >= 9
+    },
+    handelError () {
+      this.loading = false
+    },
+    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
+      console.log('++++++删除出后+++++++')
+      console.log(this.dataForm.images)
+    },
+    handlePictureCardPreview (file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    // 返回按钮点击事件
+    backToUserRelationList () {
+      this.$emit('refreshDataList')
+      this.$parent.selectComponent = 'Dailyrecordinfo'
+      this.$router.push({ path: '/workRecord-dailyrecordinforoute' })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/workRecord/dailyrecordinfo/${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
+        }
+        // 随手记下拉框赋值
+        this.getDailyTypeArrInfo('0')
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.isAble = true
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/dailyrecordinfo/', 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 }),
+    // 随手记类型取值变化事件
+    selectModel (event) {
+      this.$set(this.dataForm, 'meetType', '')
+      this.dailyTypeArr.find((item) => {
+        if (item.dictValue === event) {
+          this.getMeetTypeArrInfo(item.id)
+          this.dataForm.resourceId = item.id
+        } else {
+          this.meetTypeArr = []
+        }
+      })
+    },
+    // 会议类型下拉取值变化事件
+    selectModelMeetType (event) {
+      this.meetTypeArr.find((item) => {
+        if (item.dictValue === event) {
+          this.dataForm.resourceId = item.id
+        }
+      })
+    },
+    // 获取随手记类型下拉信息
+    getDailyTypeArrInfo (pid) {
+      this.$http.get(`/workRecord/dailyrecordinfo/getDailyTypeArrInfo/${pid}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dailyTypeArr = res.data
+        if (this.dataForm.id !== null && this.dataForm.id !== '') {
+          // 若为修改页对会议类型下拉框进行赋值
+          this.dailyTypeArr.find((item) => {
+            if (item.dictValue === this.dataForm.dailyType) {
+              this.getMeetTypeArrInfo(item.id)
+            }
+          })
+        }
+      }).catch(() => {})
+    },
+    // 获取会议类型下拉信息
+    getMeetTypeArrInfo (id) {
+      this.$http.get(`/workRecord/dailyrecordinfo/getDailyTypeArrInfo/` + id).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.meetTypeArr = res.data
+      }).catch(() => {})
+    }
+  }
+}
+</script>
+<style>
+.hide .el-upload--picture-card {
+    display: none;
+}
+</style>
diff --git a/src/views/modules/workRecord/dailyrecordinforoute.vue b/src/views/modules/workRecord/dailyrecordinforoute.vue
new file mode 100644
index 00000000..6809d164
--- /dev/null
+++ b/src/views/modules/workRecord/dailyrecordinforoute.vue
@@ -0,0 +1,29 @@
+<template>
+    <keep-alive include="dailyrecordinfo">
+        <component :is="selectComponent"></component>
+    </keep-alive>
+</template>
+<script>
+import Dailyrecordinfo from './dailyrecordinfo'
+import DailyrecordinfoDetail from './dailyrecordinfoDetail'
+export default {
+  data () {
+    return {
+      selectComponent: Dailyrecordinfo
+    }
+  },
+  components: {
+    Dailyrecordinfo,
+    DailyrecordinfoDetail
+  },
+  methods: {
+    init () {
+      this.selectComponent = Dailyrecordinfo
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>