瀏覽代碼

部分甲供。

chenshilong 7 年之前
父節點
當前提交
a470697d5a
共有 2 個文件被更改,包括 20 次插入2 次删除
  1. 8 0
      web/building_saas/main/js/models/calc_program.js
  2. 12 2
      web/building_saas/main/js/views/project_glj_view.js

+ 8 - 0
web/building_saas/main/js/models/calc_program.js

@@ -579,6 +579,14 @@ let calcTools = {
         for (let rID of rationIDs){
         for (let rID of rationIDs){
             rationNodes.push(nodes['id_' + rID]);
             rationNodes.push(nodes['id_' + rID]);
         };
         };
+
+        // 工料机形式的定额
+        let items = projectObj.project.mainTree.items;
+        for (let item of items){
+            if (item.data.projectGLJID == PGLJID)
+                rationNodes.push(item);
+        };
+
         return rationNodes;
         return rationNodes;
     },
     },
     getNodesByProgramID(programID){
     getNodesByProgramID(programID){

+ 12 - 2
web/building_saas/main/js/views/project_glj_view.js

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