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

web/over_write/js/guangdong_2018.js

@@ -170,7 +170,7 @@ if (typeof commonConstants !== 'undefined') {
         // 其他项目
         [commonConstants.fixedFlag.OTHER]: 'QTF',
         // 措施项目的子项
-        [commonConstants.fixedFlag.GREEN_MEASURE_FEE]: 'AQWMSGF', // 绿色施工安全防护措施费
+        [commonConstants.fixedFlag.SAFETY_CONSTRUCTION]: 'AQWMSGF', // 绿色施工安全防护措施费
         [commonConstants.fixedFlag.OTHER_MEASURE_FEE]: 'QTCSF', // 其他措施费
         // 其他项目的子项
         [commonConstants.fixedFlag.PROVISIONAL]: 'ZLF', // 暂列金额

web/over_write/js/guangdong_2018_export.js

@@ -235,7 +235,7 @@ const XMLStandard = (function () {
                 { name: 'measureProfit', feeName: 'profit' }
             ]
         },
-        [fixedFlag.GREEN_MEASURE_FEE]: {
+        [fixedFlag.SAFETY_CONSTRUCTION]: {
             items: [{ name: 'greenMeasureFee', feeName: 'common' }]
         },
         [fixedFlag.OTHER_MEASURE_FEE]: {
@@ -1362,7 +1362,7 @@ const XMLStandard = (function () {
                 // 绿色施工安全防护措施费
                 {
                     name: 'CostForHSE', type: _type.DECIMAL,
-                    value: node.isBelongToFlags([fixedFlag.GREEN_MEASURE_FEE]) ? _util.getFeeByFlag(items, fixedFlag.GREEN_MEASURE_FEE, 'common.totalFee') : '0'
+                    value: node.isBelongToFlags([fixedFlag.SAFETY_CONSTRUCTION]) ? _util.getFeeByFlag(items, fixedFlag.SAFETY_CONSTRUCTION, 'common.totalFee') : '0'
                 },
                 // 其他项目费
                 {
@@ -2432,7 +2432,7 @@ const XMLStandard = (function () {
             const csxmGroup = new UnitWorksSummaryGroup(csxm.data);
             // 措施项目的子项，“绿色施工安全防护措施费”、“其他措施费”
             const csxmChildren = csxm.getPosterity()
-                .filter(node => [fixedFlag.GREEN_MEASURE_FEE, fixedFlag.OTHER_MEASURE_FEE].includes(node.getFlag()))
+                .filter(node => [fixedFlag.SAFETY_CONSTRUCTION, fixedFlag.OTHER_MEASURE_FEE].includes(node.getFlag()))
                 .map(node => new UnitWorksSummaryItem(node));
             csxmGroup.children.push(...csxmChildren);
             // 其他项目

web/over_write/js/guangdong_2018_import.js

@@ -322,7 +322,7 @@ const importXML = (() => {
         // 特殊处理措施项目的费用代号(广联达这两条数据没有导出费用代号，跟我们的清单模板不匹配，从而导致从合并变成了新增)，详看mergeBills中的mergeitems放啊
         if (type === billType.BILL) {
             if (item.code === 'AQFHWMSG') {
-                item.feeCode = FlagFeeCodeMap[fixedFlag.GREEN_MEASURE_FEE];
+                item.feeCode = FlagFeeCodeMap[fixedFlag.SAFETY_CONSTRUCTION];
             } else if (item.code === 'QTCSF') {
                 item.feeCode = FlagFeeCodeMap[fixedFlag.OTHER_MEASURE_FEE];
             }