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

---
 force-app/main/default/pages/MaintenanceProductData.page |   26 +++++++++++++++++++++++---
 1 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index e680a4d..9a8502e 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1633,8 +1633,26 @@
                             <th>璁℃彁閲戦</th>  
                             <th>鎿嶄綔</th>
                         </tr>
-                        <apex:repeat value="{!muMap}" var="key" id="bb1">
-                            <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>
+                            <!-- <tr>
                                 <td class="dataCell" rowspan="{!IF(muCountMap[key] > 1,muCountMap[key],1)}">
                                     {!muMap[key][0].ProductName__c}
                                 </td>
@@ -1666,8 +1684,10 @@
                                     1
                                 </td>
                             </tr>
-                            </apex:repeat>
+                            </apex:repeat> -->
                         </apex:repeat>
+                        </apex:repeat>
+                        
                     </table>
                 </apex:pageblocksection>
                 <!-- chenjingwu 20240417 end -->

--
Gitblit v1.9.1