考勤修复5597

src/views/business/attendance/makeUpEdit.vue

@@ -262,8 +262,9 @@ export default {
             id: this.params.kao_qin_id_ || this.params.kaoQinId
           }
         ]
+        
         this.formData = {
-          id: this.params.id_ || this.params.id|| '',
+          id: this.params.id_ || this.params.id || '',
           buKaRiQi: this.params.bu_ka_ri_qi_ || this.params.buKaRiQi|| '',
           buKaBanCi: this.params.bu_ka_ban_ci_ || this.params.buKaBanCi|| '',
           buKaShiJian: this.params.bu_ka_shi_jian_ || this.params.buKaShiJian|| '',
@@ -404,6 +405,7 @@ export default {
           return self.$message.warning('请完善表单必填项信息！')
         }
         const { first, second } = self.$store.getters.level || {}
+        
         const {
           id,
           buKaRiQi,
@@ -416,6 +418,7 @@ export default {
           paiBanId,
           paiBanJiLuId
         } = self.formData || {}
+
         const time = self.$common.getFormatDate()
         if (!id) {
           // 补卡关联的考勤数据
@@ -487,7 +490,8 @@ export default {
               })
             })
         } else {
-          // 再次编辑
+          // 再次编辑 
+          /*
           const submitData = {
             banCiZhuangTai: '',
             bianZhiRen: self.$store.getters.userId,
@@ -520,12 +524,46 @@ export default {
             updateTime: '',
             zhuangTai: '待审核'
           }
+         
           // 提交数据
           saveAttendanceReissue(submitData).then((res) => {
             self.$message.success(`申请成功`)
             // 关闭弹窗，更新列表数据
             this.closeDialog()
+          })*/
+
+
+          const updateParams = {
+                "tableName": "t_attendance_reissue",
+                "updList": [
+                    {
+                        "where": {
+                            "id_": id,
+                        },
+                        "param": {
+                            "bian_zhi_ren_": self.$store.getters.userId,
+                            "bian_zhi_shi_jian": time,
+                            "zhuang_tai_": "待审核",
+                            "di_dian_": second || first,
+                            "bu_ka_ban_ci_": buKaBanCi,
+                            "bu_ka_shi_you_": buKaShiYou,
+                            "bu_ka_ri_qi_": buKaRiQi,
+                            "bu_ka_shi_jian_": buKaShiJian,
+                            "fu_jian_": fuJian,
+                            "pai_ban_id_":  paiBanId,
+                            "pai_ban_ji_lu_id_": paiBanJiLuId,
+                            "kao_qin_id_": kaoQinId,
+                            "shen_he_ren_": shenHeRen
+                        }
+                    }
+                ]
+          }
+          console.log(updateParams)
+          this.$common.request('update', updateParams).then(() => {
+            this.$message.success('提交成功！')
+            this.closeDialog()
           })
+
         }
       })
     },

src/views/business/attendance/makeUpRecords.vue

@@ -190,7 +190,7 @@ export default {
               type: 'primary',
               icon: 'ibps-icon-edit',
               hidden: function (row) {
-                return row.zhuangTai !== '已撤销'
+                return row.zhuangTai !== '已撤销' && row.zhuangTai !== '未通过'
               }
             },
             {