This commit is contained in:
parent
7f806349c5
commit
3202c0c119
|
|
@ -259,18 +259,18 @@ class VacationRemainStore {
|
||||||
lastname,
|
lastname,
|
||||||
} = data;
|
} = 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) {
|
// if (baseAmount2span !== undefined) {
|
||||||
result2 = parseFloat(baseAmount2span) + parseFloat(extraAmount2span) >= parseFloat(usedAmount2span);
|
// result2 = parseFloat(baseAmount2span) + parseFloat(extraAmount2span) >= parseFloat(usedAmount2span);
|
||||||
}
|
// }
|
||||||
|
|
||||||
if (!(result1 && result2)) {
|
// if (!(result1 && result2)) {
|
||||||
message.warning(`${getLabel(15323, '第')}${index + 1}${getLabel(27592, '行')},${lastname}${getLabel(529327, '已休年假-初始化(天)不能大于本年年假-初始化(天)+额外年假-初始化(天)')}`);
|
// message.warning(`${getLabel(15323, '第')}${index + 1}${getLabel(27592, '行')},${lastname}${getLabel(529327, '已休年假-初始化(天)不能大于本年年假-初始化(天)+额外年假-初始化(天)')}`);
|
||||||
}
|
// }
|
||||||
return result1 && result2;
|
return true;
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,6 @@
|
||||||
"noImplicitThis": true,
|
"noImplicitThis": true,
|
||||||
"noImplicitAny": true,
|
"noImplicitAny": true,
|
||||||
"strictNullChecks": true,
|
"strictNullChecks": true,
|
||||||
"suppressImplicitAnyIndexErrors": true,
|
|
||||||
"noUnusedLocals": true,
|
"noUnusedLocals": true,
|
||||||
"experimentalDecorators": true,
|
"experimentalDecorators": true,
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue