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/RentalFixtureSetAssign.page | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/pages/RentalFixtureSetAssign.page b/force-app/main/default/pages/RentalFixtureSetAssign.page
index 42946a5..9915642 100644
--- a/force-app/main/default/pages/RentalFixtureSetAssign.page
+++ b/force-app/main/default/pages/RentalFixtureSetAssign.page
@@ -511,11 +511,17 @@
<apex:inputField id="campaignType" value="{!parentObj.CampaignType__c}" />
</td>
</apex:outputPanel>
- <td colspan="2" style="text-align:end;">
+ <!-- 20230526 ljh lightning start-->
+ <!-- <td colspan="2" style="text-align:end;"> -->
+ <td style="text-align:end;">
+ <!-- 20230526 ljh lightning end-->
<apex:commandButton action="{!defaultScheduel}" disabled="{!parentObj.Demo_purpose1__c=='鍏朵粬'||parentObj.Status__c!='宸叉壒鍑�'}" onclick="if(!defualtconfirm()) return false;blockme();" oncomplete="unblockUI();" value="榛樿鎺掗槦" rerender="message,campaignType"/>
<!-- 20220105 ljh rerender add cmpid -->
</td>
- <td style="width:190px;">
+ <!-- 20230526 ljh lightning start-->
+ <!-- <td style="width:190px;"> -->
+ <td>
+ <!-- 20230526 ljh lightning end-->
<apex:outputPanel rendered="{!!(parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤'||parentObj.Status__c!='宸叉壒鍑�')}">
<apex:commandButton style="margin-left:20px;" onclick="if(!confirmSpecial()) return false;blockme();" action="{!specialScheduel}" disabled="{parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤'||parentObj.Status__c!='宸叉壒鍑�'}" value="鐗规畩鎺掗槦" rerender="cmpid,checEventFrame,message,campaignType" oncomplete="unblockUI();" />
</apex:outputPanel>
--
Gitblit v1.9.1