From 2a94603f8f0d3f847045d2e5a0d7b8d5b9905f9e Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期二, 23 四月 2024 13:59:58 +0800
Subject: [PATCH] 123
---
force-app/main/default/pages/MaintenanceProductData.page | 72 ++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 23 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index cfe18d8..9a8502e 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1624,8 +1624,8 @@
</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;">
- <table class="list" border="0" cellpadding="0" cellspacing="0">
+ <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">
<tr class="headerRow">
<th>浜у搧鍚嶇О</th>
<th>寤朵繚骞撮檺</th>
@@ -1633,35 +1633,61 @@
<th>璁℃彁閲戦</th>
<th>鎿嶄綔</th>
</tr>
- <apex:repeat value="{!muMap}" var="key" id="bb1">
- <tr>
- <td rowspan="{!muMap[key].size}">
- <apex:outputText value="{!amuMap[key][0].ProductName__c}"/>
+ <apex:repeat value="{!mpdDetailsRecords}" var="mp" id="aa">
+ <apex:repeat value="{!muMap[mp.mpded.ProductsID__c]}" var="mu" id="bb1">
+ <tr>
+ <td class="dataCell">
+ {!mu.ProductName__c}
+ </td>
+ <td class="dataCell">
+ {!mu.AgeLimit__c}
+ </td>
+ <td class="dataCell">
+ {!mu.MultiOneYearWarrantyPrice__c}
+ </td>
+ <td class="dataCell">
+ {!mu.AmountWithheld__c}
+ </td>
+ <td>
+ 1
+ </td>
+ </tr>
+ <!-- <tr>
+ <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>
- <apex:outputText value="{!muMap[key][0].AgeLimit__c}"/>
+ 1
</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[key]" var="mu" id="bb2" first="1">
- <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 class="dataCell">
+ {!mu.MultiOneYearWarrantyPrice__c}
+ </td>
+ <td class="dataCell">
+ {!mu.AmountWithheld__c}
</td>
<td>
- <apex:outputText value="{!mu.MultiOneYearWarrantyPrice__c}"/>
+ 1
</td>
- <td>
- <apex:outputText value="{!mu.AmountWithheld__c}"/>
- </td>
- <td></td>
- </apex:repeat>
+ </tr>
+ </apex:repeat> -->
</apex:repeat>
+ </apex:repeat>
+
</table>
</apex:pageblocksection>
<!-- chenjingwu 20240417 end -->
--
Gitblit v1.9.1