chenshilong 6 gadi atpakaļ
vecāks
revīzija
3be46f8bec
1 mainītis faili ar 4 papildinājumiem un 103 dzēšanām
  1. 4 103
      web/over_write/js/zhejiang_2005.js

+ 4 - 103
web/over_write/js/zhejiang_2005.js

@@ -13,111 +13,12 @@ function overwriteRationCalcBases (taxType){
     rationCalcBases['人工费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptMarketPrice, isTender);
     };
-    rationCalcBases['定额人工费'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptBasePrice, isTender);
-    };
     rationCalcBases['材料费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptMarketPrice, isTender);
     };
-    rationCalcBases['机械费'] = function (node, isTender) {
+    rationCalcBases['施工机械费使用费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptMarketPrice, isTender);
     };
-    rationCalcBases['定额机械费'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptBasePrice, isTender);
-    };
-    rationCalcBases['主材费'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptMarketPrice, 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.ptDiffPrice, isTender);
-    };
-    rationCalcBases['材料费价差'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptDiffPrice, isTender);
-    };
-    rationCalcBases['机械费价差'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptDiffPrice, isTender);
-    };
-    rationCalcBases['主材费价差'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptDiffPrice, isTender);
-    };
-    rationCalcBases['设备费价差'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptDiffPrice, isTender);
-    };
-    rationCalcBases['人工工日'] = function (node, isTender) {
-        return calcTools.labourDays(node, isTender);
-    };
-    rationCalcBases['甲供人工费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲供人工费', isTender, false);
-    };
-    rationCalcBases['甲供材料费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲供材料费', isTender, false);
-    };
-    rationCalcBases['甲供机械费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲供机械费', isTender, false);
-    };
-    rationCalcBases['甲供主材费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲供主材费', isTender, false);
-    };
-    rationCalcBases['甲供设备费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲供设备费', isTender, false);
-    };
-    rationCalcBases['甲定人工费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲定人工费', isTender, false);
-    };
-    rationCalcBases['甲定材料费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲定材料费', isTender, false);
-    };
-    rationCalcBases['甲定机械费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲定机械费', isTender, false);
-    };
-    rationCalcBases['甲定主材费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲定主材费', isTender, false);
-    };
-    rationCalcBases['甲定设备费'] = function (node, isTender) {
-        return calcTools.partASupplyFee(node, '甲定设备费', isTender, false);
-    };
-    rationCalcBases['暂估材料费'] = function (node, isTender) {
-        return calcTools.estimateFee(node, true, isTender);
-    };
-    rationCalcBases['分包人工费'] = function (node, isTender) {
-        if (node.data.isSubcontract)
-            return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptMarketPrice, isTender)
-        else
-            return 0;
-    };
-    rationCalcBases['分包材料费'] = function (node, isTender) {
-        if (node.data.isSubcontract)
-            return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptMarketPrice, isTender)
-        else
-            return 0;
-    };
-    rationCalcBases['分包机械费'] = function (node, isTender) {
-        if (node.data.isSubcontract)
-            return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptMarketPrice, isTender)
-        else
-            return 0;
-    };
-    rationCalcBases['分包主材费'] = function (node, isTender) {
-        if (node.data.isSubcontract)
-            return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptMarketPrice, isTender)
-        else
-            return 0;
-    };
-    rationCalcBases['分包设备费'] = function (node, isTender) {
-        if (node.data.isSubcontract)
-            return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender)
-        else
-            return 0;
-    };
-    rationCalcBases['分包人工工日'] = function (node, isTender) {
-        if (node.data.isSubcontract)
-            return calcTools.labourDays(node, isTender)
-        else
-            return 0;
-    };
 };
 
 (function overwriteFeeTypes() {
@@ -125,9 +26,9 @@ function overwriteRationCalcBases (taxType){
     cpFeeTypes = [
         {type: 'directWork', name: '直接工程费'},
         {type: 'direct', name: '直接费'},
-        {type: 'labour', name: '人工费'},
-        {type: 'material', name: '材料费'},
-        {type: 'machine', name: '施工机械使用费'},
+        {type: 'marketLabour', name: '人工费'},
+        {type: 'marketMaterial', name: '材料费'},
+        {type: 'marketMachine', name: '施工机械使用费'},
         {type: 'otherDirect', name: '其他直接费'},
         {type: 'local', name: '现场经费'},
         {type: 'indirect', name: '间接费'},