From f37bee097e99cbfba8df327c1ac1ff8e86a552ed Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期一, 22 四月 2024 17:06:05 +0800
Subject: [PATCH] 123
---
force-app/main/default/pages/MaintenanceProductData.page | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index babb408..d82eebe 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1635,13 +1635,22 @@
</tr>
<apex:repeat value="{!mpdDetailsRecordsView}" var="aa" id="bb1">
<tr>
- <td>
+ <td rowspan="{!IF(countMap[aa.Prod.Id] != null,countMap[aa.Prod.Id],1)}">
<apex:outputText value="{!aa.Prod.Name}"/>
</td>
- <apex:repeat value="{!muMap[aa.Prod.Id]}" var = "mu" id="cc" rows="i">
- <div if:true="{!IF(i != 0,true,false)}">
- <tr>
- </div>
+ <td>
+ <apex:outputText value="{!muMap[aa.Prod.Id][0].AgeLimit__c}"/>
+ </td>
+ <td>
+ <apex:outputText value="{!muMap[aa.Prod.Id][0].MultiOneYearWarrantyPrice__c}"/>
+ </td>
+ <td>
+ <apex:outputText value="{!muMap[aa.Prod.Id][0].AmountWithheld__c}"/>
+ </td>
+ <td></td>
+ </tr>
+ <apex:repeat value="{!muMap[aa.Prod.Id]}" var = "mu" id="cc" first="1">
+ <tr>
<td>
<apex:outputText value="{!mu.AgeLimit__c}"/>
</td>
@@ -1651,6 +1660,7 @@
<td>
<apex:outputText value="{!mu.AmountWithheld__c}"/>
</td>
+ <td></td>
</tr>
</apex:repeat>
</apex:repeat>
--
Gitblit v1.9.1