考勤-修复补卡逻辑

src/views/business/attendance/attendanceDetails.vue

@@ -189,7 +189,7 @@ export default {
             const { first, second } = this.$store.getters.level || {}
             const searchParam = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
             searchParam['Q^di_dian_^S'] = second || first
-            searchParam['Q^ri_qi_^DG'] = this.$common.getDateNow()
+            searchParam['Q^ri_qi_^DGT'] = this.$common.getDateNow()
             return ActionUtils.formatParams(searchParam, this.pagination, this.sorts)
         },
         getSearchSql () {

src/views/business/attendance/makeUPVerify.vue

@@ -81,7 +81,7 @@ export default {
                     { prop: 'shen_he_shi_jian_', label: '审批时间', dateFormat: 'yyyy-MM-dd HH:mm', sortable: 'custom', width: 140 },
                     { prop: 'zhuang_tai_', label: '状态', width: 90 },
                     { prop: 'bu_ka_ri_qi_', label: '补卡日期', dateFormat: 'yyyy-MM-dd', sortable: 'custom', width: 100 },
-                    { prop: 'bu_ka_shi_jian_', label: '补卡时间', dateFormat: 'HH:mm', sortable: 'custom', width: 100 },
+                    { prop: 'bu_ka_shi_jian_', label: '补卡时间', dateFormat: 'HH:mm:ss', sortable: 'custom', width: 100 },
                     { prop: 'bu_ka_ban_ci_', label: '补卡班次', width: 100 },
                     { prop: 'bu_ka_shi_you_', label: '补卡事由', minWidth: 300 }
                     // { prop: 'fu_jian_', label: '说明附件', width: 150 }
@@ -90,8 +90,8 @@ export default {
                     effect: 'default',
                     // effect: 'display',
                     actions: [
-                        { key: 'agree', label: '同意', type: 'success', icon: 'ibps-icon-check' },
-                        { key: 'disagree', label: '不同意', type: 'danger', icon: 'ibps-icon-close' },
+                        { key: 'agree', label: '同意', type: 'success', icon: 'ibps-icon-check', hidden: function (row) { return (row.zhuang_tai_ === '已通过') } },
+                        { key: 'disagree', label: '不同意', type: 'danger', icon: 'ibps-icon-close', hidden: function (row) { return (row.zhuang_tai_ === '已通过') } },
                         { key: 'detail', label: '详情', type: 'primary', icon: 'ibps-icon-list-alt' }
                     ]
                 }
@@ -256,13 +256,18 @@ export default {
             const self = this
             getAttendanceDetail({ id: submitData.kaoQinId }).then((res) => { // 获取考勤明细
                 const updateData = res.data
+                debugger
                 if (submitData.buKaBanCi.includes('上班')) { // 更新上班数据
                     updateData.zhuangTai1 = '正常'
-                    updateData.daKaShiJian1 = submitData.buKaShiJian
+                    updateData.daKaShiJian1 = submitData.buKaRiQi + submitData.buKaShiJian
                 } else { // 更新下班数据
                     updateData.zhuangTai2 = '正常'
-                    updateData.daKaShiJian2 = submitData.buKaShiJian
+                    updateData.daKaShiJian2 = submitData.buKaRiQi + submitData.buKaShiJian
                 }
+                if (updateData.zhuangTai1 === '正常' && updateData.zhuangTai2 === '正常') {
+                    updateData.kaoQinZhuangTa = '正常'
+                }
+                updateData.chiDaoShiChang = null
                 saveAttendanceDetail(updateData)
             })
         },

src/views/business/attendance/makeUpEdit.vue

@@ -54,7 +54,7 @@
             <el-form-item label="补卡时间" prop="buKaShiJian" class="form-item-uniform">
                 <el-time-picker
                     v-model="formData.buKaShiJian"
-                    value-format="HH:mm"
+                    value-format="HH:mm:ss"
                     :placeholder="readonly? '' : '请选择时间'"
                     :disabled="readonly"
                 />
@@ -201,7 +201,7 @@ export default {
         handleBuKaRiQiChange (buKaRiQi) {
             queryAttendanceDetail(this.getSearchFormData()).then(res => {
                 // ActionUtils.handleListData(this, res.data)
-                this.yichangdata = res.data.dataResult.filter(item => item.kaoQinZhuangTa === '异常')
+                this.yichangdata = res.data.dataResult.filter(item => item.kaoQinZhuangTa === '异常' || item.kaoQinZhuangTa === '')
                 if (this.yichangdata.length === 0) {
                     this.$message.warning('该日期没有异常班次！')
                     return

src/views/business/attendance/makeUpRecords.vue

@@ -83,7 +83,7 @@ export default {
                     { prop: 'shen_he_shi_jian_', label: '审批时间', dateFormat: 'yyyy-MM-dd HH:mm', sortable: 'custom', width: 140 },
                     { prop: 'zhuang_tai_', label: '状态', width: 90 },
                     { prop: 'bu_ka_ri_qi_', label: '补卡日期', dateFormat: 'yyyy-MM-dd', sortable: 'custom', width: 100 },
-                    { prop: 'bu_ka_shi_jian_', label: '补卡时间', dateFormat: 'HH:mm', sortable: 'custom', width: 100 },
+                    { prop: 'bu_ka_shi_jian_', label: '补卡时间', dateFormat: 'HH:mm:ss', sortable: 'custom', width: 100 },
                     { prop: 'bu_ka_ban_ci_', label: '补卡班次', width: 120 },
                     { prop: 'bu_ka_shi_you_', label: '补卡事由', minWidth: 300 },
                     { prop: 'fu_jian_', label: '说明附件', width: 0, hidden: true },

src/views/system/homepage/index.vue

@@ -84,6 +84,7 @@
                             @open="handleOpen"
                             @close="handleClose"
                             @action-event="(command,data)=> handleActionEvent(command,data,index)"
+                            @dakaSingle="dakaSingle"
                         />
                     </ibps-grid-item>
                 </ibps-grid-layout>