From 41a627eaaf29658a401ac43e4da838a5b622f44e Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期一, 29 五月 2023 16:54:34 +0800
Subject: [PATCH] DB202303088261
---
force-app/main/default/objects/Rental_Apply_Equipment_Set__c/webLinks/Loaner_arranged_e_mail.webLink-meta.xml | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/webLinks/Loaner_arranged_e_mail.webLink-meta.xml b/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/webLinks/Loaner_arranged_e_mail.webLink-meta.xml
index 3bd5543..8b8547f 100644
--- a/force-app/main/default/objects/Rental_Apply_Equipment_Set__c/webLinks/Loaner_arranged_e_mail.webLink-meta.xml
+++ b/force-app/main/default/objects/Rental_Apply_Equipment_Set__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-21 gwy 鐗堟湰鏇存敼涓�51.0
var buttons = document.getElementsByName('loaner_arranged_e_mail');
for (var i=0; i<buttons.length; i++)
{
@@ -18,28 +17,34 @@
}
var campaignStatus = '';
-var records = null; // 20220217 ljh OBPM甯傚満娲诲姩鑱斿姩
+var records = null; // 20220217 ljh OBPM甯傚満娲诲姩鑱斿姩
+var statusSting = "{!$Label.StatusProcessState}"; // 20220322 ljh add
+var statusList = statusSting.split(',');
var raliveryGood = new Array();
reliveryGood = sforce.connection.query("select Id,Campaign__c,Repair__c,Status__c, Demo_purpose1__c,Contract_pdf_updated__c,Repair_Final_Inspection_Date_F__c,RC_return_to_office__c from Rental_Apply__c where Name='{!Rental_Apply_Equipment_Set__c.Rental_Apply__c}'");
var rarecords= reliveryGood.getArray("records");
var RentalApply = rarecords[0];
if(RentalApply.Campaign__c != '' && RentalApply.Campaign__c != null) {
-var DeliveryGood = new Array();
-// 20220217 ljh update OBPM甯傚満娲诲姩鑱斿姩 start
-// DeliveryGood = sforce.connection.query("select Status, Rental_Apply_Flag__c from Campaign where id ='" + RentalApply.Campaign__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 ='" + RentalApply.Campaign__c + "'");
-records = DeliveryGood.getArray("records");
-// 20220217 ljh update OBPM甯傚満娲诲姩鑱斿姩 end
+ var DeliveryGood = new Array();
+ // 20220217 ljh update OBPM甯傚満娲诲姩鑱斿姩 start
+ // DeliveryGood = sforce.connection.query("select Status, Rental_Apply_Flag__c from Campaign where id ='" + RentalApply.Campaign__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 ='" + RentalApply.Campaign__c + "'");
+ records = DeliveryGood.getArray("records");
+ // 20220217 ljh update OBPM甯傚満娲诲姩鑱斿姩 end
-campaignStatus = records[0].Status;
-
+ 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_Equipment_Set__c.Assigned_Not_Shipment__c}" == "0") {
alert("娌℃湁鍙互鍑哄簱鎸囩ず鐨勬槑缁�");
} else if (RentalApply.Demo_purpose1__c == "闀挎湡鍊熷嚭" && RentalApply.Contract_pdf_updated__c == "0") {
@@ -49,6 +54,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()}";
--
Gitblit v1.9.1