update

web/building_saas/main/js/views/block_lib.js

@@ -84,12 +84,10 @@ var blockLibObj = {
             me.mainSpread.destroy();
             me.mainSpread = null;
         };
-
         if (me.billSpread) {
             me.billSpread.destroy();
             me.billSpread = null;
         };
-
         if (me.rationSpread) {
             me.rationSpread.destroy();
             me.rationSpread = null;
@@ -100,10 +98,8 @@ var blockLibObj = {
         me.mainSheet = me.mainSpread.getSheet(0);
         me.mainSheet.name('blockLibSheet');
         sheetCommonObj.spreadDefaultStyle(me.mainSpread);
-        // me.mainSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, this.onCellDoubleClick);
-        me.mainSpread.bind(GC.Spread.Sheets.Events.EnterCell, me.onEnterCell);
 
-        var showblockTree = function (datas) {
+        function showBlockTree(datas) {
             me.mainTree = idTree.createNew({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1, autoUpdate: false});
             me.mainTreeController = TREE_SHEET_CONTROLLER.createNew(me.mainTree, me.mainSheet, me.mainSetting);
             me.mainTree.loadDatas(datas);
@@ -114,16 +110,7 @@ var blockLibObj = {
                 blockLibObj.loadDetailDatas(node);
             });
         };
-
-/*        CommonAjax.post('/complementaryRation/api/getRationTree', {userId: userID, rationRepId: rationLibID}, function (datas) {
-            showblockTree(datas);
-            $.bootstrapLoading.end();
-        }, function () {
-            showblockTree([]);
-            $.bootstrapLoading.end();
-        });*/
-
-        showblockTree(me.mainDatas);
+        showBlockTree(me.mainDatas);
 
         me.billSpread = sheetCommonObj.buildSheet($('#div_block_bill')[0], me.billSetting, 1);
         me.billSheet = me.billSpread.getSheet(0);
@@ -137,6 +124,9 @@ var blockLibObj = {
 
         me.loadTreeContextMenu();
 
+        me.mainSpread.bind(GC.Spread.Sheets.Events.EnterCell, me.onEnterCell);
+        me.mainSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, this.onCellDoubleClick);
+
         $.bootstrapLoading.end();
     },
     loadDetailDatas: function (node){
@@ -529,6 +519,10 @@ var blockLibObj = {
     onEnterCell: function (sender, args) {
         let me = blockLibObj;
         me.mainTree.selected = me.mainTree.items[me.mainSheet.getActiveRowIndex()];
+    },
+    onCellDoubleClick: function (sender, args) {
+        let me = blockLibObj;
+        //
     }
 };
 

web/building_saas/main/js/views/project_view.js

@@ -1502,7 +1502,7 @@ var projectObj = {
                 },
                 "createBlocks":{
                     name:'生成组价模板',
-                    icon: 'fa-edit',
+                    icon: 'fa-puzzle-piece',
                     disabled:function (key,opt) {
                         let selected = project.mainTree.selected;
                         return selected.sourceType != ModuleNames.bills;