瀏覽代碼

兼容品茗的计日工名称问题

Tony Kang 1 年之前
父節點
當前提交
28022d05b7

+ 5 - 1
web/building_saas/standard_interface/export/zhejiang_hangzhou.js

@@ -499,10 +499,14 @@ INTERFACE_EXPORT = (() => {
         // isBidSubmission //这是投标判断
         let ttl = getFee(node.data.fees, 'common.tenderTotalFee');
         if (isBidInvitation) ttl = 0;
+        let dftName = node.data.name;
+        if (/计日工/.test(dftName) && node.data.type === 1) {
+          dftName = '计日工合计';
+        }
         const attrs = [
           {name: '序号', value: hzSeq++ },
           {name: '章次', value: chaptNo },
-          {name: '名称', value: node.data.name, minLen: 1 },
+          {name: '名称', value: dftName, minLen: 1 },
           {name: '金额', value: ttl, type: TYPE.DECIMAL },
           {name: '类别', value: lb },
           {name: '备注', value: node.data.remark },

+ 7 - 0
web/building_saas/standard_interface/import/zhejiang_hangzhou.js

@@ -134,12 +134,14 @@ INTERFACE_IMPORT = (() => {
         if (dayWorkBills) {
           const title = '计日工信息标题';
           const detail = '计日工信息明细';
+          let jrgBillExName = '计日工合计';
           dayWorkBills.children = extractItemsRecur(dayWorkSrc, [[title], [detail]], (src, curField) => {
             const name = getValue(src, ['_名称']);
             const dataType = getValue(src, ['_数据类型']);
             // const simpleName = name ? name.replace(/\s/g, '') : ''
             const simpleName = name ? name : ''; // 根据需求,保留所有类型的空格(空格、换行、tab缩进)
             if (curField === title && (dataType === '0' || /计日工合计|计日工/.test(simpleName))) { // 计日工标题在根节点中已经提取了,不重复提取
+              jrgBillExName = simpleName;
               return null;
             }
             const item = { name };
@@ -154,6 +156,11 @@ INTERFACE_IMPORT = (() => {
             }
             return item;
           });
+          const jrgBill = roots.find(rBill => rBill.titleType === '4');
+          if (jrgBill) {
+            // jrgBill.specialName = jrgBillExName;
+            jrgBill.name = jrgBillExName;
+          }
         }
         return roots;
       }