From 747d6874efccab094938ce6be26ef8561896651a Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期三, 24 四月 2024 15:34:27 +0800
Subject: [PATCH] 123

---
 force-app/main/default/pages/MaintenanceProductData.page |  116 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 80 insertions(+), 36 deletions(-)

diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index 52014ef..2b41473 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1632,54 +1632,98 @@
                 <!-- chenjingwu 20240417    start -->
                 <apex:pageblocksection title="{!IF(editAble,'寤朵繚淇℃伅缁存姢','寤朵繚淇℃伅缁存姢(钃濊壊涓烘柊鍊�)')}" id="exmpdDetails" rendered="{!IF(exmpdDetailsRecordsMap!=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>
-                            <tr >
-                                <apex:repeat value="{!mpdDetailsRecords}" var="mp" id="aa">
-                                    <tr>
-                                        <td class="dataCell" rowspan="{!IF(muCountMap[mp.mpded.ProductsID__c] > 1,muCountMap[mp.mpded.ProductsID__c],1)}">
-                                            {!mp.mpded.ProductsID__r.Name}
-                                        </td>
-                                        <td class="dataCell">
-                                            <apex:InputField value="{!exmpdDetailsRecordsMap[mp.mpded.ProductsID__c][0].mpdrdd.AgeLimit__c}" id="AgeLimit" />
-                                        </td>
-                                        <td class="dataCell">
-                                            <apex:InputField value="{!exmpdDetailsRecordsMap[mp.mpded.ProductsID__c][0].mpdrdd.MultiOneYearWarrantyPrice__c}" id="MultiOneYearWarrantyPrice" />
-                                        </td>
-                                        <td class="dataCell">
-                                            <apex:InputField value="{!exmpdDetailsRecordsMap[mp.mpded.ProductsID__c][0].mpdrdd.AmountWithheld__c}" id="AmountWithheld" />
-                                        </td>
-                                        <td>
-                                            <apex:commandButton onclick="addJs();" value="娣诲姞" style="position:relative;width:100px;"/>  
-                                            <apex:commandButton onclick="deleteJs();" value="鍒犻櫎" style="position:relative;width:100px;"/>
-                                        </td>
-                                    </tr>
-                                    <apex:repeat value="{!exmpdDetailsRecordsMap[mp.mpded.ProductsID__c]}" var="mu" id="bb1" first="1">
+                        <apex:variable var="edvun" value="" rendered="{!editAble}">
+                            <table class="list">
+                                <tr class="headerRow">
+                                    <th>浜у搧鍚嶇О</th>
+                                    <th>寤朵繚骞撮檺</th>  
+                                    <th>寤朵繚閲戦</th>
+                                    <th>璁℃彁閲戦</th>  
+                                    <th>鎿嶄綔</th>
+                                </tr>
+                                <tr >
+                                    <apex:repeat value="{!mpdDetailsRecords}" var="mp" id="aa">
                                         <tr>
-                                            <td class="dataCell">
-                                                <apex:InputField value="{!mu.mpdrdd.AgeLimit__c}" id="AgeLimit" />
+                                            <td class="dataCell" rowspan="{!IF(muCountMap[mp.mpded.ProductsID__c] > 1,muCountMap[mp.mpded.ProductsID__c],1)}">
+                                                {!mp.mpded.ProductsID__r.Name}
                                             </td>
                                             <td class="dataCell">
-                                                <apex:InputField value="{!mu.mpdrdd.MultiOneYearWarrantyPrice__c}" id="MultiOneYearWarrantyPrice" />
+                                                <apex:InputField value="{!exmpdDetailsRecordsMap[mp.mpded.ProductsID__c][0].mpdrdd.AgeLimit__c}" id="AgeLimit" />
                                             </td>
                                             <td class="dataCell">
