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/ReantalApplySeriesNo.page | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/force-app/main/default/pages/ReantalApplySeriesNo.page b/force-app/main/default/pages/ReantalApplySeriesNo.page
index 5907b92..a3f1bf6 100644
--- a/force-app/main/default/pages/ReantalApplySeriesNo.page
+++ b/force-app/main/default/pages/ReantalApplySeriesNo.page
@@ -1,12 +1,11 @@
<!-- <apex:page controller="ReantalApplySeriesNoController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="搴忓垪鏌ョ湅"> -->
<apex:page controller="ReantalApplySeriesNoController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="搴忓垪鏌ョ湅" lightningStylesheets="true">
<!-- 20230525 ljh lightning -->
-<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
- <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
- <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
- <apex:stylesheet value="{!URLFOR($Resource.listTable)}"/><!-- 20230525 ljh lightning -->
+ <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.listTable)}"/>
+ <!-- 20230525 ljh lightning -->
<style type="text/css">
.bPageBlock .detailList .dataCol {
width: auto;
@@ -26,6 +25,7 @@
}
</script>
<apex:form id="allForm">
+ <apex:outputPanel id="pageallPanel">
<apex:pageBlock id="searchBlock" title="搴忓垪淇℃伅">
<!-- 20230525 ljh lightning start -->
<!-- <apex:pageBlockSection columns="3" id="mainSection">
@@ -54,26 +54,27 @@
<apex:outputText value="{!IF(Isadmix,'娣峰悎','鍗曚竴')}"/>
</apex:pageBlockSectionItem>
</apex:pageBlockSection> -->
- <table style="width:100%;margin:10px 0;" >
+ <table style="width:100%;margin:10px 0;" class="detailList" border="0" cellpadding="0" cellspacing="0" >
<tr>
- <td>鍨嬪彿:</td>
- <td>{!raq.Fixture_Model_No__c}</td>
- <td>澶囧搧瀛樻斁鍦�:</td>
- <td>{!raq.Internal_asset_location__c}</td>
- <td>鏈儴:</td>
- <td>{!raq.Salesdepartment__c}</td>
+ <td align="right" style="padding-right:5px;">鍨嬪彿:</td>
+ <td align="left" >{!raq.Fixture_Model_No__c}</td>
+ <td align="right" style="padding-right:5px;">澶囧搧瀛樻斁鍦�:</td>
+ <td align="left" >{!raq.Internal_asset_location__c}</td>
+ <td align="right" style="padding-right:5px;">鏈儴:</td>
+ <td align="left" >{!raq.Salesdepartment__c}</td>
</tr>
<tr>
- <td>澶囧搧鍒嗙被:</td>
- <td>{!raq.Equipment_Type__c}</td>
- <td>浜у搧鍒嗙被:</td>
- <td>{!raq.Product_category__c}</td>
- <td>搴忓垪绫诲瀷:</td>
- <td>{!IF(Isadmix,'娣峰悎','鍗曚竴')}</td>
+ <td align="right" style="padding-right:5px;">澶囧搧鍒嗙被:</td>
+ <td align="left" >{!raq.Equipment_Type__c}</td>
+ <td align="right" style="padding-right:5px;">浜у搧鍒嗙被:</td>
+ <td align="left" >{!raq.Product_category__c}</td>
+ <td align="right" style="padding-right:5px;" >搴忓垪绫诲瀷:</td>
+ <td align="left" >{!IF(Isadmix,'娣峰悎','鍗曚竴')}</td>
</tr>
</table>
<!-- 20230525 ljh lightning end -->
</apex:pageBlock>
+ </apex:outputPanel>
<apex:outputPanel id="message">
<apex:pageMessages />
</apex:outputPanel>
--
Gitblit v1.9.1