From 148b7e632c249c2a9d1dd077de3d181737bb37b6 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期三, 11 五月 2022 11:55:03 +0800
Subject: [PATCH] 订单列表增加充值金额；客户列表增加账户余额；累计充值金额除以1000
---
web/web/GwClient.ashx | 4 +
web/web/GwOrderComplete.aspx | 44 ++++++++++++++--------
web/.vs/Web/v16/.suo | 0
web/web/GwOrder.ashx | 9 +++-
web/web/GwClient.aspx | 2 +
web/web/GwOrderAudit.aspx | 6 +--
web/web/GwOrderList.aspx | 2 +
7 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index 75791a8..0c52631 100644
--- a/web/.vs/Web/v16/.suo
+++ b/web/.vs/Web/v16/.suo
Binary files differ
diff --git a/web/web/GwClient.ashx b/web/web/GwClient.ashx
index 766ee70..151e4be 100644
--- a/web/web/GwClient.ashx
+++ b/web/web/GwClient.ashx
@@ -89,7 +89,9 @@
{
Certification_StatusResult = "宸茶璇�";
}
- str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Top_up_Amount_Total + "鍏�</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
+ //edit:yangzh by 20220511
+ //str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Top_up_Amount_Total + "鍏�</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
+ str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Balance/1000 + "鍏�</td><td>" + item.Top_up_Amount_Total/1000 + "鍏�</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
str += @"<td>";
string loginStr = "http://" + serverIp + ":" + clientPort + "/Attachedlogin.aspx?action=Attachedlogin&account=" + item.Account + "&password=" + item.Password;
diff --git a/web/web/GwClient.aspx b/web/web/GwClient.aspx
index 8bfd71d..7218cb1 100644
--- a/web/web/GwClient.aspx
+++ b/web/web/GwClient.aspx
@@ -388,6 +388,8 @@
</th>
<th>鑱旂郴鐢佃瘽
</th>
+ <th>璐︽埛浣欓
+ </th>
<th>绱鍏呭��
</th>
diff --git a/web/web/GwOrder.ashx b/web/web/GwOrder.ashx
index cf97ece..471e79e 100644
--- a/web/web/GwOrder.ashx
+++ b/web/web/GwOrder.ashx
@@ -88,7 +88,8 @@
str1 = str1 + "<td>" + bean.GivingNum + "</td>";
str1 = str1 + string.Format("<td>{0}鍏�/鏉�</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));;
+ str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
str1 = str1 + "<td>" + bean.Creator + "</td>";
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
@@ -145,7 +146,8 @@
str1 = str1 + "<td>" + bean.GivingNum + "</td>";
str1 = str1 + string.Format("<td>{0}鍏�/鏉�</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));;
+ str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
str1 = str1 + "<td>" + bean.Creator + "</td>";
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
@@ -221,7 +223,8 @@
str1 = str1 + "<td>" + bean.GivingNum + "</td>";
str1 = str1 + string.Format("<td>{0}鍏�/鏉�</td>", (object)(Convert.ToDecimal(bean.Price) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.OrderNumTotal + "</td>";
- str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));;
+ str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.OrderAmountTotal) / new Decimal(1000)));
+ str1 = str1 + string.Format("<td>{0}鍏�</td>", (object)(Convert.ToDecimal(bean.PayAmount) / new Decimal(1000)));
str1 = str1 + "<td>" + bean.BeforeBalanceNum + "</td>";
str1 = str1 + "<td>" + bean.Creator + "</td>";
str1 = str1 + "<td>" + bean.CreateTime + "</td>";
diff --git a/web/web/GwOrderAudit.aspx b/web/web/GwOrderAudit.aspx
index 8a35dea..9f54f76 100644
--- a/web/web/GwOrderAudit.aspx
+++ b/web/web/GwOrderAudit.aspx
@@ -55,8 +55,6 @@
$("#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");
@@ -93,8 +91,6 @@
$("#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");
@@ -261,6 +257,8 @@
</th>
<th>璁㈠崟鎬婚噾棰濓紙鍏冿級
</th>
+ <th>鍏呭�奸噾棰濓紙鍏冿級
+ </th>
<th>鍏呭�煎墠璐﹀彿浣欓锛堟潯锛�
</th>
<th>鍒涘缓浜�
diff --git a/web/web/GwOrderComplete.aspx b/web/web/GwOrderComplete.aspx
index 320ef5e..4db6f61 100644
--- a/web/web/GwOrderComplete.aspx
+++ b/web/web/GwOrderComplete.aspx
@@ -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");
@@ -151,6 +150,8 @@
<th>璁㈠崟鎬绘潯鏁�
</th>
<th>璁㈠崟鎬婚噾棰濓紙鍏冿級
+ </th>
+ <th>鍏呭�奸噾棰濓紙鍏冿級
</th>
<th>鍏呭�煎墠璐﹀彿浣欓锛堟潯锛�
</th>
@@ -283,6 +284,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">
diff --git a/web/web/GwOrderList.aspx b/web/web/GwOrderList.aspx
index 09b5c4a..e6cf071 100644
--- a/web/web/GwOrderList.aspx
+++ b/web/web/GwOrderList.aspx
@@ -149,6 +149,8 @@
</th>
<th>璁㈠崟鎬婚噾棰濓紙鍏冿級
</th>
+ <th>鍏呭�奸噾棰濓紙鍏冿級
+ </th>
<th>鍏呭�煎墠璐﹀彿浣欓锛堟潯锛�
</th>
<th>鍒涘缓浜�
--
Gitblit v1.9.1