diff --git a/src/views/modules/eamReport/employeeAttendanceTime.vue b/src/views/modules/eamReport/employeeAttendanceTime.vue
index e62eb10..06c01ce 100644
--- a/src/views/modules/eamReport/employeeAttendanceTime.vue
+++ b/src/views/modules/eamReport/employeeAttendanceTime.vue
@@ -43,6 +43,9 @@
       <el-form-item label="员工编号">
         <el-input v-model="searchData.operatorId" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item label="员工名称">
+        <el-input v-model="searchData.operatorName" clearable style="width: 120px"></el-input>
+      </el-form-item>
       <el-form-item label="部门名称">
         <el-select v-model="searchData.deptId" placeholder="请选择" clearable style="width: 80px">
           <el-option
@@ -53,6 +56,16 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'所属角色'" >
+        <el-select v-model="searchData.roleId" placeholder="请选择" :disabled="searchData.groupType!='1'&&searchData.groupType!='3'" style="width: 120px">
+          <el-option
+            v-for = "i in roleList"
+            :key = "i.roleId"
+            :label = "i.roleName"
+            :value = "i.roleId">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="' '">
         <el-button type="primary" :loading="searchLoading" @click="getDataList()">查询</el-button>
         <download-excel
@@ -103,6 +116,7 @@ import {
 } from "@/api/eam/eam.js"
 import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
 import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+import {getUserRoleList} from "../../../api/eam/eam";
 export default {
   components: {
 
@@ -138,7 +152,7 @@ export default {
       searchData: {
         site: '',
         buDesc: '',
-        groupType: '0',
+        groupType: '1',
         operatorId: '',
         deptId: '',
         startDate: '',
@@ -239,78 +253,78 @@ export default {
           fixed: '',
           columnWidth: 100,
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1ErpReportTime',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'erpReportTime',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '传ERP报工工时',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1ErpProportion',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'erpProportion',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '传ERP报工比例(%)',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1NotErpReportTime',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'notErpReportTime',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '不传ERP报工工时',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1NotErpProportion',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'notErpProportion',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '不传ERP报工比例(%)',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1ErpReportTime',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'erpReportTime',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '传ERP报工工时',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1ErpProportion',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'erpProportion',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '传ERP报工比例(%)',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1NotErpReportTime',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'notErpReportTime',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '不传ERP报工工时',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1NotErpProportion',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'notErpProportion',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '不传ERP报工比例(%)',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
       ],
       arrayColumns1: [
         {
@@ -457,78 +471,78 @@ export default {
           fixed: '',
           columnWidth: 100,
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1ErpReportTime',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'erpReportTime',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '传ERP报工工时',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1ErpProportion',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'erpProportion',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '传ERP报工比例(%)',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1NotErpReportTime',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'notErpReportTime',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '不传ERP报工工时',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1NotErpProportion',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'notErpProportion',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '不传ERP报工比例(%)',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1ErpReportTime',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'erpReportTime',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '传ERP报工工时',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1ErpProportion',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'erpProportion',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '传ERP报工比例(%)',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1NotErpReportTime',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'notErpReportTime',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '不传ERP报工工时',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1NotErpProportion',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'notErpProportion',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '不传ERP报工比例(%)',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
       ],
       arrayColumns2: [
         {
@@ -639,78 +653,78 @@ export default {
           fixed: '',
           columnWidth: 100,
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1ErpReportTime',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'erpReportTime',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '传ERP报工工时',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1ErpProportion',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'erpProportion',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '传ERP报工比例(%)',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1NotErpReportTime',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'notErpReportTime',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '不传ERP报工工时',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1NotErpProportion',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'notErpProportion',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '不传ERP报工比例(%)',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1ErpReportTime',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'erpReportTime',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '传ERP报工工时',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1ErpProportion',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'erpProportion',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '传ERP报工比例(%)',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1NotErpReportTime',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'notErpReportTime',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '不传ERP报工工时',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1NotErpProportion',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'notErpProportion',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '不传ERP报工比例(%)',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
       ],
       arrayColumns3: [
         {
@@ -875,81 +889,82 @@ export default {
           fixed: '',
           columnWidth: 100,
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1ErpReportTime',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'erpReportTime',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '传ERP报工工时',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1ErpProportion',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'erpProportion',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '传ERP报工比例(%)',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1NotErpReportTime',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'notErpReportTime',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '不传ERP报工工时',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 101005010,
-          serialNumber: '101005010Table1NotErpProportion',
-          tableId: "101005010Table1",
-          tableName: "员工考勤vs报工工时",
-          columnProp: 'notErpProportion',
-          headerAlign: "center",
-          align: "right",
-          columnLabel: '不传ERP报工比例(%)',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 100,
-        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1ErpReportTime',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'erpReportTime',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '传ERP报工工时',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1ErpProportion',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'erpProportion',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '传ERP报工比例(%)',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1NotErpReportTime',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'notErpReportTime',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '不传ERP报工工时',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 101005010,
+        //   serialNumber: '101005010Table1NotErpProportion',
+        //   tableId: "101005010Table1",
+        //   tableName: "员工考勤vs报工工时",
+        //   columnProp: 'notErpProportion',
+        //   headerAlign: "center",
+        //   align: "right",
+        //   columnLabel: '不传ERP报工比例(%)',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: '',
+        //   columnWidth: 100,
+        // },
       ],
       siteList: [],
       deptList: [],
+      roleList: [],
       searchLoading: false,
     }
   },
@@ -969,10 +984,22 @@ export default {
     this.favoriteIsOk()
     // 动态列
     this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
-
+    //获取角色列表
+    this.getUserRoleList()
   },
 
   methods: {
+    // 获取用户角色
+    getUserRoleList () {
+      getUserRoleList().then(({data}) => {
+        if (data.code === 0) {
+          this.roleList = data.rows
+          this.$set(this.searchData,'roleId',20)
+        } else {
+          this.roleList = []
+        }
+      })
+    },
     // 获取用户的bu
     getSite () {
       let tempData = {