From 8475b9f98c8a4c95446f02be4bf2a64e359c359a Mon Sep 17 00:00:00 2001
From: liwentao <1376563863@qq.com>
Date: 星期五, 11 八月 2023 09:10:31 +0800
Subject: [PATCH] 与测试环境对比，部分代码已被人修改，删除其中的alert和部分硬编码，还原测试环境代码逻辑

---
 force-app/main/default/pages/AssetModifyBelongs.page |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/force-app/main/default/pages/AssetModifyBelongs.page b/force-app/main/default/pages/AssetModifyBelongs.page
index 630ab4c..3361cbc 100644
--- a/force-app/main/default/pages/AssetModifyBelongs.page
+++ b/force-app/main/default/pages/AssetModifyBelongs.page
@@ -158,7 +158,7 @@
                     <apex:commandButton onclick="DeleteConsumable();" 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="backOrderJs();"   value="鍐嶇敵璇�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF(ambc.Change_status__c='椹冲洖' && !editAble,true,false)}" />
                 </apex:pageBlock>
-
+                
                  <apex:pageBlock title="鍙樻洿鐢宠鍗曚俊鎭�" id="unEditable" rendered="{!!(editAble)}">
                     <table>
                         <colgroup>
@@ -186,8 +186,8 @@
                             <td align="right" >鐩爣瀹㈡埛锛�</td>
                             <td align="left" ><apex:outputField value="{!ambc.AccountField__r.Name}"/></td>
                             <td/>
-                        </tr>
-
+                        </tr> 
+                        
                         <tr  style='line-height: 25px;'>
                             <apex:outputPanel rendered="{!checkUser}">
                                 <td align="right" >SPO琛ㄥ崟鍙凤細</td>
@@ -236,7 +236,7 @@
                             <col width="180px"/>
                             <col width="60px"/>
                             <col width="60px"/>
-
+                            
                         </colgroup>
                         <tr>
                             <td align="right"></td>
@@ -246,7 +246,7 @@
                             <td>
                              <apex:selectList value="{!text1}" id="text1" size="1" style="width:90px"><apex:selectOptions value="{!textOpts}"/>
                             </apex:selectList>
-                            </td>
+                            </td>                           
                             <td>
                             <apex:inputText value="{!val1}"
                             id="val1" style="width:200px"/>
@@ -264,7 +264,7 @@
                             <td colspan="4" style="height:50px;">&nbsp; &nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;鍘熷鎴凤細<apex:outputField value="{!ambc.rawAccount__c}"/></td>
                             <td colspan="4">鐩爣瀹㈡埛锛�<apex:inputField id="OEC" value="{!ambc.AccountField__c}" style="height:25px;width:200px"/></td>
                         </tr>
-
+                       
                         <tr  >
                             <apex:outputPanel rendered="{!checkUser}">
                                 <td colspan="3"/>
@@ -275,11 +275,11 @@
                             <!-- </apex:selectList> -->
                             </td>
                             <!-- CHAN-B9B68N Stop -->
-
+                           
                         </tr>
                          <tr>
                             <td colspan="3"/>
-
+                            
                                 <td colspan="4" style="height:50px;">&nbsp; &nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                     &nbsp;&nbsp;澶囨敞锛�<apex:inputText value="{!ambc.remark__c}" style="width:200px"/></td>
                              <!-- LZHU-BPJ8DF 20200513  Start -->
@@ -342,17 +342,17 @@
                     </table>
 
                 </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="{!contents}" var="attachment" >
-
-
+                        
+                        
                         <apex:column headerValue="鏍囬" style="width: 33%">
                             <apex:outputField value="{!attachment.Title}"/>
                         </apex:column>
@@ -372,4 +372,4 @@
 <script>
 
 </script>
-</apex:page>
+</apex:page>
\ No newline at end of file

--
Gitblit v1.9.1