Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

web/over_write/js/neimeng_2019.js

@@ -0,0 +1,59 @@
+/**
+ * Created by CSL on 2019/09/23.  内蒙计算程序、基数 等覆盖。
+ */
+
+let isNM2019 = true;
+
+function overwriteRationCalcBases (){
+    if (typeof rationCalcBases == 'undefined') return;
+    for (let key in rationCalcBases) delete rationCalcBases[key];
+
+    rationCalcBases['人工费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptMarketPrice, isTender);
+    };
+    rationCalcBases['材料费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptMarketPrice, isTender);
+    };
+    rationCalcBases['施工机械使用费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, baseMachineTypes, 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.ptBasePrice, isTender);
+    };
+    rationCalcBases['定额施工机械使用费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptBasePrice, isTender);
+    };
+};
+
+(function overwriteFeeTypes() {
+    if (typeof cpFeeTypes == 'undefined') return;
+    cpFeeTypes = [
+        {type: 'direct', name: '直接费'},
+        {type: 'labour', name: '人工费'},
+        {type: 'material', name: '材料费'},
+        {type: 'machine', name: '施工机械使用费'},
+        {type: 'rDirect', name: '定额直接费'},
+        {type: 'rLabour', name: '定额人工费'},
+        {type: 'rMaterial', name: '定额材料费'},
+        {type: 'rMachine', name: '定额施工机械使用费'},
+        {type: 'measure', name: '措施费'},
+        {type: 'manage', name: '企业管理费'},
+        {type: 'force', name: '规费'},
+        {type: 'profit', name: '利润'},
+        {type: 'tax', name: '税金'},
+        {type: 'safeProduce', name: '安全生产费'},
+        {type: 'common', name: '建筑安装工程费'},
+        {type: 'rCommon', name: '定额建筑安装工程费'}
+    ];
+})();
+
+
+
+
+
+
+
+

web/over_write/js/zhejiang_2005.js

@@ -1,5 +1,5 @@
 /**
- * Created by CSL on 2019/09/11.  江西计算程序、基数 等覆盖。
+ * Created by CSL on 2019/09/11.  浙江计算程序、基数 等覆盖。
  */
 
 let isZJ2005 = true;
@@ -16,7 +16,7 @@ function overwriteRationCalcBases (taxType){
     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);
     };
 };