From 1503b9d7ed1d71b98bd5715c23d236ef3c019ead Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期一, 13 十月 2025 15:40:20 +0800
Subject: [PATCH] Merge branch 'main' of http://8.134.184.104:10801/r/came
---
ServiceOrder_Data.gds | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/ServiceOrder_Data.gds b/ServiceOrder_Data.gds
index 1430151..840baf2 100644
--- a/ServiceOrder_Data.gds
+++ b/ServiceOrder_Data.gds
@@ -67,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")'宸环鍘熷洜
@@ -133,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()
@@ -1379,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>
--
Gitblit v1.9.1