update

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

@@ -148,15 +148,28 @@ let calcTools = {
         if (!treeNode.data.fees) {
             treeNode.data.fees = [];
             treeNode.data.feesIndex = {};
-            treeNode.updateData.fee = [];
-            treeNode.updateData.feesIndex = {};
+            // treeNode.updateData.fees = [];   // 在某种未知情况下，treeNode.data.fees有值，导致这句无法执行。下同
+            // treeNode.updateData.feesIndex = {};
             treeNode.changed = true;
         }
         else if (!treeNode.data.feesIndex){
             treeNode.data.feesIndex = {};
-            treeNode.updateData.feesIndex = {};
+            // treeNode.updateData.feesIndex = {};
             for (let fee of treeNode.data.fees){
                 treeNode.data.feesIndex[fee.fieldName] = fee;
+                // treeNode.updateData.feesIndex[fee.fieldName] = fee;
+            };
+            treeNode.changed = true;
+        };
+
+        if (!treeNode.updateData.fees) {
+            treeNode.updateData.fees = [];
+            treeNode.updateData.feesIndex = {};
+            treeNode.changed = true;
+        }
+        else if (!treeNode.updateData.feesIndex){
+            treeNode.updateData.feesIndex = {};
+            for (let fee of treeNode.updateData.fees){
                 treeNode.updateData.feesIndex[fee.fieldName] = fee;
             };
             treeNode.changed = true;
@@ -363,7 +376,7 @@ let calcTools = {
                 for (let md of mds) {
                     if (md.type == detailType) {
                         let q = md["consumption"] ? md["consumption"] : 0;
-                        let p = md["basePrice"] ? md["basePrice"] : 0;
+                        let p = md["marketPrice"] ? md["marketPrice"] : 0;
                         mdSum = mdSum + (q * p).toDecimal(decimalObj.glj.unitPriceHasMix);
                         mdSum = (mdSum).toDecimal(decimalObj.glj.unitPriceHasMix);
                     }
@@ -922,9 +935,12 @@ let rationCalcBases = {
     '材料费': function (node, isTender) {
         return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptMarketPrice, isTender);
     },
-    '施工机具费': function (node, isTender) {
+    '施工机械使用费': function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.GENERAL_MACHINE], priceTypes.ptMarketPrice, isTender);
     },
+    '施工机械人工费': function (node, isTender) {
+        return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.MACHINE_LABOUR, isTender);
+    },
     '商品砼费': function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.COMMERCIAL_CONCRETE, gljType.COMMERCIAL_MORTAR], priceTypes.ptMarketPrice, isTender);
     },
@@ -937,16 +953,14 @@ let rationCalcBases = {
     '定额材料费': function (node, isTender) {
         return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptBasePrice, isTender);
     },
-    '定额施工机具使用费': function (node, isTender) {
+    '定额施工机械使用费': function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.GENERAL_MACHINE], priceTypes.ptBasePrice, isTender);
     },
     '定额设备费': function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptBasePrice, isTender);
     }
 
-/*    '定额基价机上人工费': function (node, isTender) {
-        return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.MACHINE_LABOUR, isTender);
-    },
+    /*
     '人工费价差': function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptDiffPrice, isTender);
     },

web/building_saas/main/js/views/calc_program_view.js

@@ -14,7 +14,7 @@ let calcProgramObj = {
             {headerName: "费用名称", headerWidth: CP_Col_Width.name, dataCode: "name", dataType: "String"},
             {headerName: "计算基数", headerWidth: CP_Col_Width.dispExprUser, dataCode: "dispExprUser", dataType: "String"},
             {headerName: "费率", headerWidth: CP_Col_Width.feeRate, dataCode: "feeRate", dataType: "Number"},
-            {headerName: "单价", headerWidth: CP_Col_Width.unitFee, dataCode: "unitFee", dataType: "Number"},
+            // {headerName: "单价", headerWidth: CP_Col_Width.unitFee, dataCode: "unitFee", dataType: "Number"},
             {headerName: "合价", headerWidth: CP_Col_Width.totalFee, dataCode: "totalFee", dataType: "Number"},
             {headerName: "费用类别", headerWidth:CP_Col_Width.displayFieldName, dataCode:"displayFieldName", dataType: "String", hAlign: "center"},
             {headerName: "基数说明", headerWidth: CP_Col_Width.statement, dataCode: "statement", dataType: "String"},