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/OPDSortManage.page | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/force-app/main/default/pages/OPDSortManage.page b/force-app/main/default/pages/OPDSortManage.page index b392ecd..06f5e5c 100644 --- a/force-app/main/default/pages/OPDSortManage.page +++ b/force-app/main/default/pages/OPDSortManage.page @@ -1,9 +1,9 @@ -<apex:page controller="OPDSortManageController" action="{!init}" showHeader="false" sidebar="true" id="allPage" title="OPD璁″垝绠$悊琛�"> +<apex:page lightningStylesheets="true" controller="OPDSortManageController" action="{!init}" showHeader="false" sidebar="true" id="allPage" title="OPD璁″垝绠$悊琛�" > <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/> <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/> <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/> -<apex:includeScript value="/soap/ajax/29.0/connection.js"/> -<apex:includeScript value="/soap/ajax/29.0/apex.js"/> +<apex:includeScript value="{!URLFOR($Resource.connection20)}"/> +<apex:includeScript value="{!URLFOR($Resource.apex20)}"/> <style type="text/css"> ul,li{ padding:0;margin-top:10px;list-style:none} td{ @@ -709,7 +709,7 @@ </apex:pageBlock> <apex:pageBlock title="寰呮帓搴忔爮" id="OPDSection2" rendered="true" > - <div style="position:relative;height: 0px;"> + <div style="position:relative;height: 10px;"> <apex:commandButton onclick="saveAddJs();return false;" value="纭杩藉姞" style="position:relative;top: -45px;left: 120px; width:100px;" rendered="true" /> <input type="hidden" id="allPage:allForm:allBlock:OPDSection2:unCheckedOPDPlanCount" value="{!unCheckedOPDPlanCount}" /> </div> -- Gitblit v1.9.1