分摊功能bug

web/building_saas/main/html/divide.html

@@ -83,10 +83,10 @@
       </div>
       <div class="divide_side" style="display: inline-block" id="divide_side">
       
-        <div class="tab-content" style="width: 99%; height: 100%; float: left">
+        <div class="tab-content" style="width: 100%; height: 100%; float: left">
           <div class="resize-x" id="divideSideResize"></div>
           <!--定额库-->
-          <div class="tab-pane" id="divide_de">
+          <div class="tab-pane" style=" float:left;" id="divide_de">
             <div class="tools-bar-height-d container-fluid" id="divide_deToolsBar">
                 <div class="p-1 row">
                     <select class="form-control form-control-sm col-6" id="divide_stdRationLibSelect">
@@ -112,7 +112,7 @@
                
                 </div>
             </div>
-            <div class="top-content" id="divide_deTopDiv" style="overflow: hidden">
+            <div class="" id="divide_deTopDiv" style="overflow: hidden">
                 <div class="" id="divide_stdRationChapter"></div>
             </div>
             <div class="resize-y" id="divide_deResize" style="background: #F1F1F1"></div>

web/building_saas/main/js/views/divide_view.js

@@ -1121,7 +1121,8 @@ let divideObj = {
         let rg_sideResizeEles = this.getSubSideResize();
         SlideResize.loadHorizonWidth(rg_sideResizeEles.eleObj.module,
             [rg_sideResizeEles.eleObj.resize], [rg_sideResizeEles.eleObj.left, rg_sideResizeEles.eleObj.right]);
-        $("#divide_gljSubDiv").width( $('#divide_itemTextDiv').width() - rg_sideResizeEles.eleObj.resize.width() - 30)
+        $("#divide_gljSubDiv").width( $('#divide_itemTextDiv').width() - rg_sideResizeEles.eleObj.resize.width() - 30);
+
     }
   },
   initDivideGljSubTab:function(){
@@ -1381,7 +1382,7 @@ $('#tab_divide').on('shown.bs.tab', function (e) {
 })
 
 $('.divide-nav-link').bind('click', function () {//$('.side-tabs ul li a').bind   2018-11-23  使用更多标签，所以不能这样绑定事件了
-    var tab = $(this), tabPanel = $(tab.attr('relaPanel'));
+   var tab = $(this), tabPanel = $(tab.attr('relaPanel'));
     if(tab.hasClass('disabled')){
         return;
     }
@@ -1443,20 +1444,24 @@ SlideResize.horizontalSlide(dSideResizeEles.eleObj, dSideResizeEles.limit, funct
   divideObj.refreshViews();  
 });
 
-//分摊左和右表水平拖动
-let divideLeftAndRight={
-  eleObj:{
-    module: 'divideLeftRight',
-    resize: $('#divideMiddleResize'),
-    parent: $('#divide_top'),
-    left: $('#divide_main_sheet'),
-    right: $('#divide_bills_div')
-  },
-  limit:{
-    min: 150,
-    max: `$('#divide_top').width()-150`
+function getDivideLeftAndRightReside(){
+  return {
+    eleObj:{
+      module: 'divideLeftRight',
+      resize: $('#divideMiddleResize'),
+      parent: $('#divide_top'),
+      left: $('#divide_main_sheet'),
+      right: $('#divide_bills_div')
+    },
+    limit:{
+      min: 150,
+      max: `$('#divide_top').width()-150`
+    }
   }
 }
+
+//分摊左和右表水平拖动
+let divideLeftAndRight = getDivideLeftAndRightReside();
 SlideResize.horizontalSlide(divideLeftAndRight.eleObj, divideLeftAndRight.limit, function(){
   if(divideObj.divideSpread) divideObj.divideSpread.refresh();
   if(divideObj.billsSpread) divideObj.billsSpread.refresh();
@@ -1480,7 +1485,12 @@ function showDivideSide(tabPanel, show, id){
               if(rationLibObj.divide_rationChapterSpread) rationLibObj.divide_rationChapterSpread.refresh();
               if(rationLibObj.divide_sectionRationsSpread) rationLibObj.divide_sectionRationsSpread.refresh();
             });
-          }
+          } 
+      });
+      let divideLeftAndRight = getDivideLeftAndRightReside();
+      SlideResize.loadHorizonWidth(id, [divideLeftAndRight.eleObj.resize], [divideLeftAndRight.eleObj.left, divideLeftAndRight.eleObj.right], function(){      
+        if(divideObj.divideSpread) divideObj.divideSpread.refresh();
+        if(divideObj.billsSpread) divideObj.billsSpread.refresh();
       });
   } else {
       divideSideResizeEles.eleObj.left.css('width', '100%');
@@ -1499,6 +1509,8 @@ $('#divide_stdRationTab').bind('click', function () {
   divideObj.initNavItem();
 });
 
+
+
 $('#divide_stdRationLibSelect').change(function () {
   var select = $(this);
   if (this.children.length !== 0) {

web/building_saas/main/js/views/std_ration_lib.js

@@ -17,8 +17,8 @@ var rationLibObj = {
     refreshSettingForHint: function () {
         TREE_SHEET_HELPER.initSetting($('#stdSectionRations')[0], rationLibObj.sectionRationsSetting);
     },
-    checkSpread: function () {
-        let from = $('#divide_de').is(':visible')?"divide_":"";
+    checkSpread: function (tfrom) {
+        let from = $('#divide_de').is(':visible')||tfrom?"divide_":"";
         if (!this[from+'rationChapterSpread']) {
              this[from+'rationChapterSpread'] = SheetDataHelper.createNewSpread($(`#${from}stdRationChapter`)[0]);
              let rationChapterSpread = this[from+'rationChapterSpread'];
@@ -164,16 +164,17 @@ var rationLibObj = {
     },
     //双击隐藏显示
     onChapterSpreadCellDoubleClick: function (sender, args) {
+        let from = $('#divide_de').is(':visible')?"divide_":"";
         let me = rationLibObj;
-        let node = me.tree.items[args.row];
+        let node = me[from+'tree'].items[args.row];
         if (!node || node.children.length === 0)
             return;
         node.setExpanded(!node.expanded);
-        sessionStorage.setItem('stdRationLibExpState', me.tree.getExpState(me.tree.items));
+        sessionStorage.setItem(from+'stdRationLibExpState', me[from+'tree'].getExpState(me[from+'tree'].items));
         TREE_SHEET_HELPER.massOperationSheet(args.sheet, function () {
             let iCount = node.posterityCount(), i, child;
             for (i = 0; i < iCount; i++) {
-                child = me.tree.items[args.row + i + 1];
+                child = me[from+'tree'].items[args.row + i + 1];
                 args.sheet.setRowVisible(args.row + i + 1, child.visible, args.sheetArea);
             }
             args.sheet.invalidateLayout();