Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

web/building_saas/standard_interface/export/guangdong_zhongshan.js

@@ -923,12 +923,12 @@ INTERFACE_EXPORT = (() => {
           },
           {
             name: "Price",
-            value: b.tenderPrice,
+            value: b.marketPrice || '0',
             type: TYPE.DECIMAL
           },
           {
             name: "LimitedPrice",
-            value: b.tenderPrice,
+            value: b.marketPrice || '0',
             type: TYPE.DECIMAL
           },
           {

web/building_saas/standard_interface/import/guangdong_zhongshan.js

@@ -159,7 +159,8 @@ INTERFACE_IMPORT = (() => {
 
     function setUpBidEvaluation(b) { 
       return {
-        code: b._Code,
+        seq: b._Code,
+        code: b._Number,
         name: b._Name,
         specs: b.Specification,
         unit: b._Unit,

web/over_write/js/guangxi_2021.js

@@ -305,7 +305,7 @@ if (typeof baseFigureTemplate !== 'undefined') {
       },
       // 招标费 算法：按“指标建筑安装工程费”为基数，以累进办法计算。
       ZBF(tender) {
-          const baseFee = this['ZBJZAZGCF'](tender);
+          const baseFee = this['DEJZAZGCF'](tender);
           if (!tender) {
               calcBase.baseProgressiveFee = baseFee;
           }