From bfca7a84bec815da594f1d12558535ed06d2490b Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 13 九月 2022 09:57:32 +0800
Subject: [PATCH] 本地提交备份

---
 force-app/main/default/objects/Rental_Apply__c/webLinks/Loaner_arranged_e_mail.webLink-meta.xml |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/objects/Rental_Apply__c/webLinks/Loaner_arranged_e_mail.webLink-meta.xml b/force-app/main/default/objects/Rental_Apply__c/webLinks/Loaner_arranged_e_mail.webLink-meta.xml
index a432fd3..42819a7 100644
--- a/force-app/main/default/objects/Rental_Apply__c/webLinks/Loaner_arranged_e_mail.webLink-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply__c/webLinks/Loaner_arranged_e_mail.webLink-meta.xml
@@ -9,7 +9,6 @@
     <protected>false</protected>
     <url>{!RequireScript(&quot;/soap/ajax/51.0/connection.js&quot;)} 
 {!RequireScript(&quot;/soap/ajax/51.0/apex.js&quot;)}
-//2021-10-22 gwy 鐗堟湰鏇存敼涓�51.0
 var buttons = document.getElementsByName(&apos;loaner_arranged_e_mail&apos;);
 for (var i=0; i&lt;buttons.length; i++)
 {
@@ -19,6 +18,8 @@
 
 var campaignStatus = &apos;&apos;; 
 var records = null;  // 20220217 ljh  OBPM甯傚満娲诲姩鑱斿姩 
+var statusSting = &quot;{!$Label.StatusProcessState}&quot;; // 20220322 ljh add
+var statusList = statusSting.split(&apos;,&apos;);
 if(&apos;{!Rental_Apply__c.Campaign__c}&apos; != &apos;&apos;) { 
 var DeliveryGood = new Array();
 // 20220217 ljh update OBPM甯傚満娲诲姩鑱斿姩 start
@@ -27,13 +28,9 @@
 DeliveryGood = sforce.connection.query(&quot;select Status, Rental_Apply_Flag__c,IF_Approved__c,Meeting_Approved_No__c,Approved_Status__c from Campaign where id =&apos;{!Rental_Apply__c.CampaignId__c}&apos;&quot;);  
 records = DeliveryGood.getArray(&quot;records&quot;); 
 // 20220217 ljh update OBPM甯傚満娲诲姩鑱斿姩 end
-
-
 campaignStatus = records[0].Status; 
 
 }
-
-
 if(&quot;{!Rental_Apply__c.Wei_Assigned_Cnt__c}&quot; &gt; &quot;0&quot;) {
     alert(&quot;鐢宠鍗曞唴瀛樺湪鏈垎閰嶇殑閰嶅锛岃鍒嗛厤澶囧搧鎴栧垎鍓茬敵璇峰崟&quot;);
 }else if(campaignStatus == &apos;鍙栨秷&apos;){ 
@@ -49,6 +46,8 @@
 // 20220217 ljh add OBPM甯傚満娲诲姩鑱斿姩 start
 } else if (records != null &amp;&amp; records[0].IF_Approved__c == &quot;true&quot; &amp;&amp; (records[0].Meeting_Approved_No__c == null || records[0].Meeting_Approved_No__c == &quot;&quot;) ) {
     alert(&quot;娌℃湁鍐宠鍙风殑锛屾殏涓嶈兘鍑哄��,璇锋洿鏂拌鍐充俊鎭��&quot;);
+} else if (records != null &amp;&amp; records[0].IF_Approved__c == &quot;true&quot; &amp;&amp; records[0].Meeting_Approved_No__c != &quot;&quot; &amp;&amp;  statusList.indexOf(records[0].Approved_Status__c) != -1 ) {
+    alert(&quot;宸茬敵璇峰喅瑁佷絾鍐宠鐘舵�佷笉绗﹀悎鏉′欢銆�&quot;);
 // 20220217 ljh add OBPM甯傚満娲诲姩鑱斿姩 end
 } else {
     sforce.connection.sessionId = &quot;{!GETSESSIONID()}&quot;; 
@@ -99,8 +98,6 @@
     window.open(&apos;/apex/FixtureRentalPDF?raid={!Rental_Apply__c.Id}&amp;page=&apos; + i);
 }
 }
-
-
 function fixTime(time){
    if(time &lt; 10) {time = &quot;0&quot; + time};
    return time;

--
Gitblit v1.9.1