debug

web/building_saas/complementary_ration_lib/js/ration.js

@@ -74,33 +74,48 @@ let rationOprObj = {
             me.rationSelInit(row);
         }
     },
-    rationSelInit: function (row) {
+    //focusOnSection,焦点返回章节表
+    rationSelInit: function (row, focusOnSection = null) {
         let me = rationOprObj,
             sheetGLJ = rationGLJOprObj.sheet, settingGLJ = rationGLJOprObj.setting,
             sheetCoe = rationCoeOprObj.sheet, settingCoe = rationCoeOprObj.setting,
             sheetAss = rationAssistOprObj.sheet, settingAss = rationAssistOprObj.setting,
             sheetInst = rationInstObj.sheet, settingInst = rationInstObj.setting;
-        sheetCommonObj.cleanSheet(sheetGLJ, settingGLJ, -1);
-        sheetCommonObj.cleanSheet(sheetCoe, settingCoe, -1);
-        sheetCommonObj.cleanSheet(sheetAss, settingAss, -1);
-        sheetCommonObj.cleanSheet(sheetInst, settingInst, -1);
+        sheetCommonObj.cleanData(sheetGLJ, settingGLJ, -1);
+        sheetCommonObj.cleanData(sheetCoe, settingCoe, -1);
+        sheetCommonObj.cleanData(sheetAss, settingAss, -1);
+        sheetCommonObj.cleanData(sheetInst, settingInst, -1);
         let cacheSection = me.getCache();
         if (cacheSection && row < cacheSection.length) {
             rationGLJOprObj.getGljItems(cacheSection[row], function () {
-                me.workBook.focus(true);
+                if (focusOnSection) {
+                    sectionTreeObj.workBook.focus(true);
+                } else {
+                    me.workBook.focus(true);
+                }
             });
             rationCoeOprObj.getCoeItems(cacheSection[row], function () {
-                me.workBook.focus(true);
+                if (focusOnSection) {
+                    sectionTreeObj.workBook.focus(true);
+                } else {
+                    me.workBook.focus(true);
+                }
             });
             rationAssistOprObj.getAssItems(cacheSection[row]);
             rationInstObj.getInstItems(cacheSection[row], function () {
-                me.workBook.focus(true);
+                if (focusOnSection) {
+                    sectionTreeObj.workBook.focus(true);
+                } else {
+                    me.workBook.focus(true);
+                }
             });
         }
         else {
             rationGLJOprObj.currentRationItem = null;
         }
-        me.workBook.focus(true);
+        if (!focusOnSection) {
+            me.workBook.focus(true);
+        }
     },
     isDef: function (v) {
         return v !== undefined && v !== null;

web/building_saas/complementary_ration_lib/js/ration_glj.js

@@ -409,7 +409,7 @@ var rationGLJOprObj = {
                             bV = b.gljType + b.code;
                         if (aV > bV) {
                             return 1;
-                        } else if (av < bV) {
+                        } else if (aV < bV) {
                             return -1
                         }
                         return 0;
@@ -434,7 +434,7 @@ var rationGLJOprObj = {
                         bV = b.gljType + b.code;
                     if (aV > bV) {
                         return 1;
-                    } else if (av < bV) {
+                    } else if (aV < bV) {
                         return -1
                     }
                     return 0;
@@ -574,7 +574,7 @@ var rationGLJOprObj = {
                             bV = b.gljType + b.code;
                         if (aV > bV) {
                             return 1;
-                        } else if (av < bV) {
+                        } else if (aV < bV) {
                             return -1
                         }
                         return 0;
@@ -596,7 +596,7 @@ var rationGLJOprObj = {
                     bV = b.gljType + b.code;
                 if (aV > bV) {
                     return 1;
-                } else if (av < bV) {
+                } else if (aV < bV) {
                     return -1
                 }
                 return 0;

web/building_saas/complementary_ration_lib/js/section_tree.js

@@ -462,7 +462,7 @@ let sectionTreeObj = {
             rationOprObj.workBook.getSheet(0).clearSelection();
             rationOprObj.getRationItems(node.data.ID, function () {
                 rationOprObj.workBook.getActiveSheet().setActiveCell(0, 0);
-                rationOprObj.rationSelInit(0);
+                rationOprObj.rationSelInit(0, true);
             });
             rationOprObj.setCombo(rationOprObj.workBook.getSheet(0), 'dynamic');
         }

web/building_saas/main/html/main.html

@@ -1477,7 +1477,7 @@
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">说明</h5>
+                <h5 class="modal-title">补注</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>

web/building_saas/main/js/controllers/material_controller.js

@@ -179,6 +179,7 @@ let MaterialController = {
     initSpread:function () {
         if(!this.spread){
             this.spread = SheetDataHelper.createNewSpread($("#replaceM")[0]);
+            sheetCommonObj.spreadDefaultStyle(this.spread);
             this.initSheet();
         }else {
             this.spread.refresh();

web/building_saas/main/js/main.js

@@ -136,6 +136,7 @@ function slideResize(eles, limit, type, callback) {
             else{
                 eles.nearSpread[type](nEleChangeSize);
                 eles.farSpread[type](fEleChangeSize - navSize);
+                eles.farElement[type](fEleChangeSize);
             }
             //实时刷新页面
             mouseMoveCount+=Math.abs(moveSize);//取移动的决对值
@@ -219,6 +220,7 @@ function setSizeWithPercent(tag,eles,nearSize,farSize,type) {
         nearSize = (nearSize/(nearSize + farSize))* totalHeight;
         eles.nearSpread[type](nearSize);
         eles.farSpread[type](totalHeight - nearSize);
+        eles.farElement[type](totalHeight - nearSize + navSize);
     }
 }
 
@@ -235,6 +237,7 @@ function setDefaultSize(tag,eles,type) {
         let nearSize = (o_nearSize/(o_nearSize + o_farSize))* totalHeight;
         eles.nearSpread[type](nearSize);
         eles.farSpread[type](totalHeight - nearSize);
+        eles.farElement[type](totalHeight - nearSize + navSize);
     }
 }
 

web/building_saas/main/js/views/std_billsGuidance_lib.js

@@ -772,6 +772,7 @@ const billsGuidance = (function () {
                             $(input).prop('checked', false);
                         }
                         $(this).prop('checked', 'checked');
+                        elfItem.workBook.getSheet(0).endEdit();
                     } else {//多选
 
                     }
@@ -1374,7 +1375,7 @@ const billsGuidance = (function () {
             refreshWorkBook();
         });
         //监听alt建，确定选项单选多选状态
-        $('#billsGuidance_items').keydown(function(e){
+       /* $('#billsGuidance_items').keydown(function(e){
             if(e.keyCode === 18){
                 billsGuidanceSelMode = 1;
             }
@@ -1383,7 +1384,7 @@ const billsGuidance = (function () {
             if(e.keyCode === 18){
                 billsGuidanceSelMode = 0;
             }
-        });
+        });*/
     }
     //刷新表
     //@return {void}