bug

web/building_saas/main/js/models/calc_program.js

@@ -388,9 +388,11 @@ let calcTools = {
 
         let supplyT = [];
         if (baseName.includes('甲供'))
-            supplyT = [supplyType.BFJG, supplyType.WQJG]
+            supplyT = [supplyType.BFJG, supplyType.WQJG]  // 字段中存储的是汉字！
+            // supplyT = ['部分甲供', '完全甲供']
         else if (baseName.includes('甲定'))
             supplyT = [supplyType.JDYG];
+            // supplyT = ['甲定乙供'];
 
         let gljT = [], compositionTypesArr = [];
         if (baseName == calcBaseNames.JGDEJJRGF || baseName == calcBaseNames.JDDEJJRGF){
@@ -416,7 +418,7 @@ let calcTools = {
         if (supplyProjectGLJs.length == 0) return 0;
 
         let pGLJIdx = {};
-        for (let pglj of supplyProjectGLJs){pGLJIdx[pglj.projectGLJID] = pglj};
+        for (let pglj of supplyProjectGLJs){pGLJIdx[pglj.id] = pglj};
 
         let sum = 0;
         for (let glj of treeNode.data.gljList){
@@ -433,7 +435,7 @@ let calcTools = {
                             for (let supply of supplies){
                                 if(supply.code == composition.code && supply.name == composition.name && supply.unit == composition.unit &&
                                     supply.specs == composition.specs && supply.type == composition.type ){
-                                    composition.basePrice = supply.base_price;
+                                    composition.basePrice = supply.unit_price.base_price;
                                     return true;
                                 }
                             };

web/building_saas/main/js/views/project_view.js

@@ -31,10 +31,9 @@ var projectObj = {
         }
 
         // for test interface.  CSLAAAAA
-/*        node.data.gljList = project.ration_glj.getGljArrByRation(node.data.ID);
         // node.data.isSubcontract = true;
-        let bname = '甲供定额基价材料费';
-        alert(bname + ': ' + rationCalcBases[bname](node));*/
+        // node.data.gljList = project.ration_glj.getGljArrByRation(node.data.ID);
+        // let bname = '甲定定额基价材料费'; alert(bname + ': ' + rationCalcBases[bname](node));
 
 /*        let value = projectObj.project.calcProgram.getBeforeTaxTotalFee([node]);
         alert('前四项累计值排除当前选中项：' + value);*/