From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111

---
 force-app/main/default/objects/RepairAgainAn__c/webLinks/OSHFollowEnd.webLink-meta.xml |   85 ++++++++++++++++++++++++++++--------------
 1 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/force-app/main/default/objects/RepairAgainAn__c/webLinks/OSHFollowEnd.webLink-meta.xml b/force-app/main/default/objects/RepairAgainAn__c/webLinks/OSHFollowEnd.webLink-meta.xml
index 3ec9103..254102e 100644
--- a/force-app/main/default/objects/RepairAgainAn__c/webLinks/OSHFollowEnd.webLink-meta.xml
+++ b/force-app/main/default/objects/RepairAgainAn__c/webLinks/OSHFollowEnd.webLink-meta.xml
@@ -4,18 +4,18 @@
     <availability>online</availability>
     <displayType>button</displayType>
     <linkType>javascript</linkType>
-    <masterLabel>OSH璺熻繘瀹屾瘯</masterLabel>
+    <masterLabel>鍝佷繚鎻愪氦瀹℃壒</masterLabel>
     <openType>onClickJavaScript</openType>
     <protected>false</protected>
     <url>{!RequireScript(&quot;/soap/ajax/51.0/connection.js&quot;)}
 {!RequireScript(&quot;/soap/ajax/51.0/apex.js&quot;)}
 {!RequireScript(&quot;/resource/CommonUtilJs&quot;)}
 var foo = function() {
-	if (&apos;{!RepairAgainAn__c.RepairAgain_Status__c}&apos; != &apos;OSH鍙楃悊&apos;) {
+	if(&apos;{!RepairAgainAn__c.RepairAgain_Status__c}&apos; != &apos;OSH鍙楃悊&apos;) {
 		alert(&apos;璇峰厛杩涜OSH鍙楃悊!&apos;);
 		return;
 	}
-	if (&apos;{!RepairAgainAn__c.RepairAgain_Status__c}&apos; == &apos;鍙栨秷&apos;) {
+	if(&apos;{!RepairAgainAn__c.RepairAgain_Status__c}&apos; == &apos;鍙栨秷&apos;) {
 		alert(&apos;鍙栨秷鍚庣殑鍐嶄慨鐞嗚繑鍝佸垎鏋愪笉鍏佽鍐嶆彁浜わ紝濡傛灉闇�瑕佹彁浜よ鐐瑰嚮\&quot;澶嶅埗\&quot;鎸夐挳閲嶆柊鐢熸垚涓�涓啀淇悊杩斿搧鍒嗘瀽&apos;);
 		var btns = document.getElementsByName(&apos;OSHFollowEnd&apos;);
 		for (var i=0; i&lt;btns.length; i++) {
@@ -24,32 +24,59 @@
 		}
 		return;
 	}
-	if (&apos;{!RepairAgainAn__c.JudgementOSH__c}&apos;==&apos;&apos;) {
-		alert(&apos;銆愮粨璁猴紙OSH锛夈�戜负绌烘椂涓嶈兘鎻愪氦鐢宠&apos;);
-		return;
+        if(&apos;{!RepairAgainAn__c.RepairAgainAn_Approve_status__c}&apos; == &apos;&apos; || &apos;{!RepairAgainAn__c.RepairAgainAn_Approve_status__c}&apos; != &apos;鎵瑰噯&apos;){
+         	if(&apos;{!RepairAgainAn__c.JudgementOSH__c}&apos; == &apos;&apos; || {!ISBLANK(RepairAgainAn__c.AnalysisOSH__c)} || {!ISBLANK(RepairAgainAn__c.AnalysisReasonOSH__c)} || &apos;{!RepairAgainAn__c.ActionOSH__c}&apos; == &apos;&apos;){
+			alert(&apos;銆愮粨璁猴紙OSH锛夈�戙�愭妧鏈娴嬪垎鏋愶紙OSH鍖荤枟鍝佽川淇濋殰閮ㄥ～鍐欙級銆戙�愭妧鏈娴嬪垎鏋愬師鍥犮�戙�愭妧鏈搴斻�戞湁涓�椤逛负绌烘椂涓嶈兘鎻愪氦鐢宠&apos;);
+			return;
+		}
+                var ra = new sforce.SObject(&quot;RepairAgainAn__c&quot;);
+		ra.Id = &quot;{!RepairAgainAn__c.Id}&quot;;
+		ra.RepairAgainAn_Approve_status__c = &quot;宸叉彁浜�&quot;;
+        
+
+			
+		//妫�娴嬭��
+		ra.OSH_Detector__c = &quot;{!$User.Id}&quot;;
+		var result = sforce.connection.update([ra]);
+		var messages = getConnectDMLErrorMessages(result);
+
+		if (messages.length &gt; 0) {
+			alert(messages.join(&quot;\n&quot;));
+			return;
+		}
+			
+		window.location.reload();
+        }
+
+        if(&apos;{!RepairAgainAn__c.RepairAgainAn_Approve_status__c}&apos; == &apos;鎵瑰噯&apos;){
+	   if (&apos;{!RepairAgainAn__c.JudgementOSH2__c}&apos;==&apos;&apos; || {!ISBLANK(RepairAgainAn__c.AnalysisOSH2__c)} || {!ISBLANK(RepairAgainAn__c.AnalysisReasonOSH2__c)} || &apos;{!RepairAgainAn__c.ActionOSH2__c}&apos;==&apos;&apos;) {
+			alert(&apos;銆愮粨璁猴紙OSH锛�(浜屾)銆戙�愭妧鏈娴嬪垎鏋愶紙OSH鍖荤枟鍝佽川淇濋殰閮ㄥ～鍐欙級(浜屾锛�)銆戙�愭妧鏈娴嬪垎鏋愬師鍥�(浜屾)銆戙�愭妧鏈搴�(浜屾)銆戞湁涓�椤逛负绌烘椂涓嶈兘鎻愪氦鐢宠&apos;);
+			return;
+		}
+		
+		var ra = new sforce.SObject(&quot;RepairAgainAn__c&quot;);
+		ra.Id = &quot;{!RepairAgainAn__c.Id}&quot;;
+
+
+		if(&apos;{!RepairAgainAn__c.JudgementOSH2__c}&apos;==&quot;鏁呴殰鏈啀鐜�&quot;){
+		   ra.RepairAgain_Status__c = &quot;OSH濉啓瀹屾瘯&quot;;
+		}else{
+		   ra.RepairAgainAn_Approve_status2__c = &quot;宸叉彁浜�&quot;;
+		}
+		
+		//妫�娴嬭��
+		ra.OSH_Detector2__c = &quot;{!$User.Id}&quot;;
+		var result = sforce.connection.update([ra]);
+		var messages = getConnectDMLErrorMessages(result);
+			if (messages.length &gt; 0) {
+			alert(messages.join(&quot;\n&quot;));
+			return;
+		}
+		
+		window.location.reload();
 	}
-	if (&apos;{!RepairAgainAn__c.AnalysisOSH__c}&apos;==&apos;&apos;) {
-		alert(&apos;銆愭妧鏈娴嬪垎鏋愶紙OSH鍖荤枟鍝佽川淇濋殰閮ㄥ～鍐欙級銆戜负绌烘椂涓嶈兘鎻愪氦鐢宠&apos;);
-		return;
-	}
-	if (&apos;{!RepairAgainAn__c.AnalysisReasonOSH__c}&apos;==&apos;&apos;) {
-		alert(&apos;銆愭妧鏈娴嬪垎鏋愬師鍥犮�戜负绌烘椂涓嶈兘鎻愪氦鐢宠&apos;);
-		return;
-	}
-	if (&apos;{!RepairAgainAn__c.ActionOSH__c}&apos;==&apos;&apos;) {
-		alert(&apos;銆愭妧鏈搴斻�戜负绌烘椂涓嶈兘鎻愪氦鐢宠&apos;);
-		return;
-	}
-	var ra = new sforce.SObject(&quot;RepairAgainAn__c&quot;);
-	ra.Id = &quot;{!RepairAgainAn__c.Id}&quot;;
-	ra.RepairAgain_Status__c = &quot;OSH濉啓瀹屾瘯&quot;;
-	var result = sforce.connection.update([ra]);
-	var messages = getConnectDMLErrorMessages(result);
-	if (messages.length &gt; 0) {
-		alert(messages.join(&quot;\n&quot;));
-		return;
-	}
-	window.location.reload();
-}
+	
+
+}    
 foo();</url>
 </WebLink>

--
Gitblit v1.9.1