From 61e6b14c3ac9305ecf2fc187d23000552a0bd1db Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期二, 23 四月 2024 10:46:43 +0800
Subject: [PATCH] 123
---
force-app/main/default/pages/MaintenanceProductData.page | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index cfe18d8..44ae06f 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1624,7 +1624,7 @@
</script>
</apex:pageBlock>
<!-- chenjingwu 20240417 start -->
- <apex:pageblocksection title="{!IF(editAble,'寤朵繚淇℃伅缁存姢','寤朵繚淇℃伅缁存姢(钃濊壊涓烘柊鍊�)')}" id="exmpdDetails" rendered="{!IF(mpdDetailsRecordsCount >0,true,false)}" html-style="width: 100%;max-height:210px;;overflow:auto;">
+ <apex:pageblocksection title="{!IF(editAble,'寤朵繚淇℃伅缁存姢','寤朵繚淇℃伅缁存姢(钃濊壊涓烘柊鍊�)')}" id="exmpdDetails" rendered="{!IF(muMap!=null,true,false)}" html-style="width: 100%;max-height:210px;;overflow:auto;">
<table class="list" border="0" cellpadding="0" cellspacing="0">
<tr class="headerRow">
<th>浜у搧鍚嶇О</th>
@@ -1635,28 +1635,28 @@
</tr>
<apex:repeat value="{!muMap}" var="key" id="bb1">
<tr>
- <td rowspan="{!muMap[key].size}">
- <apex:outputText value="{!amuMap[key][0].ProductName__c}"/>
+ <td class="dataCell" rowspan="{!IF(muCountMap[key] > 1,muCountMap[key],1)}">
+ <apex:outputText value="{!muMap[key][0].ProductName__c}"/>
</td>
- <td>
+ <td class="dataCell">
<apex:outputText value="{!muMap[key][0].AgeLimit__c}"/>
</td>
- <td>
+ <td class="dataCell">
<apex:outputText value="{!muMap[key][0].MultiOneYearWarrantyPrice__c}"/>
</td>
- <td>
+ <td class="dataCell">
<apex:outputText value="{!muMap[key][0].AmountWithheld__c}"/>
</td>
<td></td>
</tr>
- <apex:repeat value="muMap[key]" var="mu" id="bb2" first="1">
- <td>
+ <apex:repeat value="{!muMap[key]}" var="mu" id="bb2">
+ <td class="dataCell">
<apex:outputText value="{!mu.AgeLimit__c}"/>
</td>
- <td>
+ <td class="dataCell">
<apex:outputText value="{!mu.MultiOneYearWarrantyPrice__c}"/>
</td>
- <td>
+ <td class="dataCell">
<apex:outputText value="{!mu.AmountWithheld__c}"/>
</td>
<td></td>
--
Gitblit v1.9.1