From ddb0231ef7c5cf2bad9d3f1afc2f733674ad38a5 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 24 八月 2023 14:50:51 +0800
Subject: [PATCH] 再修理按钮

---
 force-app/main/default/pages/ReantalApplySeriesNo.page |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/force-app/main/default/pages/ReantalApplySeriesNo.page b/force-app/main/default/pages/ReantalApplySeriesNo.page
index e826778..a3f1bf6 100644
--- a/force-app/main/default/pages/ReantalApplySeriesNo.page
+++ b/force-app/main/default/pages/ReantalApplySeriesNo.page
@@ -1,9 +1,11 @@
-<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: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.blockUIcss)}"/>
+    <apex:stylesheet value="{!URLFOR($Resource.listTable)}"/>
+    <!-- 20230525 ljh lightning  -->
     <style type="text/css">
     .bPageBlock .detailList .dataCol {
         width: auto;
@@ -23,8 +25,10 @@
         }
     </script>
     <apex:form id="allForm">
+        <apex:outputPanel id="pageallPanel">
         <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,12 +51,30 @@
                 </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;" class="detailList" border="0" cellpadding="0" cellspacing="0" >
+                <tr>
+                    <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 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