Ver código fonte

fix: 重庆、广东导出接口,承包人材料接口调用变更

vian 4 anos atrás
pai
commit
5e55b6b770

+ 1 - 1
web/over_write/js/chongqing_2018_export.js

@@ -1206,7 +1206,7 @@ const XMLStandard = (function () {
                     let engineeringCostNode = tenderDetail.Bills.tree.roots.find(node => node.getFlag() === fixedFlag.ENGINEERINGCOST);
                     if (engineeringCostNode) {
                         let ecTotalFee = _util.getFee(engineeringCostNode.data.fees, 'common.totalFee');
-                        let exponentialGljs = materialAdjustObj.getPriceCoeDatas(projectGLJList, contractorList, ecTotalFee, decimalObj);
+                        let exponentialGljs = materialAdjustObj.getPriceCoeDatas(projectGLJList, contractorList, ecTotalFee, tenderDetail.projectInfo.property);
                         if (exponentialGljs.length) {
                             // 变值权重B累加
                             let totalVarWeight = exponentialGljs.reduce((acc, cur) => acc += cur.varWeight || 0, 0);

+ 1 - 1
web/over_write/js/guangdong_2018_export.js

@@ -2804,7 +2804,7 @@ const XMLStandard = (function () {
             // 总承包人价格指数调整法数据
             const engineeringCostNode = tenderDetail.Bills.tree.roots.find(node => node.getFlag() === fixedFlag.ENGINEERINGCOST);
             const ecTotalFee = _util.getFee(engineeringCostNode.data.fees, 'common.totalFee');
-            const coeDatas = materialAdjustObj.getPriceCoeDatas(gljList, contractorList, ecTotalFee, decimalObj);
+            const coeDatas = materialAdjustObj.getPriceCoeDatas(gljList, contractorList, ecTotalFee, tenderDetail.projectInfo.property);
             return gljList
                 .filter(glj => !!+glj.quantity) // 总消耗量为0不导出
                 .map(glj => {