浏览代码

广西的两个养护需要新增:
1.基数:施工机械人工费:ROUND(∑(机械工的预算价*机械工单位台班消耗量*机械台班消耗量*定额工程量),精度)
2.费用类别:施工机械人工费.

chenshilong 4 年之前
父节点
当前提交
98e11d2176
共有 2 个文件被更改,包括 11 次插入4 次删除
  1. 6 3
      web/over_write/js/guangxi_2021.js
  2. 5 1
      web/over_write/js/guangxiyusuan_2021.js

+ 6 - 3
web/over_write/js/guangxi_2021.js

@@ -390,10 +390,12 @@ function overwriteRationCalcBases() {
     rationCalcBases['施工机械使用费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptMarketPrice, isTender);
     };
+    rationCalcBases['施工机械人工费'] = function (node, isTender) {
+        return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.MACHINE_LABOUR, isTender);
+    };
     rationCalcBases['设备购置费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender);
     };
-
     rationCalcBases['定额人工费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptBasePrice, isTender);
     };
@@ -419,10 +421,10 @@ function overwriteRationCalcBases() {
 
 if (typeof projectObj !== 'undefined') {
     projectObj.isInsertEquipmentVisable = function (selected) {
-        return true;   //广西不管是预算或者工程量清单,都是显示   
+        return true;   //广西不管是预算或者工程量清单,都是显示
     }
   }
-  
+
 
 if (typeof feeRateObject !== 'undefined') {
     feeRateObject.feeRateSpecialHandle = function (subRate, value) {
@@ -451,6 +453,7 @@ if (typeof feeRateObject !== 'undefined') {
         { type: 'marketLabour', name: '人工费' },
         { type: 'marketMaterial', name: '材料费' },
         { type: 'marketMachine', name: '施工机械使用费' },
+        { type: 'marketMachineLabour', name: '施工机械人工费' },
         { type: 'marketEquipment', name: '设备购置费' },
 
         { type: 'labour', name: '定额人工费' },

+ 5 - 1
web/over_write/js/guangxiyusuan_2021.js

@@ -217,6 +217,9 @@ function overwriteRationCalcBases() {
     rationCalcBases['施工机械使用费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptMarketPrice, isTender);
     };
+    rationCalcBases['施工机械人工费'] = function (node, isTender) {
+        return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.MACHINE_LABOUR, isTender);
+    };
     rationCalcBases['设备购置费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender);
     };
@@ -236,7 +239,7 @@ function overwriteRationCalcBases() {
 
 if (typeof projectObj !== 'undefined') {
     projectObj.isInsertEquipmentVisable = function (selected) {
-        return true;   //广西不管是预算或者工程量清单,都是显示   
+        return true;   //广西不管是预算或者工程量清单,都是显示
     }
   }
 
@@ -261,6 +264,7 @@ if (typeof feeRateObject !== 'undefined') {
         { type: 'marketLabour', name: '人工费' },
         { type: 'marketMaterial', name: '材料费' },
         { type: 'marketMachine', name: '施工机械使用费' },
+        { type: 'marketMachineLabour', name: '施工机械人工费' },
         { type: 'marketEquipment', name: '设备购置费' },
         { type: 'labour', name: '指标人工费' },
         { type: 'material', name: '指标材料费' },