liang.cheng
/
weaver_trunk_cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试

This commit is contained in:
Chengliang 2023-07-27 11:27:26 +08:00
parent 7f806349c5
commit 3202c0c119
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pc4backstage/hrmAttendance/stores/vacationRemain.js
View File

@ -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;
})
}

1
tsconfig.json
View File

@ -15,7 +15,6 @@
"noImplicitThis": true,
"noImplicitAny": true,
"strictNullChecks": true,
"suppressImplicitAnyIndexErrors": true,
"noUnusedLocals": true,
"experimentalDecorators": true,
},