From cabd73d623a0d4e627737a5a81ef4f7bc1c9e278 Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期二, 23 四月 2024 15:07:01 +0800
Subject: [PATCH] 123
---
force-app/main/default/pages/MaintenanceProductData.page | 89 +++++++++++++++++++++++++-------------------
1 files changed, 50 insertions(+), 39 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index 07b2a20..8152059 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1624,47 +1624,58 @@
</script>
</apex:pageBlock>
<!-- chenjingwu 20240417 start -->
- <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>
- <th>寤朵繚骞撮檺</th>
- <th>寤朵繚閲戦</th>
- <th>璁℃彁閲戦</th>
- <th>鎿嶄綔</th>
- </tr>
- <apex:repeat value="{!muMap}" var="key" id="bb1">
- <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></td>
+ <apex:pageblocksection title="{!IF(editAble,'寤朵繚淇℃伅缁存姢','寤朵繚淇℃伅缁存姢(钃濊壊涓烘柊鍊�)')}" id="exmpdDetails" rendered="{!IF(muMap!=null&&muCountMap!=null,true,false)}" html-style="width: 100%;max-height:210px;;overflow:auto;">
+ <apex:outputLabel style="width: 100%;">
+ <table class="list">
+ <tr class="headerRow">
+ <th>浜у搧鍚嶇О</th>
+ <th>寤朵繚骞撮檺</th>
+ <th>寤朵繚閲戦</th>
+ <th>璁℃彁閲戦</th>
+ <th>鎿嶄綔</th>
</tr>
- <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></td>
+ <tr >
+ <apex:repeat value="{!mpdDetailsRecords}" var="mp" id="aa">
+ <tr>
+ <td class="dataCell" rowspan="muMap[mp.mpded.ProductsID__c].size">
+ {!muMap[mp.mpded.ProductsID__c][0].ProductName__c}
+ </td>
+ <td class="dataCell">
+ {!muMap[mp.mpded.ProductsID__c][0].AgeLimit__c}
+ </td>
+ <td class="dataCell">
+ {!muMap[mp.mpded.ProductsID__c][0].MultiOneYearWarrantyPrice__c}
+ </td>
+ <td class="dataCell">
+ {!muMap[mp.mpded.ProductsID__c][0].AmountWithheld__c}
+ </td>
+ <td>
+ <apex:commandButton onclick="addJs();" value="娣诲姞" style="position:relative;top: -45px;left: 120px; width:100px;"/>
+ <apex:commandButton onclick="deleteJs();" value="鍒犻櫎" style="position:relative;top: -45px;left: 120px; width:100px;"/>
+ </td>
+ </tr>
+ <apex:repeat value="{!muMap[mp.mpded.ProductsID__c]}" var="mu" id="bb1">
+ <tr>
+ <td class="dataCell">
+ {!mu.AgeLimit__c}
+ </td>
+ <td class="dataCell">
+ {!mu.MultiOneYearWarrantyPrice__c}
+ </td>
+ <td class="dataCell">
+ {!mu.AmountWithheld__c}
+ </td>
+ <td>
+ <apex:commandButton onclick="addJs();" value="娣诲姞" style="position:relative;top: -45px;left: 120px; width:100px;"/>
+ <apex:commandButton onclick="deleteJs();" value="鍒犻櫎" style="position:relative;top: -45px;left: 120px; width:100px;"/>
+ </td>
+ </tr>
+ </apex:repeat>
+ </apex:repeat>
</tr>
- </apex:repeat>
- </apex:repeat>
- </table>
+ </table>
+ </apex:outputLabel>
+
</apex:pageblocksection>
<!-- chenjingwu 20240417 end -->
</apex:pageBlock>
--
Gitblit v1.9.1