From 1ce68427c1d414c39261a26bca710fbf4fd9a6e5 Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期四, 14 八月 2025 09:56:11 +0800
Subject: [PATCH] feat:新增旧单据编号搜索单据和修改福祉车价格计算

---
 ServiceOrder.gds |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ServiceOrder.gds b/ServiceOrder.gds
index 21baf3a..4720add 100644
--- a/ServiceOrder.gds
+++ b/ServiceOrder.gds
@@ -125,6 +125,7 @@
 		OrderLevel			= rs("OrderLevel")				'鏌ョ湅绛夌骇
 		ServiceOrd_AP_Check	= rs("ServiceOrd_AP_Check")
 		IsLocking			= rs("IsLocking")			'璐㈠姟閿佸畾
+		Old_ServiceOrdID_TXT = rs("Old_ServiceOrdID_TXT") '鍘熷鍗曟嵁缂栧彿
 		ServiceOrdNo			= ServiceOrdClass& year(rs("ServiceOrd_CC_Time"))&Right("0"&month(rs("ServiceOrd_CC_Time")),2)&Right("0"&day(rs("ServiceOrd_CC_Time")),2) & "-"&Right("00"&rs("ServiceOrdNo"),3)
 		If InStr(session("admin_OrderClass"),ServiceOrdClass)>0 Or isDepartment("070109")=1 Then 
 			Call OA_Running("鎵撳紑鏈嶅姟鍗�:"&ServiceOrdNo&" ID:"&ServiceOrdID)
@@ -1529,7 +1530,21 @@
 								<input name="ServiceOrd_work_ID" type="hidden" value="<%=ServiceOrd_work_ID%>">
 								<input name="ServiceOrd_work_IDs" type="hidden" value="<%=ServiceOrd_work_IDs%>">
 							<%End If%>
-							
+							<div class="field">			            
+								<div class="label" style="float: left;margin-left: 0px;">
+								<label for="input-small">鍘熷鍗曟嵁缂栧彿:</label></div>					
+<div class="input" style="float:left;margin-left: 84px;">
+	<input type="text" id="Old_ServiceOrdID_TXT" name="Old_ServiceOrdID_TXT" 
+    class="small <% If ServiceOrdState=4 Then %>error<% Else %>valid<% End If %>"
+    style="width: 98px;"
+    value="<% If Old_ServiceOrdID_TXT <> "" Then %>
+            <%=Server.HTMLEncode(Old_ServiceOrdID_TXT)%>
+          <% Else %>
+            [鏈叧鑱擼
+          <% End If %>">
+								</div> 
+								</div>
+
 				<%If OrderLevel<>1 Or isDepartment("020111")=1 Then%>
 						<!-- 鏈嶅姟鍗曟暟鎹� -->
 						<!--#INCLUDE FILE="ServiceOrder_Data.gds" -->
@@ -1800,13 +1815,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";

--
Gitblit v1.9.1