From 82954f31a43d8f6c2c76b24bf09fd45502c24638 Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期一, 13 十月 2025 15:34:18 +0800
Subject: [PATCH] 解决合并冲突
---
ServiceOrder_Data.gds | 82 +++++++++++++++++++++++++++++++++--------
1 files changed, 66 insertions(+), 16 deletions(-)
diff --git a/ServiceOrder_Data.gds b/ServiceOrder_Data.gds
index 93772fe..840baf2 100644
--- a/ServiceOrder_Data.gds
+++ b/ServiceOrder_Data.gds
@@ -1,4 +1,3 @@
-
<%'------------------------------------------鏈嶅姟鍗�------------------------------------------
If admin_save<>"" Then
'鎻愪氦杩斿洖瀛楁
@@ -68,7 +67,12 @@
ServiceOrdTraOfferPrice=rs("ServiceOrdTraOfferPrice") '鏍囧噯鎶ヤ环
ServiceOrdTraTxnPrice = rs("ServiceOrdTraTxnPrice") '鎴愪氦浠�
SettlementPrice = rs("SettlementPrice") '缁撶畻浠�
- ServiceOrdTraPrePayment=rs("ServiceOrdTraPrePayment") '闇�棰勪粯娆鹃噾棰�
+ ServiceOrdTraPrePayment = rs("ServiceOrdTraPrePayment") '闇�棰勪粯娆鹃噾棰�
+ If Not IsNull(rs("ServiceOrdStairClimberPrice")) Then
+ ServiceOrdStairClimberPrice=rs("ServiceOrdStairClimberPrice") '鐖ゼ鏈轰环鏍�
+ Else
+ ServiceOrdStairClimberPrice=0 '鐖ゼ鏈轰环鏍奸粯璁や负0
+ End If
ServiceOrdTraPaidPrice= rs("ServiceOrdTraPaidPrice") '宸叉敮浠橀噾棰�
ServiceOrdPoints = rs("ServiceOrdPoints") '浣跨敤绉垎
ServiceOrdTraPriceReason=rs("ServiceOrdTraPriceReason")'宸环鍘熷洜
@@ -134,7 +138,8 @@
If ServiceOrdTraUnitPrice="" Then ServiceOrdTraUnitPrice=0
If ServiceOrdTraOfferPrice="" Then ServiceOrdTraOfferPrice=0
If ServiceOrdTraTxnPrice="" Then ServiceOrdTraTxnPrice=0
-If ServiceOrdTraPrePayment="" Then ServiceOrdTraPrePayment=0
+ If ServiceOrdTraPrePayment="" Then ServiceOrdTraPrePayment=0
+ If ServiceOrdStairClimberPrice="" Then ServiceOrdStairClimberPrice=0 '鐖ゼ鏈轰环鏍奸粯璁ゅ��
If ServiceOrdTraProvince<>"" Then ProvinceCityID=ServiceOrdTraProvince
If ServiceOrdTraCity<>"" Then ProvinceCityID=ServiceOrdTraCity
If TEL_Time="" Then TEL_Time=now()
@@ -1236,7 +1241,21 @@
</div>
<%End If
rs.close()
- End If%>
+ else%>
+ <%If ServiceOrdUnitRemarks<>"" Then%>
+ <div class="field">
+ <div class="label" style="float: left;margin-left: 0px;">
+ <label for="input-small">瀹㈡埛瑕佹眰:</label>
+ </div>
+ <div class="checkboxes" style="float:left;margin-left: 70px;max-width: 800px;line-height: 25px;">
+ <ul>
+ <%=ServiceOrdUnitRemarks %>
+ </ul>
+ </div>
+ </div>
+ <% End If%>
+
+ <%End If%>
<div class="field">
<div class="label" style="float: left;margin-left: 0px;">
<label for="input-small">瀵瑰尰鎶ゅ徃澶囨敞:</label>
@@ -1316,7 +1335,21 @@
<%Next%>
</div>
<%End If%>
-
+ <div class="field">
+ <!--鏍囧噯鎶ヤ环-->
+ <% if ServiceOrdTraOfferPrice<>"" and ServiceOrdTraOfferPrice<>0 then %>
+ <div class="label" style="float: left;">
+ <label for="input-small">鎺ㄩ�佹姤浠�:</label>
+ </div>
+ <div class="input" style="float:left;margin-left: 70px;">
+ <input type="text" id="ServiceOrdTraTxnPrice" name="ServiceOrdTraTxnPrice" value="<%=ServiceOrdTraOfferPrice%>" readonly>
+ <input id="ServiceOrdTraOfferPrice_A" type="hidden" value="<%=ServiceOrdTraOfferPrice%>">
+ </div>
+ <% else%>
+ <input id="ServiceOrdTraOfferPrice_A" type="hidden" value="<%=ServiceOrdTraOfferPrice%>">
+ <input type="hidden" id="ServiceOrdTraOfferPrice" name="ServiceOrdTraOfferPrice" class="small" style="width:138px;" onkeyup="value=value.replace(/[^\d.]/g,'')" onblur="value=value.replace(/[^\d.]/g,'')" value="<%=Round(ServiceOrdTraOfferPrice,2)%>">
+ <%end if%>
+ </div>
<%'鍦伴潰鏈嶅姟鍗�
If OrderClassB(ServiceOrdClass,"vType")="1" then%>
<%'杞﹁締璋冨害鍗�
@@ -1336,15 +1369,12 @@
%>
<input type="hidden" id="ServiceOrdTraUnitPrice" name="ServiceOrdTraUnitPrice" class="small" style="width:138px;" onkeyup="value=value.replace(/[^\d.]/g,'')" onblur="value=value.replace(/[^\d.]/g,'')" value="<%=Round(ServiceOrdTraUnitPrice,2)%>">
- <!--鏍囧噯鎶ヤ环-->
- <input id="ServiceOrdTraOfferPrice_A" type="hidden" value="<%=ServiceOrdTraOfferPrice%>">
- <input type="hidden" id="ServiceOrdTraOfferPrice" name="ServiceOrdTraOfferPrice" class="small" style="width:138px;" onkeyup="value=value.replace(/[^\d.]/g,'')" onblur="value=value.replace(/[^\d.]/g,'')" value="<%=Round(ServiceOrdTraOfferPrice,2)%>">
-
+
<!--琛岀▼鏃堕棿-->
<input type="hidden" id="ServiceOrdTraDuration" name="ServiceOrdTraDuration" class="small" style="width:138px;" value="<%=ServiceOrdTraDuration%>">
<!--鍑哄彂鍦�-->
-
+
<div class="label" style="float: left;">
<label for="input-small">鎴愪氦浠�:</label>
@@ -1355,11 +1385,17 @@
</div>
<div class="label" style="float: left;margin-left:224px;">
- <label for="input-small">闇�棰勪粯娆�:</label>
- </div>
- <div class="input" style="float:left;margin-left: 60px;">
- <input type="text" id="ServiceOrdTraPrePayment" name="ServiceOrdTraPrePayment" class="small<%If ServiceOrd_AP_Check="1" And DispatchOrd_AP_Check="1" Then Response.Write " valid"%>" style="width:138px;" onkeyup="value=value.replace(/[^\d.]/g,'')" onblur="value=value.replace(/[^\d.]/g,'')" value="<%=MoneyCheck(ServiceOrdTraPrePayment,0)%>"<%If ServiceOrd_AP_Check="1" And DispatchOrd_AP_Check="1" Then Response.Write " readonly=""true""" %> onchange="upperCase(this.name)">
- </div>
+ <label for="input-small">闇�棰勪粯娆�:</label>
+ </div>
+ <div class="input" style="float:left;margin-left: 60px;">
+ <input type="text" id="ServiceOrdTraPrePayment" name="ServiceOrdTraPrePayment" class="small<%If ServiceOrd_AP_Check="1" And DispatchOrd_AP_Check="1" Then Response.Write " valid"%>" style="width:138px;" onkeyup="value=value.replace(/[^\d.]/g,'')" onblur="value=value.replace(/[^\d.]/g,'')" value="<%=MoneyCheck(ServiceOrdTraPrePayment,0)%>"<%If ServiceOrd_AP_Check="1" And DispatchOrd_AP_Check="1" Then Response.Write " readonly=""true""" %> onchange="upperCase(this.name)">
+ </div>
+ <div class="label" style="float: left;margin-left:590px;">
+ <label for="input-small">鐖ゼ鏈轰环鏍�:</label>
+ </div>
+ <div class="input" style="float:left;margin-left: 226px;">
+ <input type="text" id="ServiceOrdStairClimberPrice" name="ServiceOrdStairClimberPrice" class="small<%If ServiceOrd_AP_Check="1" And DispatchOrd_AP_Check="1" Then Response.Write " valid"%>" style="width:138px;" onkeyup="value=value.replace(/[^\d.]/g,'')" onblur="value=value.replace(/[^\d.]/g,'')" value="<%=MoneyCheck(ServiceOrdStairClimberPrice,0)%>"<%If ServiceOrd_AP_Check="1" And DispatchOrd_AP_Check="1" Then Response.Write " readonly=""true""" %> onchange="upperCase(this.name)">
+ </div>
<%If SettlementPrice>0 Then%>
<div class="label" style="float: left;margin-left:448px;">
<label for="input-small">缁撶畻浠�:</label>
@@ -2538,4 +2574,18 @@
}
</script>
<!--浼佸井缁╂晥鏂规绐楀彛 end-->
- <input name="EditDataForm" id="EditDataForm" type="hidden" value="">
\ No newline at end of file
+ <input name="EditDataForm" id="EditDataForm" type="hidden" value="">
+ <% if ServiceOrdTraOfferPrice<>"" and ServiceOrdTraOfferPrice<>0 then %>
+ <div class="label" style="float: left;">
+ <label for="input-small">鍙傝�冧环:</label>
+ </div>
+ <div class="input" style="float:left;margin-left: 70px;">
+ <input type="text" id="ServiceOrdTraOfferPrice_Display" name="ServiceOrdTraOfferPrice_Display" class="small" style="width:138px;" readonly value="<%=Round(ServiceOrdTraOfferPrice,2)%>">
+ </div>
+ <div class="label" style="float: left;margin-left:224px;">
+ <label for="input-small">鍙傝�冩垚浜や环:</label>
+ </div>
+ <div class="input" style="float:left;margin-left: 60px;">
+ <input type="text" id="ServiceOrdTraTxnPrice_Ref" name="ServiceOrdTraTxnPrice_Ref" class="small" style="width:138px;" readonly value="<%=MoneyCheck(ServiceOrdTraTxnPrice,0)%>">
+ </div>
+ <% end if%>
\ No newline at end of file
--
Gitblit v1.9.1