From 3b18a48485f7207438d9d0eb3038d979e069431d Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 26 五月 2022 17:58:18 +0800
Subject: [PATCH] 优化产品及产品分类,订单,对称加密,IP转地区名称

---
 web/web/GwOrderComplete.aspx |   80 ++++++++++++++++++++++++----------------
 1 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/web/web/GwOrderComplete.aspx b/web/web/GwOrderComplete.aspx
index 320ef5e..2ff3163 100644
--- a/web/web/GwOrderComplete.aspx
+++ b/web/web/GwOrderComplete.aspx
@@ -9,14 +9,14 @@
 
         function loadPageList() {
             var clientId = $("#ClientId").val();
-            var clientName = $("#ClientName").val();
+            var compay = $("#Compay").val();
             var spId = $("#SpId").val();
             var startDate = $("#StartTime").val();
             var endDate = $("#EndTime").val();
             $.ajax({
                 url: "GwOrder.ashx",
                 type: "POST",
-                data: { action: "listComplete", clientId: clientId, clientName: clientName, spId: spId, startDate: startDate, endDate: endDate, flag: 1, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
+                data: { action: "listComplete", clientId: clientId, compay: compay, spId: spId, startDate: startDate, endDate: endDate, flag: 1, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
                 success: function(result) {
                     if (result.OK) {
                         $("#orderTable tbody").html(result.Message.Table);
@@ -40,23 +40,22 @@
 
                 //$("#orderDialog .modal-title").text("璁㈠崟鏄庣粏");
                 //$("#orderDialog #action").val("detail");
-                $("#orderDialog #orderId").val(r.Message.OrderId).attr("readonly", false);
-                $("#orderDialog #spId").val(r.Message.SpId);
-                $("#orderDialog #clientId").val(r.Message.ClientId);
-                $("#orderDialog #productId").val(r.Message.ProductId);
+                $("#orderDialog #orderId").val(r.Message.OrderId).attr("readonly", "readonly");
+                $("#orderDialog #spId").val(r.Message.SpId).attr("readonly", "readonly");
+                $("#orderDialog #clientId").val(r.Message.ClientId).attr("disabled", "disabled");
+                $("#orderDialog #productId").val(r.Message.ProductId).attr("disabled", "disabled");
                 //$("#orderDialog #comboId").val(r.Message.ComboId);
-                $("#orderDialog #basicNum").val(r.Message.BasicNum, 0);
-                $("#orderDialog #givingNum").val(r.Message.GivingNum, 0);
-                $("#orderDialog #price").val(r.Message.Price / 1000, 0.00);
-                $("#orderDialog #orderNumTotal").val(r.Message.OrderNumTotal, 0);
-                $("#orderDialog #orderAmountTotal").val(r.Message.OrderAmountTotal / 1000, 0);
-                $("#orderDialog #beforeBalanceNum").val(r.Message.BeforeBalanceNum, 0);
-                $("#orderDialog #creator").val(r.Message.Creator);
-                $("#orderDialog #createTime").val(r.Message.CreateTime);
-                //$("#orderDialog #auditor").valval(r.Message.Auditor);
-                //$("#orderDialog #auditTime").val(r.Message.AuditTime);
-                $("#orderDialog #status").val(r.Message.Status);
-                $("#orderDialog #remark").val(r.Message.Remark);
+                $("#orderDialog #basicNum").val(r.Message.BasicNum, 0).attr("readonly", "readonly");
+                $("#orderDialog #givingNum").val(r.Message.GivingNum, 0).attr("readonly", "readonly");
+                $("#orderDialog #price").val(r.Message.Price / 1000, 0.00).attr("readonly", "readonly");
+                $("#orderDialog #orderNumTotal").val(r.Message.OrderNumTotal, 0).attr("readonly", "readonly");
+                $("#orderDialog #orderAmountTotal").val(r.Message.OrderAmountTotal / 1000, 0).attr("readonly", "readonly");
+                $("#orderDialog #payAmount").val(r.Message.PayAmount / 1000, 0).attr("readonly", "readonly");
+                $("#orderDialog #beforeBalanceNum").val(r.Message.BeforeBalanceNum, 0).attr("readonly", "readonly");
+                $("#orderDialog #creator").val(r.Message.Creator).attr("readonly", "readonly");
+                $("#orderDialog #createTime").val(r.Message.CreateTime).attr("readonly", "readonly");
+                $("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
+                $("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");
 
                 $("#orderDialog").modal("show");
             }, "json");
@@ -94,19 +93,19 @@
         <div class="m-b">
             <div class="form-group">
                 <div class="input-group m-b">
-                    <span class="input-group-addon">浠g悊鍟嗗鎴疯处鎴�</span>
+                    <span class="input-group-addon">瀹㈡埛璐︽埛</span>
                     <input type="text" name="ClientId" id="ClientId" class="form-control col-md-2" />
                 </div>
             </div>
             <div class="form-group">
                 <div class="input-group m-b">
-                    <span class="input-group-addon">浠g悊鍟嗗鎴峰悕绉�</span>
-                    <input type="text" name="ClientName" id="ClientName" class="form-control col-md-2" />
+                    <span class="input-group-addon">鍏徃鍚嶇О</span>
+                    <input type="text" name="Compay" id="Compay" class="form-control col-md-2" />
                 </div>
             </div>
             <div class="form-group">
                 <div class="input-group m-b">
-                    <span class="input-group-addon">SP璐﹀彿</span>
+                    <span class="input-group-addon">鐭俊璐﹀彿</span>
                     <input type="text" name="SpId" id="SpId" class="form-control col-md-2" />
                 </div>
             </div>
@@ -131,26 +130,32 @@
         <table class="table table-striped table-bordered table-hover" id="orderTable">
             <thead>
                 <tr class="header">
+                    <!--
                     <th>璁㈠崟ID
                     </th>
-                    <th>璐﹀彿ID
+                    -->
+                    <th>鐭俊璐﹀彿
                     </th>
-                    <th>瀹㈡埛ID
+                    <th>瀹㈡埛璐﹀彿
                     </th>
-                    <th>浜у搧ID
+                    <th>鍏徃鍚嶇О
+                    </th>
+                    <th>浜у搧鍚嶇О
                     </th>
                     <%--<th>濂楅ID
                     </th>
                          --%>
-                    <th>璁㈠崟鍩烘湰鏉℃暟
+                    <th>璁㈠崟鍩烘湰鏉℃暟锛堟潯锛�
                     </th>
-                    <th>璁㈠崟璧犻�佹潯鏁�
+                    <th>璁㈠崟璧犻�佹潯鏁帮紙鏉★級
                     </th>
                     <th>鍗曚环锛堝厓/鏉★級
                     </th>
-                    <th>璁㈠崟鎬绘潯鏁�
+                    <th>璁㈠崟鎬绘潯鏁帮紙鏉★級
                     </th>
                     <th>璁㈠崟鎬婚噾棰濓紙鍏冿級
+                    </th>
+                    <th>鍏呭�奸噾棰濓紙鍏冿級
                     </th>
                     <th>鍏呭�煎墠璐﹀彿浣欓锛堟潯锛�
                     </th>
@@ -160,7 +165,7 @@
                     </th>
                     <th>鐘舵��
                     </th>
-                    <th class="text-right">鎿嶄綔
+                    <th class="text-center">鎿嶄綔
                     </th>
                 </tr>
             </thead>
@@ -194,14 +199,14 @@
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label">
-                                璐﹀彿ID</label>
+                                鐭俊璐﹀彿</label>
                             <div class="col-sm-4 ">
                                 <input type="text" class="form-control" name="spId" id="spId" value="" />
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label">
-                                瀹㈡埛ID</label>
+                                瀹㈡埛璐﹀彿</label>
                             <div class="col-sm-4 ">
                                 <select name="clientId" id="clientId" class="form-control">
                                     <%=GetClientOptions("0")%>
@@ -210,7 +215,7 @@
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label">
-                                浜у搧ID</label>
+                                浜у搧鍚嶇О</label>
                             <div class="col-sm-4 ">
                                 <select name="productId" id="productId" class="form-control">
                                     <%=GetProductOptions("0")%>
@@ -283,6 +288,17 @@
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label">
+                                鍏呭�奸噾棰�</label>
+                            <div class="col-sm-4">
+                                <div class="input-group">
+                                <input type="text" class="form-control" name="payAmount" id="payAmount" value="" maxlength="10"
+                                    onkeyup="value=value.replace(/[^\d\.]/g,'')" onpaste="value=value.replace(/[^\d\.]/g,'')"
+                                    oncontextmenu="return false" /><span class="input-group-addon">鍏� </span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">
                                 鍏呭�煎墠璐﹀彿浣欓</label>
                             <div class="col-sm-4">
                                 <div class="input-group">

--
Gitblit v1.9.1