diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js
index 2719352..ec0e889 100644
--- a/src/api/eam/eam.js
+++ b/src/api/eam/eam.js
@@ -193,8 +193,6 @@ export const refreshItem= data => createAPI(`/pms/eam/refreshItem`,'post',data)
 export const reach= data => createAPI(`/pms/eam/reach`,'post',data)
 export const searchItemFileUrl= data => createAPI(`/pms/eam/searchItemFileUrl`,'post',data)
 
-
-
 //---------------树形结构-------------------
 export const getFamilyTree= data => createAPI(`/pms/eam/getFamilyTree`,'post',data)
 export const getDetail= data => createAPI(`/pms/eam/getDetail`,'post',data)
@@ -205,54 +203,26 @@ export const getSiteAndBuByUserName= data => createAPI(`/pms/eam/getSiteAndBuByU
 export const eamCheckRecordSearch= data => createAPI(`/pms/eam/eamCheckRecordSearch`,'post',data)
 export const eamDefectRecordSearch= data => createAPI(`/pms/eam/eamDefectRecordSearch`,'post',data)
 
-/**
- * 获取用户角色列表
- * @param data
- * @returns {*}
- */
+// 获取用户角色列表
 export const getUserRoleList= data => createAPI(`/pms/eam/getUserRoleList`,'post',data)
-/**
- * 获取故障图片
- * @param data
- * @returns {*}
- */
+// 获取故障图片
 export const getFeedBackImages= data => createAPI(`/pms/eam/getFeedBackImages`,'post',data)
-
-/**
- * 获取领用出库信息
- * @param data
- * @returns {*}
- */
+// 获取领用出库信息
 export const getInventoryStockList= data => createAPI(`/pms/eam/getInventoryStockList`,'post',data)
-
-/**
- * 维修出库
- * @param data
- * @returns {*}
- */
+// 维修出库
 export const saveTrans= data => createAPI(`/pms/eam/saveTrans`,'post',data)
-
 export const saveCoreComponent= data => createAPI(`/pms/eam/saveCoreComponent`,'post',data)
-
 export const confirmDefectOrder= data => createAPI(`/pms/eam/confirmDefectOrder`,'post',data)
-
 export const getSparPartImages= data => createAPI(`/pms/eam/getSparPartImages`,'post',data)
-
 export const getRoleByUserName= data => createAPI(`/pms/eam/getRoleByUserName`,'post',data)
-
 export const eamWorkOrderSearch2 = data => createAPI(`/pms/eam/eamWorkOrderSearch2`,'post',data)
-
 export const searchFeedMatterRecord = data => createAPI(`/pms/eam/searchFeedMatterRecord`,'post',data)
-
 export const saveFeedMatter = data => createAPI(`/pms/eam/saveFeedMatter`,'post',data)
-
 export const updateFeedMatter = data => createAPI(`/pms/eam/updateFeedMatter`,'post',data)
-
 export const deleteFeedMatter = data => createAPI(`/pms/eam/deleteFeedMatter`,'post',data)
-
 export const getOperatorListByOrder = data => createAPI(`/pms/eam/getOperatorListByOrder`,'post',data)
-
 export const checkWorkOrders = data => createAPI(`/pms/eam/checkWorkOrders`,'post',data)
+export const exportEmployeeAttendanceSearch = data => createAPI(`/pms/eam/exportEmployeeAttendanceSearch`,'post',data)
 
 // 换线专家组维修执行 转单
 export const updateRepairTypes = data => createAPI(`/pms/eam/updateRepairTypes`,'post',data)
diff --git a/src/api/factory/site.js b/src/api/factory/site.js
index b87df84..83a5458 100644
--- a/src/api/factory/site.js
+++ b/src/api/factory/site.js
@@ -53,3 +53,7 @@ export const getResponsibleDepartment = data => createAPI(`/site/getResponsibleD
 
 export const getEamWorkShop = data => createAPI(`/site/getEamWorkShop`,'post',data)
 
+export const getEmpyDeptList = data => createAPI(`/site/getEmpyDeptList`,'post',data)
+
+export const getSite2 = data => createAPI(`/site/getSite2`,'post',data)
+
diff --git a/src/views/modules/eam/eamFeedBack.vue b/src/views/modules/eam/eamFeedBack.vue
index 218f7cb..c7ca5d6 100644
--- a/src/views/modules/eam/eamFeedBack.vue
+++ b/src/views/modules/eam/eamFeedBack.vue
@@ -1008,7 +1008,7 @@
             columnProp: 'actualOrderCount',
             headerAlign: "center",
             align: "right",
-            columnLabel: '实际维修工单数',
+            columnLabel: '维修中工单数',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1757,7 +1757,6 @@
       operatorClick (row) {
         // 找到operatorList中actualOrderCount最小值
         const minActualOrderCount = Math.min(...this.operatorList.map(item => item.actualOrderCount));
-
         if (row.actualOrderCount === minActualOrderCount) {
           // 只有actualOrderCount最小的行允许选择
           this.saveModalData.planOperator = row.adminID;
diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
index 5f94b9c..6c66e83 100644
--- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
@@ -1477,8 +1477,7 @@
                   message: '操作成功',
                   type: 'success',
                   duration: 1500,
-                  onClose: () => {
-                  }
+                  onClose: () => {}
                 })
               } else {
                 this.$alert(data.msg, '错误', {
diff --git a/src/views/modules/eamReport/employeeAttendanceTime.vue b/src/views/modules/eamReport/employeeAttendanceTime.vue
new file mode 100644
index 0000000..e62eb10
--- /dev/null
+++ b/src/views/modules/eamReport/employeeAttendanceTime.vue
@@ -0,0 +1,1140 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" :model="searchData">
+      <el-form-item label="Site">
+        <el-select v-model="searchData.site" placeholder="请选择" style="width: 150px">
+          <el-option
+            v-for = "i in siteList"
+            :key = "i.siteid"
+            :label = "i.sitename"
+            :value = "i.siteid">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="查询日期">
+        <el-date-picker
+          style="width: 120px"
+          v-model="searchData.startDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item style="margin-top: 23px;">
+        <laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
+      </el-form-item>
+      <el-form-item label=" ">
+        <el-date-picker
+          style="width: 120px"
+          v-model="searchData.endDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="汇总方式">
+        <el-select v-model="searchData.groupType" @change="groupTypeChange" style="width: 120px">
+          <el-option value="0" label="部门汇总"></el-option>
+          <el-option value="1" label="员工汇总"></el-option>
+          <el-option value="2" label="部门/日期汇总"></el-option>
+          <el-option value="3" label="员工/日期汇总"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="员工编号">
+        <el-input v-model="searchData.operatorId" 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
+            v-for = "i in deptList"
+            :key = "i.deptId"
+            :label = "i.deptName"
+            :value = "i.deptId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="' '">
+        <el-button type="primary" :loading="searchLoading" @click="getDataList()">查询</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ "导出" }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      style="width: 100%;">
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {getSite2, getEmpyDeptList} from '@/api/factory/site.js'
+import {
+  exportEmployeeAttendanceSearch
+} from "@/api/eam/eam.js"
+import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
+import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+export default {
+  components: {
+
+  },
+  watch: {
+    'searchData.groupType': {
+      handler(newVal, oldVal) {
+        if (this.searchData.groupType === '0'){
+          this.columnList = this.arrayColumns0
+        } else if (this.searchData.groupType === '1') {
+          this.columnList = this.arrayColumns1
+        } else if (this.searchData.groupType === '2') {
+          this.columnList = this.arrayColumns2
+        } else if (this.searchData.groupType === '3') {
+          this.columnList = this.arrayColumns3
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  data () {
+    return {
+      // 是否收藏
+      favorite: false,
+      // 导出 start
+      exportData: [],
+      exportName: "员工考勤vs报工工时" + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ["员工考勤vs报工工时"],
+      exportFooter: [],
+      exportList: [],
+      // 导出 end
+      searchData: {
+        site: '',
+        buDesc: '',
+        groupType: '0',
+        operatorId: '',
+        deptId: '',
+        startDate: '',
+        endDate: '',
+      },
+      height: 200,
+      dataList: [],
+      // 展示列集
+      columnList: [],
+      arrayColumns0: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1DeptId',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'deptId',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '部门编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1DeptName',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'deptName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '部门名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1AttendanceTime',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'attendanceTime',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '考勤工时',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1ReportTime',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'reportTime',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '报工工时',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1Proportion',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'proportion',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '报工比例(%)',
+          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: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1OperatorName',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'operatorName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '员工姓名',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1ErpOperatorId',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'erpOperatorId',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '员工编号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1OperatorId',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'operatorId',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '操作员编号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1DeptId',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'deptId',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '部门编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1DeptName',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'deptName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '部门名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1AttendanceTime',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'attendanceTime',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '考勤工时',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1ReportTime',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'reportTime',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '报工工时',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1Proportion',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'proportion',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '报工比例(%)',
+          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: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1DeptId',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'deptId',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '部门编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1DeptName',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'deptName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '部门名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1AttendanceDate',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'attendanceDate',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1AttendanceTime',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'attendanceTime',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '考勤工时',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1ReportTime',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'reportTime',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '报工工时',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1Proportion',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'proportion',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '报工比例(%)',
+          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: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1OperatorName',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'operatorName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '员工姓名',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1ErpOperatorId',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'erpOperatorId',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '员工编号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1OperatorId',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'operatorId',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '操作员编号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1DeptId',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'deptId',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '部门编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1DeptName',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'deptName',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '部门名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1AttendanceDate',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'attendanceDate',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1AttendanceTime',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'attendanceTime',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '考勤工时',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1ReportTime',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'reportTime',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '报工工时',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 101005010,
+          serialNumber: '101005010Table1Proportion',
+          tableId: "101005010Table1",
+          tableName: "员工考勤vs报工工时",
+          columnProp: 'proportion',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '报工比例(%)',
+          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: [],
+      searchLoading: false,
+    }
+  },
+
+  mounted () {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 145
+    })
+  },
+
+  created () {
+    // 获取用户的 site
+    this.getSite()
+    // 获取所有部门
+    this.getEmpyDept()
+    // 校验用户是否收藏
+    this.favoriteIsOk()
+    // 动态列
+    this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+
+  },
+
+  methods: {
+    // 获取用户的bu
+    getSite () {
+      let tempData = {
+        username: this.$store.state.user.name,
+      }
+      getSite2(tempData).then(({data}) => {
+        if (data.code === 0) {
+          this.siteList = data.rows
+          // site赋初始值
+          if (this.siteList.length > 0) {
+            this.searchData.site = this.siteList[0].siteid
+            // 获取数据列表
+            this.getDataList()
+          }
+        }
+      })
+    },
+
+    // 获取所有部门
+    getEmpyDept () {
+      let tempData = {
+        userName: this.$store.state.user.name,
+      }
+      getEmpyDeptList(tempData).then(({data}) => {
+        if (data.code === 0) {
+          this.deptList = data.rows
+        }
+      })
+    },
+
+    // 获取数据列表
+    getDataList () {
+      if ((this.searchData.groupType === '2' || this.searchData.groupType === '3') && ((this.searchData.startDate == null || this.searchData.startDate === '') && (this.searchData.endDate == null || this.searchData.endDate === ''))) {
+        this.$message.warning('请选择查询日期！')
+        return
+      }
+      this.searchLoading = true
+      exportEmployeeAttendanceSearch(this.searchData).then(({data}) => {
+        if (data.code === 0) {
+          this.dataList = data.rows
+          this.searchLoading = false
+        } else {
+          this.searchLoading = false
+        }
+      }).catch(() => {
+        this.searchLoading = false
+      })
+    },
+
+    // 汇总方式改变事件
+    groupTypeChange () {
+      this.dataList = []
+      this.getDataList()
+    },
+
+    // 动态列开始 获取 用户保存的 格式列
+    async getTableUserColumn (tableId, columnId) {
+      let queryTableUser = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        status: true,
+        languageCode: this.$i18n.locale
+      }
+      await getTableUserListLanguage(queryTableUser).then(({data}) => {
+        if (data.rows.length > 0) {
+          switch (columnId) {
+            case 1:
+              this.columnList = data.rows
+              break;
+          }
+        } else {
+          this.getColumnList(tableId, columnId)
+        }
+      })
+    },
+
+    // 获取 tableDefault 列
+    async getColumnList(tableId, columnId) {
+      let queryTable = {
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        languageCode: this.$i18n.locale
+      }
+      await getTableDefaultListLanguage(queryTable).then(({data}) => {
+        if (!data.rows.length === 0) {
+          switch (columnId) {
+            case 1:
+              this.columnList = data.rows
+              break;
+          }
+        }
+      })
+    },
+
+    // 校验用户是否收藏
+    favoriteIsOk () {
+      let userFavorite = {
+        userId: this.$store.state.user.id,
+        languageCode: this.$i18n.locale
+      }
+      userFavoriteList(userFavorite).then(({data}) => {
+        for (let i = 0; i < data.list.length; i++) {
+          if (this.$route.meta.menuId === data.list[i].menuId) {
+            this.favorite = true
+          }
+        }
+      })
+    },
+
+    // 收藏 OR 取消收藏
+    favoriteFunction () {
+      let userFavorite = {
+        userId: this.$store.state.user.id,
+        functionId: this.$route.meta.menuId,
+      }
+      if (this.favorite) {
+        removeUserFavorite(userFavorite).then(({data}) => {
+          this.$message.success(data.msg)
+          this.favorite = false
+        })
+      } else {
+        // 收藏
+        saveUserFavorite(userFavorite).then(({data}) => {
+          this.$message.success(data.msg)
+          this.favorite = true
+        })
+      }
+    },
+
+    //导出excel
+    async createExportData () {
+      this.searchData.limit = -1
+      this.searchData.page = 1
+      await exportEmployeeAttendanceSearch(this.searchData).then(({data}) => {
+        this.exportList= data.page.list
+      })
+      return this.exportList
+    },
+
+    startDownload() {},
+
+    finishDownload() {},
+
+    fields() {
+      let json = "{"
+      this.columnList.forEach((item, index) => {
+        if (index == this.columnList.length - 1) {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+        } else {
+          json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+        }
+      })
+      json += "}"
+      let s = eval("(" + json + ")")
+      return s
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index ff522e3..3099772 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -164,7 +164,7 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <el-dialog top="18vh" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1000px">
+    <el-dialog top="18vh" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="940px">
       <template v-slot:title>
         <div style="padding-top: 5px;padding-left: 15px">
           <span :style="{ fontSize: '15px', fontWeight: 'bold' }">维修工单</span>
@@ -181,7 +181,7 @@
         </span>
         </div>
       </template>
-      <div style="margin-left: 70px">
+      <div style="margin-left: 10px">
         <el-form :inline="true" label-position="top" style="margin-top: 10px">
           <el-form-item label="工单号">
             <el-input v-model="saveData.orderNo" disabled style="width: 100px"></el-input>
@@ -511,7 +511,7 @@
 <!--          </el-tab-pane>-->
         </el-tabs>
       </div>
-      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+      <el-footer style="height:35px;margin-top: 5px;text-align:center">
         <el-button type="primary" @click="saveCheckReport">保存</el-button>
         <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
       </el-footer>
@@ -2111,8 +2111,6 @@
         if (this.tagNo === 1059) {
           this.coreComponentData.partNo = val.part_no
           this.coreComponentData.partDescription = val.part_description
-          this.coreComponentData.oldSerialNo = val.oldSerialNo
-          this.coreComponentData.newSerialNo = val.newSerialNo
         }
       },
 
@@ -2131,16 +2129,12 @@
               if (data.baseListData.length > 0) {
                 this.coreComponentData.partNo = val.part_no
                 this.coreComponentData.partDescription = val.part_description
-                this.coreComponentData.oldSerialNo = val.oldSerialNo
-                this.coreComponentData.newSerialNo = val.newSerialNo
                 return
               }
             }
           })
         }
         this.coreComponentData.partDescription = ''
-        this.coreComponentData.oldSerialNo = ''
-        this.coreComponentData.newSerialNo = ''
       },
 
       async exportExcel() {
@@ -2843,14 +2837,11 @@
         if (value && value !== '') {
           let tempData = this.corePartSpareList.filter(item => item.partNo === value)[0]
           this.coreComponentData.partDescription = tempData.partDescription
-          this.coreComponentData.oldSerialNo = tempData.oldSerialNo
-          this.coreComponentData.newSerialNo = tempData.newSerialNo
         } else {
           this.coreComponentData.partDescription = ''
-          this.coreComponentData.oldSerialNo = ''
-          this.coreComponentData.newSerialNo = ''
         }
       },
