From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111

---
 force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page b/force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page
index 9c86448..1f8d342 100644
--- a/force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page
+++ b/force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page
@@ -49,13 +49,13 @@
             </table>
             <table width="100%" cellspacing="0" cellpadding="0" >
                 <tr>
-                    <td width="15%">&nbsp;</td>
-                    <td width="3%">&nbsp;</td>
-                    <td width="7%">&nbsp;</td>
-                    <td width="15%">&nbsp;</td>
+                    <td width="12%">&nbsp;</td>
+                    <td width="2%">&nbsp;</td>
+                    <td width="2%">&nbsp;</td>
+                    <td width="20%">&nbsp;</td>
                     <td width="5%">&nbsp;</td>
-                    <td width="3%">&nbsp;</td>
-                    <td width="15%">&nbsp;</td>
+                    <td width="2%">&nbsp;</td>
+                    <td width="20%">&nbsp;</td>
                     <td width="2%">&nbsp;</td>
                     <td width="2%">&nbsp;</td>
                     <td width="2%">&nbsp;</td>
@@ -113,11 +113,11 @@
                     </apex:outputText>涓湀</td>
                     <!-- URF闄愭鍚堝悓2鏈� XXF 20220818 start -->
                     <apex:outputPanel rendered="{!targetObj.estimate.URF_Contract__c}" layout="none">
-                        <td colspan="2">P绯诲垪缁翠慨娆℃暟</td>
+                        <td colspan="2">P绯诲垪鍚堝悓澶т慨娆℃暟</td>
                         <td >锛�</td>
                         <!-- <td>{!targetObj.estimate.URF_P_MaxRepairCount__c}</td> -->
                         <!-- URF闄愭鍚堝悓2鏈� XXF 20220818 start -->
-                        <td >{!IF(targetObj.estimate.URF_P_MaxRepairCount__c == '0', '/ ',targetObj.estimate.URF_P_MaxRepairCount__c)}&nbsp;娆�</td>
+                        <td >{!IF(targetObj.estimate.URF_P_MaxRepairCount__c == '0' || targetObj.estimate.URF_P_MaxRepairCount__c == NULL, '/ ',targetObj.estimate.URF_P_RepairTime__c)}&nbsp;娆�</td>
                     </apex:outputPanel>
                     <!-- URF闄愭鍚堝悓2鏈� XXF 20220818 end -->
                 </tr>
@@ -136,9 +136,9 @@
                     <td colspan="1">{!targetObj.estimate.Maintenance_Contract__r.Service_Contract_Staff__r.Name}</td>
                     <!-- URF闄愭鍚堝悓2鏈� XXF 20220818 start -->
                     <apex:outputPanel rendered="{!targetObj.estimate.URF_Contract__c}" layout="none">
-                        <td colspan="2">V绯诲垪缁翠慨娆℃暟</td>
+                        <td colspan="2">V绯诲垪鍚堝悓澶т慨娆℃暟</td>
                         <td >锛�</td>
-                        <td >{!IF(targetObj.estimate.URF_V_MaxRepairCount__c == '0', '/ ',targetObj.estimate.URF_V_MaxRepairCount__c)}&nbsp;娆�</td>
+                        <td >{!IF(targetObj.estimate.URF_V_MaxRepairCount__c == '0' || targetObj.estimate.URF_V_MaxRepairCount__c == NULL, '/ ',targetObj.estimate.URF_V_RepairTime__c)}&nbsp;娆�</td>
                     </apex:outputPanel>
                     <!-- URF闄愭鍚堝悓2鏈� XXF 20220818 end -->
                 </tr>

--
Gitblit v1.9.1