diff --git a/src/api/api_result.js b/src/api/api_result.js
index abe78f7..7ace164 100644
--- a/src/api/api_result.js
+++ b/src/api/api_result.js
@@ -2,5 +2,9 @@ import http from '../utils/http'
 
 // 获取侧边菜单栏
 export const apiGetResultRecordList = params => {
-  return http({ url: '/lz_management/user/lzresultrecord/list', method: 'get', params })
+  return http({url: '/lz_management/user/lzresultrecord/list', method: 'get', params})
+}
+
+export const departmentQuery = params => {
+  return http({url: '/lz_management/user/lzresultrecord/departmentQuery', method: 'get', params})
 }
diff --git a/src/views/modules/result/record/lzresultrecord.vue b/src/views/modules/result/record/lzresultrecord.vue
index 940799c..c3ba65e 100644
--- a/src/views/modules/result/record/lzresultrecord.vue
+++ b/src/views/modules/result/record/lzresultrecord.vue
@@ -1,13 +1,87 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item>
-        <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+
+      <el-form-item label="一级部门">
+        <el-select v-model="dataForm.department1" placeholder="请选择" @change="changeDepartment('2')">
+          <el-option
+            v-for="item in departmentList1"
+            :key="item.departmentId"
+            :label="item.departmentName"
+            :value="item.departmentId"
+          ></el-option>
+        </el-select>
       </el-form-item>
