统一命名

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

@@ -1,8 +1,3 @@
-/**
- * Created by CSL on 2017-07-19.
- * 计算程序。所有定额、清单、父清单的计算都从此入。
- */
- 
  /**
  * Created by CSL on 2017-07-19.
  * 计算程序。所有定额、清单、父清单的计算都从此入。
@@ -518,12 +513,12 @@ let calcTools = {
         let rcj = (treeNode.data.subType === gljType.LABOUR && calcTools.inBase(baseName, 'RGF')) ||
             (baseMaterialTypes.includes(treeNode.data.subType) && calcTools.inBase(baseName, 'CLF')) ||
             (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'JXF')) ||
-            (treeNode.data.subType === gljType.EQUIPMENT && calcTools.inBase(baseName, 'SBF')) ||
+            (treeNode.data.subType === gljType.EQUIPMENT && calcTools.inBase(baseName, 'SBF'));
 
-            (treeNode.data.subType === gljType.LABOUR && calcTools.inBase(baseName, 'SC_RGF')) ||
-            (baseMaterialTypes.includes(treeNode.data.subType) && calcTools.inBase(baseName, 'SC_CLF')) ||
-            (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'SC_JXF')) ||
-            (treeNode.data.subType === gljType.EQUIPMENT && calcTools.inBase(baseName, 'SC_SBF'));
+            // (treeNode.data.subType === gljType.LABOUR && calcTools.inBase(baseName, 'SC_RGF')) ||
+            // (baseMaterialTypes.includes(treeNode.data.subType) && calcTools.inBase(baseName, 'SC_CLF')) ||
+            // (treeNode.data.subType === gljType.GENERAL_MACHINE && calcTools.inBase(baseName, 'SC_JXF')) ||
+            // (treeNode.data.subType === gljType.EQUIPMENT && calcTools.inBase(baseName, 'SC_SBF'));
 
         if (rcj ||
             (treeNode.data.subType === gljType.MAIN_MATERIAL && calcTools.inBase(baseName, 'ZCF'))) {
@@ -885,21 +880,21 @@ let calcTools = {
 };
 
 let rationCalcBasesNameKinds = {
-    RGF:        ['定额基价人工费', '定额人工费'],
-    CLF:        ['定额基价材料费', '定额材料费'],
+    RGF:        ['人工费', '定额基价人工费', '定额人工费'],
+    CLF:        ['材料费', '定额基价材料费', '定额材料费'],
     QTCLF:      ['定额其他材料费'],
-    JXF:        ['定额基价机械费', '定额机械费', '定额施工机具使用费', '定额施工机械使用费'],
+    JXF:        ['机械费', '施工机具使用费', '施工机械使用费', '定额基价机械费', '定额机械费', '定额施工机具使用费', '定额施工机械使用费'],
     JSRGF:      ['定额基价机上人工费', '定额施工机械人工费'],
     ZCF:        ['主材费', '市场价主材费'],
     SBF:        ['定额设备费'],
     RGGR:       ['人工工日'],
-    ZGCLF:      ['暂估材料费'],
+    // ZGCLF:      ['暂估材料费'],
 
     // 市场价人工费、市场价材料费、市场价机械费。江西用，跟重庆区分开，概念上不太统一，这里要注意区分。
-    SC_RGF:     ['人工费'],
-    SC_CLF:     ['材料费'],
-    SC_JXF:     ['机械费', '施工机具使用费', '施工机械使用费'],
-    SC_JSRGF:   ['施工机械人工费'],
+    // SC_RGF:     ['人工费'],
+    // SC_CLF:     ['材料费'],
+    // SC_JXF:     ['机械费', '施工机具使用费', '施工机械使用费'],
+    // SC_JSRGF:   ['施工机械人工费'],
     SC_SBF:     ['设备费', '市场价设备费', '设备购置费'],
 
     JC_RGF:     ['人工费价差'],

web/building_saas/main/js/models/main_consts.js

@@ -291,6 +291,11 @@ const billText = {
     5:'补项'
 };
 
+// 2019.10.30，CSL
+// 说明：此处是重庆养护标准，作为代码模板，其它地区需要在其自已的文件中覆盖，如neimeng_2019.js。
+// 这里的命名十分头疼，因养护和建筑反过来，且各地区编办不统一，导致各地区命名出现混乱：如“人工费”，重庆建筑指市场价人工费，江西建筑指定额价人工费。
+// 规费、利润等这种，实际上是市场价算来的，但并不需要加market前缀。因为它是间接基数，且任何时候只有一个，不存在需要区分的情况。
+// 建安费命名没统一，没办法，重庆养护已发布，不允许再改了，维持现状。强迫症者对不住了。
 let cpFeeTypes = [
     {type: 'marketLabour', name: '人工费'},
     {type: 'marketMaterial', name: '材料费'},
@@ -298,11 +303,13 @@ let cpFeeTypes = [
     {type: 'marketMachineLabour', name: '施工机械人工费'},
     {type: 'marketEquipment', name: '设备购置费'},
     {type: 'marketDirect', name: '直接费'},
+
     {type: 'labour', name: '定额人工费'},
     {type: 'material', name: '定额材料费'},
     {type: 'machine', name: '定额施工机械使用费'},
     {type: 'equipment', name: '定额设备费'},
     {type: 'direct', name: '定额直接费'},
+
     {type: 'measure', name: '措施费'},
     {type: 'measure1', name: '措施费I'},
     {type: 'measure2', name: '措施费II'},

web/over_write/js/chongqing_2018.js

@@ -45,161 +45,11 @@ if(typeof materialComponent !== 'undefined'){
     materialComponent = [201];
 }
 
-// CSL, 2018-08-21 计算程序、基数 的覆盖。---------------------------------------------------------------------------------
+// CSL, 2018-08-21 计算程序定额基数、取费类别的覆盖。-----------------------------------------------------------------------
+// 重庆养护作为原始代码模块，以下变量及方法定义已写入原始位置，此处无需覆盖。其它地区的养护需在此位置覆盖，参见neimeng_2019.js。
 // let isCQ2018 = true;
-
-/*if(typeof baseMaterialTypes !== 'undefined'){
-    baseMaterialTypes.push(gljType.OTHER_MATERIAL);
-    allMaterialTypes.delete(gljType.EQUIPMENT);
-    baseMachineTypes.delete(gljType.MACHINE_COMPOSITION);
-    baseMachineTypes.push(gljType.INSTRUMENT, gljType.FUEL_POWER_FEE, gljType.DEPRECIATION_FEE,
-        gljType.INSPECTION_FEE, gljType.MAINTENANCE, gljType.DISMANTLING_FREIGHT_FEE,
-        gljType.VERIFICATION_FEE, gljType.OTHER_FEE, gljType.OTHER_MACHINE_USED);
-    baseMachineMasterTypes.push(gljType.INSTRUMENT);
-}*/
-
-
-/*function overwriteRationCalcBases (taxType){
-    if (rationCalcBases){
-        for (let key in rationCalcBases) {
-            delete rationCalcBases[key];
-        };
-        let isJY = taxType == '2';
-
-        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, [gljType.OTHER_MATERIAL], priceTypes.ptBasePrice, isTender);
-        };
-        rationCalcBases['定额施工机具使用费'] = function (node, isTender) {
-            return calcTools.rationBaseFee(node, [gljType.GENERAL_MACHINE, gljType.INSTRUMENT, gljType.OTHER_MACHINE_USED], priceTypes.ptBasePrice, isTender);
-        };
-        rationCalcBases['市场价主材费'] = function (node, isTender) {
-            return calcTools.rationBaseFee(node, [gljType.MAIN_MATERIAL], priceTypes.ptMarketPrice, isTender);
-        };
-        rationCalcBases['人工工日'] = function (node, isTender) {
-            return calcTools.labourDays(node, 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);
-        };
-/!*        if (isJY){
-            rationCalcBases['计价材料价差'] = function (node, isTender) {
-                let baseMaterialTypesWithoutOtherMaterial = [
-                    gljType.GENERAL_MATERIAL,
-                    gljType.CONCRETE,
-                    gljType.MORTAR,
-                    gljType.MIX_RATIO,
-                    gljType.COMMERCIAL_CONCRETE,
-                    gljType.COMMERCIAL_MORTAR
-                ];
-                return calcTools.rationBaseFee(node, baseMaterialTypesWithoutOtherMaterial, priceTypes.ptDiffPrice, isTender);
-            };
-        };*!/
-        rationCalcBases['机上人工费价差'] = function (node, isTender) {
-            return calcTools.rationBaseFee(node, [gljType.MACHINE_LABOUR], priceTypes.ptDiffPrice, isTender);
-        };
-        rationCalcBases['燃料动力费价差'] = function (node, isTender) {
-            return calcTools.rationBaseFee(node, [gljType.FUEL_POWER_FEE], priceTypes.ptDiffPrice, isTender);
-        };
-        if (isJY) {
-            rationCalcBases['定额其他施工机具使用费'] = function (node, isTender) {
-                return calcTools.rationBaseFee(node, [gljType.OTHER_MACHINE_USED], priceTypes.ptBasePrice, isTender);
-            };
-            rationCalcBases['机械折旧费'] = function (node, isTender) {
-                return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.DEPRECIATION_FEE, isTender);
-            };
-            rationCalcBases['特大机械检修费'] = function (node, isTender) {
-                return calcTools.machineDetailFee(node, node.data.gljList, [1, 2], gljType.INSPECTION_FEE, isTender);
-            };
-            rationCalcBases['中小机械检修费'] = function (node, isTender) {
-                return calcTools.machineDetailFee(node, node.data.gljList, [3, 4], gljType.INSPECTION_FEE, isTender);
-            };
-            rationCalcBases['特大机械维护费'] = function (node, isTender) {
-                return calcTools.machineDetailFee(node, node.data.gljList, [1, 2], gljType.MAINTENANCE, isTender);
-            };
-            rationCalcBases['中小机械维护费'] = function (node, isTender) {
-                return calcTools.machineDetailFee(node, node.data.gljList, [3, 4], gljType.MAINTENANCE, isTender);
-            };
-            rationCalcBases['安拆费及场外运输费'] = function (node, isTender) {
-                return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.DISMANTLING_FREIGHT_FEE, isTender);
-            };
-/!*            rationCalcBases['燃料动力费'] = function (node, isTender) {
-                return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.FUEL_POWER_FEE, isTender);
-            };*!/
-            rationCalcBases['定额仪器仪表费'] = function (node, isTender) {
-                return calcTools.rationBaseFee(node, [gljType.INSTRUMENT], priceTypes.ptBasePrice, isTender);
-            };
-        };
-        rationCalcBases['建筑面积'] = function (node, isTender) {
-            return calcTools.getProjectFeatureProperty('buildingArea');
-        };
-        rationCalcBases['甲供定额人工费'] = function (node, isTender) {
-            return calcTools.partASupplyFee(node, '甲供定额人工费', isTender);
-        };
-        rationCalcBases['甲供定额材料费'] = function (node, isTender) {
-            return calcTools.partASupplyFee(node, '甲供定额材料费', isTender);
-        };
-        rationCalcBases['甲供定额施工机具费'] = function (node, isTender) {
-            return calcTools.partASupplyFee(node, '甲供定额施工机具费', isTender);
-        };
-        rationCalcBases['甲供主材费'] = function (node, isTender) {
-            return calcTools.partASupplyFee(node, '甲供主材费', isTender);
-        };
-        rationCalcBases['甲定定额人工费'] = function (node, isTender) {
-            return calcTools.partASupplyFee(node, '甲定定额人工费', isTender);
-        };
-        rationCalcBases['甲定定额材料费'] = function (node, isTender) {
-            return calcTools.partASupplyFee(node, '甲定定额材料费', isTender);
-        };
-        rationCalcBases['甲定定额施工机具费'] = function (node, isTender) {
-            return calcTools.partASupplyFee(node, '甲定定额施工机具费', isTender);
-        };
-        rationCalcBases['甲定主材费'] = function (node, isTender) {
-            return calcTools.partASupplyFee(node, '甲定主材费', isTender);
-        };
-        rationCalcBases['暂估材料费'] = function (node, isTender) {
-            return calcTools.estimateFee(node, true, isTender);
-        };
-        // rationCalcBases['分包定额施工机具费'] = function (node, isTender) {
-        //     if (node.data.isSubcontract)
-        //         return calcTools.rationBaseFee(node, [gljType.GENERAL_MACHINE, gljType.INSTRUMENT, gljType.OTHER_MACHINE_USED], priceTypes.ptBasePrice, isTender)
-        //     else
-        //         return 0;
-        // };
-    };
-};*/
-
-/*(function overwriteFeeTypes() {
-    if (typeof cpFeeTypes == 'undefined') return;
-    cpFeeTypes = [
-        {type: 'marketLabour', name: '人工费'},
-        {type: 'marketMaterial', name: '材料费'},
-        {type: 'marketMachine', name: '施工机具使用费'},
-        {type: 'marketEquipment', name: '设备费'},
-        {type: 'marketDirect', name: '直接费'},
-        {type: 'labour', name: '定额人工费'},
-        {type: 'material', name: '定额材料费'},
-        {type: 'machine', name: '定额施工机具使用费'},
-        {type: 'equipment', name: '定额设备费'},
-        {type: 'direct', name: '定额直接费'},
-        {type: 'measure', name: '措施费'},
-        {type: 'measure1', name: '措施费I'},
-        {type: 'measure2', name: '措施费II'},
-        {type: 'manage', name: '企业管理费'},
-        {type: 'force', name: '规费'},
-        {type: 'profit', name: '利润'},
-        {type: 'tax', name: '税金'},
-        {type: 'common', name: '建安费'}
-    ];
-})();*/
+// function overwriteRationCalcBases (taxType){};
+// (function overwriteFeeTypes() {})();
 
 
 //清单计算基数相关
