From eae3e7ef625bc54350d61e9c3390d71f1fe1e008 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@prec-tech.com>
Date: 星期四, 25 五月 2023 14:13:16 +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 | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/pages/ReantalApplySeriesNo.page b/force-app/main/default/pages/ReantalApplySeriesNo.page
index e826778..5907b92 100644
--- a/force-app/main/default/pages/ReantalApplySeriesNo.page
+++ b/force-app/main/default/pages/ReantalApplySeriesNo.page
@@ -1,9 +1,12 @@
-<apex:page controller="ReantalApplySeriesNoController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="搴忓垪鏌ョ湅">
- <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<!-- <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 -->
<style type="text/css">
.bPageBlock .detailList .dataCol {
width: auto;
@@ -24,7 +27,8 @@
</script>
<apex:form id="allForm">
<apex:pageBlock id="searchBlock" title="搴忓垪淇℃伅">
- <apex:pageBlockSection columns="3" id="mainSection">
+ <!-- 20230525 ljh lightning start -->
+ <!-- <apex:pageBlockSection columns="3" id="mainSection">
<apex:pageBlockSectionItem >
<apex:outputLabel value="鍨嬪彿:" />
<apex:outputField value="{!raq.Fixture_Model_No__c}"/>
@@ -47,11 +51,28 @@
</apex:pageBlockSectionItem>
<apex:pageBlockSectionItem >
<apex:outputLabel value="搴忓垪绫诲瀷:"/>
- <!-- {!Isadmix} -->
<apex:outputText value="{!IF(Isadmix,'娣峰悎','鍗曚竴')}"/>
- <!-- <input name="Isadmix" disabled="true" type="checkbox" value="{!Isadmix}" checked="{!IF(Isadmix,'checked','')}" /> -->
</apex:pageBlockSectionItem>
- </apex:pageBlockSection>
+ </apex:pageBlockSection> -->
+ <table style="width:100%;margin:10px 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>
+ </tr>
+ <tr>
+ <td>澶囧搧鍒嗙被:</td>
+ <td>{!raq.Equipment_Type__c}</td>
+ <td>浜у搧鍒嗙被:</td>
+ <td>{!raq.Product_category__c}</td>
+ <td>搴忓垪绫诲瀷:</td>
+ <td>{!IF(Isadmix,'娣峰悎','鍗曚竴')}</td>
+ </tr>
+ </table>
+ <!-- 20230525 ljh lightning end -->
</apex:pageBlock>
<apex:outputPanel id="message">
<apex:pageMessages />
--
Gitblit v1.9.1