From 298c511bd4e96c69666caecb1cc5c09c662af140 Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期一, 22 四月 2024 16:00:37 +0800
Subject: [PATCH] 123
---
force-app/main/default/pages/MaintenanceProductData.page | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index 322f78a..0686e2e 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1623,37 +1623,34 @@
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]}">
+ <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.ProductsID__c][0].AgeLimit__c}"/>
+ <apex:outputText value="{!muMap[aa.mpded.ProductsID__c][0].AgeLimit__c}"/>
</td>
<td>
- <apex:outputText value="{!muMap[aa.ProductsID__c][0].MultiOneYearWarrantyPrice__c}"/>
+ <apex:outputText value="{!muMap[aa.mpded.ProductsID__c][0].MultiOneYearWarrantyPrice__c}"/>
</td>
<td>
- <apex:outputText value="{!muMap[aa.ProductsID__c][0].AmountWithheld__c}"/>
+ <apex:outputText value="{!muMap[aa.mpded.ProductsID__c][0].AmountWithheld__c}"/>
</td>
<td>
</td>
</tr>
- <apex:repeat value="{!muMap[aa.ProductsID__c]}" var = "mu" id="cc" first="1">
+ <apex:repeat value="{!muMap[aa.mpded.ProductsID__c]}" var = "mu" id="cc" first="1">
<tr>
<td>
<apex:outputText value="{!mu.AgeLimit__c}"/>
--
Gitblit v1.9.1