bug fixed

config/gulpConfig.js

@@ -110,6 +110,7 @@ module.exports = {
         'web/building_saas/main/js/views/calc_program_view.js',
         'web/building_saas/main/js/views/confirm_modal.js',
         'web/building_saas/main/js/views/zlfb_view.js',
+        'web/building_saas/main/js/views/installation_fee_view.js',
         'public/web/rpt_tpl_def.js',
         'public/web/treeDataHelper.js',
         'public/web/ztree_common.js',

web/building_saas/main/js/models/quantity_detail.js

@@ -583,7 +583,7 @@ var quantity_detail = {
                     if(EXPString.indexOf("QDL")!=-1){//如果定额的工程量是通过计算出来的，则应该重新计算。
                         let tem_contain = scMathUtil.roundForObj(rationNode.data.contain,getDecimal("process"));
                         let tem_quantity = scMathUtil.roundForObj(value*tem_contain,getDecimal("quantity",rationNode));
-                        rationNode.data.quantity = this.autoTransformQuantity(tem_quantity,rationNode);
+                        rationNode.data.quantity = tem_quantity;//this.autoTransformQuantity(tem_quantity,rationNode);
                         rationNode.changed = true;
                         needUpdateChildren.push(rationNode);
                         if (rationNode.children.length>0){//如果有子工料机
@@ -593,7 +593,7 @@ var quantity_detail = {
                         let tem_contain=0;
                         if(value&&value!=0){
                            let children_quantity = scMathUtil.roundForObj(rationNode.data.quantity,getDecimal("quantity"),rationNode);
-                           children_quantity = scMathUtil.roundForObj(this.reverseQuantity(children_quantity,rationNode),getDecimal("quantity",rationNode));
+                            // children_quantity = scMathUtil.roundForObj(this.reverseQuantity(children_quantity,rationNode),getDecimal("quantity",rationNode));  原先是要反算的，现在改成不用反算了
                             tem_contain =scMathUtil.roundForObj(children_quantity/value,getDecimal("process"));
                         }
                         rationNode.data.contain = tem_contain;

web/building_saas/main/js/models/ration.js

@@ -437,7 +437,11 @@ var Ration = {
             node.data.contain = contain;
             node.data.quantityEXP="QDL*"+contain;
             node.data.quantity=scMathUtil.roundForObj(billQuantity*contain,getDecimal("quantity"),node);
-            node.data.quantity = projectObj.project.quantity_detail.autoTransformQuantity(node.data.quantity,node);//按单位做转换
+            let times = parseInt(node.data.unit)
+            if (!isNaN(times)) {
+                node.data.quantityEXP+='*'+times;
+            }
+          //  node.data.quantity = projectObj.project.quantity_detail.autoTransformQuantity(node.data.quantity,node);//按单位做转换
             node.changed = true;
             project.calcProgram.calcAndSave(node);
             projectObj.mainController.refreshTreeNode(node.children);//刷新子工料机树节点总消耗量