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/RepairSubOrder__c/webLinks/ApplyForQIS.webLink-meta.xml |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/force-app/main/default/objects/RepairSubOrder__c/webLinks/ApplyForQIS.webLink-meta.xml b/force-app/main/default/objects/RepairSubOrder__c/webLinks/ApplyForQIS.webLink-meta.xml
index cdf11ea..503e526 100644
--- a/force-app/main/default/objects/RepairSubOrder__c/webLinks/ApplyForQIS.webLink-meta.xml
+++ b/force-app/main/default/objects/RepairSubOrder__c/webLinks/ApplyForQIS.webLink-meta.xml
@@ -14,10 +14,20 @@
 
 
 var status = &quot;{!RepairSubOrder__c.Status__c}&quot;;
-if( status != &apos;寰呭鐞�&apos;){
-alert(&apos;鎶ヤ慨瀛愬崟鐨勭姸鎬佷笉鏄� 寰呭鐞� 鏃犳硶鐢宠淇悊&apos;);
-return;
+//LLIU-CG53S9 LY 20220711 start
+var processResult = &quot;{!RepairSubOrder__c.ProcessResult__c}&quot;;
+if( status != &quot;寰呭鐞�&quot;){
+    if( status != &quot;宸插畬鎴�&quot; &amp;&amp; status !=&quot;宸茶浆QIS&quot;){
+	alert(&quot;鎶ヤ慨瀛愬崟鐨勭姸鎬佷笉鏄� 寰呭鐞� 鏃犳硶鐢宠QIS&quot;);
+        return; 
+    }
+	
+	if(processResult !=&quot;闇�鍋氳川閲忓垽瀹�&quot;){
+	   alert(&quot;鎶ヤ慨瀛愬崟鐨勭姸鎬佷笉鏄� 寰呭鐞� 鏃犳硶鐢宠QIS&quot;);
+           return;
+	}
 }
+//LLIU-CG53S9 LY 20220711  end
 var url = &apos;/apex/ChoiceAsset?Id={!RepairSubOrder__c.Id}&amp;Type=QIS&apos;;
 window.open(url,&apos;鐢宠QIS&apos;,&apos;height=700, width=1000, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no&apos;);
 }

--
Gitblit v1.9.1