From d8dc84a3d56df839895f1c417a4d9cbee763d262 Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期五, 03 三月 2023 14:50:59 +0800
Subject: [PATCH] gzw 测试环境代码更新
---
force-app/main/default/objects/Rental_Apply__c/webLinks/Loaner_arranged_e_mail.webLink-meta.xml | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 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..ceee4b8 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("/soap/ajax/51.0/connection.js")}
{!RequireScript("/soap/ajax/51.0/apex.js")}
-//2021-10-22 gwy 鐗堟湰鏇存敼涓�51.0
var buttons = document.getElementsByName('loaner_arranged_e_mail');
for (var i=0; i<buttons.length; i++)
{
@@ -19,25 +18,27 @@
var campaignStatus = '';
var records = null; // 20220217 ljh OBPM甯傚満娲诲姩鑱斿姩
+var statusSting = "{!$Label.StatusProcessState}"; // 20220322 ljh add
+var statusList = statusSting.split(',');
if('{!Rental_Apply__c.Campaign__c}' != '') {
-var DeliveryGood = new Array();
-// 20220217 ljh update OBPM甯傚満娲诲姩鑱斿姩 start
-// DeliveryGood = sforce.connection.query("select Status, Rental_Apply_Flag__c from Campaign where id ='{!Rental_Apply__c.CampaignId__c}'");
-// var records= DeliveryGood.getArray("records");
-DeliveryGood = sforce.connection.query("select Status, Rental_Apply_Flag__c,IF_Approved__c,Meeting_Approved_No__c,Approved_Status__c from Campaign where id ='{!Rental_Apply__c.CampaignId__c}'");
-records = DeliveryGood.getArray("records");
-// 20220217 ljh update OBPM甯傚満娲诲姩鑱斿姩 end
-
-
-campaignStatus = records[0].Status;
-
+ var DeliveryGood = new Array();
+ // 20220217 ljh update OBPM甯傚満娲诲姩鑱斿姩 start
+ // DeliveryGood = sforce.connection.query("select Status, Rental_Apply_Flag__c from Campaign where id ='{!Rental_Apply__c.CampaignId__c}'");
+ // var records= DeliveryGood.getArray("records");
+ DeliveryGood = sforce.connection.query("select Status, Rental_Apply_Flag__c,IF_Approved__c,Meeting_Approved_No__c,Approved_Status__c from Campaign where id ='{!Rental_Apply__c.CampaignId__c}'");
+ records = DeliveryGood.getArray("records");
+ // 20220217 ljh update OBPM甯傚満娲诲姩鑱斿姩 end
+ campaignStatus = records[0].Status;
}
-
if("{!Rental_Apply__c.Wei_Assigned_Cnt__c}" > "0") {
alert("鐢宠鍗曞唴瀛樺湪鏈垎閰嶇殑閰嶅锛岃鍒嗛厤澶囧搧鎴栧垎鍓茬敵璇峰崟");
-}else if(campaignStatus == '鍙栨秷'){
- alert("瀛︿細鍙栨秷锛屼笉鍙嚭搴撴寚绀�");
+// 20230220 ljh DB202301265636 start
+// }else if(campaignStatus == '鍙栨秷'){
+// alert("瀛︿細鍙栨秷锛屼笉鍙嚭搴撴寚绀�");
+}else if(campaignStatus == '鍙栨秷' || campaignStatus == '鍙栨秷鐢宠涓�'){
+ alert("瀛︿細鍙栨秷鐢宠涓垨鑰呭凡鍙栨秷锛屼笉鍙嚭搴撴寚绀�");
+// 20230220 ljh DB202301265636 end
}else if ("{!Rental_Apply__c.Status__c}" == "宸插嚭搴撴寚绀�" && "{!Rental_Apply__c.Assigned_Not_Shipment__c}" == "0") {
alert("鎵�鏈夌殑鍊熷嚭澶囧搧Set涓�瑙堥兘杩涜杩囧嚭搴撴寚绀轰簡");
} else if ("{!Rental_Apply__c.Assigned_Not_Shipment__c}" == "0") {
@@ -49,6 +50,8 @@
// 20220217 ljh add OBPM甯傚満娲诲姩鑱斿姩 start
} else if (records != null && records[0].IF_Approved__c == "true" && (records[0].Meeting_Approved_No__c == null || records[0].Meeting_Approved_No__c == "") ) {
alert("娌℃湁鍐宠鍙风殑锛屾殏涓嶈兘鍑哄��,璇锋洿鏂拌鍐充俊鎭��");
+} else if (records != null && records[0].IF_Approved__c == "true" && records[0].Meeting_Approved_No__c != "" && statusList.indexOf(records[0].Approved_Status__c) != -1 ) {
+ alert("宸茬敵璇峰喅瑁佷絾鍐宠鐘舵�佷笉绗﹀悎鏉′欢銆�");
// 20220217 ljh add OBPM甯傚満娲诲姩鑱斿姩 end
} else {
sforce.connection.sessionId = "{!GETSESSIONID()}";
@@ -99,8 +102,6 @@
window.open('/apex/FixtureRentalPDF?raid={!Rental_Apply__c.Id}&page=' + i);
}
}
-
-
function fixTime(time){
if(time < 10) {time = "0" + time};
return time;
--
Gitblit v1.9.1