调整

web/building_saas/standard_interface/export/zhejiang_xiangshan.js

@@ -407,7 +407,8 @@ INTERFACE_EXPORT = (() => {
           {name: '定额编号', value: ''},
           {name: '定额名称', value: node.data.name, minLen: 1 },
           {name: '单位', value: node.data.unit, minLen: 1 },
-          {name: '数量', value: node.data.tenderQuantity, type: TYPE.DECIMAL},
+          // {name: '数量', value: node.data.tenderQuantity, type: TYPE.DECIMAL},
+          {name: '数量', value: (node.data.tenderQuantity)?node.data.tenderQuantity:node.data.quantity, type: TYPE.DECIMAL},
           {name: '单价', value: getFee(node.data.fees, 'common.tenderUnitFee', exportKind), type: TYPE.DECIMAL},
           {name: '合价', value: getFee(node.data.fees, 'common.tenderTotalFee', exportKind), type: TYPE.DECIMAL},
           {name: '备注', value: node.data.remark },
@@ -436,7 +437,8 @@ INTERFACE_EXPORT = (() => {
           {name: '定额编号', value: node.data.code},
           {name: '定额名称', value: node.data.name, minLen: 1 },
           {name: '单位', value: node.data.unit, minLen: 1 },
-          {name: '数量', value: node.data.tenderQuantity, type: TYPE.DECIMAL},
+          // {name: '数量', value: node.data.tenderQuantity, type: TYPE.DECIMAL},
+          {name: '数量', value: (node.data.tenderQuantity)?node.data.tenderQuantity:node.data.quantity, type: TYPE.DECIMAL},
           {name: '单价', value: getFee(node.data.fees, 'common.tenderUnitFee', exportKind), type: TYPE.DECIMAL},
           {name: '合价', value: getFee(node.data.fees, 'common.tenderTotalFee', exportKind), type: TYPE.DECIMAL},
           {name: '备注', value: node.data.remark },
@@ -616,12 +618,19 @@ INTERFACE_EXPORT = (() => {
   
       /* 生成工程量清单表 */
       function createGCLQD() {
+        function _checkIfNeedTransfer(node) {
+          let rst = false;
+          if (node.data.specialProvisional !== undefined && node.data.specialProvisional !== null && node.data.specialProvisional !== '' && node.children.length === 0) {
+            rst = (node.data.specialProvisional === '材料暂估' && node.data.specialProvisional === '工程设备');
+          }
+          return rst;
+        }
           // 设置工程量清单明细
         function setupGCLQDMX(nodes) {
           const rst = [];
           nodes.forEach(node => {
             // if (node.data.name === '利用石方') debugger;
-            if (node.data.specialProvisional !== undefined && node.data.specialProvisional !== null && node.data.specialProvisional !== '' && node.children.length === 0) {
+            if (_checkIfNeedTransfer(node)) {
               //象山的坑，叶子清单(专项暂定)要转成定额信息表
               const dexxb = new billDEXXB(node);
               rst.push(dexxb);