From 1b3fb93f787b8b546a307bf063183f5295d183f8 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 16:53:25 +0800
Subject: [PATCH] merge

---
 force-app/main/default/objects/Report__c/webLinks/OPD_Report.webLink-meta.xml |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/force-app/main/default/objects/Report__c/webLinks/OPD_Report.webLink-meta.xml b/force-app/main/default/objects/Report__c/webLinks/OPD_Report.webLink-meta.xml
index e06e2d9..8f13a55 100644
--- a/force-app/main/default/objects/Report__c/webLinks/OPD_Report.webLink-meta.xml
+++ b/force-app/main/default/objects/Report__c/webLinks/OPD_Report.webLink-meta.xml
@@ -12,7 +12,6 @@
     <url>{!RequireScript(&quot;/soap/ajax/51.0/connection.js&quot;)} 
 {!RequireScript(&quot;/soap/ajax/51.0/apex.js&quot;)} 
 {!RequireScript(&quot;/resource/CommonUtilJs&quot;)} 
-//2021-10-22 gwy 鐗堟湰鏇存敼涓�51.0
 var foo = function() {
 var status = &quot;{!Rental_Apply__c.RA_Status__c}&quot;;
 if(status != &quot;宸插嚭搴�&quot; &amp;&amp; status != &quot;鐢宠鑰呭凡鏀惰揣&quot; &amp;&amp; status != &quot;鍖婚櫌宸茶鏈虹‘璁�&quot; &amp;&amp; status != &quot;宸插洖瀵�&quot; &amp;&amp; status != &quot;宸插洖鏀�&quot; &amp;&amp; status != &quot;瀹屼簡&quot; &amp;&amp; status != &quot;娆犲搧涓�&quot;){
@@ -48,7 +47,8 @@
 //window.open(&apos;/a0B/e?retURL=%2F{!Rental_Apply__c.Id}&apos;+
 //&apos;&amp;RecordType=01210000000Qekj&amp;ent=01I10000000SWfe&apos;+ 
 
-window.open(url +=
+//Before Update by LiJun 20220321 start
+/*window.open(url +=
 &apos;&amp;CF00N10000004maf3={!Rental_Apply__c.Name}&apos; +
 &apos;&amp;CF00N10000004maf3_lkid={!Rental_Apply__c.Id}&apos; +
 &apos;&amp;CF00N10000002DPUD={!Rental_Apply__c.Hospital__c}&apos;+ 
@@ -59,6 +59,23 @@
 &apos;&amp;CF00N10000008ps6d_lkid={!Rental_Apply__c.OPDPlanId__c}&apos;+  
 &apos;&amp;CF00N10000002CWW4={!Rental_Apply__c.Account__c}&apos;+
 &apos;&amp;CF00N10000002CWW4_lkid={!Rental_Apply__c.AccountId__c}&apos;+strs)
+}*/
+//Before Update by LiJun 20220321 end
+//After Update by LiJun 20220321 start
+url = url + &apos;&amp;CF00N10000004maf3={!Rental_Apply__c.Name}&apos; +
+&apos;&amp;CF00N10000004maf3_lkid={!Rental_Apply__c.Id}&apos; +
+&apos;&amp;CF00N10000002DPUD={!Rental_Apply__c.Hospital__c}&apos;+ 
+&apos;&amp;CF00N10000002DPUD_lkid={!Rental_Apply__c.HospitalId__c}&apos;+ 
+&apos;&amp;CF00N10000002Dh0f={!Rental_Apply__c.Strategic_dept__c}&apos; +
+&apos;&amp;CF00N10000002Dh0f_lkid={!Rental_Apply__c.Strategic_deptId__c}&apos;+
+&apos;&amp;CF00N10000008ps6d={!Rental_Apply__c.OPDPlan__c}&apos; +
+&apos;&amp;CF00N10000008ps6d_lkid={!Rental_Apply__c.OPDPlanId__c}&apos;+  
+&apos;&amp;CF00N10000002CWW4={!Rental_Apply__c.Account__c}&apos;+
+&apos;&amp;CF00N10000002CWW4_lkid={!Rental_Apply__c.AccountId__c}&apos;;
+if(strs){
+url= url+strs;
 }
+window.open(url);}
+//After Update by LiJun 20220321 end
 foo();</url>
 </WebLink>

--
Gitblit v1.9.1