From 072cc5decf541a57d579b39cfb6c92e0f12dcd04 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期二, 10 五月 2022 15:29:43 +0800
Subject: [PATCH] 充值功能优化，客户表增加余额、订单表增加充值金额
---
web/Lib/Dao.dll | 0
web/web/Bin/Dao.dll | 0
web/Dao/obj/Debug/Dao.dll | 0
web/.vs/Web/v16/.suo | 0
web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt | 1 +
web/web/GwOrderList.aspx | 40 ++++++++++++++++++++++++++--------------
web/Model/obj/Debug/Model.csproj.AssemblyReference.cache | 0
web/Lib/Dao.pdb | 0
web/web/Bin/Dao.pdb | 0
web/Dao/obj/Debug/Dao.pdb | 0
10 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/web/.vs/Web/v16/.suo b/web/.vs/Web/v16/.suo
index 1a7ac25..2bac104 100644
--- a/web/.vs/Web/v16/.suo
+++ b/web/.vs/Web/v16/.suo
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt b/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
index 45be178..6a9ca5c 100644
--- a/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
+++ b/web/Dao/obj/Debug/Dao.csproj.FileListAbsolute.txt
@@ -11,3 +11,4 @@
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.CopyComplete
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.dll
C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.pdb
+C:\AYZH\work\Git_Rep\SMGW_NewWeb\web\Dao\obj\Debug\Dao.csproj.AssemblyReference.cache
diff --git a/web/Dao/obj/Debug/Dao.dll b/web/Dao/obj/Debug/Dao.dll
index 463204a..2f2838e 100644
--- a/web/Dao/obj/Debug/Dao.dll
+++ b/web/Dao/obj/Debug/Dao.dll
Binary files differ
diff --git a/web/Dao/obj/Debug/Dao.pdb b/web/Dao/obj/Debug/Dao.pdb
index 5b8ba2a..a30e763 100644
--- a/web/Dao/obj/Debug/Dao.pdb
+++ b/web/Dao/obj/Debug/Dao.pdb
Binary files differ
diff --git a/web/Lib/Dao.dll b/web/Lib/Dao.dll
index 463204a..2f2838e 100644
--- a/web/Lib/Dao.dll
+++ b/web/Lib/Dao.dll
Binary files differ
diff --git a/web/Lib/Dao.pdb b/web/Lib/Dao.pdb
index 5b8ba2a..a30e763 100644
--- a/web/Lib/Dao.pdb
+++ b/web/Lib/Dao.pdb
Binary files differ
diff --git a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache b/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
index f5e894a..659dda6 100644
--- a/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
+++ b/web/Model/obj/Debug/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/web/web/Bin/Dao.dll b/web/web/Bin/Dao.dll
index 463204a..2f2838e 100644
--- a/web/web/Bin/Dao.dll
+++ b/web/web/Bin/Dao.dll
Binary files differ
diff --git a/web/web/Bin/Dao.pdb b/web/web/Bin/Dao.pdb
index 5b8ba2a..a30e763 100644
--- a/web/web/Bin/Dao.pdb
+++ b/web/web/Bin/Dao.pdb
Binary files differ
diff --git a/web/web/GwOrderList.aspx b/web/web/GwOrderList.aspx
index c219de4..09b5c4a 100644
--- a/web/web/GwOrderList.aspx
+++ b/web/web/GwOrderList.aspx
@@ -51,23 +51,24 @@
//$("#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 #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 #auditor").valval(r.Message.Auditor);
//$("#orderDialog #auditTime").val(r.Message.AuditTime);
- $("#orderDialog #status").val(r.Message.Status);
- $("#orderDialog #remark").val(r.Message.Remark);
+ $("#orderDialog #status").val(r.Message.Status).attr("disabled", "disabled");
+ $("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");
$("#orderDialog").modal("show");
}, "json");
@@ -284,6 +285,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