From f37bee097e99cbfba8df327c1ac1ff8e86a552ed Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期一, 22 四月 2024 17:06:05 +0800
Subject: [PATCH] 123
---
force-app/main/default/pages/MaintenanceProductData.page | 59 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index 322f78a..d82eebe 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1623,48 +1623,45 @@
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.mpded}" var="aa" id="bb">
+ <apex:repeat value="{!mpdDetailsRecordsView}" var="aa" 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="{!IF(countMap[aa.Prod.Id] != null,countMap[aa.Prod.Id],1)}">
+ <apex:outputText value="{!aa.Prod.Name}"/>
+ </td>
+ <td>
+ <apex:outputText value="{!muMap[aa.Prod.Id][0].AgeLimit__c}"/>
+ </td>
+ <td>
+ <apex:outputText value="{!muMap[aa.Prod.Id][0].MultiOneYearWarrantyPrice__c}"/>
+ </td>
+ <td>
+ <apex:outputText value="{!muMap[aa.Prod.Id][0].AmountWithheld__c}"/>
+ </td>
+ <td></td>
</tr>
- <apex:repeat value="{!muMap[aa.ProductsID__c]}" var = "mu" id="cc" first="1">
- <tr>
- <td>
- <apex:outputText value="{!mu.AgeLimit__c}"/>
- </td>
- <td>
- <apex:outputText value="{!mu.MultiOneYearWarrantyPrice__c}"/>
- </td>
- <td>
- <apex:outputText value="{!mu.AmountWithheld__c}"/>
- </td>
- </tr>
+ <apex:repeat value="{!muMap[aa.Prod.Id]}" var = "mu" id="cc" first="1">
+ <tr>
+ <td>
+ <apex:outputText value="{!mu.AgeLimit__c}"/>
+ </td>
+ <td>
+ <apex:outputText value="{!mu.MultiOneYearWarrantyPrice__c}"/>
+ </td>
+ <td>
+ <apex:outputText value="{!mu.AmountWithheld__c}"/>
+ </td>
+ <td></td>
+ </tr>
</apex:repeat>
</apex:repeat>
</table>
--
Gitblit v1.9.1