Browse Source

山东调整

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

+ 13 - 2
web/building_saas/standard_interface/export/shandong_common.js

@@ -1809,7 +1809,7 @@ INTERFACE_EXPORT = (() => {
   
   
             let qtyFormula = data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderTotalFee : "";
             let qtyFormula = data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderTotalFee : "";
             //data.calcBase //data.calcBase ? cbParser.toFExpr(data.calcBase, tenderProject.mainTree.items) : "",
             //data.calcBase //data.calcBase ? cbParser.toFExpr(data.calcBase, tenderProject.mainTree.items) : "",
-            if (!data.name.includes('暂列金额') || isBidInvitation) {
+            if (!data.name.includes('暂列金额') && isBidInvitation) {
               if (data.hasOwnProperty('calcBase')) {
               if (data.hasOwnProperty('calcBase')) {
                 let chkNaN = parseFloat(data.calcBase);
                 let chkNaN = parseFloat(data.calcBase);
                 if (isNaN(chkNaN)) {
                 if (isNaN(chkNaN)) {
@@ -1937,7 +1937,18 @@ INTERFACE_EXPORT = (() => {
             this.children.push(CostStructure(data))
             this.children.push(CostStructure(data))
   
   
             function CostComposition(bNode) {
             function CostComposition(bNode) {
-              if (isBidInvitation) return null;
+              // if (isBidInvitation) return null;
+              // 山东逻辑:如果清单下有计算基数,则需要输出
+              let bSet = true;
+              if (bNode.data.hasOwnProperty('calcBase')) {
+                let chkNaN = parseFloat(bNode.data.calcBase);
+                if (!isNaN(chkNaN)) {
+                  bSet = false;
+                }
+              } else {
+                bSet = false;
+              }
+              if (!bSet) return null;
               let CostComposition = new emptyElement('CostComposition');
               let CostComposition = new emptyElement('CostComposition');
               let Norms = [];
               let Norms = [];
               let Costs = [];
               let Costs = [];