Browse Source

广东导入接口:特殊处理“绿色施工安全防护措施费”、“措施其他项目”,广联达没有导出费用代号

vian 5 years ago
parent
commit
5d6c57ceb0

+ 1 - 1
web/building_saas/main/js/views/project_view.js

@@ -1464,7 +1464,7 @@ var projectObj = {
                                 return projectReadOnly;
                                 return projectReadOnly;
                             },
                             },
                             callback: function (key, opt) {
                             callback: function (key, opt) {
-                                OVER_HEIGHT.switchVisible();
+                                OVER_HEIGHT.switchVisible(true);
                             }
                             }
                         },
                         },
                         'setOption': {
                         'setOption': {

+ 8 - 0
web/over_write/js/guangdong_2018_import.js

@@ -319,6 +319,14 @@ const importXML = (() => {
             feeCode: getValue(divisionalSrc, ['_Code']),
             feeCode: getValue(divisionalSrc, ['_Code']),
             remark: getValue(divisionalSrc, ['_Remark']),
             remark: getValue(divisionalSrc, ['_Remark']),
         };
         };
+        // 特殊处理措施项目的费用代号(广联达这两条数据没有导出费用代号,跟我们的清单模板不匹配,从而导致从合并变成了新增),详看mergeBills中的mergeitems放啊
+        if (type === billType.BILL) {
+            if (item.code === 'AQFHWMSG') {
+                item.feeCode = FlagFeeCodeMap[fixedFlag.GREEN_MEASURE_FEE];
+            } else if (item.code === 'QTCSF') {
+                item.feeCode = FlagFeeCodeMap[fixedFlag.OTHER_MEASURE_FEE];
+            }
+        }
         if (importFileKind === FileKind.tender) {
         if (importFileKind === FileKind.tender) {
             const summaryFees = getFeesFromBasicCost(divisionalSrc);
             const summaryFees = getFeesFromBasicCost(divisionalSrc);
             const fees = [{ fieldName: 'common', totalFee: getValue(divisionalSrc, ['_Total']), unitFee: getValue(divisionalSrc, ['_TechnicalAndEconomicIndex']) }];
             const fees = [{ fieldName: 'common', totalFee: getValue(divisionalSrc, ['_Total']), unitFee: getValue(divisionalSrc, ['_TechnicalAndEconomicIndex']) }];