From be8dc1e5c21fccf84cf25497d55e5261e93fbb35 Mon Sep 17 00:00:00 2001
From: zhangchunxu <1842059105@qq.com>
Date: 星期三, 02 八月 2023 17:01:29 +0800
Subject: [PATCH] 签收单 验收确认(经销商) 修改
---
force-app/main/default/staticresources/RelationListPagingCmpJS.js | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/staticresources/RelationListPagingCmpJS.js b/force-app/main/default/staticresources/RelationListPagingCmpJS.js
index 674ddbe..ffe2bb4 100644
--- a/force-app/main/default/staticresources/RelationListPagingCmpJS.js
+++ b/force-app/main/default/staticresources/RelationListPagingCmpJS.js
@@ -333,7 +333,9 @@
heightsp = bottomspace;
}
blockHeight = j$(window).innerHeight() - j$(escapeVfId('allPage:allForm:searchBlock')).height() - heightAjustment;
+ // console.log(j$(window).innerHeight() +'-'+ j$(escapeVfId('allPage:allForm:searchBlock')).height() +'-'+ heightAjustment+'-'+heightsp);
blockHeight = blockHeight - heightsp;
+
sbwidth = scrollbarWidth();
// 20230531 ljh start
// blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width() - widthAjustment - sbwidth - 20;
@@ -374,10 +376,23 @@
// 20230519 ljh 澧炶if鍒ゆ柇
// j$('div#out_Div').css('width', (blockWidth + sbwidth) + 'px');
// j$('div#in_Div').css('width', (blockWidth + sbwidth) + 'px');
- if (j$('table#tableData').width() > j$('div#in_Div').width()) {
- j$('div#out_Div').css('width', (blockWidth) + 'px');
- j$('div#in_Div').css('width', (blockWidth) + 'px');
+ // 20230704 ljh start
+ if(blockWidth > 1000){
+ // j$('div#out_Div').css('width', (blockWidth) + 'px');
+ // j$('div#in_Div').css('width', (blockWidth) + 'px');
+ if (j$('table#tableData').width() > j$('div#in_Div').width()) {
+ j$('div#out_Div').css('width', (blockWidth) + 'px');
+ j$('div#in_Div').css('width', (blockWidth) + 'px');
+ }
+ }else{
+ j$('table#tableData').css('width', (blockWidth) + 'px');
+ j$('table#tableHeader').css('width', (blockWidth) + 'px');
}
+ // if (j$('table#tableData').width() > j$('div#in_Div').width()) {
+ // j$('div#out_Div').css('width', (blockWidth) + 'px');
+ // j$('div#in_Div').css('width', (blockWidth) + 'px');
+ // }
+ // 20230704 ljh end
}
if (j$('table#tableData').width() > j$('div#in_Div').width()) {
j$('div#in_Div').css('height', (blockHeight + sbwidth) +'px');
--
Gitblit v1.9.1