+
+
+      <el-form-item label="二级部门">
+        <el-select v-model="dataForm.department2" placeholder="请选择" @change="changeDepartment('3')">
+          <el-option
+            v-for="item in departmentList2"
+            :key="item.departmentId"
+            :label="item.departmentName"
+            :value="item.departmentId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="三级部门">
+        <el-select v-model="dataForm.department3" placeholder="请选择">
+          <el-option
+            v-for="item in departmentList3"
+            :key="item.departmentId"
+            :label="item.departmentName"
+            :value="item.departmentId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item>
+        <el-input v-model="dataForm.name" placeholder="员工姓名" clearable></el-input>
+      </el-form-item>
+
+      <el-form-item :label="`月份`">
+        <el-date-picker
+          v-model="dataForm.value"
+          type="daterange"
+          align="right"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="changeData"
+        ></el-date-picker>
+
+        <div>
+          <el-button
+            v-for="i in Datalist"
+            :key="i.Month"
+            :type="index==i.Month?'primary':'info'"
+            size="mini"
+            @click="handleChangeData(i)"
+          >{{ i.title }}
+          </el-button>
+        </div>
+      </el-form-item>
+
+      <el-form-item label="审批状态">
+        <el-select v-model="dataForm.status" placeholder="请选择">
+          <el-option
+            v-for="item in stateList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-input v-model="dataForm.remark" placeholder="备注" clearable></el-input>
+      </el-form-item>
+
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
-        <el-button v-if="isAuth('user:lzresultrecord:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        <el-button v-if="isAuth('user:lzresultrecord:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -16,66 +90,25 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       style="width: 100%;">
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
+      <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+      <el-table-column prop="id" header-align="center" align="center" label="ID"></el-table-column>
+      <el-table-column prop="monthTime" header-align="center" align="center" label="月份">
+        <template slot-scope="scope">
+          <div class="conatnt-name">
+            <span>{{ scope.row.monthTime | formaterDate }}</span>
+          </div>
+        </template>
       </el-table-column>
-      <el-table-column
-        prop="id"
-        header-align="center"
-        align="center"
-        label="">
-      </el-table-column>
-      <el-table-column
-        prop="isDelete"
-        header-align="center"
-        align="center"
-        label="是否删除状态，1：删除，0：有效">
-      </el-table-column>
-      <el-table-column
-        prop="gmtCreate"
-        header-align="center"
-        align="center"
-        label="创建时间">
-      </el-table-column>
-      <el-table-column
-        prop="gmtModified"
-        header-align="center"
-        align="center"
-        label="最后修改时间">
-      </el-table-column>
-      <el-table-column
-        prop="monthTime"
-        header-align="center"
-        align="center"
-        label="月份">
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        header-align="center"
-        align="center"
-        label="0.新建，1 提交审批中，2 拒绝">
-      </el-table-column>
-      <el-table-column
-        prop="lastScore"
-        header-align="center"
-        align="center"
-        label="最后得分">
-      </el-table-column>
-      <el-table-column
-        prop="allScore"
-        header-align="center"
-        align="center"
-        label="总分">
-      </el-table-column>
-      <el-table-column
-        prop="remark"
-        header-align="center"
-        align="center"
-        label="备注">
+      <el-table-column prop="statusStr" header-align="center" align="center" label="状态">
+        <template slot-scope="scope">
+          <div class="conatnt-name">
+            <span>{{ scope.row.status | getStatusStr }}</span>
+          </div>
+        </template>
       </el-table-column>
+      <el-table-column prop="lastScore" header-align="center" align="center" label="最后得分"></el-table-column>
+      <el-table-column prop="allScore" header-align="center" align="center" label="总分"></el-table-column>
+      <el-table-column prop="remark" header-align="center" align="center" label="备注"></el-table-column>
       <el-table-column
         fixed="right"
         header-align="center"
@@ -103,100 +136,197 @@
 </template>
 
 <script>
-  import AddOrUpdate from './lzresultrecord-add-or-update'
-  import { apiGetResultRecordList } from '@/api/api_result'
-  export default {
-    data () {
-      return {
-        dataForm: {
-          key: ''
-        },
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false
+import AddOrUpdate from './lzresultrecord-add-or-update'
+import {apiGetResultRecordList, departmentQuery} from '@/api/api_result'
+import {getDataForMonth} from '@/utils'
+
+export default {
+  filters: {
+    formaterDate (val) {
+      var date = new Date(val)
+      var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+      var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+      return date.getFullYear() + '-' + month + '-' + day
+    },
+    getStatusStr (status) {
+      if (status === 0) {
+        return '新建'
+      } else if (status === 1) {
+        return '审批中'
+      } else if (status === 2) {
+        return '拒绝'
+      } else if (status === 3) {
+        return '审批通过'
       }
+      return ''
+    }
+  },
+  data () {
+    return {
+      Datalist: [{
+        Month: 1,
+        title: '近一个月'
+      }, {
+        Month: 3,
+        title: '近三个月'
+      }, {
+        Month: 6,
+        title: '近半年'
+      }, {
+        Month: 12,
+        title: '近一年'
+      }],
+      dataForm: {
+        key: '',
+        value: [],
+        department1: '',
+        department2: '',
+        department3: ''
+      },
+      dataList: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPage: 0,
+      dataListLoading: false,
+      dataListSelections: [],
+      stateList: [
+        {value: '0', label: '新建'},
+        {value: '1', label: '审批中'},
+        {value: '2', label: '拒绝'},
+        {value: '3', label: '审批通过'}
+      ],
+      departmentList1: [],
+      departmentList2: [],
+      departmentList3: [],
+      addOrUpdateVisible: false
+
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  activated () {
+    this.getDataList()
+  },
+  methods: {
+    async handleChangeData (data) {
+      this.index = data.Month
+      this.title = data.title
+      let dataList = getDataForMonth(data.Month)
+      this.dataForm.value = dataList
+      this.dataForm.beginDate = dataList[0]
+      this.dataForm.endDate = dataList[1]
+      this.onSubmit()
     },
-    components: {
-      AddOrUpdate
+    async changeDepartment (i) {
+      let departmentId = 0
+      if (i === '2') {
+        departmentId = this.dataForm.department1
+      } else if (i === '3') {
+        departmentId = this.dataForm.department2
+      } else {
+        departmentId = this.dataForm.department3
+      }
+      departmentQuery({
+        'departmentId': departmentId
+      }).then(data => {
+        if (data && data.code === 0) {
+          this['departmentList' + i] = data.departmentList
+          if (i === '2') {
+            this.dataForm['department2'] = ''
+            this.dataForm['department3'] = ''
+          } else if (i === '3') {
+            this.dataForm['department3'] = ''
+          }
+        }
+        this.dataListLoading = false
+      })
     },
-    activated () {
+    // 获取数据列表
+    getDataList () {
+      apiGetResultRecordList({
+        'page': this.pageIndex,
+        'limit': this.pageSize,
+        'monthBeginDate': this.dataForm.beginDate,
+        'monthEndDate': this.dataForm.endDate,
+        'status': this.dataForm.status,
+        'department1': this.dataForm.department1,
+        'department2': this.dataForm.department2,
+        'department3': this.dataForm.department3,
+        'name': this.dataForm.name,
+        'remark': this.dataForm.remark
+      }).then(data => {
+        if (data && data.code === 0) {
+          this.dataList = data.page.list
+          this.totalPage = data.page.totalCount
+          this.departmentList1 = data.departmentList1
+        } else {
+          this.dataList = []
+          this.totalPage = 0
+        }
+        this.dataListLoading = false
+      })
+    },
+    changeData (data) {
+      this.index = null
+      this.title = null
+      this.dataForm.beginDate = data[0]
+      this.dataForm.endDate = data[1]
+    },
+    // 每页数
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
       this.getDataList()
     },
-    methods: {
-      // 获取数据列表
-      getDataList () {
-        apiGetResultRecordList({
-          'page': this.pageIndex,
-          'limit': this.pageSize
+
+    // 当前页
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+
+    // 多选
+    selectionChangeHandle (val) {
+      this.dataListSelections = val
+    },
+    // 新增 / 修改
+    addOrUpdateHandle (id) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id)
+      })
+    },
+    // 删除
+    deleteHandle (id) {
+      var ids = id ? [id] : this.dataListSelections.map(item => {
+        return item.id
+      })
+      this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$http({
+          url: this.$http.adornUrl('/user/lzresultrecord/delete'),
+          method: 'post',
+          data: this.$http.adornData(ids, false)
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.getDataList()
+              }
+            })
           } else {
-            this.dataList = []
-            this.totalPage = 0
+            this.$message.error(data.msg)
           }
-          this.dataListLoading = false
         })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
-      },
-
-      // 多选
-      selectionChangeHandle (val) {
-        this.dataListSelections = val
-      },
-      // 新增 / 修改
-      addOrUpdateHandle (id) {
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
-        })
-      },
-      // 删除
-      deleteHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
-          return item.id
-        })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('/user/lzresultrecord/delete'),
-            method: 'post',
-            data: this.$http.adornData(ids, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        })
-      }
+      })
     }
   }
+}
 </script>
diff --git a/src/views/modules/staff/profile/componments/query-form/index.vue b/src/views/modules/staff/profile/componments/query-form/index.vue
index 23493cf..34d58ba 100644
--- a/src/views/modules/staff/profile/componments/query-form/index.vue
+++ b/src/views/modules/staff/profile/componments/query-form/index.vue
@@ -33,6 +33,7 @@
           >{{i.title}}</el-button>
         </div>
       </el-form-item>
+
       <el-form-item>
         <el-button type="primary" @click="onSubmit">查询</el-button>
         <el-button type="primary" @click="restValue">重置</el-button>
@@ -172,4 +173,4 @@ export default {
   opacity: 0;
   overflow: hidden;
 }
-</style>
\ No newline at end of file
+</style>