Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

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

@@ -212,6 +212,17 @@ let calcTools = {
             treeNode.changed = true;
         };
     },
+    setFieldValue: function (treeNode, fieldName, value){
+        if (fieldName.includes('feesIndex')){
+            let arr = fieldName.split('.');
+            this.initFeeField(treeNode, arr[1]);
+            treeNode.data.feesIndex[arr[1]][arr[2]] = value;
+        }
+        else{
+            treeNode.data[fieldName] = value;
+        };
+        treeNode.changed = true;
+    },
     initSummaryFee: function (treeNode){
         if (!treeNode.data.summaryFees){
             treeNode.data.summaryFees = {
@@ -1505,13 +1516,27 @@ class CalcProgram {
             if (treeNode.data.programID) {
                 treeNode.data.programID = null;
                 treeNode.changed = true;
-            }
+            };
 
-            if (treeNode.data.fees && treeNode.data.fees.length > 0){
-                treeNode.data.fees = null;
-                treeNode.data.feesIndex = null;
-                treeNode.changed = true;
+            // 第1、2部分以外的叶子清单在没有公式的情况下可以手工修改综合单价并参与计算。
+            if(!calcTools.isInheritFrom(treeNode, [fixedFlag.SUB_ENGINERRING, fixedFlag.MEASURE])){
+                if (treeNode.data.feesIndex && treeNode.data.feesIndex.common){
+                    let ftObj = {};
+                    ftObj.fieldName = 'common';
+                    ftObj.unitFee = parseFloatPlus(treeNode.data.feesIndex.common.unitFee);
+                    let q = parseFloatPlus(treeNode.data.quantity);
+                    ftObj.totalFee = (ftObj.unitFee * q).toDecimal(decimalObj.bills.totalPrice);
+                    calcTools.checkFeeField(treeNode, ftObj);
+                }
             }
+            else{
+                if (treeNode.data.fees && treeNode.data.fees.length > 0){
+                    treeNode.data.fees = null;
+                    treeNode.data.feesIndex = null;
+                    treeNode.changed = true;
+                }
+            };
+
             treeNode.data.calcTemplate = {"calcItems": []};
         }
         // 叶子清单公式计算

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

@@ -417,13 +417,13 @@ var projectObj = {
             else if(fieldName ==='contain'){//编辑含量
                 project.Ration.updateContain(value,node);
             }
-            else if (fieldName === 'quantity' || fieldName === 'marketUnitFee' || fieldName === 'commonUnitFee' || fieldName === 'programID' ||
+            else if (fieldName === 'quantity' || fieldName === 'marketUnitFee' || fieldName === 'feesIndex.common.unitFee' || fieldName === 'programID' ||
                 fieldName === 'subType' || fieldName === 'calcBase' || fieldName === 'isSubcontract'){
                 if (fieldName === 'quantity') {
                     project.quantity_detail.editMainTreeNodeQuantity(value,node,fieldName,editingText);
                     return;
                 }
-                else if (fieldName === 'marketUnitFee' || fieldName === 'commonUnitFee' ) {
+                else if (fieldName === 'marketUnitFee' || fieldName === 'feesIndex.common.unitFee') {
                     if (value) {value = parseFloat(value).toDecimal(decimalObj.decimal("unitPrice", node))};
                 }
                 else if (fieldName === 'calcBase') {
@@ -442,9 +442,8 @@ var projectObj = {
                 };
                 //计算基数赋值要经过解析和标准化，已在calculate里赋值
                 if(fieldName !== 'calcBase'){
-                    node.data[fieldName] = value;
-                    node.changed = true;
-                }
+                    calcTools.setFieldValue(node, fieldName, value);
+                };
 
                 project.calcProgram.calcAndSave(node);
                 gljOprObj.showRationGLJSheetData();