chenshilong 5 лет назад
Родитель
Сommit
a3f7815d33

+ 4 - 0
web/building_saas/main/js/views/glj_col.js

@@ -286,6 +286,10 @@ let gljCol = {
             }
         };
 
+        colSettingObj.setVisible('feesIndex.common.tenderUnitFee', showFields);
+        colSettingObj.setVisible('feesIndex.common.tenderTotalFee', showFields);
+        colSettingObj.updateColSetting(true);
+
         if (needRefresh){
             if(projectGljObject.projectGljSpread) {
                 projectGljObject.projectGljSheet = projectGljObject.projectGljSpread .getSheet(0);

+ 3 - 3
web/building_saas/main/js/views/project_view.js

@@ -898,9 +898,6 @@ var projectObj = {
             }
             if (!err) {
                 that.project.projectGLJ.calcQuantity(true);//计算分部分项和技术措施项目消耗量;
-                gljCol.initGljCol(that.project.projSetting.glj_col?that.project.projSetting.glj_col.showAdjustPrice:false,
-                    that.project.property.tenderSetting.showTenderFields?that.project.property.tenderSetting.showTenderFields:false);
-                subObj.initSubSpread();//初始化主界面下方的表格
 
                 let quantityTime = +new Date();
                // that.project.property = projectObj.project.projectInfo.property;
@@ -962,6 +959,9 @@ var projectObj = {
                 that.mainController.bind('refreshBaseActn', that.refreshBaseActn);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.beforeTreeSelectedChange, that.beforeMainTreeSelectedChange);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.treeSelectedChanged, that.treeSelectedChanged);
+                gljCol.initGljCol(that.project.projSetting.glj_col?that.project.projSetting.glj_col.showAdjustPrice:false,
+                that.project.property.tenderSetting.showTenderFields?that.project.property.tenderSetting.showTenderFields:false);
+                subObj.initSubSpread();//初始化主界面下方的表格
                 if(!projectReadOnly){
                     that.mainSpreadEscKey(that.mainSpread, that.mainSpreadEditStarting, that.mainSpreadEditEnded);
                     sheetCommonObj.bindEnterKey(that.mainSpread, that.mainSpreadEnterKey);

+ 1 - 1
web/building_saas/standard_interface/export/anhui_chizhou.js

@@ -466,7 +466,7 @@ INTERFACE_EXPORT = (() => {
                     return (node.data.feesIndex && node.data.feesIndex.common ? node.data.feesIndex.common.tenderTotalFee : 0);
             }
             debugger;
-            let nodes = [vTree.roots[0], ...vTree.roots[0].children, ...vTree.roots.slice(2)];
+            let nodes = [vTree.roots[0], ...vTree.roots[0].children, ...vTree.roots.slice(1)];
 
             let hzmxNo = 0;
             for (let i = 0; i < nodes.length; i++){