From 14553e97825d8c112ce2c40275e0c71b79fe3121 Mon Sep 17 00:00:00 2001
From: wanglizhong <wlz>
Date: 星期一, 05 五月 2025 11:17:08 +0800
Subject: [PATCH] fix:将开单人跟单人放到服务单中

---
 admin_save.gds   |    4 ++--
 ServiceOrder.gds |    6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ServiceOrder.gds b/ServiceOrder.gds
index 21baf3a..0d7ee52 100644
--- a/ServiceOrder.gds
+++ b/ServiceOrder.gds
@@ -1800,13 +1800,17 @@
 								document.form1.NEWOrder.value = "";
 								document.form1.ServiceOrdState.value = "4";
 								document.getElementById("zhezhao").style.display="block"; 
-						document.getElementById("login").style.display="block";
+								document.getElementById("login").style.display="block";
 								form1.submit();
 							}
 						}
 						
 						//淇濆瓨鍜ㄨ鍗�(淇敼)
 						function form1_submit20_1(){
+							let checkResult=checkOpenerAndFollower();
+							if(!checkResult){
+								return;
+							}
 							document.getElementById("MessageContents_form1").value=document.getElementById("MessageContents").value;
 							document.form1.action = "admin_save.gds";
 							document.form1.admin_save.value = "20";
diff --git a/admin_save.gds b/admin_save.gds
index d88bfc6..1d4d5ed 100644
--- a/admin_save.gds
+++ b/admin_save.gds
@@ -1050,7 +1050,7 @@
 rs.close()
 ServiceOrdNo	= ServiceOrdClass& year(now())&Right("0"&month(now()),2)&Right("0"&day(now()),2) & "-"&Right("00"&ServiceOrdNo,3)
 
-'淇濆瓨寮�鍗曚汉鍙婃彁鎴愭瘮渚嬬殑鍑芥暟
+
 SaveOpenerCommission ServiceOrdID
 SaveFollowers ServiceOrdID
 '鍜ㄨ鍗曡浆涓烘湇鍔″崟('鑷姩瀹℃牳)
@@ -1315,7 +1315,7 @@
 
 ServiceOrd_Check		= SafeRequest(Request.form("ServiceOrd_Check"))		'褰撳墠瀹℃牳鎿嶄綔
 EditDataForm			= SafeRequest(Request.form("EditDataForm"))			'褰撳墠淇敼椤圭洰
-'淇濆瓨寮�鍗曚汉鍙婃彁鎴愭瘮渚嬬殑鍑芥暟
+
 SaveOpenerCommission ServiceOrdID
 SaveFollowers ServiceOrdID
 

--
Gitblit v1.9.1