From f63d8ead25bdb3c32dacca817a059bd30390e9bc Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期三, 15 六月 2022 22:20:07 +0800
Subject: [PATCH] 1.系统账户数据库优化： 修改“账户类型”的数据类型为VARCHAR2(1024)，多个角色时以半角“,”分隔。 加密盐。 密码加密优化；账户登录优化；角色权限管理（作废用户权限）； 2.字典类型管理（定义：用户角色） 3.字典数据管理（初始化用户角色数据） 3.角色权限管理 4.系统账户管理，账户类型对应用户角色（可多选）。
---
web/web/GwOrderComplete.aspx | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/web/web/GwOrderComplete.aspx b/web/web/GwOrderComplete.aspx
index 1eea045..5134d50 100644
--- a/web/web/GwOrderComplete.aspx
+++ b/web/web/GwOrderComplete.aspx
@@ -32,6 +32,31 @@
$(".input-daterange").datepicker({ keyboardNavigation: !1, forceParse: !1, autoclose: !0 });
+ //鐘舵�佽浆鎹㈠悕绉�
+ function statusToName(status) {
+ if (status == "") {
+ return "";
+ }
+ else if (status == 0) {
+ return "寰呭鏍�";
+ }
+ else if (status == 1) {
+ return "瀹℃牳涓�";
+ }
+ else if (status == 2) {
+ return "瀹℃牳閫氳繃";
+ }
+ else if (status == 3) {
+ return "瀹℃牳涓嶉�氳繃";
+ }
+ else if (status == 4) {
+ return "鍙栨秷";
+ }
+ else {
+ return status;
+ }
+ }
+
$(document).on("click", ".action-modal-detail", function () {
var orderId = $(this).data("orderid");
$("#orderDialog .modal-title").text("璁㈠崟鏄庣粏");
@@ -42,19 +67,25 @@
//$("#orderDialog #action").val("detail");
$("#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 #clientId").val(r.Message.ClientId).attr("disabled", "disabled");
+ $("#orderDialog #clientId").val(r.Message.ClientId);
+ $("#orderDialog #clientCompany").val(r.Message.Company).attr("disabled", "disabled"); //杞崲鍚嶇О
+ //$("#orderDialog #productId").val(r.Message.ProductId).attr("disabled", "disabled");
+ $("#orderDialog #productId").val(r.Message.ProductId);
+ $("#orderDialog #productName").val(r.Message.ProductName).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", 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 #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 #status").val(r.Message.Status).attr("disabled", "disabled");
+ $("#orderDialog #status").val(r.Message.Status);
+ $("#orderDialog #statusName").val(statusToName(r.Message.Status)).attr("disabled", "disabled"); //杞崲鍚嶇О
$("#orderDialog #remark").val(r.Message.Remark).attr("disabled", "disabled");
$("#orderDialog").modal("show");
@@ -210,18 +241,32 @@
<label class="col-sm-2 control-label">
瀹㈡埛璐﹀彿</label>
<div class="col-sm-4 ">
+ <!--
<select name="clientId" id="clientId" class="form-control">
- <%=GetClientOptions("0")%>
+ <!%=GetClientOptions("0")%>
</select>
+ -->
+ <input type="text" class="form-control" name="clientId" id="clientId" value="" readonly="readonly" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 鍏徃鍚嶇О</label>
+ <div class="col-sm-4 ">
+ <input type="text" class="form-control" name="clientCompany" id="clientCompany" value="" readonly="readonly" />
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">
浜у搧鍚嶇О</label>
<div class="col-sm-4 ">
+ <!--
<select name="productId" id="productId" class="form-control">
- <%=GetProductOptions("0")%>
+ <!%=GetProductOptions("0")%>
</select>
+ -->
+ <input type="text" class="form-control" name="productName" id="productName" value="" readonly="readonly" />
+ <input type="hidden" class="form-control" name="productId" id="productId" value="" />
</div>
</div>
<%--
@@ -328,6 +373,7 @@
<label class="col-sm-2 control-label">
鐘舵��</label>
<div class="col-sm-4 ">
+ <!--
<select name="status" id="status" class="form-control">
<option value=""></option>
<option value="0">寰呭鏍�</option>
@@ -336,6 +382,9 @@
<option value="3">瀹℃牳涓嶉�氳繃</option>
<option value="4">鍙栨秷</option>
</select>
+ -->
+ <input type="text" class="form-control" name="statusName" id="statusName" value="" />
+ <input type="hidden" class="form-control" name="status" id="status" value="" />
</div>
</div>
<div class="form-group">
--
Gitblit v1.9.1