+
       // 转单方法
       transferOrderHandle () {
         if (this.dataListSelections.length === 0) {
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder2.vue b/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
index e9039ce..dc62f8c 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
@@ -156,7 +156,7 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
 
-    <el-dialog top="18vh" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="1000px">
+    <el-dialog top="18vh" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="940px">
       <template v-slot:title>
         <div style="padding-top: 5px;padding-left: 15px">
           <span :style="{ fontSize: '15px', fontWeight: 'bold' }">维修工单</span>
@@ -173,7 +173,7 @@
         </span>
         </div>
       </template>
-      <div style="margin-left: 70px">
+      <div style="margin-left: 10px">
         <el-form :inline="true" label-position="top" style="margin-top: 10px">
           <el-form-item label="工单号">
             <el-input v-model="saveData.orderNo" disabled style="width: 100px"></el-input>
@@ -503,7 +503,7 @@
           <!--          </el-tab-pane>-->
         </el-tabs>
       </div>
-      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+      <el-footer style="height:35px;margin-top: 5px;text-align:center">
         <el-button type="primary" @click="saveCheckReport">保存</el-button>
         <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
       </el-footer>
@@ -2099,8 +2099,6 @@ export default {
       if (this.tagNo === 1059) {
         this.coreComponentData.partNo = val.part_no
         this.coreComponentData.partDescription = val.part_description
-        this.coreComponentData.oldSerialNo = val.oldSerialNo
-        this.coreComponentData.newSerialNo = val.newSerialNo
       }
     },
 
@@ -2119,16 +2117,12 @@ export default {
             if (data.baseListData.length > 0) {
               this.coreComponentData.partNo = val.part_no
               this.coreComponentData.partDescription = val.part_description
-              this.coreComponentData.oldSerialNo = val.oldSerialNo
-              this.coreComponentData.newSerialNo = val.newSerialNo
               return
             }
           }
         })
       }
       this.coreComponentData.partDescription = ''
-      this.coreComponentData.oldSerialNo = ''
-      this.coreComponentData.newSerialNo = ''
     },
 
     async exportExcel() {
@@ -2812,12 +2806,8 @@ export default {
       if (value && value !== '') {
         let tempData = this.corePartSpareList.filter(item => item.partNo === value)[0]
         this.coreComponentData.partDescription = tempData.partDescription
-        this.coreComponentData.oldSerialNo = tempData.oldSerialNo
-        this.coreComponentData.newSerialNo = tempData.newSerialNo
       } else {
         this.coreComponentData.partDescription = ''
-        this.coreComponentData.oldSerialNo = ''
-        this.coreComponentData.newSerialNo = ''
       }
     }
   }