From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/ConsumEquipmentSetReturn.page | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/pages/ConsumEquipmentSetReturn.page b/force-app/main/default/pages/ConsumEquipmentSetReturn.page
index 778b569..1bb3094 100644
--- a/force-app/main/default/pages/ConsumEquipmentSetReturn.page
+++ b/force-app/main/default/pages/ConsumEquipmentSetReturn.page
@@ -1,4 +1,4 @@
-<apex:page Controller="ConsumEquipmentSetReturnController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<apex:page Controller="ConsumEquipmentSetReturnController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
<head>
<meta name="format-detection" content="telephone=no"/>
<meta name="viewport" content="width=device-width,initial-scale=1"/>
@@ -7,6 +7,9 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
+
+<apex:stylesheet value="{!URLFOR($Resource.ConsumEquipmentSetReturnCss)}"/>
+
<style type="text/css">
div#out_Div_L {
position:relative;
@@ -27,6 +30,9 @@
font-size: 110%;
margin-right: 20px;
}
+/* add by yc 202202-17 **/
+.col_EquipmentManagementCode_OldData__c {display: none;}
+.col_Scroll{display: none;}
</style>
<apex:form id="allForm">
--
Gitblit v1.9.1