考勤-排班修复批量同意连续点击

src/views/business/attendance/attendanceDetails.vue

@@ -32,7 +32,7 @@
             </template>
             <!-- 自定义多级表头 -->
             <template #prepend-column>
-                <el-table-column key="userName" prop="userName" label="姓名" width="80">
+                <el-table-column key="userName" prop="userName" label="姓名" width="110">
                     <template #default="{ row }">
                         <el-tag style="margin: 2px;">
                             {{ row.userName }}
@@ -42,7 +42,7 @@
                 <!-- 基本信息分组 -->
                 <el-table-column label="基本信息">
                     <!--<el-table-column prop="yong_hu_id_" title="姓名" key="yong_hu_id_" width="80" />-->
-                    <el-table-column key="deptName" prop="deptName" label="部门" width="100">
+                    <el-table-column key="deptName" prop="deptName" label="部门" width="120">
                         <template #default="{ row }">
                             <el-tag style="margin: 2px;">
                                 {{ row.deptName }}
@@ -53,15 +53,15 @@
                 </el-table-column>
                 <!-- 班次信息分组 -->
                 <el-table-column label="班次信息">
-                    <el-table-column key="pai_ban_ming_chen" prop="pai_ban_ming_chen" label="排班名称" width="130" />
-                    <el-table-column key="ban_ci_ming_" prop="ban_ci_ming_" label="班次名" width="80" />
-                    <el-table-column key="ban_ci_bie_ming_" prop="ban_ci_bie_ming_" label="班次别名" width="80" />
+                    <el-table-column key="pai_ban_ming_chen" prop="pai_ban_ming_chen" label="排班名称" min-width="140" />
+                    <el-table-column key="ban_ci_ming_" prop="ban_ci_ming_" label="班次名" width="100" />
+                    <el-table-column key="ban_ci_bie_ming_" prop="ban_ci_bie_ming_" label="班次别名" width="100" />
                 </el-table-column>
                 <el-table-column key="ri_qi_" prop="ri_qi_" label="日期" width="100" />
                 <!-- 上班分组 -->
                 <el-table-column label="上班">
-                    <el-table-column key="da_ka_shi_jian_1_" prop="da_ka_shi_jian_1_" label="打卡时间" width="140" />
-                    <el-table-column key="zhuang_tai_1_" prop="zhuang_tai_1_" label="打卡状态" width="80">
+                    <el-table-column key="da_ka_shi_jian_1_" prop="da_ka_shi_jian_1_" label="打卡时间" width="160" />
+                    <el-table-column key="zhuang_tai_1_" prop="zhuang_tai_1_" label="打卡状态" width="90">
                         <template #default="{ row }">
                             <span :style="{ color: row.zhuang_tai_1_=='异常' ? 'red' : (!row.da_ka_shi_jian_1_ ? 'red' :'inherit') }">
                                 {{ !row.da_ka_shi_jian_1_ ? '缺勤' : (row.zhuang_tai_1_ === '异常' ? '迟到' : row.zhuang_tai_1_) }}
@@ -71,8 +71,8 @@
                 </el-table-column>
                 <!-- 下班分组 -->
                 <el-table-column label="下班">
-                    <el-table-column key="da_ka_shi_jian_2_" prop="da_ka_shi_jian_2_" label="打卡时间" width="140" />
-                    <el-table-column key="zhuang_tai_2_" prop="zhuang_tai_2_" label="打卡状态" width="80">
+                    <el-table-column key="da_ka_shi_jian_2_" prop="da_ka_shi_jian_2_" label="打卡时间" width="160" />
+                    <el-table-column key="zhuang_tai_2_" prop="zhuang_tai_2_" label="打卡状态" width="90">
                         <template #default="{ row }">
                             <span :style="{ color: row.zhuang_tai_2_=='异常' ? 'red' : (!row.da_ka_shi_jian_2_ ? 'red' :'inherit') }">
                                 {{ !row.da_ka_shi_jian_2_ ? '缺勤' : (row.zhuang_tai_2_ === '异常' ? '迟到' : row.zhuang_tai_2_) }}
@@ -80,9 +80,9 @@
                         </template>
                     </el-table-column>
                 </el-table-column>
