冲突解决

web/building_saas/main/js/views/sub_view.js

@@ -9,34 +9,43 @@
 
 let subSpread = null;
 let subObj = {
-  initSubSpread:function () {
-      contentOprObj.buildSheet($("#jobSpread")[0]);
-      characterOprObj.buildSheet($("#itemSpread")[0]);
-      $("#tzjnrCon").hide();
-      $("#subSpread").show();
-      subSpread = sheetCommonObj.createSpread($("#subSpread")[0], 4);
-      subSpread.options.allowUserDragDrop = false;
-      subSpread.options.allowUserDragFill = false;
-      subSpread.getSheet(2).name('JSCX');
-
-      pageCCOprObj.active = false;
-
-       // 工料机
-      gljOprObj.initSheet(subSpread.getSheet(0));
+    initSubSpread:function () {
+        contentOprObj.buildSheet($("#jobSpread")[0]);
+        characterOprObj.buildSheet($("#itemSpread")[0]);
+        $("#tzjnrCon").hide();
+        $("#subSpread").show();
+        subSpread = sheetCommonObj.createSpread($("#subSpread")[0], 4);
+        subSpread.options.allowUserDragDrop = false;
+        subSpread.options.allowUserDragFill = false;
+        subSpread.getSheet(2).name('JSCX');
+
+        pageCCOprObj.active = false;
+
+        // 工料机
+        gljOprObj.initSheet(subSpread.getSheet(0));
         //sheetCommonObj.shieldAllCells(subSpread.getSheet(0), gljOprObj.setting);
-      SheetDataHelper.protectdSheet(subSpread.getSheet(0));
+        SheetDataHelper.protectdSheet(subSpread.getSheet(0));
         // assistOprObj.initSheet(subSpread.getSheet(1));
         // sheetCommonObj.shieldAllCells(subSpread.getSheet(1), assistOprObj.setting);
 
+        if(!projectReadOnly){
+            gljContextMenu.loadGLJSpreadContextMenu();
+        }
+
+        //工程量明细
+        gljOprObj.initDetailSheet(subSpread.getSheet(1));
+        SheetDataHelper.protectdSheet(subSpread.getSheet(1));
 
-if(!projectReadOnly){
-    gljContextMenu.loadGLJSpreadContextMenu();
-}
         //安装增加费
-      installationFeeObj.initRationInstallSheet(subSpread.getSheet(3));
-      SheetDataHelper.protectdSheet(subSpread.getSheet(3));
-      gljContextMenu.loadGLJSpreadContextMenu();
-  }
+        installationFeeObj.initRationInstallSheet(subSpread.getSheet(3));
+        SheetDataHelper.protectdSheet(subSpread.getSheet(3));
+
+        if(projectReadOnly){
+            disableSpread(subSpread);
+            disableSpread(contentOprObj.workBook);
+            disableSpread(characterOprObj.workBook);
+        }
+    }
 };
 
 
@@ -402,9 +411,3 @@ $('#linkGCLMX').on('shown.bs.tab', function () {
 $('#linkAZZJF').on('shown.bs.tab', function () {
     gljOprObj.showDataIfRationSelect(projectObj.project.mainTree.selected, '111111');
 });
-
-if(projectReadOnly){
-    disableSpread(subSpread);
-    disableSpread(contentOprObj.workBook);
-    disableSpread(characterOprObj.workBook);
-}