Tony Kang 3 лет назад
Родитель
Сommit
79c5911de4
1 измененных файлов с 41 добавлено и 27 удалено
  1. 41 27
      web/building_saas/standard_interface/export/shandong_common.js

+ 41 - 27
web/building_saas/standard_interface/export/shandong_common.js

@@ -959,6 +959,19 @@ INTERFACE_EXPORT = (() => {
         }
         }
         return rstSum;
         return rstSum;
       };
       };
+
+      function _getSum(orgSum) {
+        let rst = orgSum;
+        // const isBidInvitation = exportKind === BID_INVITATION; // 是否是招标
+        // const isBidSubmission = exportKind === BID_SUBMISSION; // 是否是投标
+        // const isControl = exportKind === CONTROL; // 是否是控制价
+        //根据导出类型(上面3个),输出实际合计或price
+        if (isBidInvitation) {
+          rst = 0;
+        }
+        return rst;
+      }
+
       function quoteSummary(tenderProject) {
       function quoteSummary(tenderProject) {
         let quoteSummaryItem = new emptyElement('QuoteSummary');
         let quoteSummaryItem = new emptyElement('QuoteSummary');
         // let attrs = [];
         // let attrs = [];
@@ -1059,8 +1072,8 @@ INTERFACE_EXPORT = (() => {
               value: item.Name
               value: item.Name
             },
             },
             { name: 'Sum',
             { name: 'Sum',
-              // value: item.Sum
-              value: 0 // 所有清单的金额都是0
+              value: _getSum(item.Sum)
+              // value: 0 // 所有清单的金额都是0
             }
             }
           ];
           ];
           let rst = new emptyElement('Item');
           let rst = new emptyElement('Item');
@@ -1104,8 +1117,8 @@ INTERFACE_EXPORT = (() => {
           const pSumAttrs = [
           const pSumAttrs = [
             {
             {
               name: 'Sum',
               name: 'Sum',
-              // value: _getFee(orgNode)
-              value: 0
+              value: _getSum(_getFee(orgNode))
+              // value: 0
             }
             }
           ];
           ];
           // Element.call(this, parentKey, pSumAttrs);
           // Element.call(this, parentKey, pSumAttrs);
@@ -1127,12 +1140,12 @@ INTERFACE_EXPORT = (() => {
                   value: node.quantity
                   value: node.quantity
                 }, {
                 }, {
                   name: 'Price',
                   name: 'Price',
-                  // value: _getFee(node, 'common', 'tenderUnitFee')
-                  value: 0
+                  value: _getSum(_getFee(node, 'common', 'tenderUnitFee'))
+                  // value: 0
                 }, {
                 }, {
                   name: 'Sum',
                   name: 'Sum',
-                  // value: _getFee(node)
-                  value: 0
+                  value: _getSum(_getFee(node))
+                  // value: 0
                 }
                 }
               ];
               ];
               childNode.attrs.push(...attrs);
               childNode.attrs.push(...attrs);
