|
@@ -401,9 +401,9 @@ projectGljObject={
|
|
info.sheet.resumeEvent();
|
|
info.sheet.resumeEvent();
|
|
info.sheet.resumePaint();
|
|
info.sheet.resumePaint();
|
|
|
|
|
|
- if (dataCode === 'supply' || dataCode === 'supply_quantity'){
|
|
|
|
|
|
+ if (dataCode === 'supply' || dataCode === 'supply_quantity'){ // basePrice、marketPrice 有自己的计算代码,无需走这里重复计算
|
|
let rations = calcTools.getRationsByProjectGLJ(recode.id);
|
|
let rations = calcTools.getRationsByProjectGLJ(recode.id);
|
|
- projectObj.project.calcProgram.calcRationsAndSave(rations, function () {
|
|
|
|
|
|
+ projectObj.project.calcProgram.calcNodesAndSave(rations, function () {
|
|
projectObj.mainController.refreshTreeNode(projectObj.project.mainTree.roots);
|
|
projectObj.mainController.refreshTreeNode(projectObj.project.mainTree.roots);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
@@ -498,6 +498,16 @@ projectGljObject={
|
|
socket.emit('changeNewRoom',data);
|
|
socket.emit('changeNewRoom',data);
|
|
socketObject.roomInfo.unitFile = socketObject.getUnitFileRoomID();
|
|
socketObject.roomInfo.unitFile = socketObject.getUnitFileRoomID();
|
|
}
|
|
}
|
|
|
|
+ },
|
|
|
|
+ calcPartASupplyFeeByProjectGLJs: function (projectGLJsArr) {
|
|
|
|
+ for (let pGLJ of projectGLJsArr){
|
|
|
|
+ if (pGLJ.supply == supplyType.BFJG){
|
|
|
|
+ let rations = calcTools.getRationsByProjectGLJ(pGLJ.id);
|
|
|
|
+ projectObj.project.calcProgram.calcNodesAndSave(rations, function () {
|
|
|
|
+ projectObj.mainController.refreshTreeNode(projectObj.project.mainTree.roots);
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ };
|
|
}
|
|
}
|
|
};
|
|
};
|
|
|
|
|