From cc399638fd26fe0a9f0bc0bb31ed4afcc21c928d Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期一, 07 八月 2023 09:39:03 +0800
Subject: [PATCH] 20230807页面提交

---
 force-app/main/default/pages/ProductRepairQuote.page |   47 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/force-app/main/default/pages/ProductRepairQuote.page b/force-app/main/default/pages/ProductRepairQuote.page
index 9870619..5e9db9f 100644
--- a/force-app/main/default/pages/ProductRepairQuote.page
+++ b/force-app/main/default/pages/ProductRepairQuote.page
@@ -1,5 +1,6 @@
 <apex:page Controller="ProductRepairQuoteController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="浜у搧淇悊鎶ヤ环棰勪及" lightningStylesheets="true">
-    
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
     <apex:form id="allForm">
         <apex:outputPanel id="allPanel">
             <apex:pageBlock title="浜у搧淇悊鎶ヤ环棰勪及" id="allBlock">
@@ -26,22 +27,24 @@
                             </td>
                             <!-- lighting鍗囩骇 20230210 lt 鏂囧瓧涓茶闂 add  ;width:200px;height:25px; -->
                             <th style="text-align:right;width:200px;height:25px;">
+                                {!$ObjectType.Product2.fields.Can_Repair__c.label} 锛�
+                            </th>
+                            <td align="left">
+                                <apex:outputText value="{!canRepair}" />
+                            </td>
+                             
+                        </tr>
+                        <tr>
+                            <th style="text-align:right;width:200px;height:25px;">
                                 {!$ObjectType.Product2.fields.RepairListPriceLevelB__c.label} 锛�
                             </th>
                             <td align="left">
                                 <apex:outputText value="{!repairListPriceLevelB}" />
                             </td>
-                        </tr>
-                        <tr>
                             <!-- lighting鍗囩骇 20230210 lt 鏂囧瓧涓茶闂 add  ;height:25px; -->
-                            <th style="text-align:right;height:25px;">
-                                {!$ObjectType.Product2.fields.RepairListPriceLevelC__c.label} 锛�
-                            </th>
-                            <td align="left">
-                                <apex:outputText value="{!repairListPriceLevelC}" />
-                            </td>
-                            <!-- lighting鍗囩骇 20230210 lt 鏂囧瓧涓茶闂 add  ;height:25px; -->
-                            <th style="text-align:right;height:25px;">
+                            
+                            
+                            <th style="text-align:right;width:200px;height:25px;">
                                 {!$ObjectType.Product2.fields.PartSupplyFinishDate__c.label} 锛�
                             </th>
                             <td align="left">
@@ -49,7 +52,29 @@
                                     <apex:param value="{!partSupplyFinishDate}" />
                                 </apex:outputText>
                             </td>
+                           
+                            
+                            <!-- lighting鍗囩骇 20230210 lt 鏂囧瓧涓茶闂 add  ;height:25px; -->
                         </tr>
+                        <tr>
+                            <th style="text-align:right;width:200px;height:25px;">
+                                {!$ObjectType.Product2.fields.RepairListPriceLevelC__c.label} 锛�
+                            </th>
+                            <td align="left">
+                                <apex:outputText value="{!repairListPriceLevelC}" />
+                            </td>
+                            <th style="text-align:right;width:200px;height:25px;">
+                                {!$ObjectType.Product2.fields.PartSupplyFinishDateExp__c.label} 锛�
+                            </th>
+
+                            <td align="left">
+                                <apex:outputText value="{0,date,yyyy/MM/dd}">
+                                    <apex:param value="{!partSupplyFinishDateExp}" />
+                                </apex:outputText>
+                                <!-- <apex:outputText value="{!partSupplyFinishDateExp}"/> -->
+                            </td>
+                        </tr>
+                       
                     </table>
                 </apex:pageBlock>
 

--
Gitblit v1.9.1