From b51b57a619d3f0075ccaa13303c99c9e849bf23a Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期二, 23 四月 2024 18:13:54 +0800
Subject: [PATCH] 123

---
 force-app/main/default/pages/MaintenanceProductData.page |   61 +++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/force-app/main/default/pages/MaintenanceProductData.page b/force-app/main/default/pages/MaintenanceProductData.page
index e0505d7..05cb754 100644
--- a/force-app/main/default/pages/MaintenanceProductData.page
+++ b/force-app/main/default/pages/MaintenanceProductData.page
@@ -1625,40 +1625,57 @@
                 </apex:pageBlock>
                 <!-- chenjingwu 20240417    start -->
                 <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>  
-                            <th>寤朵繚閲戦</th>
-                            <th>璁℃彁閲戦</th>  
-                            <th>鎿嶄綔</th>
-                        </tr>
-                        <tr >
-                            <apex:repeat value="{!mpdDetailsRecords}" var="mp" id="aa">
-                                <apex:repeat value="{!muMap[mp.mpded.ProductsID__c]}" var="mu" id="bb1">
+                    <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">
-                                            {!mu.ProductName__c}
+                                        <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">
-                                            {!mu.AgeLimit__c}
+                                            <apex:InputField value="{!muMap[mp.mpded.ProductsID__c][0].AgeLimit__c}" id="AgeLimit" />
                                         </td>
                                         <td class="dataCell">
-                                            {!mu.MultiOneYearWarrantyPrice__c}
+                                            <apex:InputField value="{!muMap[mp.mpded.ProductsID__c][0].MultiOneYearWarrantyPrice__c}" id="MultiOneYearWarrantyPrice" />
                                         </td>
                                         <td class="dataCell">
-                                            {!mu.AmountWithheld__c}
+                                            <apex:InputField value="{!muMap[mp.mpded.ProductsID__c][0].AmountWithheld__c}" id="AmountWithheld" />
                                         </td>
                                         <td>
-                                            1
+                                            <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="{!muMap[mp.mpded.ProductsID__c]}" var="mu" id="bb1" first="1">
+                                        <tr>
+                                            <td class="dataCell">
+                                                <apex:InputField value="{!mu.AgeLimit__c}" id="AgeLimit" />
+                                            </td>
+                                            <td class="dataCell">
+                                                <apex:InputField value="{!mu.MultiOneYearWarrantyPrice__c}" id="MultiOneYearWarrantyPrice" />
+                                            </td>
+                                            <td class="dataCell">
+                                                <apex:InputField value="{!mu.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:outputLabel>
+                    
                 </apex:pageblocksection>
                 <!-- chenjingwu 20240417 end -->
             </apex:pageBlock>

--
Gitblit v1.9.1