Просмотр исходного кода

导出重庆招投标接口,人材机汇总、定额下的人材机,筛选“企业管理费”、“利润”、“一般风险费”不导出。

zhongzewei 6 лет назад
Родитель
Сommit
b8ee867256

+ 4 - 2
web/building_saas/main/js/models/calc_program.js

@@ -579,8 +579,10 @@ let calcTools = {
         }
         else if (me.isLeafBill(treeNode)){
             if (projectObj.project.Bills.isEngineerEst(treeNode)){
-                sumT = treeNode.data.feesIndex['common'].totalFee;
-                sumU = treeNode.data.feesIndex['common'].unitFee;
+                if (treeNode.data.feesIndex['common'] != undefined){
+                    sumT = treeNode.data.feesIndex['common'].totalFee;
+                    sumU = treeNode.data.feesIndex['common'].unitFee;
+                }
             }
             else{
                 if (isGather){

+ 9 - 0
web/building_saas/main/js/models/exportStandardInterface.js

@@ -151,6 +151,9 @@ const XMLStandard = (function () {
     async function entry(userID, exportKind, projectData) {
         let _failList = _cache.getItem('failList');
 
+        // 不导出的人材机类型数据:企业管理费、利润、一般风险费
+        let skipGLJTypes = [6, 7, 8];
+
         //建设项目定义
         //source:来源数据
         function Project(source) {
@@ -1384,6 +1387,9 @@ const XMLStandard = (function () {
                 //定额人材机排序
                 rationGljData = gljUtil.sortRationGLJ(rationGljData);
                 for (let rGlj of rationGljData) {
+                    if (skipGLJTypes.includes(rGlj.type)) {
+                        continue;
+                    }
                     let gljSource = {
                         //code: rGlj.code,
                         code: getGljCode(rGlj.projectGLJID),
@@ -1920,6 +1926,9 @@ const XMLStandard = (function () {
                     '6': '400'
                 };
                 for (let glj of allGljs) {
+                    if (skipGLJTypes.includes(glj.type)) {
+                        continue;
+                    }
                     let price = gljUtil.getGLJPrice(glj, detail.projectGLJ.datas,
                         detail.projectInfo.property.calcOptions, detail.labourCoe.datas, detail.projectInfo.property.decimal, false, _, scMathUtil);
                     //调整价