|
@@ -735,8 +735,8 @@ class TrainplanService extends CrudService {
|
|
|
const r = batchs.find(f => f._id === batchid);
|
|
|
if (r) {
|
|
|
const { type } = r;
|
|
|
- reaObj[type] = (reaObj[type] || 0) + parseInt(number); // 计划人数累加
|
|
|
- reaObj.reaTotal = _.add(reaObj.reaTotal, parseInt(number)); // 实际人数累加
|
|
|
+ reaObj[type] = (parseInt(reaObj[type]) || 0) + parseInt(number); // 计划人数累加
|
|
|
+ reaObj.reaTotal = _.add(parseInt(reaObj.reaTotal), parseInt(number)); // 实际人数累加
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -757,8 +757,8 @@ class TrainplanService extends CrudService {
|
|
|
if (number) n = parseInt(number);
|
|
|
}
|
|
|
// 用code去reaObj中提取实际分配的人数,就可以算处的值
|
|
|
- const rea = reaObj[code] || 0;
|
|
|
- let word = n - rea;
|
|
|
+ const rea = parseInt(reaObj[code]) || 0;
|
|
|
+ let word = _.subtract(n - rea);
|
|
|
// n===0:表示原来计划里没有这个类型,word再为0,说明实际上也没有这个类型,就不需要显示了
|
|
|
if (n === 0 && word === 0) word = '';
|
|
|
reaObj.total = _.add(reaObj.total, n);// 计划人数累加
|