@@ -283,23 +133,7 @@ if(typeof $ !== 'undefined' && $('#cbClassList')){
 }
 //测试地区============
 /*if(typeof regions !== 'undefined') {
-    regions = [
-        '兰州',
-        '定西',
-        '天水',
-        '平凉',
-        '庆阳',
-        '武威',
-        '金昌',
-        '张掖',
-        '酒泉',
-        '甘矿',
-        '嘉峪关',
-        '临夏',
-        '合作',
-        '武都',
-        '白银',
-    ];
+    regions = [ '兰州', '定西', '天水', '平凉', '庆阳', '武威', '金昌', '张掖', '酒泉', '甘矿', '嘉峪关', '临夏', '合作', '武都', '白银'];
 }*/
 //==============
 

web/over_write/js/neimeng_2019.js

@@ -50,17 +50,17 @@ function overwriteRationCalcBases (){
 (function overwriteFeeTypes() {
     if (typeof cpFeeTypes == 'undefined') return;
     cpFeeTypes = [
-        {type: 'labour', name: '人工费'},
-        {type: 'material', name: '材料费'},
-        {type: 'machine', name: '施工机械使用费'},
-        {type: 'equipment', name: '设备购置费'},
-        {type: 'direct', name: '直接费'},
+        {type: 'marketLabour', name: '人工费'},
+        {type: 'marketMaterial', name: '材料费'},
+        {type: 'marketMachine', name: '施工机械使用费'},
+        {type: 'marketEquipment', name: '设备购置费'},
+        {type: 'marketDirect', name: '直接费'},
 
-        {type: 'rLabour', name: '定额人工费'},
-        {type: 'rMaterial', name: '定额材料费'},
-        {type: 'rMachine', name: '定额施工机械使用费'},
-        {type: 'rEquipment', name: '定额设备购置费'},
-        {type: 'rDirect', name: '定额直接费'},
+        {type: 'labour', name: '定额人工费'},
+        {type: 'material', name: '定额材料费'},
+        {type: 'machine', name: '定额施工机械使用费'},
+        {type: 'equipment', name: '定额设备购置费'},
+        {type: 'direct', name: '定额直接费'},
 
         {type: 'measure', name: '措施费'},
         {type: 'manage', name: '企业管理费'},
@@ -68,7 +68,7 @@ function overwriteRationCalcBases (){
         {type: 'profit', name: '利润'},
         {type: 'tax', name: '税金'},
         {type: 'common', name: '建安费'},
-        {type: 'rCommon', name: '定额建安费'},
+        {type: 'rationCommon', name: '定额建安费'},
         {type: 'safeProduce', name: '安全生产费'}
     ];
 })();