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/GwOrderComplete.aspx | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/web/web/GwOrderComplete.aspx b/web/web/GwOrderComplete.aspx
index 320ef5e..3af1a0e 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");
@@ -94,13 +93,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>
@@ -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">
--
Gitblit v1.9.1