From 3affb8b01f55f90cc047d3048e4ec04aad249e9d Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期二, 23 四月 2024 09:56:47 +0800
Subject: [PATCH] 123
---
force-app/main/default/pages/MaintenanceProductData.page | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index 706e57a..cfe18d8 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1633,35 +1633,33 @@
<th>璁℃彁閲戦</th>
<th>鎿嶄綔</th>
</tr>
- <apex:repeat value="{!mpdDetailsRecordsView}" var="aa" id="bb1">
+ <apex:repeat value="{!muMap}" var="key" id="bb1">
<tr>
- <td rowspan="{!IF(muCountMap[aa.Prod.Id] != null,muCountMap[aa.Prod.Id],1)}">
- <apex:outputText value="{!aa.Prod.Name}"/>
+ <td rowspan="{!muMap[key].size}">
+ <apex:outputText value="{!amuMap[key][0].ProductName__c}"/>
</td>
<td>
- <apex:outputText value="{!muMap[aa.Prod.Id][0].AgeLimit__c}"/>
+ <apex:outputText value="{!muMap[key][0].AgeLimit__c}"/>
</td>
<td>
- <apex:outputText value="{!muMap[aa.Prod.Id][0].MultiOneYearWarrantyPrice__c}"/>
+ <apex:outputText value="{!muMap[key][0].MultiOneYearWarrantyPrice__c}"/>
</td>
<td>
- <apex:outputText value="{!muMap[aa.Prod.Id][0].AmountWithheld__c}"/>
+ <apex:outputText value="{!muMap[key][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>
- <td>
- <apex:outputText value="{!mu.MultiOneYearWarrantyPrice__c}"/>
- </td>
- <td>
- <apex:outputText value="{!mu.AmountWithheld__c}"/>
- </td>
- <td></td>
- </tr>
+ <apex:repeat value="muMap[key]" var="mu" id="bb2" first="1">
+ <td>
+ <apex:outputText value="{!mu.AgeLimit__c}"/>
+ </td>
+ <td>
+ <apex:outputText value="{!mu.MultiOneYearWarrantyPrice__c}"/>
+ </td>
+ <td>
+ <apex:outputText value="{!mu.AmountWithheld__c}"/>
+ </td>
+ <td></td>
</apex:repeat>
</apex:repeat>
</table>
--
Gitblit v1.9.1