-                <el-table-column key="chi_dao_shi_chang" prop="chi_dao_shi_chang" label="迟到时长(分钟)" width="100" />
-                <el-table-column key="da_ka_ci_shu_" prop="da_ka_ci_shu_" label="打卡次数" width="70" />
-                <el-table-column key="kao_qin_zhuang_ta" prop="kao_qin_zhuang_ta" label="考勤状态" width="80">
+                <el-table-column key="chi_dao_shi_chang" prop="chi_dao_shi_chang" label="迟到时长(分钟)" width="120" />
+                <el-table-column key="da_ka_ci_shu_" prop="da_ka_ci_shu_" label="打卡次数" width="90" />
+                <el-table-column key="kao_qin_zhuang_ta" prop="kao_qin_zhuang_ta" label="考勤状态" width="90">
                     <template #default="{ row }">
                         <span :style="{ color: row.kao_qin_zhuang_ta=='异常' ? 'red' : 'inherit' }">
                             {{ row.kao_qin_zhuang_ta }}
@@ -358,7 +358,7 @@ export default {
 
 ::v-deep .el-table {
     .el-table__column[prop="bu_men_"] { min-width: 200px; }
-    .el-table__column[prop="pal_ban_ming_chen"] { min-width: 180px; }
+    .el-table__column[prop="pal_ban_ming_chen"] { min-width: 200px; }
     .el-tag { margin: 2px; }
 }
 </style>

src/views/business/attendance/attendanceOverview.vue

@@ -32,8 +32,8 @@
             </template>
             <!-- 自定义多级表头 -->
             <template #prepend-column>
-                <el-table-column key="ri_qi_" prop="ri_qi_" label="日期" width="100" />
-                <el-table-column key="user_name_" prop="user_name_" label="姓名" width="80">
+                <el-table-column key="ri_qi_" prop="ri_qi_" label="日期" width="110" />
+                <el-table-column key="user_name_" prop="user_name_" label="姓名" width="120">
                     <template #default="{ row }">
                         <el-tag style="margin: 2px;">
                             {{ row.user_name_ }}
@@ -43,23 +43,23 @@
                 <!-- 基本信息分组 -->
                 <el-table-column label="基本信息">
                     <!--<el-table-column prop="yong_hu_id_" title="姓名" key="yong_hu_id_" width="80" />-->
-                    <el-table-column key="pos_name_" prop="pos_name_" label="部门" width="100">
+                    <el-table-column key="pos_name_" prop="pos_name_" label="部门" width="140">
                         <template #default="{ row }">
                             <el-tag style="margin: 2px;">
                                 {{ row.pos_name_ }}
                             </el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column key="gong_hao_" prop="gong_hao_" label="工号" width="80" />
+                    <el-table-column key="gong_hao_" prop="gong_hao_" label="工号" width="110" />
                 </el-table-column>
                 <!-- 上班分组 -->
                 <el-table-column label="考勤概况">
-                    <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="kao_qin_zhuang_tai" prop="kao_qin_zhuang_tai" label="考勤结果" width="80">
+                    <el-table-column key="zui_zao" prop="zui_zao" label="最早" min-width="160" />
+                    <el-table-column key="zui_wan" prop="zui_wan" label="最晚" min-width="160" />
+                    <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" />
+                    <el-table-column key="total_gong_zuo_shi_chan" prop="total_gong_zuo_shi_chan" label="实际工作时长（小时）" min-width="160" />
+                    <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' }">
                                 {{ row.kao_qin_zhuang_tai }}

src/views/business/attendance/attendanceStatistics.vue

@@ -32,7 +32,7 @@
             </template>
             <!-- 自定义多级表头 -->
             <template #prepend-column>
-                <el-table-column key="user_name_" prop="user_name_" label="姓名" width="90">
+                <el-table-column key="user_name_" prop="user_name_" label="姓名" width="110">
                     <template #default="{ row }">
                         <el-tag style="margin: 2px;">
                             {{ row.user_name_ }}
@@ -42,42 +42,42 @@
                 <!-- 基本信息分组 -->
                 <el-table-column label="基本信息">
                     <!--<el-table-column prop="yong_hu_id_" title="姓名" key="yong_hu_id_" width="80" />-->
-                    <el-table-column key="pos_name_" prop="pos_name_" label="部门" width="90">
+                    <el-table-column key="pos_name_" prop="pos_name_" label="部门" width="110">
                         <template #default="{ row }">
                             <el-tag style="margin: 2px;">
                                 {{ row.pos_name_ }}
                             </el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column key="gong_hao_" prop="gong_hao_" label="工号" width="70" />
+                    <el-table-column key="gong_hao_" prop="gong_hao_" label="工号" width="90" />
                 </el-table-column>
                 <!-- 考勤情况 -->
                 <el-table-column label="考勤情况">
-                    <el-table-column key="ying_chu_qin_shu" prop="ying_chu_qin_shu" label="应出勤天数" width="80" />
-                    <el-table-column key="shi_ji_chu_qin_shu" prop="shi_ji_chu_qin_shu" label="实际出勤天数" width="85" />
-                    <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="ying_chu_qin_shu" prop="ying_chu_qin_shu" label="应出勤天数" width="110" />
+                    <el-table-column key="shi_ji_chu_qin_shu" prop="shi_ji_chu_qin_shu" label="实际出勤天数" width="110" />
+                    <el-table-column key="xiu_xi_shu" prop="xiu_xi_shu" label="休息天数" width="90" />
+                    <el-table-column key="zheng_chang_shu" prop="zheng_chang_shu" label="正常天数" width="90" />
+                    <el-table-column key="yi_chang_shu" prop="yi_chang_shu" label="异常天数" width="90" />
+                    <el-table-column key="total_ban_ci_shi_chang" prop="total_ban_ci_shi_chang" label="标准工作时长(小时)" min-width="140" />
+                    <el-table-column key="total_gong_zuo_shi_chan" prop="total_gong_zuo_shi_chan" label="实际工作时长(小时)" min-width="140" />
                 </el-table-column>
                 <!-- 异常统计 -->
                 <el-table-column label="异常统计">
-                    <el-table-column key="yi_chang_he_ji" prop="yi_chang_he_ji" label="异常合计" width="70">
+                    <el-table-column key="yi_chang_he_ji" prop="yi_chang_he_ji" label="异常合计" width="90">
                         <template #default="{ row }">
                             <span :style="{ color: 'red' }">
                                 {{ row.yi_chang_he_ji }}次
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column key="chi_dao_ci_shu" prop="chi_dao_ci_shu" label="迟到次数" width="70">
+                    <el-table-column key="chi_dao_ci_shu" prop="chi_dao_ci_shu" label="迟到次数" width="90">
                         <template #default="{ row }">
                             <span :style="{ color: 'red' }">
                                 {{ row.chi_dao_ci_shu }}次
                             </span>
                         </template>
                     </el-table-column>
-                    <el-table-column key="total_chi_dao_shi_chang" prop="total_chi_dao_shi_chang" label="迟到时长(分钟)" width="100">
+                    <el-table-column key="total_chi_dao_shi_chang" prop="total_chi_dao_shi_chang" label="迟到时长(分钟)" min-width="120">
                         <template #default="{ row }">
                             <span :style="{ color: 'red' }">
                                 {{ row.total_chi_dao_shi_chang }}
@@ -86,7 +86,7 @@
                     </el-table-column>
                     <!--<el-table-column key="zao_tui_ci_shu" prop="zao_tui_ci_shu" label="早退次数" width="70" />
                     <el-table-column key="zao_tui_shi_chang" prop="zao_tui_shi_chang" label="早退时长" width="70" />-->
-                    <el-table-column key="kuang_gong_ci_shu" prop="kuang_gong_ci_shu" label="旷工次数" width="80">
+                    <el-table-column key="kuang_gong_ci_shu" prop="kuang_gong_ci_shu" label="旷工次数" width="90">
                         <template #default="{ row }">
                             <span :style="{ color: 'red' }">
                                 {{ row.kuang_gong_ci_shu }}次

src/views/business/attendance/personAttendanceDetails.vue

@@ -32,7 +32,7 @@
             </template>
             <!-- 自定义多级表头 -->
             <template #prepend-column>
-                <el-table-column key="userName" prop="userName" label="姓名" width="80">
+                <el-table-column key="userName" prop="userName" label="姓名" width="110">
                     <template #default="{ row }">
                         <el-tag style="margin: 2px;">
                             {{ row.userName }}
@@ -42,7 +42,7 @@
                 <!-- 基本信息分组 -->
                 <el-table-column label="基本信息">
                     <!--<el-table-column prop="yong_hu_id_" title="姓名" key="yong_hu_id_" width="80" />-->
-                    <el-table-column key="deptName" prop="deptName" label="部门" width="100">
+                    <el-table-column key="deptName" prop="deptName" label="部门" width="110">
                         <template #default="{ row }">
                             <el-tag style="margin: 2px;">
                                 {{ row.deptName }}
@@ -53,15 +53,15 @@
                 </el-table-column>
                 <!-- 班次信息分组 -->
                 <el-table-column label="班次信息">
-                    <el-table-column key="pai_ban_ming_chen" prop="pai_ban_ming_chen" label="排班名称" width="120" />
-                    <el-table-column key="ban_ci_ming_" prop="ban_ci_ming_" label="班次名" width="80" />
-                    <el-table-column key="ban_ci_bie_ming_" prop="ban_ci_bie_ming_" label="班次别名" width="80" />
+                    <el-table-column key="pai_ban_ming_chen" prop="pai_ban_ming_chen" label="排班名称" min-width="140" />
+                    <el-table-column key="ban_ci_ming_" prop="ban_ci_ming_" label="班次名" width="95" />
+                    <el-table-column key="ban_ci_bie_ming_" prop="ban_ci_bie_ming_" label="班次别名" width="95" />
                 </el-table-column>
                 <el-table-column key="ri_qi_" prop="ri_qi_" label="日期" width="100" />
                 <!-- 上班分组 -->
                 <el-table-column label="上班">
-                    <el-table-column key="da_ka_shi_jian_1_" prop="da_ka_shi_jian_1_" label="打卡时间" width="120" />
-                    <el-table-column key="zhuang_tai_1_" prop="zhuang_tai_1_" label="打卡状态" width="80">
+                    <el-table-column key="da_ka_shi_jian_1_" prop="da_ka_shi_jian_1_" label="打卡时间" width="160" />
+                    <el-table-column key="zhuang_tai_1_" prop="zhuang_tai_1_" label="打卡状态" width="90">
                         <template #default="{ row }">
                             <span :style="{ color: row.zhuang_tai_1_=='异常' ? 'red' : (!row.da_ka_shi_jian_1_ ? 'red' :'inherit') }">
                                 {{ !row.da_ka_shi_jian_1_ ? '缺勤' : (row.zhuang_tai_1_ === '异常' ? '迟到' : row.zhuang_tai_1_) }}
@@ -71,8 +71,8 @@
                 </el-table-column>
                 <!-- 下班分组 -->
                 <el-table-column label="下班">
-                    <el-table-column key="da_ka_shi_jian_2_" prop="da_ka_shi_jian_2_" label="打卡时间" width="120" />
-                    <el-table-column key="zhuang_tai_2_" prop="zhuang_tai_2_" label="打卡状态" width="80">
+                    <el-table-column key="da_ka_shi_jian_2_" prop="da_ka_shi_jian_2_" label="打卡时间" width="160" />
+                    <el-table-column key="zhuang_tai_2_" prop="zhuang_tai_2_" label="打卡状态" width="90">
                         <template #default="{ row }">
                             <span :style="{ color: row.zhuang_tai_2_=='异常' ? 'red' : (!row.da_ka_shi_jian_2_ ? 'red' :'inherit') }">
                                 {{ !row.da_ka_shi_jian_2_ ? '缺勤' : (row.zhuang_tai_2_ === '异常' ? '迟到' : row.zhuang_tai_2_) }}
@@ -80,9 +80,9 @@
                         </template>
                     </el-table-column>
                 </el-table-column>
-                <el-table-column key="chi_dao_shi_chang" prop="chi_dao_shi_chang" label="迟到时长(分钟)" width="100" />
-                <el-table-column key="da_ka_ci_shu_" prop="da_ka_ci_shu_" label="打卡次数" width="70" />
-                <el-table-column key="kao_qin_zhuang_ta" prop="kao_qin_zhuang_ta" label="考勤状态" width="80">
+                <el-table-column key="chi_dao_shi_chang" prop="chi_dao_shi_chang" label="迟到时长(分钟)" width="120" />
+                <el-table-column key="da_ka_ci_shu_" prop="da_ka_ci_shu_" label="打卡次数" width="90" />
+                <el-table-column key="kao_qin_zhuang_ta" prop="kao_qin_zhuang_ta" label="考勤状态" width="100">
                     <template #default="{ row }">
                         <span :style="{ color: row.kao_qin_zhuang_ta=='异常' ? 'red' : 'inherit' }">
                             {{ row.kao_qin_zhuang_ta }}
@@ -224,7 +224,6 @@ export default {
                         }
                     }
                 })
-                debugger
                 if (conditions.length > 0) {
                     const wherestr = ' WHERE ' + conditions.join(' AND ')
                     sql = `select t.*, (select COUNT(*) FROM t_attendance_detail ${wherestr} ) AS total_count FROM t_attendance_detail t ${wherestr} `

src/views/business/​scheduleManage/adjustVerify.vue

@@ -562,6 +562,10 @@ export default {
                 }
                 await this.$common.request('update', sonUpdateParams) // 更新调班子表
                 ActionUtils.successMessage()
+                // 取消列表勾选
+                this.$nextTick(() => {
+                    this.$refs.crud.clearSelection()
+                })
                 data.forEach(async (el) => { // 给每个申请单发通知
                     if (el.status === '已通过') {
                         // 获取排班子表数据