@@ -1187,7 +1200,8 @@ INTERFACE_EXPORT = (() => {
           const pSumAttrs = [
           const pSumAttrs = [
             {
             {
               name: 'Sum',
               name: 'Sum',
-              value: _getFee(nodeLabour) + _getFee(nodeMaterial) + _getFee(nodeMachine)
+              // value: _getFee(nodeLabour) + _getFee(nodeMaterial) + _getFee(nodeMachine)
+              value: _getSum(_getFee(nodeLabour) + _getFee(nodeMaterial) + _getFee(nodeMachine))
             }
             }
           ];
           ];
           summaryNode.attrs = pSumAttrs;
           summaryNode.attrs = pSumAttrs;
@@ -1245,10 +1259,10 @@ INTERFACE_EXPORT = (() => {
               {name: 'Name', value: bill.name},
               {name: 'Name', value: bill.name},
               {name: 'Unit', value: bill.unit},
               {name: 'Unit', value: bill.unit},
               {name: 'Num', value: bill.quantity},
               {name: 'Num', value: bill.quantity},
-              // {name: 'Price', value: _getFee(bill, 'common', 'tenderUnitFee')},
-              // {name: 'Sum', value: _getFee(bill), type:TYPE.DECIMAL},
-              {name: 'Price', value: 0},
-              {name: 'Sum', value: 0},
+              {name: 'Price', value: _getSum(_getFee(bill, 'common', 'tenderUnitFee'))},
+              {name: 'Sum', value: _getSum(_getFee(bill)), type:TYPE.DECIMAL},
+              // {name: 'Price', value: 0},
+              // {name: 'Sum', value: 0},
               {name: 'Remark', value: (bill.remark) ? glj.remark : ''}
               {name: 'Remark', value: (bill.remark) ? glj.remark : ''}
             ];
             ];
             itemNo++;
             itemNo++;
@@ -1271,10 +1285,10 @@ INTERFACE_EXPORT = (() => {
               {name: 'Name', value: glj.name},
               {name: 'Name', value: glj.name},
               {name: 'Unit', value: glj.unit},
               {name: 'Unit', value: glj.unit},
               {name: 'Num', value: glj.tenderQuantity},
               {name: 'Num', value: glj.tenderQuantity},
-              // {name: 'Price', value: glj.unit_price.market_price},
-              // {name: 'Sum', value: glj.tenderQuantity * glj.unit_price.market_price, type:TYPE.DECIMAL},
-              {name: 'Price', value: 0},
-              {name: 'Sum', value: 0},
+              {name: 'Price', value: _getSum(glj.unit_price.market_price)},
+              {name: 'Sum', value: _getSum(glj.tenderQuantity * glj.unit_price.market_price), type:TYPE.DECIMAL},
+              // {name: 'Price', value: 0},
+              // {name: 'Sum', value: 0},
               {name: 'Remark', value: (glj.remark) ? glj.remark : ''}
               {name: 'Remark', value: (glj.remark) ? glj.remark : ''}
             ];
             ];
             itemNo++;
             itemNo++;
@@ -1311,10 +1325,10 @@ INTERFACE_EXPORT = (() => {
               {name: 'Name', value: bill.name},
               {name: 'Name', value: bill.name},
               {name: 'Unit', value: bill.unit},
               {name: 'Unit', value: bill.unit},
               {name: 'Num', value: bill.quantity},
               {name: 'Num', value: bill.quantity},
-              // {name: 'Price', value: _getFee(bill, 'common', 'tenderUnitFee')},
-              // {name: 'Sum', value: _getFee(bill), type:TYPE.DECIMAL},
-              {name: 'Price', value: 0},
-              {name: 'Sum', value: 0},
+              {name: 'Price', value: _getSum(_getFee(bill, 'common', 'tenderUnitFee'))},
+              {name: 'Sum', value: _getSum(_getFee(bill)), type:TYPE.DECIMAL},
+              // {name: 'Price', value: 0},
+              // {name: 'Sum', value: 0},
               {name: 'Remark', value: (bill.remark) ? glj.remark : ''}
               {name: 'Remark', value: (bill.remark) ? glj.remark : ''}
             ];
             ];
             itemNo++;
             itemNo++;
@@ -1337,10 +1351,10 @@ INTERFACE_EXPORT = (() => {
               {name: 'Name', value: glj.name},
               {name: 'Name', value: glj.name},
               {name: 'Unit', value: glj.unit},
               {name: 'Unit', value: glj.unit},
               {name: 'Num', value: glj.tenderQuantity},
               {name: 'Num', value: glj.tenderQuantity},
-              // {name: 'Price', value: glj.unit_price.market_price},
-              // {name: 'Sum', value: glj.tenderQuantity * glj.unit_price.market_price, type:TYPE.DECIMAL},
-              {name: 'Price', value: 0},
-              {name: 'Sum', value: 0},
+              {name: 'Price', value: _getSum(glj.unit_price.market_price)},
+              {name: 'Sum', value: _getSum(glj.tenderQuantity * glj.unit_price.market_price), type:TYPE.DECIMAL},
+              // {name: 'Price', value: 0},
+              // {name: 'Sum', value: 0},
               {name: 'Remark', value: (glj.remark) ? glj.remark : ''}
               {name: 'Remark', value: (glj.remark) ? glj.remark : ''}
             ];
             ];
             itemNo++;
             itemNo++;
@@ -1376,8 +1390,8 @@ INTERFACE_EXPORT = (() => {
               {name: 'Number', value: bill.code},
               {name: 'Number', value: bill.code},
               {name: 'Name', value: bill.name},
               {name: 'Name', value: bill.name},
               {name: 'Content', value: bill.jobContent.toString()},
               {name: 'Content', value: bill.jobContent.toString()},
-              // {name: 'Sum', value: ttl, type:TYPE.DECIMAL},
-              {name: 'Sum', value: 0, type:TYPE.DECIMAL},
+              {name: 'Sum', value: _getSum(ttl), type:TYPE.DECIMAL},
+              // {name: 'Sum', value: 0, type:TYPE.DECIMAL},
             ];
             ];
             mEstItemNode.attrs.push(...attrs);
             mEstItemNode.attrs.push(...attrs);
           });
           });