From 2a11acffdd3df927be6abace9e8155e370b49681 Mon Sep 17 00:00:00 2001 From: wanglizhong <wlz> Date: 星期一, 05 五月 2025 15:35:38 +0800 Subject: [PATCH] fix:修改推送的报价和客户要求 --- ServiceOrder_Data.gds | 56 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 47 insertions(+), 9 deletions(-) diff --git a/ServiceOrder_Data.gds b/ServiceOrder_Data.gds index 93772fe..1430151 100644 --- a/ServiceOrder_Data.gds +++ b/ServiceOrder_Data.gds @@ -1,4 +1,3 @@ - <%'------------------------------------------鏈嶅姟鍗�------------------------------------------ If admin_save<>"" Then '鎻愪氦杩斿洖瀛楁 @@ -1236,7 +1235,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 +1329,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 +1363,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> @@ -2538,4 +2562,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