From dc7634ec22c8addecc081a91691a02c3f9c2284a Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期一, 22 四月 2024 16:47:43 +0800
Subject: [PATCH] 123

---
 force-app/main/default/pages/MaintenanceProductData.page |   42 +++++++++++++-----------------------------
 1 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index 75284c6..5af0dd7 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1633,35 +1633,19 @@
                             <th>璁℃彁閲戦</th>  
                             <th>鎿嶄綔</th>
                         </tr>
-                        <apex:repeat value="{!mpdDetailsRecords}" var="aa" id="bb1"> 
-                            <tr>
-                            <td class="dataCell" rowspan="{!IF(muCountMap[aa.mpded.ProductsID__c] != null,muCountMap[aa.mpded.ProductsID__c],1)}">
-                                <apex:outputText value="{!aa.mpded.ProductsID__r.Name}"/>
-                            </td>
-                            <td>
-                                <apex:outputText value="{!muMap[aa.mpded.ProductsID__c][0].AgeLimit__c}"/>
-                            </td>
-                            <td>
-                                <apex:outputText value="{!muMap[aa.mpded.ProductsID__c][0].MultiOneYearWarrantyPrice__c}"/>
-                            </td>
-                            <td>
-                                <apex:outputText value="{!muMap[aa.mpded.ProductsID__c][0].AmountWithheld__c}"/>
-                            </td>
-                            <td>
-                            </td>
-                            </tr>
-                            <apex:repeat value="{!muMap[aa.mpded.ProductsID__c]}" 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>
-                            </tr>
+                        <apex:repeat value="{!mpdDetailsRecordsView}" var="aa" id="bb1">
+                            <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>
+                                </tr>
                             </apex:repeat>
                         </apex:repeat>
                     </table>

--
Gitblit v1.9.1