浏览代码

fix: 设备定额设备费取费字段问题

vian 4 年之前
父节点
当前提交
4cddb0cf84
共有 1 个文件被更改,包括 7 次插入6 次删除
  1. 7 6
      web/over_write/js/quanguo_2018.js

+ 7 - 6
web/over_write/js/quanguo_2018.js

@@ -351,11 +351,12 @@ if (typeof baseFigureTemplate !== 'undefined') {
     // 施工场地建设费 算法:按“定额建筑安装工程费”扣除专项费为基数,以累进办法计算
     // 【变更】:按【固定类别是“建筑安装工程费”的“定额建安费”,扣除固定类别是“专项费用”的“定额建安费”,扣除“设备”的“定额设备费”*60%】为基数,以累进办法计算
     SGCDJSF(tender) {
+      debugger;
       let baseFee = this['DEJZAZGCF'](tender);
       const specialFee = cbTools.getBaseFee(fixedFlag.SPECIAL_COST, tender, 'rationCommon');
       baseFee = (baseFee - specialFee).toDecimal(decimalObj.process);
       const fixedNode = projectObj.project.mainTree.roots.find(node => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
-      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, 'rationCommon');
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, 'equipment');
       baseFee = (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.process);
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
@@ -367,7 +368,7 @@ if (typeof baseFigureTemplate !== 'undefined') {
     JSDWYZGLF(tender) {
       let baseFee = this['DEJZAZGCF'](tender);
       const fixedNode = projectObj.project.mainTree.roots.find(node => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
-      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, 'rationCommon');
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, 'equipment');
       baseFee = (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.process);
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
@@ -379,7 +380,7 @@ if (typeof baseFigureTemplate !== 'undefined') {
     JSXMXXHF(tender) {
       let baseFee = this['DEJZAZGCF'](tender);
       const fixedNode = projectObj.project.mainTree.roots.find(node => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
-      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, 'rationCommon');
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, 'equipment');
       baseFee = (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.process);
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
@@ -391,7 +392,7 @@ if (typeof baseFigureTemplate !== 'undefined') {
     GCJLF(tender) {
       let baseFee = this['DEJZAZGCF'](tender);
       const fixedNode = projectObj.project.mainTree.roots.find(node => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
-      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, 'rationCommon');
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, 'equipment');
       baseFee = (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.process);
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
@@ -403,7 +404,7 @@ if (typeof baseFigureTemplate !== 'undefined') {
     SJWJSCF(tender) {
       let baseFee = this['DEJZAZGCF'](tender);
       const fixedNode = projectObj.project.mainTree.roots.find(node => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
-      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, 'rationCommon');
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, 'equipment');
       baseFee = (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.process);
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;
@@ -415,7 +416,7 @@ if (typeof baseFigureTemplate !== 'undefined') {
     QQGZF(tender) {
       let baseFee = this['DEJZAZGCF'](tender);
       const fixedNode = projectObj.project.mainTree.roots.find(node => node.getFlag() === fixedFlag.CONSTRUCTION_INSTALL_FEE);
-      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, 'rationCommon');
+      const equipmentFee = cbTools.getEquipmentFee(fixedNode, tender, 'equipment');
       baseFee = (baseFee - equipmentFee * 0.6).toDecimal(decimalObj.process);
       if (!tender) {
         calcBase.baseProgressiveFee = baseFee;