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/AssetGuaranteePeriodAlteration.page | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page b/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page
index 144577c..94a7016 100644
--- a/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page
+++ b/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page
@@ -10,7 +10,7 @@
blockme();
document.getElementById("allPage:allForm:allBlock:searchBlock:text1").value = "";
document.getElementById("allPage:allForm:allBlock:searchBlock:val1").value = "";
-
+
searchConsumableorderdetails();
}
var selectedSize = 0;
@@ -154,14 +154,14 @@
<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)}"/>
<apex:commandButton onclick="saveJs();" value="淇濆瓨鍙樻洿鐢宠鍗�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF((editAble) && ambc.Change_status__c !='椹冲洖',true,false)}" />
<apex:commandButton onclick="saveJs();" value="淇濆瓨鍙樻洿鐢宠鍗�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF(ambc.Change_status__c='椹冲洖' && editAble,true,false)}" />
<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>
@@ -181,9 +181,9 @@
<td align="right" >鐘� 鎬侊細</td>
<td align="left" ><apex:outputField id="OrderStatus_out" value="{!ambc.Change_status__c}" style="width:100px"/></td>
<!-- <td/> -->
- </tr>
+ </tr>
<tr>
-
+
<!-- <td/> -->
<td align="right">鍙樻洿鍘熷洜锛�</td>
<td align="left">
@@ -219,7 +219,7 @@
<col width="180px"/>
<col width="60px"/>
<col width="60px"/>
-
+
</colgroup>
<tr>
<td align="right"></td>
@@ -229,7 +229,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:100px"/>
@@ -245,14 +245,14 @@
<tr >
<td colspan="3"/>
-
+
<td colspan="4" style="height:50px"> 鍙樻洿鍘熷洜锛�<!-- <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>
<td colspan="4">鍙樻洿鍘熷洜鍏朵粬锛�<apex:inputText value="{!ambc.ChangeReason_text__c}" style="width:200px"/></td>
<!-- <td colspan="4">淇濅慨澶╂暟锛�<apex:inputText value="{!ambc.WarrantyDays__c}" style="width:200px"/></td> -->
-
+
</tr>
<!-- <tr></tr> -->
<tr>
@@ -263,7 +263,7 @@
<!-- <td colspan="4"> 淇濅慨澶╂暟锛�<apex:inputText value="{!ambc.WarrantyDays__c}" style="width:200px"/></td> -->
<!-- <td colspan="4"/> -->
</tr>
-
+
</table>
</apex:pageBlock>
<apex:outputPanel id="message">
@@ -311,14 +311,14 @@
</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>
@@ -337,4 +337,4 @@
</apex:form>
<script>
</script>
-</apex:page>
+</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1