From 559771a80cf779dc13a84ecd2f178e6ca5a8353a Mon Sep 17 00:00:00 2001
From: FUYU <fuyu@prec-tech.com>
Date: 星期五, 19 五月 2023 15:52:16 +0800
Subject: [PATCH] 备份省目标录入
---
force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page | 76 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 15 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page b/force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page
index 89a34b3..1f8d342 100644
--- a/force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page
+++ b/force-app/main/default/pages/MaintenanceContractEstimateVMPDF.page
@@ -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" >
@@ -149,6 +189,9 @@
<td class="border-thick-title" >{!IF(targetObj.estimate.Asset_Repair_Sum_Price__c > 0, '淇悊閲戦', '')}</td>
</apex:outputPanel>
<td class="border-thick-title" >澶囨敞</td>
+ <!-- add 鐐规鏀瑰杽锛氱害瀹氱偣妫�璁惧瀵硅薄 2021.6.10 fxk start-->
+ <!-- <td class="border-thick-title" >绾﹀畾鐐规璁惧瀵硅薄</td> -->
+ <!-- add 鐐规鏀瑰杽锛氱害瀹氱偣妫�璁惧瀵硅薄 2021.6.10 fxk end-->
</tr>
<!-- 鏄庣窗琛屻儷銉笺儣 -->
<apex:repeat value="{!targetObj.assetInfoList}" var="asset" id="asset">
@@ -230,6 +273,9 @@
</apex:outputPanel>
<!-- 澶囨敞 -->
<td class="detail" style="text-align: center;"><c:PDFWbr targetStr="{!asset.mcae.Comment__c}"/></td>
+ <!-- add 鐐规鏀瑰杽锛氱害瀹氱偣妫�璁惧瀵硅薄 2021.6.10 fxk start-->
+ <!-- <td class="detail" style="text-align: center;"><c:PDFWbr targetStr="{!If((asset.mcae.Check_Object__c = true),'鈭�','脳')}"/></td> -->
+ <!-- add 鐐规鏀瑰杽锛氱害瀹氱偣妫�璁惧瀵硅薄 2021.6.10 fxk end-->
</tr>
<apex:variable value="{!lineNo + 1}" var="lineNo" />
</apex:repeat>
@@ -237,14 +283,14 @@
<!-- 鏈�寰屻儦銉笺偢銇悎瑷堥噾椤嶃仩銇戙亴瀛樺湪銇欍倠鍫村悎銇伩銆佹弿鐢汇仐銇亜 -->
<apex:outputPanel rendered="{!NOT(pageCnt == targetObjSize && lineNo < pageCnt)}" layout="none">
- <tr><td colspan="{!IF(targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_Simplify__c, if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'13','12'), if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'9','8'))}" class="border-thick-bottom"></td></tr>
+ <tr><td colspan="{!IF(targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_Simplify__c, if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'13','13'), if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'9','8'))}" class="border-thick-bottom"></td></tr>
</apex:outputPanel>
<apex:outputPanel rendered="{!((targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_RepairPrice__c) || targetObj.estimate.Asset_Repair_Sum_Price__c > 0) && pageCnt == targetObjSize}" layout="none">
<tr>
- <td colspan="{!IF(targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_Simplify__c, if( targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'11','10'), if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'7','6'))}" style="text-align: right;">鎶ヤ环鎬婚</td>
+ <td colspan="{!IF(targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_Simplify__c, if( targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'11','11'), if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'7','7'))}" style="text-align: right;">鎶ヤ环鎬婚</td>
<td colspan="2" style="text-align: right;">
<apex:outputText value="{0,number,#,##0銆�}" rendered="{!(((targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_RepairPrice__c) || targetObj.estimate.Asset_Repair_Sum_Price__c > 0) &&targetObj.estimate.Estimate_Target__c == '鍖婚櫌')}">
<apex:param value="{!targetObj.estimate.GuidePrice_Up__c}" />
@@ -260,7 +306,7 @@
</apex:outputPanel>
<apex:outputPanel rendered="{!((targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_RepairPrice__c) || targetObj.estimate.Asset_Repair_Sum_Price__c > 0) &&pageCnt == targetObjSize }" layout="none">
<tr>
- <td colspan="{!IF(targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_Simplify__c, if( targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'11','10'), if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'7','6'))}" style="text-align: right;">浼樻儬鐧惧垎姣�</td>
+ <td colspan="{!IF(targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_Simplify__c, if( targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'11','11'), if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'7','7'))}" style="text-align: right;">浼樻儬鐧惧垎姣�</td>
<td colspan="2" style="text-align: right;">
<apex:outputField value="{!targetObj.estimate.Service_DiscountPercentage__c}"/>
</td>
@@ -268,7 +314,7 @@
</apex:outputPanel>
<apex:outputPanel rendered="{!((targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_RepairPrice__c) && pageCnt == targetObjSize) }" layout="none">
<tr>
- <td colspan="{!IF(targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_Simplify__c, if( targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'11','10'), if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'7','6'))}" style="text-align: right;">浼樻儬閲戦</td>
+ <td colspan="{!IF(targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_Simplify__c, if( targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'11','11'), if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'7','7'))}" style="text-align: right;">浼樻儬閲戦</td>
<td colspan="2" style="text-align: right;">
<apex:outputText value="{0,number,#,##0銆�}">
<apex:param value="{!targetObj.estimate.Service_Discount_Price__c}" />
@@ -278,7 +324,7 @@
</apex:outputPanel>
<apex:outputPanel rendered="{!(targetObj.estimate.Asset_Repair_Sum_Price__c > 0) && pageCnt == targetObjSize }" layout="none">
<tr>
- <td colspan="{!IF(targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_Simplify__c, if( targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'11','10'), if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'7','6'))}" style="text-align: right;">缁翠慨閲戦鎬婚</td>
+ <td colspan="{!IF(targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_Simplify__c, if( targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'11','11'), if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'7','7'))}" style="text-align: right;">缁翠慨閲戦鎬婚</td>
<td colspan="2" style="text-align: right;">
<apex:outputText value="{0,number,#,##0銆�}">
<apex:param value="{!targetObj.estimate.Asset_Repair_Sum_Price__c}" />
@@ -288,7 +334,7 @@
</apex:outputPanel>
<apex:outputPanel rendered="{!(pageCnt == targetObjSize)}" layout="none">
<tr>
- <td colspan="{!IF(targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_Simplify__c, if( targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'11','10'), if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'7','6'))}" style="text-align: right;">鍚堝悓鎬讳环鏍�</td>
+ <td colspan="{!IF(targetObj.estimate.Print_ListPrice__c || targetObj.estimate.Print_Simplify__c, if( targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'11','11'), if(targetObj.estimate.Asset_Repair_Sum_Price__c > 0,'7','7'))}" style="text-align: right;">鍚堝悓鎬讳环鏍�</td>
<td colspan="2" style="text-align: right;">
<apex:outputText value="{0,number,#,##0銆�}">
<apex:param value="{!targetObj.estimate.Maintenance_Price__c}"/>
--
Gitblit v1.9.1