diff --git a/pc4backstage/hrmAttendance/stores/vacationRemain.js b/pc4backstage/hrmAttendance/stores/vacationRemain.js index 972304d..23587ed 100644 --- a/pc4backstage/hrmAttendance/stores/vacationRemain.js +++ b/pc4backstage/hrmAttendance/stores/vacationRemain.js @@ -259,18 +259,18 @@ class VacationRemainStore { lastname, } = data; - const result1 = parseFloat(baseAmountspan) + parseFloat(extraAmountspan) >= parseFloat(usedAmountspan); + //const result1 = parseFloat(baseAmountspan) + parseFloat(extraAmountspan) >= parseFloat(usedAmountspan); - let result2 = true; + // let result2 = true; - if (baseAmount2span !== undefined) { - result2 = parseFloat(baseAmount2span) + parseFloat(extraAmount2span) >= parseFloat(usedAmount2span); - } + // if (baseAmount2span !== undefined) { + // result2 = parseFloat(baseAmount2span) + parseFloat(extraAmount2span) >= parseFloat(usedAmount2span); + // } - if (!(result1 && result2)) { - message.warning(`${getLabel(15323, '第')}${index + 1}${getLabel(27592, '行')},${lastname}${getLabel(529327, '已休年假-初始化(天)不能大于本年年假-初始化(天)+额外年假-初始化(天)')}`); - } - return result1 && result2; + // if (!(result1 && result2)) { + // message.warning(`${getLabel(15323, '第')}${index + 1}${getLabel(27592, '行')},${lastname}${getLabel(529327, '已休年假-初始化(天)不能大于本年年假-初始化(天)+额外年假-初始化(天)')}`); + // } + return true; }) } diff --git a/tsconfig.json b/tsconfig.json index 8dd306a..bf6762a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,7 +15,6 @@ "noImplicitThis": true, "noImplicitAny": true, "strictNullChecks": true, - "suppressImplicitAnyIndexErrors": true, "noUnusedLocals": true, "experimentalDecorators": true, },