|
|
@@ -30,18 +30,18 @@ export const handleMulAss = (rationAssList: IRationAss[]) => {
|
|
|
// 处理多个辅助定额的情况
|
|
|
if (ass.groupList && ass.groupList.length > 0) {
|
|
|
const newAss = { ...ass };
|
|
|
- const newList = sortBy(ass.groupList, item => parseFloat(item.param)); // 按参数排序
|
|
|
+ const newList = sortBy(ass.groupList, item => parseFloat(item.param || '0')); // 按参数排序
|
|
|
let pre = 0;
|
|
|
for (const tem of newList) {
|
|
|
if (ass.actualValue) {
|
|
|
- if (ass.actualValue > pre && ass.actualValue <= parseFloat(tem.param)) {
|
|
|
+ if (ass.actualValue > pre && ass.actualValue <= parseFloat(tem.param || '0')) {
|
|
|
// 落在中间,则用组里的这条定额
|
|
|
newAss.param = tem.param;
|
|
|
newAss.paramName = tem.paramName;
|
|
|
newAss.assistCode = tem.assistCode;
|
|
|
break;
|
|
|
}
|
|
|
- pre = parseFloat(tem.param);
|
|
|
+ pre = parseFloat(tem.param || '0');
|
|
|
}
|
|
|
}
|
|
|
assList.push(newAss);
|