考勤功能-修复补卡撤销数据无法提交的bug

src/views/business/attendance/makeUpEdit.vue

@@ -117,11 +117,17 @@ export default {
             dialogVisible: this.visible,
             title: '补卡申请',
             formData: {
+                id: '',
                 buKaRiQi: '',
                 buKaBanCi: '',
                 buKaShiJian: '',
                 buKaShiYou: '',
-                fuJian: ''
+                shenHeRen: '',
+                shenHeShiJian: '',
+                kaoQinId: '',
+                fuJian: '',
+                paiBanId: '',
+                paiBanJiLuId: ''
             },
             buKaBanCiOptions: [],
             fileList: [],
@@ -161,11 +167,17 @@ export default {
             if (!isEmpty) {
                 this.buKaBanCiOptions = [{ label: this.params.bu_ka_ban_ci_, value: this.params.bu_ka_ban_ci_ }]
                 this.formData = {
+                    id: this.params.id_ || '',
                     buKaRiQi: this.params.bu_ka_ri_qi_ || '',
                     buKaBanCi: this.params.bu_ka_ban_ci_ || '',
                     buKaShiJian: this.params.bu_ka_shi_jian_ || '',
                     buKaShiYou: this.params.bu_ka_shi_you_ || '',
-                    fuJian: this.params.fu_jian_ || ''
+                    shenHeRen: this.params.shen_he_ren_ || '',
+                    shenHeShiJian: this.params.shen_he_shi_jian_ || '',
+                    kaoQinId: this.params.kao_qin_id_ || '',
+                    fuJian: this.params.fu_jian_ || '',
+                    paiBanId: this.params.pai_ban_id_ || '',
+                    paiBanJiLuId: this.params.pai_ban_ji_lu_id_ || ''
                 }
             }
         },
@@ -239,64 +251,104 @@ export default {
                     return self.$message.warning('请完善表单必填项信息！')
                 }
                 const { first, second } = self.$store.getters.level || {}
-                const { buKaRiQi, buKaBanCi, buKaShiJian, buKaShiYou, fuJian } = self.formData || {}
-
-                // 补卡关联的考勤数据
-                const updateObj = self.buKaBanCiOptions.filter(obj => obj.value === self.formData.buKaBanCi)
-                const updateId = updateObj[0].id
-                const updateData = self.yichangdata.filter(obj => obj.id === updateId)
-                // 获得补卡审批人
-                const sql = `select config_ FROM t_schedule WHERE id_ = '${updateData[0].paiBanId}'`
-                self.$common.request('sql', sql).then((res) => {
-                    const str = res.variables.data[0].config_ || ''
-                    let shenHeRen = ''
-                    if (str) {
-                        const obj = JSON.parse(str)
-                        const shenHeRenArr = obj.approver
-                        shenHeRen = shenHeRenArr.join(',')
-                    }
-                    const time = self.$common.getFormatDate()
+                const { id, buKaRiQi, buKaBanCi, buKaShiJian, buKaShiYou, shenHeRen, kaoQinId, fuJian, paiBanId, paiBanJiLuId } = self.formData || {}
+                const time = self.$common.getFormatDate()
+                if (!id) {
+                    // 补卡关联的考勤数据
+                    const updateObj = self.buKaBanCiOptions.filter(obj => obj.value === self.formData.buKaBanCi)
+                    const updateId = updateObj[0].id
+                    const updateData = self.yichangdata.filter(obj => obj.id === updateId)
+                    // 获得补卡审批人
+                    const sql = `select config_ FROM t_schedule WHERE id_ = '${updateData[0].paiBanId}'`
+                    self.$common.request('sql', sql).then((res) => {
+                        const str = res.variables.data[0].config_ || ''
+                        let shenHeRen = ''
+                        if (str) {
+                            const obj = JSON.parse(str)
+                            const shenHeRenArr = obj.approver
+                            shenHeRen = shenHeRenArr.join(',')
+                        }
+                        const submitData =
+                        {
+                            banCiZhuangTai: '',
+                            bianZhiRen: self.$store.getters.userId,
+                            bianZhiShiJian: time,
+                            buKaBanCi: buKaBanCi,
+                            buKaRiQi: buKaRiQi,
+                            buKaShiJian: buKaShiJian,
+                            buKaShiYou: buKaShiYou,
+                            createBy: '',
+                            createTime: '',
+                            dataStatus: '',
+                            dbType: '',
+                            diDian: second || first,
+                            dsAlias: '',
+                            fuJian: fuJian,
+                            id: self.params.id,
+                            ip: '',
+                            kaoQinId: updateId,
+                            kuaiZhao: '',
+                            name: '',
+                            paiBanId: updateData.paiBanId,
+                            paiBanJiLuId: updateData.paiBanJiLuId,
+                            pk: self.params.pk,
+                            shenHeRen: shenHeRen,
+                            shenHeShiJian: '',
+                            shenHeYiJian: '',
+                            tenantId: '',
+                            type: '',
+                            updateBy: '',
+                            updateTime: '',
+                            zhuangTai: '待审核'
+                        }
+                        // 提交数据
+                        saveAttendanceReissue(submitData).then((res) => {
+                            self.$message.success(`申请成功`)
+                            // 关闭弹窗，更新列表数据
+                            this.closeDialog()
+                        })
+                    })
+                } else { // 再次编辑
                     const submitData =
-                    {
-                        banCiZhuangTai: '',
-                        bianZhiRen: self.$store.getters.userId,
-                        bianZhiShiJian: time,
-                        buKaBanCi: buKaBanCi,
-                        buKaRiQi: buKaRiQi,
-                        buKaShiJian: buKaShiJian,
-                        buKaShiYou: buKaShiYou,
-                        createBy: '',
-                        createTime: '',
-                        dataStatus: '',
-                        dbType: '',
-                        diDian: second || first,
-                        dsAlias: '',
-                        fuJian: fuJian,
-                        id: self.params.id,
-                        ip: '',
-                        kaoQinId: updateId,
-                        kuaiZhao: '',
-                        name: '',
-                        paiBanId: updateData.paiBanId,
-                        paiBanJiLuId: updateData.paiBanJiLuId,
-                        pk: self.params.pk,
-                        shenHeRen: shenHeRen,
-                        shenHeShiJian: '',
-                        shenHeYiJian: '',
-                        tenantId: '',
-                        type: '',
-                        updateBy: '',
-                        updateTime: '',
-                        zhuangTai: '待审核'
-                    }
-
-                    // 提交数据
+                        {
+                            banCiZhuangTai: '',
+                            bianZhiRen: self.$store.getters.userId,
+                            bianZhiShiJian: time,
+                            buKaBanCi: buKaBanCi,
+                            buKaRiQi: buKaRiQi,
+                            buKaShiJian: buKaShiJian,
+                            buKaShiYou: buKaShiYou,
+                            createBy: '',
+                            createTime: '',
+                            dataStatus: '',
+                            dbType: '',
+                            diDian: second || first,
+                            dsAlias: '',
+                            fuJian: fuJian,
+                            id: id,
+                            ip: '',
+                            kaoQinId: kaoQinId,
+                            kuaiZhao: '',
+                            name: '',
+                            paiBanId: paiBanId,
+                            paiBanJiLuId: paiBanJiLuId,
+                            pk: self.params.pk,
+                            shenHeRen: shenHeRen,
+                            shenHeShiJian: '',
+                            shenHeYiJian: '',
+                            tenantId: '',
+                            type: '',
+                            updateBy: '',
+                            updateTime: '',
+                            zhuangTai: '待审核'
+                        }
+                        // 提交数据
                     saveAttendanceReissue(submitData).then((res) => {
                         self.$message.success(`申请成功`)
                         // 关闭弹窗，更新列表数据
                         this.closeDialog()
                     })
-                })
+                }
             })
         },
         handleCancel () {

src/views/business/attendance/makeUpRecords.vue

@@ -84,8 +84,10 @@ export default {
                     { 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_ban_ci_', label: '补卡班次', width: 120 },
-                    { prop: 'bu_ka_shi_you_', label: '补卡事由', minWidth: 300 }
-                    // { prop: 'fu_jian_', label: '说明附件', width: 150 }
+                    { prop: 'bu_ka_shi_you_', label: '补卡事由', minWidth: 300 },
+                    { prop: 'fu_jian_', label: '说明附件', width: 0, hidden: true },
+                    { prop: 'pai_ban_id_', label: '关联排班', width: 0, hidden: true },
+                    { prop: 'pai_ban_ji_lu_id_', label: '关联排班详情', width: 0, hidden: true }
                 ],
                 rowHandle: {
                     effect: 'default',