Просмотр исходного кода

考勤-调整分钟为小时数,修复班次详情显示迟到

zhonghuizhen 1 год назад
Родитель
Сommit
f1acd5390a

+ 4 - 4
src/views/business/attendance/attendanceOverview.vue

@@ -57,8 +57,8 @@
                     <el-table-column key="zui_zao" prop="zui_zao" label="最早" width="120" />
                     <el-table-column key="zui_wan" prop="zui_wan" label="最晚" width="120" />
                     <el-table-column key="da_ka_ci_shu_" prop="da_ka_ci_shu_" label="打卡次数" width="70" />
-                    <el-table-column key="total_ban_ci_shi_chang" prop="total_ban_ci_shi_chang" label="标准工作时长(分钟)" width="100" />
-                    <el-table-column key="total_gong_zuo_shi_chan" prop="total_gong_zuo_shi_chan" label="实际工作时长(分钟)" width="100" />
+                    <el-table-column key="total_ban_ci_shi_chang" prop="total_ban_ci_shi_chang" label="标准工作时长(小时)" width="100" />
+                    <el-table-column key="total_gong_zuo_shi_chan" prop="total_gong_zuo_shi_chan" label="实际工作时长(小时)" width="100" />
                     <el-table-column key="kao_qin_zhuang_tai" prop="kao_qin_zhuang_tai" label="考勤结果" width="80">
                         <template #default="{ row }">
                             <span :style="{ color: row.kao_qin_zhuang_tai=='正常' ? 'inherit' : 'red' }">
@@ -218,8 +218,8 @@ export default {
                                 MIN(da_ka_shi_jian_1_) AS zui_zao,
                                 MAX(da_ka_shi_jian_2_) AS zui_wan,
                                 SUM(da_ka_ci_shu_) AS da_ka_ci_shu_,
-                                SUM(ban_ci_shi_chang_) AS total_ban_ci_shi_chang,
-                                SUM(gong_zuo_shi_chan) AS total_gong_zuo_shi_chan,
+                                ROUND(SUM(ban_ci_shi_chang_) / 60.0,2) AS total_ban_ci_shi_chang,
+                                ROUND(SUM(gong_zuo_shi_chan) / 60.0,2) AS total_gong_zuo_shi_chan,
                                 SUM(CASE WHEN zhuang_tai_1_ = '异常' THEN 1 ELSE 0 END) + 
                                 SUM(CASE WHEN zhuang_tai_2_ = '异常' THEN 1 ELSE 0 END) AS chi_dao_ci_shu,
                                 SUM(CASE WHEN zhuang_tai_1_ = '' OR zhuang_tai_1_ IS NULL THEN 1 ELSE 0 END) + 

+ 4 - 4
src/views/business/attendance/attendanceStatistics.vue

@@ -58,8 +58,8 @@
                     <el-table-column key="xiu_xi_shu" prop="xiu_xi_shu" label="休息天数" width="85" />
                     <el-table-column key="zheng_chang_shu" prop="zheng_chang_shu" label="正常天数" width="65" />
                     <el-table-column key="yi_chang_shu" prop="yi_chang_shu" label="异常天数" width="65" />
-                    <el-table-column key="total_ban_ci_shi_chang" prop="total_ban_ci_shi_chang" label="标准工作时长(分钟)" width="120" />
-                    <el-table-column key="total_gong_zuo_shi_chan" prop="total_gong_zuo_shi_chan" label="实际工作时长(分钟)" width="120" />
+                    <el-table-column key="total_ban_ci_shi_chang" prop="total_ban_ci_shi_chang" label="标准工作时长(小时)" width="120" />
+                    <el-table-column key="total_gong_zuo_shi_chan" prop="total_gong_zuo_shi_chan" label="实际工作时长(小时)" width="120" />
                 </el-table-column>
                 <!-- 异常统计 -->
                 <el-table-column label="异常统计">
@@ -249,8 +249,8 @@ export default {
                                                 THEN 1 ELSE 0 END) AS shi_ji_chu_qin_shu,
                         SUM(kao_qin_zhuang_ta) AS zheng_chang_shu,
                         SUM(CASE WHEN kao_qin_zhuang_ta = '异常' OR kao_qin_zhuang_ta IS NULL OR kao_qin_zhuang_ta = '' THEN 1 ELSE 0 END) AS yi_chang_shu,
-                        SUM(ban_ci_shi_chang_) AS total_ban_ci_shi_chang,
-                        SUM(gong_zuo_shi_chan) AS total_gong_zuo_shi_chan,
+                        ROUND(SUM(ban_ci_shi_chang_) / 60.0,2) AS total_ban_ci_shi_chang,
+                        ROUND(SUM(gong_zuo_shi_chan) / 60.0,2) AS total_gong_zuo_shi_chan,
                         SUM(CASE WHEN zhuang_tai_1_ = '异常' OR zhuang_tai_2_ = '异常' THEN 1 ELSE 0 END) AS chi_dao_ci_shu,
                         SUM(chi_dao_shi_chang) AS total_chi_dao_shi_chang,
                         SUM(CASE WHEN zhuang_tai_1_ IS NULL OR zhuang_tai_1_ = '' THEN 1 ELSE 0 END) + 

+ 1 - 1
src/views/system/homepage/components/banciDialog.vue

@@ -111,7 +111,7 @@ export default {
                 return '未打卡'
             }
 
-            return data[status[type]] === '正常' ? `${data[time[type]]} 正常` : `${data[time[type]]} <span style="color: red;">${data[status[type]]}${data[duration[type]]}分钟</span>`
+            return data[status[type]] === '正常' ? `${data[time[type]]} 正常` : `${data[time[type]]} <span style="color: red;">${data[status[type]] === '异常' ? '迟到' : data[status[type]]}${data[duration[type]]}分钟</span>`
         },
         compareTime () { // 比较班次时间和当前时间,过去日期的才显示。
             const today = this.$common.getDateNow()