From ef13506c5a4290b0af01033149ac3245e63e7fb1 Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期二, 23 四月 2024 14:23:04 +0800
Subject: [PATCH] 123

---
 force-app/main/default/pages/MaintenanceProductData.page |   58 ++++++++++++++++++++++++----------------------------------
 1 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index e680a4d..e0505d7 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1633,41 +1633,31 @@
                             <th>璁℃彁閲戦</th>  
                             <th>鎿嶄綔</th>
                         </tr>
-                        <apex:repeat value="{!muMap}" var="key" id="bb1">
-                            <tr>
-                                <td class="dataCell" rowspan="{!IF(muCountMap[key] > 1,muCountMap[key],1)}">
-                                    {!muMap[key][0].ProductName__c}
-                                </td>
-                                <td class="dataCell">
-                                    {!muMap[key][0].AgeLimit__c}
-                                </td>
-                                <td class="dataCell">
-                                    {!muMap[key][0].MultiOneYearWarrantyPrice__c}
-                                </td>
-                                <td class="dataCell"> 
-                                    {!muMap[key][0].AmountWithheld__c}
-                                </td>
-                                <td>
-                                    1
-                                </td>
-                            </tr>
-                            <apex:repeat value="{!muMap[key]}" var="mu" id="bb2" first="1">
-                                <tr>
-                                <td class="dataCell">
-                                    {!mu.AgeLimit__c}
-                                </td>
-                                <td class="dataCell">
-                                    {!mu.MultiOneYearWarrantyPrice__c}
-                                </td>
-                                <td class="dataCell">
-                                    {!mu.AmountWithheld__c}
-                                </td>
-                                <td>
-                                    1
-                                </td>
-                            </tr>
+                        <tr >
+                            <apex:repeat value="{!mpdDetailsRecords}" var="mp" id="aa">
+                                <apex:repeat value="{!muMap[mp.mpded.ProductsID__c]}" var="mu" id="bb1">
+                                    <tr>
+                                        <td class="dataCell">
+                                            {!mu.ProductName__c}
+                                        </td>
+                                        <td class="dataCell">
+                                            {!mu.AgeLimit__c}
+                                        </td>
+                                        <td class="dataCell">
+                                            {!mu.MultiOneYearWarrantyPrice__c}
+                                        </td>
+                                        <td class="dataCell">
+                                            {!mu.AmountWithheld__c}
+                                        </td>
+                                        <td>
+                                            1
+                                        </td>
+                                    </tr>
+                                </apex:repeat>
                             </apex:repeat>
-                        </apex:repeat>
+                        </tr>
+                        
+                        
                     </table>
                 </apex:pageblocksection>
                 <!-- chenjingwu 20240417 end -->

--
Gitblit v1.9.1