Browse Source

调整章导入导出处理

Tony Kang 3 năm trước cách đây
mục cha
commit
8f6672c180

+ 2 - 2
web/building_saas/standard_interface/import/base.js

@@ -262,7 +262,7 @@ const INTERFACE_EXPORT_BASE = (() => {
       const titleType = bills.titleType || '0';
       const titleType = bills.titleType || '0';
       let matched;
       let matched;
       if (!parent) {
       if (!parent) {
-        if (titleTypeToFlag[titleType] === fixedFlag.ONE_SEVEN_BILLS || /100章.*700章|100章.*900章/.test(simpleName)) {
+        if (titleTypeToFlag[titleType] === fixedFlag.ONE_SEVEN_BILLS || /100章.*章|100章.*700章|100章.*900章/.test(simpleName)) {
           matched = target.find(bills => getFlag(bills) === fixedFlag.ONE_SEVEN_BILLS);
           matched = target.find(bills => getFlag(bills) === fixedFlag.ONE_SEVEN_BILLS);
         } else if (titleTypeToFlag[titleType] === fixedFlag.PROVISIONAL_TOTAL || /包含在清单合计中的材料、工程设备、专业工程暂估/.test(simpleName)) {
         } else if (titleTypeToFlag[titleType] === fixedFlag.PROVISIONAL_TOTAL || /包含在清单合计中的材料、工程设备、专业工程暂估/.test(simpleName)) {
           matched = target.find(bills => getFlag(bills) === fixedFlag.PROVISIONAL_TOTAL);
           matched = target.find(bills => getFlag(bills) === fixedFlag.PROVISIONAL_TOTAL);
@@ -277,7 +277,7 @@ const INTERFACE_EXPORT_BASE = (() => {
         }
         }
       } else {
       } else {
         const parentSimpleName = parent.name ? parent.name.replace(/\s/g, '') : '';
         const parentSimpleName = parent.name ? parent.name.replace(/\s/g, '') : '';
-        if (/100章.*700章|100章.*900章/.test(parentSimpleName) && /100章总则/.test(simpleName)) {
+        if (/100章.*章|100章.*700章|100章.*900章/.test(parentSimpleName) && /100章总则/.test(simpleName)) {
           matched = target.find(bills => getFlag(bills) === fixedFlag.ONE_HUNDRED_BILLS);
           matched = target.find(bills => getFlag(bills) === fixedFlag.ONE_HUNDRED_BILLS);
         } else if (/计日工合计/.test(parentSimpleName) && /劳务/.test(simpleName)) {
         } else if (/计日工合计/.test(parentSimpleName) && /劳务/.test(simpleName)) {
           matched = target.find(bills => getFlag(bills) === fixedFlag.LABOUR_SERVICE);
           matched = target.find(bills => getFlag(bills) === fixedFlag.LABOUR_SERVICE);