瀏覽代碼

针对泓浒 ,暂时先去掉考勤校验

QuYueTing 1 周之前
父節點
當前提交
c52487cd54

+ 3 - 3
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -7594,7 +7594,7 @@
                             overcorp += zhi[n].zhoDataTime + ','
                         }
                     }
-                    if(this.user.companyId != 5978 && overcorp != ''){
+                    if(this.user.companyId != 5978 && this.user.companyId != 7536 && overcorp != ''){
                         overcorp = overcorp.substring(0,overcorp.length - 1)
                         this.$message({
                             message: this.$t('weekDay.date')+'[' + overcorp + ']'+this.$t('message.cannotexceedtotal'),
@@ -8505,8 +8505,8 @@
                                 }
                             }
                         }
-                        //针对凡己和景昱,苏州博海,此处不校验考勤时长
-                        if (this.user.companyId != 3918 && this.user.companyId != 5978 && this.user.companyId != 4281 && this.reportTimeType.type == 1 && this.workForm.time) {
+                        //针对凡己和景昱,苏州博海,泓浒(暂时) 此处不校验考勤时长
+                        if (this.user.companyId != 3918 && this.user.companyId != 5978 && this.user.companyId != 4281 && this.user.companyId != 7536 && this.reportTimeType.type == 1 && this.workForm.time) {
                             if (this.workForm.time.workHours && totalTime > parseFloat(this.workForm.time.workHours)) {
                                 this.$message({
                                         message: this.$t('message.Fillinthesumofworkinghours')+(totalTime)+"h"+this.$t('message.Cannotexceedthetotalworkinghoursofattendance')+"("+this.workForm.time.workHours.toFixed(1)+"h)",

+ 1 - 1
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -2145,7 +2145,7 @@
                     }
                 }
                 //针对凡己,不校验考勤时长
-                if(this.user.companyId != 3918 && this.user.companyId != 5978 && this.user.companyId != 4281 && (this.user.timeType.showDdCardtime == 1 || this.user.timeType.showCorpwxCardtime == 1) && this.reportTimeType.type == 1){
+                if(this.user.companyId != 3918 && this.user.companyId != 5978 && this.user.companyId != 4281 && this.user.companyId != 7536 && (this.user.timeType.showDdCardtime == 1 || this.user.timeType.showCorpwxCardtime == 1) && this.reportTimeType.type == 1){
                     let tips = ''
                     for(let m in this.form){
                         let allhours = 0