Merge branch 'master' of http://192.168.1.12:3000/SmartCost/ConstructionCost

web/building_saas/main/html/main.html

@@ -42,7 +42,7 @@
         <div class="main-nav">
             <ul class="nav nav-tabs flex-column" role="tablist">
                 <li class="nav-item"><a class="active" data-toggle="tab" href="#zaojiashu" id="tab_zaojiashu" role="tab">造价书</a></li>
-                <li class="nav-item"><a data-toggle="tab" href="#project_glj" id="tab_project_glj" data-name="tab_project_glj" role="tab">工料机新</a></li>
+                <li class="nav-item"><a data-toggle="tab" href="#project_glj" id="tab_project_glj" data-name="tab_project_glj" role="tab">工料机</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#fee_rates" id="tab_fee_rate" role="tab" >费率</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#calc_program_manage" id="tab_calc_program_manage" role="tab">计算程序</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#reports" role="tab" id="tab_report" onclick="rptTplObj.iniPage();">报表</a></li>

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

@@ -469,8 +469,16 @@ let calcTools = {
                 }
             }
             else {
-                if (supplyGLJsIdx[glj.projectGLJID]) {
-                    sum = (sum + glj.basePrice * glj.quantity).toDecimal(decimalObj.process);
+                let tempSGLJ = supplyGLJsIdx[glj.projectGLJID];
+                if (tempSGLJ) {
+                    // 处理部分甲供
+                    if (baseName.includes('甲供') && (tempSGLJ.supply == supplyType.BFJG)){
+                        let Q = tempSGLJ.quantity ? tempSGLJ.quantity : 1;
+                        let X = tempSGLJ.supply_quantity / Q;
+                        sum = (sum + glj.basePrice * glj.quantity * X).toDecimal(decimalObj.process);
+                    }
+                    else
+                        sum = (sum + glj.basePrice * glj.quantity).toDecimal(decimalObj.process);
                 }
             };
 

web/building_saas/main/js/models/project_glj.js

@@ -101,6 +101,8 @@ ProjectGLJ.prototype.testGLJs = function () {
          let o = new Object();
          o.name = glj.name;
          o.supply = glj.supply;
+         o.quantity = glj.quantity;
+         o.supply_quantity = glj.supply_quantity;
          gljs.push(o);
     };
     return gljs;

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

@@ -47,9 +47,9 @@ var projectObj = {
 
         // 基数
         // node.data.isSubcontract = true;
-        /*node.data.gljList = project.ration_glj.getGljArrByRation(node.data.ID);
-        let bname = '甲定定额基价材料费';
-        projectObj.testDisplay(bname, rationCalcBases[bname](node));*/
+        node.data.gljList = project.ration_glj.getGljArrByRation(node.data.ID);
+        let bname = '甲供定额基价材料费';
+        projectObj.testDisplay(bname, rationCalcBases[bname](node));
 
     },
     refreshBaseActn: function (tree) {