山东接口(暂列金额技术及招标导出定额)

web/building_saas/standard_interface/export/shandong_common.js

@@ -2078,7 +2078,7 @@ INTERFACE_EXPORT = (() => {
               if (bNode.children && bNode.children.length > 0 && bNode.children[0].sourceType == ModuleNames.ration) {
                 for (let r of bNode.children) {
                   if (r.data.type == rationType.ration) {
-                    if(isEmptyRation(r.data)) continue;//定额空行不输出到接口文件中。
+                    if( isEmptyRation(r.data) || isBidInvitation) continue; // 招标 或者 定额空行不输出到接口文件中。
                     Norms.push(new Ration(r.data));
                   } else {
                     Costs.push(new Cost(r.data));

web/building_saas/standard_interface/import/shandong_common.js

@@ -119,7 +119,10 @@ INTERFACE_IMPORT = (() => {
           let bill = setupBills(i);
           if (bill.name == "暂列金额(不含计日工总额)") { 
             bill.fees = [{ fieldName: "common",tenderTotalFee:ProvisionalSums, tenderUnitFee: "0", totalFee: ProvisionalSums, unitFee: "0" }];
-            bill.calcBase = ProvisionalSums;
+            if (bill.calcBase === undefined || bill.calcBase === null || bill.calcBase === '') {
+              // 正常导入的暂列金额应该有公式(山东特有)，没有公式再导ProvisionalSums
+              bill.calcBase = ProvisionalSums;
+            }
             bill.calcFlag = 1;
           }
           tender.bills.push(bill);