zhonghuizhen 8 месяцев назад
Родитель
Сommit
422f9acb28
1 измененных файлов с 11 добавлено и 9 удалено
  1. 11 9
      src/views/business/attendance/attendanceOverview.vue

+ 11 - 9
src/views/business/attendance/attendanceOverview.vue

@@ -69,8 +69,8 @@
                   <el-table-column key="zui_zao" prop="zui_zao" label="最早" min-width="160" :formatter="formatDateTime"/>
                   <el-table-column key="zui_wan" prop="zui_wan" label="最晚" min-width="160" :formatter="formatDateTime"/>
                   <el-table-column key="da_ka_ci_shu_" prop="da_ka_ci_shu_" label="打卡次数" min-width="100" />
-                  <el-table-column key="total_ban_ci_shi_chang" prop="total_ban_ci_shi_chang" label="标准工作时长(小时)" min-width="160"  :formatter="(row, col, value) => formatDecimal(value)"  />
-                  <el-table-column key="total_gong_zuo_shi_chan" prop="total_gong_zuo_shi_chan" label="实际工作时长(小时)" min-width="160"  :formatter="(row, col, value) => formatDecimal(value)"  />
+                  <el-table-column key="ban_ci_shi_chang" prop="ban_ci_shi_chang" label="标准工作时长(小时)" min-width="160"  :formatter="(row, col, value) => formatDecimal(value)"  />
+                  <el-table-column key="gong_zuo_shi_chang" prop="gong_zuo_shi_chang" label="实际工作时长(小时)" min-width="160"  :formatter="(row, col, value) => formatDecimal(value)"  />
                   <el-table-column key="kao_qin_zhuang_tai" prop="kao_qin_zhuang_tai" label="考勤结果" min-width="100">
                       <template #default="{ row }">
                           <span :style="{ color: row.kao_qin_zhuang_tai=='正常' ? 'inherit' : 'red' }">
@@ -85,7 +85,8 @@
 </template>
 
 <script>
-import { queryAttendanceData } from '@/api/business/attendance'
+import { queryAttendanceStatData } from '@/api/business/attendance'
+import type from '@/business/platform/bpmn/setting/bpmn-setting/mixins/type'
 import ibpsUserSelector from '@/business/platform/org/selector'
 import FixHeight from '@/mixins/height'
 import IbpsExport from '@/plugins/export'
@@ -173,7 +174,7 @@ export default {
       // 加载数据
       loadData () {
           this.loading = true
-          queryAttendanceData(this.getSearchFormData()).then(res => {
+          queryAttendanceStatData(this.getSearchFormData()).then(res => {
               this.listData = res.data.dataResult
               this.pagination.totalCount = res.data.pageResult?.totalCount
           }).finally(() => {
@@ -207,7 +208,8 @@ export default {
                     'locationId': second || first,
                     'yongHuId': searchUser,
                     'kaishiJianShiJ^S': this.daterRange[0],
-                    'kaishiJianShiJ^E': this.daterRange[1]
+                    'kaishiJianShiJ^E': this.daterRange[1],
+                    'type':'2'
                 }
           }
           return queryParams
@@ -296,14 +298,14 @@ export default {
               },
 
               {
-                  field_name: 'total_ban_ci_shi_chang',
+                  field_name: 'ban_ci_shi_chang',
                   label: '标准工作时长(分钟)',
-                  name: 'total_ban_ci_shi_chang'
+                  name: 'ban_ci_shi_chang'
               },
               {
-                  field_name: 'total_gong_zuo_shi_chan',
+                  field_name: 'gong_zuo_shi_chang',
                   label: '实际工作时长(分钟)',
-                  name: 'total_gong_zuo_shi_chan'
+                  name: 'gong_zuo_shi_chang'
               },
               {
                   field_name: 'kao_qin_zhuang_tai',