解决合并冲突

hzj

3 天以前 82954f31a43d8f6c2c76b24bf09fd45502c24638

 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="">
            <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%>