From 7b01bbb3d1bc830fd69288b98feea7fdb9eb96bf Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期二, 23 四月 2024 11:36:04 +0800
Subject: [PATCH] 123
---
force-app/main/default/pages/MaintenanceProductData.page | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index 0686e2e..07b2a20 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>
@@ -1633,34 +1633,34 @@
<th>璁℃彁閲戦</th>
<th>鎿嶄綔</th>
</tr>
- <apex:repeat value="{!mpdDetailsRecordsView}" var="aa" id="bb1">
+ <apex:repeat value="{!muMap}" var="key" id="bb1">
<tr>
- <td class="dataCell" rowspan="{!IF(muCountMap[aa.mpded.ProductsID__c] != null,muCountMap[aa.mpded.ProductsID__c],1)}">
- <apex:outputText value="{!aa.mpded.ProductsID__r.Name}"/>
- </td>
- <td>
- <apex:outputText value="{!muMap[aa.mpded.ProductsID__c][0].AgeLimit__c}"/>
- </td>
- <td>
- <apex:outputText value="{!muMap[aa.mpded.ProductsID__c][0].MultiOneYearWarrantyPrice__c}"/>
- </td>
- <td>
- <apex:outputText value="{!muMap[aa.mpded.ProductsID__c][0].AmountWithheld__c}"/>
- </td>
- <td>
- </td>
+ <td class="dataCell" rowspan="{!IF(muCountMap[key] > 1,muCountMap[key],1)}">
+ {!muMap[key][0].ProductName__c}
+ </td>
+ <td class="dataCell">
+ {!muMap[key][0].AgeLimit__c}
+ </td>
+ <td class="dataCell">
+ {!muMap[key][0].MultiOneYearWarrantyPrice__c}
+ </td>
+ <td class="dataCell">
+ {!muMap[key][0].AmountWithheld__c}
+ </td>
+ <td></td>
</tr>
- <apex:repeat value="{!muMap[aa.mpded.ProductsID__c]}" var = "mu" id="cc" first="1">
- <tr>
- <td>
- <apex:outputText value="{!mu.AgeLimit__c}"/>
+ <apex:repeat value="{!muMap[key]}" var="mu" id="bb2" first="1">
+ <tr>
+ <td class="dataCell">
+ {!mu.AgeLimit__c}
</td>
- <td>
- <apex:outputText value="{!mu.MultiOneYearWarrantyPrice__c}"/>
+ <td class="dataCell">
+ {!mu.MultiOneYearWarrantyPrice__c}
</td>
- <td>
- <apex:outputText value="{!mu.AmountWithheld__c}"/>
+ <td class="dataCell">
+ {!mu.AmountWithheld__c}
</td>
+ <td></td>
</tr>
</apex:repeat>
</apex:repeat>
--
Gitblit v1.9.1