From d700774f27731e52a24df7eaa5d02ee152202308 Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期二, 21 十月 2025 09:23:11 +0800
Subject: [PATCH] fix:修复跟单人记录被删除问题

---
 m_DispatchOrder.gds |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/m_DispatchOrder.gds b/m_DispatchOrder.gds
index 1f2a43d..07fc95d 100644
--- a/m_DispatchOrder.gds
+++ b/m_DispatchOrder.gds
@@ -636,8 +636,26 @@
 		<%End If%>
 		<%'鏀粯鎯呭喌
 		If (DispatchOrdState>=5 And DispatchOrdState<=9) And ServiceOrdTraTxnPrice<>"" And CInt(session("adminID"))=CInt(EntourageLeadID) then%>
+			<%If ServiceOrdType="27" Then%>
+			<div class="os_shopname">鎴愪氦浠凤細銆愰殣銆�<%If ServiceOrdTraPaidPrice<>"" Then%>
+				<%If StretcherMoney<>"" And StretcherMoney>0 Then%>
+					&nbsp;&nbsp;&nbsp;&nbsp;闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%>
+				<%End if%>
+				&nbsp;&nbsp;&nbsp;&nbsp;
+				宸叉敮浠橈細銆愰殣銆�<%End if%>
+				<%If ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice>0 Then%>
+					<br>鏈敮浠橈細銆愰殣銆�</div> 
+				<%End if%>
+			<%Else%>
 			<div class="os_shopname"></div>
-			<div class="os_shopname">杞繍璐圭敤锛�<%=FormatCurrency(ServiceOrdTraTxnPrice,-1,-1)%><%If StretcherMoney<>"" And StretcherMoney>0 Then%>&nbsp;&nbsp;&nbsp;&nbsp;闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%><%End if%><%If ServiceOrdTraPaidPrice<>"" Then%>&nbsp;&nbsp;&nbsp;&nbsp;宸叉敮浠橈細<%=FormatCurrency(ServiceOrdTraPaidPrice,-1,-1)%><%End if%>
+			<div class="os_shopname">杞繍璐圭敤锛�<%=FormatCurrency(ServiceOrdTraTxnPrice,-1,-1)%>
+				<%If StretcherMoney<>"" And StretcherMoney>0 Then%>
+					&nbsp;&nbsp;&nbsp;&nbsp;闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%>
+				<%End if%>
+				<%If ServiceOrdTraPaidPrice<>"" Then%>
+					&nbsp;&nbsp;&nbsp;&nbsp;宸叉敮浠橈細<%=FormatCurrency(ServiceOrdTraPaidPrice,-1,-1)%>
+				<%End if%>
+			<%End if%>
 			<%If (ServiceOrdTraTxnPrice+StretcherMoney)-ServiceOrdTraPaidPrice>0 And 1=2 Then%><br>鐜版敮浠橈細
 			<select name="PaidMoneyType" id="PaidMoneyType" style="-webkit-appearance: none;outline: none;border: none;font-size: 14px;" >
 				<option value="">璇烽�夋嫨</option>
@@ -653,12 +671,22 @@
 			<%else%>
 			<input name="PaidMoneyType" id="PaidMoneyType" type="hidden" value="">
 			<input name="PaidMoney" id="PaidMoney" type="hidden" value="0">
-			<%End if%>
+			<%End if%>			
 			</div>
 		<%ElseIf ServiceOrdTraTxnPrice<>"" And ServiceOrdTraTxnPrice<>"0" Then%>
 			<div class="os_shopname"></div>
-			<div class="os_shopname">鎴愪氦浠凤細<%=FormatCurrency(ServiceOrdTraTxnPrice,-1,-1)%><%If ServiceOrdTraPaidPrice<>"" Then%><%If StretcherMoney<>"" And StretcherMoney>0 Then%>&nbsp;&nbsp;&nbsp;&nbsp;闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%><%End if%>&nbsp;&nbsp;&nbsp;&nbsp;宸叉敮浠橈細<%=FormatCurrency(ServiceOrdTraPaidPrice,-1,-1)%><%End if%><%If ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice>0 Then%><br>鏈敮浠橈細<%=FormatCurrency(ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice,-1,-1)%> 
-			
+			<%If ServiceOrdType="27" Then%>
+				<div class="os_shopname">鎴愪氦浠凤細銆愰殣銆�
+				<%If ServiceOrdTraPaidPrice<>"" Then%>
+					<%If StretcherMoney<>"" And StretcherMoney>0 Then%>
+					&nbsp;&nbsp;&nbsp;&nbsp;闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%>
+					<%End if%>
+					&nbsp;&nbsp;&nbsp;&nbsp;宸叉敮浠橈細銆愰殣銆�<%End if%>
+					<%If ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice>0 Then%><br>鏈敮浠橈細銆愰殣銆�</div>
+					<%End if%>
+			<%Else%>
+				<div class="os_shopname">鎴愪氦浠凤細<%=FormatCurrency(ServiceOrdTraTxnPrice,-1,-1)%><%If ServiceOrdTraPaidPrice<>"" Then%><%If StretcherMoney<>"" And StretcherMoney>0 Then%>&nbsp;&nbsp;&nbsp;&nbsp;闄勫姞璐癸細<%=FormatCurrency(StretcherMoney,-1,-1)%><%End if%>&nbsp;&nbsp;&nbsp;&nbsp;宸叉敮浠橈細<%=FormatCurrency(ServiceOrdTraPaidPrice,-1,-1)%><%End if%><%If ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice>0 Then%><br>鏈敮浠橈細<%=FormatCurrency(ServiceOrdTraTxnPrice+StretcherMoney-ServiceOrdTraPaidPrice,-1,-1)%> 
+			<%End If%>
 			<%If ServiceOrdTraTxnPrice>0 And ServiceOrdTraPaidPrice<ServiceOrdTraTxnPrice And DispatchOrdCoPhone<>"" And (NEWOrder<>"" Or DispatchOrdState=8) Then%>&nbsp;&nbsp;<a onclick="JS_SMSCreateSave('<%=DispatchOrdCoPhone%>','[Pay|0|<%=ServiceOrdID%>] ')">鍙戜粯<label style="color: #ff0000;">鍏ㄦ</label>鐭俊</a>
 			<script>
 			//鍙戦�佺煭淇�
@@ -669,9 +697,11 @@
 				}
 			}
 			</script>
-			<%End If%>
 			
-			<%End if%></div>
+			<%End If%>
+			<%End if%>
+			</div>
+			
 			<%
 			UserPointsCost=0	'绉垎鎴愭湰
 			UserPoints=0		'鐢ㄦ埛绉垎

--
Gitblit v1.9.1