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

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

diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index 14a9817..81d0f23 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1625,7 +1625,7 @@
                 </apex:pageBlock>
                 <!-- chenjingwu 20240417    start -->
                 <apex:pageblocksection title="{!IF(editAble,'寤朵繚淇℃伅缁存姢','寤朵繚淇℃伅缁存姢(钃濊壊涓烘柊鍊�)')}" id="exmpdDetails" rendered="{!IF(muMap!=null&&muCountMap!=null,true,false)}" html-style="width: 100%;max-height:210px;;overflow:auto;">
-                    <table class="list" border="0" cellpadding="0" cellspacing="0">
+                    <table class="list">
                         <tr class="headerRow">
                             <th>浜у搧鍚嶇О</th>
                             <th>寤朵繚骞撮檺</th>  
@@ -1633,10 +1633,24 @@
                             <th>璁℃彁閲戦</th>  
                             <th>鎿嶄綔</th>
                         </tr>
+                        <tr>
+                            <td class="dataCell">
+                                1
+                            </td>
+                            <td class="dataCell">
+                                2
+                            </td>
+                            <td class="dataCell">
+                                3
+                            </td>
+                            <td class="dataCell"> 
+                                4
+                            </td>
+                            <td></td>
+                        </tr>
                         <apex:repeat value="{!muMap}" var="key" id="bb1">
                             <tr>
-                                <!-- <td class="dataCell" rowspan="{!IF(muCountMap[key] > 1,muCountMap[key],1)}"> -->
-                                    <td class="dataCell">
+                                <td class="dataCell" rowspan="{!IF(muCountMap[key] > 1,muCountMap[key],1)}">
                                     {!muMap[key][0].ProductName__c}
                                 </td>
                                 <td class="dataCell">
@@ -1652,9 +1666,6 @@
                             </tr>
                             <apex:repeat value="{!muMap[key]}" var="mu" id="bb2" first="1">
                                 <tr>
-                                    <td class="dataCell">
-                                        {!muMap[key][0].ProductName__c}
-                                    </td>
                                 <td class="dataCell">
                                     {!mu.AgeLimit__c}
                                 </td>

--
Gitblit v1.9.1