From 41ecad7e49a93c493832282b5ecd6c69f464b648 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期一, 23 五月 2022 01:07:51 +0800
Subject: [PATCH] 日志文件合并处理
---
web/web/GwOrderAudit.aspx | 135 +++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 46 deletions(-)
diff --git a/web/web/GwOrderAudit.aspx b/web/web/GwOrderAudit.aspx
index 3e759ca..693a9a5 100644
--- a/web/web/GwOrderAudit.aspx
+++ b/web/web/GwOrderAudit.aspx
@@ -41,24 +41,25 @@
//$("#orderDialog .modal-title").text("璁㈠崟鏄庣粏");
//$("#orderDialog #action").val("detail");
- $("#orderDialog #orderId").val(r.Message.OrderId).attr("readonly", false);
- $("#orderDialog #spId").val(r.Message.SpId).attr("readonly", false);
- $("#orderDialog #clientId").val(r.Message.ClientId).attr("readonly", false);
- $("#orderDialog #productId").val(r.Message.ProductId).attr("readonly", false);
+ $("#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).attr("readonly", false);
- $("#orderDialog #remark").val(r.Message.Remark).attr("readonly", false);
+ $("#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 #auditInfo-1").css("display", "none");
$("#orderDialog #auditPass").css("display", "none");
$("#orderDialog #auditNoPass").css("display", "none");
@@ -76,23 +77,25 @@
//$("#orderDialog .modal-title").text("璁㈠崟鏄庣粏");
//$("#orderDialog #action").val("detail");
- $("#orderDialog #orderId").val(r.Message.OrderId).attr("readonly", false);
- $("#orderDialog #spId").val(r.Message.SpId).attr("readonly", false);
- $("#orderDialog #clientId").val(r.Message.ClientId).attr("readonly", false);
- $("#orderDialog #productId").val(r.Message.ProductId).attr("readonly", false);
+ $("#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", 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 #status").val(r.Message.Status).attr("disabled", "disabled");
+ $("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");
+
+ $("#orderDialog #auditReason").val(r.Message.AuditReason);
+ $("#orderDialog #auditInfo-1").css("display", "");
$("#orderDialog #auditPass").css("display", "");
$("#orderDialog #auditNoPass").css("display", "");
@@ -117,9 +120,10 @@
$(document).on("click", ".action-modal-cancel", function () {
var orderId = $(this).data("orderid");
+ var auditReason = $(this).data("auditReason");
mytek.confirm("鏄惁纭畾鍙栨秷璇ヤ俊鎭紵", "鏁版嵁鍙栨秷鍚庡皢鏃犳硶鎭㈠锛岃璋ㄦ厧鎿嶄綔锛�", function (b) {
if (b) {
- $.post("gwOrder.ashx", { "action": "cancel", status: 4, orderId: orderId }, function (result) {
+ $.post("gwOrder.ashx", { "action": "cancel", status: 4, orderId: orderId, auditReason: auditReason }, function (result) {
mytek.alert(result.Message, result.OK, function () {
loadPageList();
});
@@ -131,10 +135,16 @@
//瀹℃牳閫氳繃
$(document).on("click", ".action-auditPass", function () {
- var orderId = $(this).data("orderid");
+ var spId = $("#spId").val();
+ 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, orderId: orderId }, 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();
});
@@ -146,10 +156,16 @@
//瀹℃牳涓嶉�氳繃
$(document).on("click", ".action-auditNoPass", function () {
- var orderId = $(this).data("orderid");
+ var spId = $("#spId").val();
+ 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, orderId: orderId }, 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();
});
@@ -183,13 +199,13 @@
<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>
+ <span class="input-group-addon">瀹㈡埛鍚嶇О</span>
<input type="text" name="ClientName" id="ClientName" class="form-control col-md-2" />
</div>
</div>
@@ -240,6 +256,8 @@
<th>璁㈠崟鎬绘潯鏁�
</th>
<th>璁㈠崟鎬婚噾棰濓紙鍏冿級
+ </th>
+ <th>鍏呭�奸噾棰濓紙鍏冿級
</th>
<th>鍏呭�煎墠璐﹀彿浣欓锛堟潯锛�
</th>
@@ -320,7 +338,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>
@@ -331,7 +349,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>
@@ -342,7 +360,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>
@@ -353,7 +371,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>
@@ -364,7 +382,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>
@@ -375,7 +404,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>
@@ -399,7 +428,14 @@
<label class="col-sm-2 control-label">
鐘舵��</label>
<div class="col-sm-4 ">
- <input type="text" class="form-control" name="status" id="status" value="" />
+ <select name="status" id="status" class="form-control">
+ <option value=""></option>
+ <option value="0">寰呭鏍�</option>
+ <option value="1">瀹℃牳涓�</option>
+ <option value="2">瀹℃牳閫氳繃</option>
+ <option value="3">瀹℃牳涓嶉�氳繃</option>
+ <option value="4">鍙栨秷</option>
+ </select>
</div>
</div>
<div class="form-group">
@@ -409,6 +445,13 @@
<input type="text" class="form-control" name="remark" id="remark" value="" />
</div>
</div>
+ <div class="form-group" id="auditInfo-1">
+ <label class="col-sm-2 control-label">
+ 涓嶉�氳繃鍘熷洜</label>
+ <div class="col-sm-10 input-group m-b">
+ <input type="text" class="form-control" name="auditReason" id="auditReason" value="" />
+ </div>
+ </div>
</div>
<div class="modal-footer">
<button class="action-auditPass btn btn-primary" data-dismiss="modal" aria-hidden="true" id="auditPass">
--
Gitblit v1.9.1