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

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

diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index 3f64771..375e697 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1636,11 +1636,26 @@
                             </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" rowspan="{!IF(muCountMap[mp.mpded.ProductsID__c] > 1,muCountMap[mp.mpded.ProductsID__c],1)}">
+                                            {!mp.mpded.ProductsID__r.Name}
+                                        </td>
+                                        <td class="dataCell">
+                                            {!muMap[mp.mpded.ProductsID__c][0].AgeLimit__c}
+                                        </td>
+                                        <td class="dataCell">
+                                            {!muMap[mp.mpded.ProductsID__c][0].MultiOneYearWarrantyPrice__c}
+                                        </td>
+                                        <td class="dataCell">
+                                            {!muMap[mp.mpded.ProductsID__c][0].AmountWithheld__c}
+                                        </td>
+                                        <td>
+                                            <apex:commandButton onclick="addJs();" value="娣诲姞" style="position:relative;width:100px;"/>  
+                                            <apex:commandButton onclick="deleteJs();" value="鍒犻櫎" style="position:relative;width:100px;"/>
+                                        </td>
+                                    </tr>
+                                    <apex:repeat value="{!muMap[mp.mpded.ProductsID__c]}" var="mu" id="bb1" first="1">
                                         <tr>
-                                            <td class="dataCell">
-                                                {!mu.ProductName__c}
-                                            </td>
                                             <td class="dataCell">
                                                 {!mu.AgeLimit__c}
                                             </td>
@@ -1651,7 +1666,8 @@
                                                 {!mu.AmountWithheld__c}
                                             </td>
                                             <td>
-                                                1
+                                                <apex:commandButton onclick="addJs();" value="娣诲姞" style="position:relative;width:100px;"/>  
+                                                <apex:commandButton onclick="deleteJs();" value="鍒犻櫎" style="position:relative;width:100px;"/>
                                             </td>
                                         </tr>
                                     </apex:repeat>

--
Gitblit v1.9.1