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/GwOrderAudit.aspx | 75 +++++++++++++++++++++++--------------
1 files changed, 46 insertions(+), 29 deletions(-)
diff --git a/web/web/GwOrderAudit.aspx b/web/web/GwOrderAudit.aspx
index 738d998..3af525f 100644
--- a/web/web/GwOrderAudit.aspx
+++ b/web/web/GwOrderAudit.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: "listAudit", clientId: clientId, clientName: clientName, spId: spId, startDate: startDate, endDate: endDate, flag: 0, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
+ data: { action: "listAudit", clientId: clientId, compay: compay, spId: spId, startDate: startDate, endDate: endDate, flag: 0, pageIndex: pagination.getPageIndex(), pageSize: pagination.getPageSize() },
success: function (result) {
if (result.OK) {
$("#orderTable tbody").html(result.Message.Table);
@@ -51,11 +51,10 @@
$("#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 #auditor").valval(r.Message.Auditor);
- //$("#orderDialog #auditTime").val(r.Message.AuditTime);
$("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
$("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");
@@ -83,16 +82,15 @@
$("#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).attr("readonly", "readonly");
- $("#orderDialog #givingNum").val(r.Message.GivingNum, 0).attr("readonly", "readonly");
+ $("#orderDialog #basicNum").val(r.Message.BasicNum, 0).attr("readonly", false);
+ $("#orderDialog #givingNum").val(r.Message.GivingNum, 0).attr("readonly", false);
$("#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", false);
$("#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 #auditor").valval(r.Message.Auditor);
- //$("#orderDialog #auditTime").val(r.Message.AuditTime);
$("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
$("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");
@@ -141,11 +139,12 @@
var orderId = $("#orderId").val();
var basicNum = $("#basicNum").val();
var givingNum = $("#givingNum").val();
+ var payAmount = $("#payAmount").val();
var price = $("#price").val();
var auditReason = $("#auditReason").val();
mytek.confirm("鏄惁纭畾瀹℃牳閫氳繃璇ヤ俊鎭紵", "鏁版嵁鏇存柊鍚庡皢鏃犳硶鎭㈠锛岃璋ㄦ厧鎿嶄綔锛�", function (b) {
if (b) {
- $.post("gwOrder.ashx", { "action": "audit", status: 1, spId: spId, orderId: orderId, basicNum: basicNum, givingNum: givingNum, price: price, auditReason: auditReason }, function (result) {
+ $.post("gwOrder.ashx", { "action": "audit", status: 1, spId: spId, orderId: orderId, basicNum: basicNum, givingNum: givingNum, payAmount: payAmount, price: price, auditReason: auditReason }, function (result) {
mytek.alert(result.Message, result.OK, function () {
loadPageList();
});
@@ -161,11 +160,12 @@
var orderId = $("#orderId").val();
var basicNum = $("#basicNum").val();
var givingNum = $("#givingNum").val();
+ var payAmount = $("#payAmount").val();
var price = $("#price").val();
var auditReason = $("#auditReason").val();
mytek.confirm("鏄惁纭畾瀹℃牳涓嶉�氳繃璇ヤ俊鎭紵", "鏁版嵁鏇存柊鍚庡皢鏃犳硶鎭㈠锛岃璋ㄦ厧鎿嶄綔锛�", function (b) {
if (b) {
- $.post("gwOrder.ashx", { "action": "audit", status: 0, spId: spId, orderId: orderId, basicNum: basicNum, givingNum: givingNum, price: price, auditReason: auditReason }, function (result) {
+ $.post("gwOrder.ashx", { "action": "audit", status: 0, spId: spId, orderId: orderId, basicNum: basicNum, givingNum: givingNum, payAmount: payAmount, price: price, auditReason: auditReason }, function (result) {
mytek.alert(result.Message, result.OK, function () {
loadPageList();
});
@@ -199,14 +199,14 @@
<div class="m-b">
<div class="form-group">
<div class="input-group m-b">
- <span class="input-group-addon">浠ｇ悊鍟嗗鎴疯处鎴�</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">浠ｇ悊鍟嗗鎴峰悕绉�</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">
@@ -236,26 +236,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>
@@ -265,7 +271,7 @@
</th>
<th>鐘舵��
</th>
- <th class="text-right">鎿嶄綔
+ <th class="text-center">鎿嶄綔
</th>
</tr>
</thead>
@@ -299,14 +305,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")%>
@@ -315,7 +321,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")%>
@@ -336,7 +342,7 @@
璁㈠崟鍩烘湰鏉℃暟</label>
<div class="col-sm-4">
<div class="input-group">
- <input type="text" class="form-control" name="basicNum" id="basicNum" value="" maxlength="5"
+ <input type="text" class="form-control" name="basicNum" id="basicNum" 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>
@@ -347,7 +353,7 @@
璁㈠崟璧犻�佹潯鏁�</label>
<div class="col-sm-4">
<div class="input-group">
- <input type="text" class="form-control" name="givingNum" id="givingNum" value="" maxlength="5"
+ <input type="text" class="form-control" name="givingNum" id="givingNum" 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>
@@ -358,7 +364,7 @@
鍗曚环</label>
<div class="col-sm-4">
<div class="input-group">
- <input type="text" class="form-control" name="price" id="price" value="" maxlength="5"
+ <input type="text" class="form-control" name="price" id="price" 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>
@@ -369,7 +375,7 @@
璁㈠崟鎬绘潯鏁�</label>
<div class="col-sm-4">
<div class="input-group">
- <input type="text" class="form-control" name="orderNumTotal" id="orderNumTotal" value="" maxlength="5"
+ <input type="text" class="form-control" name="orderNumTotal" id="orderNumTotal" 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>
@@ -380,7 +386,18 @@
璁㈠崟鎬婚噾棰�</label>
<div class="col-sm-4">
<div class="input-group">
- <input type="text" class="form-control" name="orderAmountTotal" id="orderAmountTotal" value="" maxlength="5"
+ <input type="text" class="form-control" name="orderAmountTotal" id="orderAmountTotal" 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">
+ <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>
@@ -391,7 +408,7 @@
鍏呭�煎墠璐﹀彿浣欓</label>
<div class="col-sm-4">
<div class="input-group">
- <input type="text" class="form-control" name="beforeBalanceNum" id="beforeBalanceNum" value="" maxlength="5"
+ <input type="text" class="form-control" name="beforeBalanceNum" id="beforeBalanceNum" 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>
--
Gitblit v1.9.1