From ff87d710ed43397f198e2c3ae41b672dd50d3e93 Mon Sep 17 00:00:00 2001
From: LiJinHuan <lijinhuan@prec-tech.com>
Date: 星期二, 06 六月 2023 17:37:38 +0800
Subject: [PATCH] 备品页面框架

---
 force-app/main/default/components/RelationListPagingCmp.component |    3 ++-
 force-app/main/default/staticresources/RelationListPagingCmpJS.js |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/components/RelationListPagingCmp.component b/force-app/main/default/components/RelationListPagingCmp.component
index 8601682..fe2b49f 100644
--- a/force-app/main/default/components/RelationListPagingCmp.component
+++ b/force-app/main/default/components/RelationListPagingCmp.component
@@ -376,6 +376,7 @@
     }
     // 20230523  ljh lightning start 
     if(i == 0){
+        sbwidth = scrollbarWidth();
         i++;
         tableWidth = j$('body .pbBody table#tableHeader').width();
         // var widthTemp = 0;
@@ -387,7 +388,7 @@
                 //widthTemp += temp;
             }
         });
-        var blockWidthNew = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width();
+        var blockWidthNew = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width()-sbwidth;
         // console.log(widthTemp+'~'+blockWidthNew+'~'+tableWidth);
         var tableHeader_L =  j$(escapeVfId('tableHeader_L')).width();
         j$('div#in_Div_L').css('width', tableHeader_L+ 'px'); 
diff --git a/force-app/main/default/staticresources/RelationListPagingCmpJS.js b/force-app/main/default/staticresources/RelationListPagingCmpJS.js
index 821480a..674ddbe 100644
--- a/force-app/main/default/staticresources/RelationListPagingCmpJS.js
+++ b/force-app/main/default/staticresources/RelationListPagingCmpJS.js
@@ -337,7 +337,7 @@
     sbwidth = scrollbarWidth();
     // 20230531 ljh start 
     // blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width() - widthAjustment - sbwidth - 20;
-    blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width();
+    blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width()- sbwidth;
     // 20230531 ljh end 
     //銈炽兂銉濄儘銉笺儓銇伄銇D銈掑鏇�
     // 20230519 ljh start

--
Gitblit v1.9.1