From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page b/force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page
index f965f38..f082675 100644
--- a/force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page
+++ b/force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page
@@ -1,4 +1,4 @@
-<apex:page standardController="Maintenance_Contract_Estimate__c" extensions="MaintenanceContractVMPDFController" showHeader="false" sidebar="false" renderAs="pdf" action="{!init}" applyHtmlTag="false" >
+<apex:page standardController="Maintenance_Contract_Estimate__c" extensions="MaintenanceContractVMPDFController" showHeader="false" sidebar="false" renderAs="pdf" action="{!init}" applyHtmlTag="false" lightningStylesheets="true" >
<!-- renderAs="pdf" -->
<html>
@@ -49,12 +49,16 @@
</table>
<table width="100%" cellspacing="0" cellpadding="0" >
<tr>
- <td width="15%"> </td>
- <td width="3%"> </td>
- <td width="7%"> </td>
- <td width="15%"> </td>
+ <td width="12%"> </td>
+ <td width="2%"> </td>
+ <td width="2%"> </td>
+ <td width="20%"> </td>
<td width="5%"> </td>
- <td width="3%"> </td>
+ <td width="2%"> </td>
+ <td width="20%"> </td>
+ <td width="2%"> </td>
+ <td width="2%"> </td>
+ <td width="2%"> </td>
<td> </td>
</tr>
<tr>
@@ -64,6 +68,14 @@
<td>绉戝</td>
<td>锛�</td>
<td>{!targetObj.estimate.Department__c}</td>
+ <!-- URF闄愭鍚堝悓2鏈� XXF 20220818 start -->
+ <apex:outputPanel rendered="{!targetObj.estimate.URF_Contract__c}" layout="none">
+ <td colspan="2">鏄惁闄愭鍚堝悓</td>
+ <td >锛�</td>
+ <td >鏄�</td>
+ </apex:outputPanel>
+ <!-- URF闄愭鍚堝悓2鏈� XXF 20220818 end -->
+
</tr>
<tr>
<td>鍚堝悓绫诲瀷</td>
@@ -72,11 +84,23 @@
<td>鏄惁缁</td>
<td>锛�</td>
<apex:outputPanel rendered="{!(targetObj.estimate.New_Contract_Type_TxT__c == '鏂板搧鍚堝悓' || targetObj.estimate.New_Contract_Type_TxT__c == '棣栫鍚堝悓')}" layout="none">
- <td colspan="2">鏂扮鍚堝悓</td>
+ <td colspan="1">鏂扮鍚堝悓</td>
</apex:outputPanel>
<apex:outputPanel rendered="{!(targetObj.estimate.New_Contract_Type_TxT__c == '缁鍚堝悓' || targetObj.estimate.New_Contract_Type_TxT__c == '闈炵画绛惧悎鍚�')}" layout="none">
- <td colspan="2">缁鍚堝悓</td>
+ <td colspan="1">缁鍚堝悓</td>
</apex:outputPanel>
+ <!-- URF闄愭鍚堝悓2鏈� XXF 20220905 start -->
+ <apex:outputPanel rendered="{!(targetObj.estimate.New_Contract_Type_TxT__c != '鏂板搧鍚堝悓' && targetObj.estimate.New_Contract_Type_TxT__c != '棣栫鍚堝悓' && targetObj.estimate.New_Contract_Type_TxT__c != '缁鍚堝悓' && targetObj.estimate.New_Contract_Type_TxT__c != '闈炵画绛惧悎鍚�')}" layout="none">
+ <td colspan="1"></td>
+ </apex:outputPanel>
+ <!-- URF闄愭鍚堝悓2鏈� XXF 20220905 end -->
+ <!-- URF闄愭鍚堝悓2鏈� XXF 20220818 start -->
+ <apex:outputPanel rendered="{!targetObj.estimate.URF_Contract__c}" layout="none">
+ <td colspan="2">鏄惁鍚屾剰涓婇檺</td>
+ <td >锛�</td>
+ <td>鏄�</td>
+ </apex:outputPanel>
+ <!-- URF闄愭鍚堝悓2鏈� XXF 20220818 end -->
</tr>
<tr>
<td>鍚堝悓棰勫畾寮�濮嬫棩鏈�</td>
@@ -87,6 +111,15 @@
<td><apex:outputText value="{0,number,#,###}">
<apex:param value="{!targetObj.estimate.Contract_Range__c}" />
</apex:outputText>涓湀</td>
+ <!-- URF闄愭鍚堝悓2鏈� XXF 20220818 start -->
+ <apex:outputPanel rendered="{!targetObj.estimate.URF_Contract__c}" layout="none">
+ <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 == NULL, '/ ',targetObj.estimate.URF_P_RepairTime__c)} 娆�</td>
+ </apex:outputPanel>
+ <!-- URF闄愭鍚堝悓2鏈� XXF 20220818 end -->
</tr>
<tr>
<td>鎻愪氦瀵硅薄</td>
@@ -100,10 +133,17 @@
</apex:outputPanel> -->
<td>涓绘媴褰撹��</td>
<td>锛�</td>
- <td colspan="2">{!targetObj.estimate.Maintenance_Contract__r.Service_Contract_Staff__r.Name}</td>
+ <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 >锛�</td>
+ <td >{!IF(targetObj.estimate.URF_V_MaxRepairCount__c == '0' || targetObj.estimate.URF_V_MaxRepairCount__c == NULL, '/ ',targetObj.estimate.URF_V_RepairTime__c)} 娆�</td>
+ </apex:outputPanel>
+ <!-- URF闄愭鍚堝悓2鏈� XXF 20220818 end -->
</tr>
<tr>
- <td colspan="7" style="text-align: right">鍗曚綅锛歊MB</td>
+ <td colspan="11" style="text-align: right">鍗曚綅锛歊MB</td>
</tr>
</table>
<table width="100%" cellspacing="0" cellpadding="0" >
--
Gitblit v1.9.1