From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/pages/NotReceivingNoteListFirst.page | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/pages/NotReceivingNoteListFirst.page b/force-app/main/default/pages/NotReceivingNoteListFirst.page
index aacec7c..4cff272 100644
--- a/force-app/main/default/pages/NotReceivingNoteListFirst.page
+++ b/force-app/main/default/pages/NotReceivingNoteListFirst.page
@@ -1,10 +1,11 @@
<apex:page controller="NotReceivingNoteListFirstController" action="{!init}" showHeader="false" sidebar="false" id="allPage" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
-<apex:stylesheet value="{!URLFOR($Resource.MainFixtureSelectCss)}"/>
+<!-- <apex:stylesheet value="{!URLFOR($Resource.MainFixtureSelectCss)}"/> -->
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
+<!-- <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/> -->
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<script type="text/javascript">
var heightAjustment = 120;
var widthAjustment = 30;
@@ -12,6 +13,23 @@
searchOpp();
}
</script>
+<style type="text/css">
+table.list .col_Internal_asset_location__c{width:100px;}
+table.list .col_Sales_order_number__c{width:100px;}
+table.list .col_OrderCode__c{width:100px;}
+table.list .col_ApprovalNumber__c{width:100px;}
+table.list .col_Asset_loaner_category__c{width:100px;}
+table.list .col_DateOfDelivery__c{width:100px;}
+table.list .col_ReceivingNoteSummary_Cnt__c{width:100px;}
+table.list .col_ContactPerson__c{width:100px;}
+table.list .col_ReceivingNoteNo_New__c{width:100px;}
+table.list .col_RN_Status__c{width:100px;}
+table.list .col_NotReceivingNoteListFirst_Link__c{width:100px;}
+body .bPageBlock .detailList .dataCol{
+ width: 8%;
+}
+</style>
+
<apex:form id="allForm">
<apex:actionFunction name="searchOpp" action="{!searchOpp}" rerender="allForm,checEventFrame" oncomplete="unblockUI();">
</apex:actionFunction>
@@ -78,7 +96,7 @@
</apex:form>
<apex:outputPanel id="checEventFrame">
<script type="text/javascript">
- j$("table#tableData").disabled = true;
+ /*j$("table#tableData").disabled = true;
function windowResize() {
var heightsp = 0;
if( typeof bottomspace != 'undefined' ){
@@ -124,7 +142,7 @@
j$('div#in_Div').css('height', (blockHeight + sbwidth) +'px');
}
}
- }
+ } */
</script>
</apex:outputPanel>
</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1