From cbe8a54c8dc4bdf132df6003682d5bef85af5fe6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期一, 29 五月 2023 15:32:43 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/pages/AccessorySelect.page | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/pages/AccessorySelect.page b/force-app/main/default/pages/AccessorySelect.page
index 4c67261..9d0eff7 100644
--- a/force-app/main/default/pages/AccessorySelect.page
+++ b/force-app/main/default/pages/AccessorySelect.page
@@ -1,4 +1,7 @@
-<apex:page controller="AccessorySelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<!-- 20230526 ljh lightning -->
+<!-- <apex:page controller="AccessorySelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> -->
+<apex:page controller="AccessorySelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
+
<head>
<title>闄勫睘鍝侀�夋嫨</title>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
@@ -140,14 +143,17 @@
</script>
</apex:outputPanel>
<!-- </apex:pageBlockSectionItem> -->
-
- <apex:pageBlockButtons location="bottom">
- <!-- <apex:commandButton style="float:left;" value="妫�绱�" action="{!searchOpp}" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" /> -->
- <apex:commandButton style="float:left;" action="{!save}" value="淇濆瓨" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="unblockUI();" />
- <apex:commandButton style="float:left;" value="鍙栨秷鍒嗛厤" onclick="unassign(); return false;" rerender="allForm,checEventFrame"/>
- <apex:commandButton style="float:left;" value="鍙栨秷" onclick="clickCancel(); return false;" />
- <apex:commandButton style="float:right;" action="{!turnback}" value="杩斿洖" rerender="allForm,checEventFrame"/>
- </apex:pageBlockButtons>
+ <!-- 20230526 ljh lightning start outputPanel 鏂板姞 pageBlockButtons娉ㄩ噴-->
+ <apex:outputPanel style="float:left;">
+ <!-- <apex:pageBlockButtons location="bottom"> -->
+ <!-- <apex:commandButton style="float:left;" value="妫�绱�" action="{!searchOpp}" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" /> -->
+ <apex:commandButton style="float:left;" action="{!save}" value="淇濆瓨" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="unblockUI();" />
+ <apex:commandButton style="float:left;" value="鍙栨秷鍒嗛厤" onclick="unassign(); return false;" rerender="allForm,checEventFrame"/>
+ <apex:commandButton style="float:left;" value="鍙栨秷" onclick="clickCancel(); return false;" />
+ <apex:commandButton style="float:right;" action="{!turnback}" value="杩斿洖" rerender="allForm,checEventFrame"/>
+ <!-- </apex:pageBlockButtons> -->
+ </apex:outputPanel>
+ <!-- 20230526 ljh lightning end-->
<div style="clear:both;"></div>
<apex:outputPanel id="message">
--
Gitblit v1.9.1