From 3affb8b01f55f90cc047d3048e4ec04aad249e9d Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期二, 23 四月 2024 09:56:47 +0800
Subject: [PATCH] 123
---
force-app/main/default/pages/MaintenanceProductData.page | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index 2621863..cfe18d8 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1623,38 +1623,33 @@
refreshinput6();
</script>
</apex:pageBlock>
- <!-- chenjingwu 20240417 start -->
+ <!-- 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;">
<table class="list" border="0" cellpadding="0" cellspacing="0">
<tr class="headerRow">
<th>浜у搧鍚嶇О</th>
- <!-- <apex:variable var="v" value="" rendered="{!IF(editAble&&RecordTypeName='GuranteeMain'&&mpd.Status__c='鏈嶅姟濉啓',true,false)}">
- <th>閫夋嫨</th>
- </apex:variable> -->
<th>寤朵繚骞撮檺</th>
<th>寤朵繚閲戦</th>
<th>璁℃彁閲戦</th>
<th>鎿嶄綔</th>
</tr>
- <apex:repeat value="{!mpdDetailsRecords}" var="aa" id="bb">
+ <apex:repeat value="{!muMap}" var="key" id="bb1">
<tr>
- <td rowspan="{!muCountMap[aa.ProductsID__c]}">
- <apex:outputText value="{!aa.mpded.ProductsID__r.Name}"/>
- </td>
- <td>
- <apex:outputText value="{!muMap[aa.ProductsID__c][0].AgeLimit__c}"/>
- </td>
- <td>
- <apex:outputText value="{!muMap[aa.ProductsID__c][0].MultiOneYearWarrantyPrice__c}"/>
- </td>
- <td>
- <apex:outputText value="{!muMap[aa.ProductsID__c][0].AmountWithheld__c}"/>
- </td>
- <td>
- </td>
+ <td rowspan="{!muMap[key].size}">
+ <apex:outputText value="{!amuMap[key][0].ProductName__c}"/>
+ </td>
+ <td>
+ <apex:outputText value="{!muMap[key][0].AgeLimit__c}"/>
+ </td>
+ <td>
+ <apex:outputText value="{!muMap[key][0].MultiOneYearWarrantyPrice__c}"/>
+ </td>
+ <td>
+ <apex:outputText value="{!muMap[key][0].AmountWithheld__c}"/>
+ </td>
+ <td></td>
</tr>
- <apex:repeat value="{!muMap[aa.ProductsID__c]}" var = "mu" id="cc" first="1">
- <tr>
+ <apex:repeat value="muMap[key]" var="mu" id="bb2" first="1">
<td>
<apex:outputText value="{!mu.AgeLimit__c}"/>
</td>
@@ -1664,7 +1659,7 @@
<td>
<apex:outputText value="{!mu.AmountWithheld__c}"/>
</td>
- </tr>
+ <td></td>
</apex:repeat>
</apex:repeat>
</table>
--
Gitblit v1.9.1