From 254ea442ff0e0a7a97e9f481e9f127a782cba840 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期一, 17 七月 2023 11:37:35 +0800
Subject: [PATCH] 修改附件7.17

---
 force-app/main/default/pages/AssetGuaranteePeriodAlteration.page |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page b/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page
index 3f38171..94a7016 100644
--- a/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page
+++ b/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page
@@ -1,5 +1,7 @@
-<apex:page standardController="GuaranteePeriodAlterationApplication__c" extensions="GuaranteePeriodAlterationController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="淇濅慨鏈熷彉鏇寸敵璇�">
+<apex:page standardController="GuaranteePeriodAlterationApplication__c" extensions="GuaranteePeriodAlterationController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="淇濅慨鏈熷彉鏇寸敵璇�" lightningStylesheets="true">
 <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
+
 <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
 <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
 <apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
@@ -137,7 +139,7 @@
         </apex:actionFunction>
          <apex:actionFunction name="DelConsumable" action="{!DelConsumable}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter()">
         </apex:actionFunction>
-        <apex:actionFunction name="uploadingAttachmentJs" action="{!uploadingAttachment}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter()">
+        <apex:actionFunction name="uploadingAttachmentJs" action="{!uploadingAttachmentLightning}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter()">
         </apex:actionFunction>
         <!-- <apex:actionFunction name="returnChangePage" action="{!returnChangePage}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter()">
         </apex:actionFunction> -->
@@ -150,6 +152,7 @@
         <apex:outputPanel id="allPanel">
             <apex:pageBlock id="allBlock" >
                 <apex:pageBlock id="EDCline_1" >
+                    <apex:commandButton style="display:none"/>
                     <apex:commandButton onclick="EditConsumable();"   value="缂栬緫" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!!(editAble)}"  disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯'||ambc.Change_status__c='椹冲洖',true,false)}"/>
                    
                     <apex:commandButton onclick="SorderJs();"         value="鎻愪氦鐢宠" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!!(editAble )}" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯',true,false)}"/>
@@ -232,7 +235,7 @@
                             id="val1" style="width:100px"/>
                             </td>
                             <td align="right"></td>
-                            <td><apex:commandButton value="淇濇湁璁惧鎼滅储" style="width: 100px;" onclick="searchProductJs('0');return false;" /></td>
+                            <td><apex:commandButton value="淇濇湁璁惧鎼滅储" style="width: 120px;" onclick="searchProductJs('0');return false;" /></td>
                             <td><input type="button" value="娓呯┖" style="width: 100px;" onclick="ClearJs();return false;" class="btn"/></td>
                             <td/>
                         </tr>
@@ -243,7 +246,7 @@
 
                             <td colspan="3"/>
                          
-                            <td  colspan="4">&nbsp; &nbsp;&nbsp;&nbsp;鍙樻洿鍘熷洜锛�<!-- <apex:selectList value="{!ambc.ChangeReason__c}" id="changeReason01" size="1" style="width:204px" onchange="ChangeReasonjs('{!ambc.ChangeReason__c}');"><apex:selectOptions value="{!changeReasonOpts}"   />  -->
+                            <td  colspan="4" style="height:50px">&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;鍙樻洿鍘熷洜锛�<!-- <apex:selectList value="{!ambc.ChangeReason__c}" id="changeReason01" size="1" style="width:204px" onchange="ChangeReasonjs('{!ambc.ChangeReason__c}');"><apex:selectOptions value="{!changeReasonOpts}"   />  -->
                             <!-- </apex:selectList> -->
                                 <apex:inputField value="{!ambc.ChangeReason__c}" style="width:200px"></apex:inputField>
                             </td>
@@ -256,7 +259,7 @@
                             <td colspan="3"/>
                             <!-- <td colspan="1"/> -->
                             <!-- <td colspan="5">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;鍙樻洿鍘熷洜鍏朵粬锛�<apex:inputText value="{!ambc.ChangeReason_text__c}" style="width:200px"/></td> -->
-                             <td colspan="4">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;瀹夎鏃ユ湡锛�<apex:outputField value="{!ambc.WarrantyStartDate__c}" style="width:200px"/></td>
+                             <td colspan="4">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;瀹夎鏃ユ湡锛�<apex:outputField value="{!ambc.WarrantyStartDate__c}" style="width:200px"/></td>
                             <!-- <td colspan="4">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 淇濅慨澶╂暟锛�<apex:inputText value="{!ambc.WarrantyDays__c}" style="width:200px"/></td> -->
                             <!-- <td  colspan="4"/> -->
                         </tr>
@@ -268,6 +271,7 @@
                  </apex:outputPanel>
                 <apex:pageBlock title="淇濇湁璁惧鎵�灞炲彉鏇存槑缁�" id="ConsumableorderdetailsSection">
                 <input type="hidden" id="allPage:allForm:allBlock:ConsumableorderdetailsSection:ConsumableorderdetailsCount" value="{!ConsumableorderdetailsviewCount}" />
+                <input type="hidden" id="allPage:allForm:allBlock:ConsumableorderdetailsSection:Id" value="{!Id}" />
                     <table class="list" border="0" cellpadding="0" cellspacing="0">
                         <tr class="headerRow">
                             <apex:variable var="v" value="" rendered="{!editAble}">
@@ -307,19 +311,19 @@
 
                 </apex:pageBlock>
                 <!-- CHAN-BC6BV2 XHL AddStart 20190522 -->
-                <apex:pageBlock title="闄勪欢" id="accessory" rendered="{!isShow}">
+                <apex:pageBlock title="鏂囦欢" id="accessory" rendered="{!isShow}">
                 
                     <apex:pageBlockButtons location="top">
-                        <apex:commandButton value="闄勪欢涓婁紶"  onclick="uploadingAttachmentJs();" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯',true,false)}"/>
+                        <apex:commandButton value="鏂囦欢涓婁紶"  onclick="uploadingAttachmentJs();" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯',true,false)}"/>
                     </apex:pageBlockButtons>
-                    <apex:pageBlockTable value="{!attachments}" var="attachment" >
+                    <apex:pageBlockTable value="{!contents}" var="attachment" >
                         
                         
                         <apex:column headerValue="鏍囬" style="width: 33%">
-                            <apex:outputField value="{!attachment.Name}"/>
+                            <apex:outputField value="{!attachment.Title}"/>
                         </apex:column>
                         <apex:column headerValue="涓婃淇敼鏃堕棿" style="width: 33%">
-                            <apex:outputField value="{!attachment.CreatedDate}"/>
+                            <apex:outputField value="{!attachment.ContentModifiedDate}"/>
                         </apex:column>
                         <apex:column headerValue="鍒涘缓浜�" style="width: 33%">
                             <apex:outputField value="{!attachment.OwnerId}"/>

--
Gitblit v1.9.1