Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

web/building_saas/main/js/views/glj_col.js

@@ -292,8 +292,11 @@ let gljCol = {
                 projectGljObject.initSheet(projectGljObject.projectGljSheet, projectGljObject.projectGljSetting);
             }
             if (subSpread) {
-                gljOprObj.initSheet(subSpread.getSheet(0), false);
-                gljOprObj.initSheet(subSpread.getSheet(2), false);
+                gljOprObj.refreshView();
+                calcProgramObj.refreshCalcProgram(projectObj.project.mainTree.selected);
+
+                //gljOprObj.initSheet(subSpread.getSheet(0), false);
+                //gljOprObj.initSheet(subSpread.getSheet(2), false);
             }
         };
     },

web/building_saas/main/js/views/glj_view.js

@@ -115,11 +115,11 @@ var gljOprObj = {
     scopeSheet:null,
     scopeDatas:[],
     scopeSelectedIDMap:{},
-    initSheet: function (sheet) {
+    initSheet: function (sheet,name="ration_glj") {
         var me = this;
         me.sheet = sheet;
         sheetCommonObj.initSheet(me.sheet, me.setting, 30);
-        sheet.name('ration_glj');
+        sheet.name(name);
         me.bindSheetEvent(sheet);
         sheet.bind(GC.Spread.Sheets.Events.CellDoubleClick, me.onCellDoubleClick);
         sheet.bind(GC.Spread.Sheets.Events.ClipboardChanged, me.onClipboardChanged);