Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation

public/web/tree_sheet/tree_sheet_controller.js

@@ -37,7 +37,7 @@ var TREE_SHEET_CONTROLLER = {
                         TREE_SHEET_HELPER.refreshTreeNodeData(that.setting, that.sheet, [newNode], false);
                         that.setTreeSelected(newNode);
                         that.sheet.setSelection(newNode.serialNo(), sels[0].col, 1, 1);
-                        that.sheet.showRow(newNode.serialNo(), GC.Spread.Sheets.VerticalPosition.center);
+                        //that.sheet.showRow(newNode.serialNo(), GC.Spread.Sheets.VerticalPosition.center);
                     });
                 }
             }
@@ -56,7 +56,7 @@ var TREE_SHEET_CONTROLLER = {
                         TREE_SHEET_HELPER.refreshTreeNodeData(that.setting, that.sheet, [newNode], false);
                         that.setTreeSelected(newNode);
                         that.sheet.setSelection(newNode.serialNo(), sels[0].col, 1, 1);
-                        that.sheet.showRow(newNode.serialNo(), GC.Spread.Sheets.VerticalPosition.center);
+                        //that.sheet.showRow(newNode.serialNo(), GC.Spread.Sheets.VerticalPosition.center);
                     });
                 }
             }
@@ -78,7 +78,7 @@ var TREE_SHEET_CONTROLLER = {
                 if (this.tree.selected.upLevel()) {
                     TREE_SHEET_HELPER.massOperationSheet(this.sheet, function () {
                         TREE_SHEET_HELPER.refreshNodesVisible([that.tree.selected], that.sheet, true);
-                        that.sheet.showRow(that.tree.selected.serialNo(), GC.Spread.Sheets.VerticalPosition.center);
+                       // that.sheet.showRow(that.tree.selected.serialNo(), GC.Spread.Sheets.VerticalPosition.center);
                         if (that.event.refreshBaseActn) {
                             that.event.refreshBaseActn(that.tree);
                         }
@@ -92,7 +92,7 @@ var TREE_SHEET_CONTROLLER = {
                 if (this.tree.selected.downLevel()) {
                     TREE_SHEET_HELPER.massOperationSheet(that.sheet, function () {
                         TREE_SHEET_HELPER.refreshNodesVisible([that.tree.selected.parent], that.sheet, true);
-                        that.sheet.showRow(that.tree.selected.serialNo(), GC.Spread.Sheets.VerticalPosition.center);
+                        //that.sheet.showRow(that.tree.selected.serialNo(), GC.Spread.Sheets.VerticalPosition.center);
                         if (that.event.refreshBaseActn) {
                             that.event.refreshBaseActn(that.tree);
                         }

web/maintain/std_glj_lib/html/gongliao.html

@@ -14,6 +14,7 @@
     <style type="text/css">
         .ztree li span.button.add{margin-right:2px;background-position:-144px 0;vertical-align:top;*vertical-align:middle}
         .modal-lg{max-width: 1000px}
+        .modal{z-index: 9999 !important;}
     </style>
     <!--zTree-->
   	<link rel="stylesheet" href="/lib/ztree/css/zTreeStyle.css" type="text/css">
@@ -140,23 +141,6 @@
         </div>
     </div>
 
-    <div class="modal fade" id="loading" data-backdrop="static">
-        <div class="modal-dialog text-center" role="document" style="margin-top:30%">
-            <div class="text-white">
-                <i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>
-                <span class="sr-only">Loading...</span>
-            </div>
-        </div>
-    </div>
-    <div class="modal fade" id="loadingx" data-backdrop="static">
-        <div class="modal-dialog text-center" role="document" style="margin-top:30%">
-            <div class="text-white">
-                <i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>
-                <span class="sr-only">Loading...</span>
-            </div>
-        </div>
-    </div>
-
     <!-- JS. -->
     <script src="/lib/jquery/jquery.min.js"></script>
     <script src="/lib/jquery-contextmenu/jquery.contextMenu.min.js"></script>

web/maintain/std_glj_lib/js/glj.js

@@ -428,7 +428,6 @@ let repositoryGljObj = {
         }
     },
     onCellEditEnd: function(sender, args) {
-        console.log(args);
         let me = repositoryGljObj, that = gljComponentOprObj,
             rObj = sheetsOprObj.combineRowData(me.workBook.getSheet(0), me.setting, args.row, me),
             updateArr = [], addArr = [], updateBasePrcArr = [];
@@ -1005,8 +1004,8 @@ let repositoryGljObj = {
     updateRationBasePrcRq: function (basePrcArr) {
         let me = this;
         me.prevent = true;
+        me.workBook.focus(false);
         $.bootstrapLoading.start();
-        //me.workBook.focus(false);
         $.ajax({
             type: 'post',
             url: 'api/updateRationBasePrc',
@@ -1016,9 +1015,9 @@ let repositoryGljObj = {
                 if(result.error){
                     alert("计算定额基价失败");
                 }
-                $.bootstrapLoading.end();
+                me.workBook.focus(true);
                 me.prevent = false;
-                //me.workBook.focus(true);
+                $.bootstrapLoading.end();
             }
         });
     },