From 07390e2fcb4adf27c928335bf27ae7939c5a80ad Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期二, 23 五月 2023 11:28:12 +0800
Subject: [PATCH] bakcup20230523
---
force-app/main/default/pages/SelectAssetEstimateURF.page | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/pages/SelectAssetEstimateURF.page b/force-app/main/default/pages/SelectAssetEstimateURF.page
index 824561a..78e22ea 100644
--- a/force-app/main/default/pages/SelectAssetEstimateURF.page
+++ b/force-app/main/default/pages/SelectAssetEstimateURF.page
@@ -1232,6 +1232,24 @@
var dayStr = '00' + contractDate.getDate();
dayStr = dayStr.substring(dayStr.length-2, dayStr.length);
var contractDateStr = contractDate.getFullYear() + '/' + monthStr + '/' + dayStr;
+ //璐告槗鍚堣 you 20230414 start
+ var AccDealerBlacklist = j$(escapeVfId('allPage:allForm:AccDealerBlacklist')).value();//榛戝悕鍗�,璀︾ず鍚嶅崟
+ var TradeComplianceStatusFlagFW = '{!$Label.TradeComplianceStatusFlagFW}';//璐告槗鍚堣寮�鍏�
+ var IFTradeComplianceAlert = '{!$Label.IFTradeComplianceAlert}';//璐告槗鍚堣鎻愰啋
+ if(TradeComplianceStatusFlagFW=='true'){
+ if(AccDealerBlacklist =='1'){
+ alert('鎮ㄦ墍閫夋嫨鐨勫鎴�(鍖婚櫌/缁忛攢鍟�)瀛樺湪璐告槗鍚堣椋庨櫓锛屾棤娉曠璁㈡湇鍔″悎鍚岋紝寤鸿鎮ㄥ悜瀹㈡埛鍋氬ソ涓嶇绾﹁鏄�,'+IFTradeComplianceAlert);
+ var reflag = interceptsend();
+ unblockUI();
+ return null;
+ }else if(AccDealerBlacklist =='2'){
+ if (!confirm('鎮ㄦ墍閫夋嫨鐨勫鎴�(鍖婚櫌/缁忛攢鍟�)瀛樺湪璐告槗鍚堣璀︾ず椋庨櫓锛屼笉寤鸿绛捐鏈嶅姟鍚堝悓锛岃鎮ㄧ‘璁ゆ槸鍚︾户缁敵璇�,'+IFTradeComplianceAlert)) {
+ unblockUI();
+ return null;
+ }
+ }
+ }
+ //璐告槗鍚堣 you 20230414 end
//var neDt = contractDate.getFullYear() + contractDate.getMonth() + contractDate.getDate();
//monthStr = '00' + (oldDate.getMonth()+1);
@@ -1400,6 +1418,9 @@
<apex:inputHidden id="changedAfterPrint" value="{!changedAfterPrint}"/>
<apex:inputHidden id="changedSubmitPrice" value="{!changedSubmitPrice}"/>
<apex:inputHidden id="isSaveOrApproval" value="{!isSaveOrApproval}"/>
+ <!-- 璐告槗鍚堣 you 20230414-->
+ <apex:inputHidden id="AccDealerBlacklist" value="{!contract.AccDealerBlacklist__c}"/>
+ <apex:actionFunction name="interceptsend" action="{!interceptsend}" oncomplete="unblockUI();"/>
<!-- HWAG-B4R3SS START 20181026-->
<apex:actionFunction name="searchfunc" action="{!searchBtn}" rerender="Form,Block,assetSection2,pageMessages,allBlock" onComplete="unblockUI();"></apex:actionFunction>
@@ -2113,8 +2134,7 @@
<th style="text-align: center">{!$ObjectType.Maintenance_Contract_Estimate__c.fields.finalPriceDecideWay__c.label}</th>
<td><apex:inputField value="{!estimate.finalPriceDecideWay__c}" id="finalPriceDecideWay" style="width:50%;" /></td>
<th style="text-align: center">{!$ObjectType.Maintenance_Contract_Estimate__c.fields.Sales_incidental__c.label}</th>
- <td><apex:inputField value="{!estimate.Sales_incidental__c}" id="Sales_incidental" style="width: 20px;height: 20px;" /></td>
- <!-- lighting鍗囩骇 20230210 lt 澶嶉�夋澶у皬寮傚父闂 style="width:50%;" == style="width: 20px;height: 20px;" -->
+ <td><apex:inputField value="{!estimate.Sales_incidental__c}" id="Sales_incidental" style="width:50%;" /></td>
</tr>
<tr>
<th style="text-align: center">{!$ObjectType.Maintenance_Contract_Estimate__c.fields.mainTalksTime__c.label}</th>
--
Gitblit v1.9.1