-                                                <apex:InputField value="{!mu.mpdrdd.AmountWithheld__c}" id="AmountWithheld" />
+                                                <apex:InputField value="{!exmpdDetailsRecordsMap[mp.mpded.ProductsID__c][0].mpdrdd.MultiOneYearWarrantyPrice__c}" id="MultiOneYearWarrantyPrice" />
+                                            </td>
+                                            <td class="dataCell">
+                                                <apex:InputField value="{!exmpdDetailsRecordsMap[mp.mpded.ProductsID__c][0].mpdrdd.AmountWithheld__c}" id="AmountWithheld" />
                                             </td>
                                             <td>
                                                 <apex:commandButton onclick="addJs();" value="娣诲姞" style="position:relative;width:100px;"/>  
                                                 <apex:commandButton onclick="deleteJs();" value="鍒犻櫎" style="position:relative;width:100px;"/>
                                             </td>
                                         </tr>
+                                        <apex:repeat value="{!exmpdDetailsRecordsMap[mp.mpded.ProductsID__c]}" var="mu" id="bb1" first="1">
+                                            <tr>
+                                                <td class="dataCell">
+                                                    <apex:InputField value="{!mu.mpdrdd.AgeLimit__c}" id="AgeLimit" />
+                                                </td>
+                                                <td class="dataCell">
+                                                    <apex:InputField value="{!mu.mpdrdd.MultiOneYearWarrantyPrice__c}" id="MultiOneYearWarrantyPrice" />
+                                                </td>
+                                                <td class="dataCell">
+                                                    <apex:InputField value="{!mu.mpdrdd.AmountWithheld__c}" id="AmountWithheld" />
+                                                </td>
+                                                <td>
+                                                    <apex:commandButton onclick="addJs();" value="娣诲姞" style="position:relative;width:100px;"/>  
+                                                    <apex:commandButton onclick="deleteJs();" value="鍒犻櫎" style="position:relative;width:100px;"/>
+                                                </td>
+                                            </tr>
+                                        </apex:repeat>
                                     </apex:repeat>
-                                </apex:repeat>
-                            </tr>
-                        </table>
+                                </tr>
+                            </table>
+                        </apex:variable>
+                        <apex:variable var="edvun" value="" rendered="{!!editAble}">
+                        </apex:variable>
+                            <table class="list">
+                                <tr class="headerRow">
+                                    <th>浜у搧鍚嶇О</th>
+                                    <th>寤朵繚骞撮檺</th>  
+                                    <th>寤朵繚閲戦</th>
+                                    <th>璁℃彁閲戦</th>  
+                                </tr>
+                                <tr >
+                                    <apex:repeat value="{!mpdDetailsRecords}" var="mp" id="aa">
+                                        <tr>
+                                            <td class="dataCell" rowspan="{!IF(muCountMap[mp.mpded.ProductsID__c] > 1,muCountMap[mp.mpded.ProductsID__c],1)}">
+                                                {!mp.mpded.ProductsID__r.Name}
+                                            </td>
+                                            <td class="dataCell">
+                                                <apex:outputField value="{!exmpdDetailsRecordsMap[mp.mpded.ProductsID__c][0].mpdrdd.AgeLimit__c}"/>
+                                            </td>
+                                            <td class="dataCell">
+                                                <apex:outputField value="{!exmpdDetailsRecordsMap[mp.mpded.ProductsID__c][0].mpdrdd.MultiOneYearWarrantyPrice__c}"/>
+                                            </td>
+                                            <td class="dataCell">
+                                                <apex:outputField value="{!exmpdDetailsRecordsMap[mp.mpded.ProductsID__c][0].mpdrdd.AmountWithheld__c}"/>
+                                            </td>
+                                        </tr>
+                                        <apex:repeat value="{!exmpdDetailsRecordsMap[mp.mpded.ProductsID__c]}" var="mu" id="bb1" first="1">
+                                            <tr>
+                                                <td class="dataCell">
+                                                    <apex:outputField value="{!mu.mpdrdd.AgeLimit__c}" />
+                                                </td>
+                                                <td class="dataCell">
+                                                    <apex:outputField value="{!mu.mpdrdd.MultiOneYearWarrantyPrice__c}" />
+                                                </td>
+                                                <td class="dataCell">
+                                                    <apex:outputField value="{!mu.mpdrdd.AmountWithheld__c}"/>
+                                                </td>
+                                            </tr>
+                                        </apex:repeat>
+                                    </apex:repeat>
+                                </tr>
+                            </table>
+                        </apex:variable>
                     </apex:outputLabel>
                     
                 </apex:pageblocksection>

--
Gitblit v1.9.1