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/GwOrderCreate.aspx | 158 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 109 insertions(+), 49 deletions(-)
diff --git a/web/web/GwOrderCreate.aspx b/web/web/GwOrderCreate.aspx
index 09a653b..05c5cfb 100644
--- a/web/web/GwOrderCreate.aspx
+++ b/web/web/GwOrderCreate.aspx
@@ -6,8 +6,9 @@
<asp:Content runat="server" ID="Content2" ContentPlaceHolderID="title"> </asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="content" runat="Server">
- <form method="get" action="GwOrderCreate.aspx" class=" form-horizontal">
+ <form method="get" action="GwOrder.ashx" class=" form-horizontal">
<!--<form method="get" action="GwOrderCreate.aspx?action=Add" name="thisForm" id="thisForm" class=" form-horizontal"> -->
+ <input type="hidden" name="Action" id="Action" maxlength="6" value="add" />
<div class="modal-dialog modal-lg">
<div class="modal-content ">
<div class="modal-header">
@@ -15,29 +16,58 @@
璐﹀彿鍏呭�� <input type="hidden" name="apid" id="apid" value="0"/></h4>
</div>
<div class="modal-body">
- <div class="form-group">
- <label class="col-sm-2 control-label">
- 璐﹀彿ID</label>
- <div class="col-sm-6 ">
- <input type="text" class="form-control" name="spId" id="spId" value="<%=GwOrder.SpId %>" readonly="readonly"/>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 瀹㈡埛璐﹀彿</label>
+ <div class="col-sm-6 ">
+ <input type="text" class="form-control" name="clientId" id="clientId" value="<%=GwOrder.ClientId %>" readonly="readonly"/>
+ </div>
</div>
- </div>
- <div class="form-group">
- <label class="col-sm-2 control-label">
- 瀹㈡埛ID</label>
- <div class="col-sm-6 ">
- <select name="clientId" id="clientId" class="form-control" disabled="disabled">
- <%=GetClientOptions(GwOrder.ClientId)%>
- </select>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 鍏徃鍚嶇О</label>
+ <div class="col-sm-6 ">
+ <input type="text" class="form-control" name="company" id="company" value="<%=GwOrder.Company %>" readonly="readonly"/>
+ </div>
</div>
- </div>
+ <%if (_controlFlag == 0)
+ { %>
+ <!--
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 瀹㈡埛璐﹀彿</label>
+ <div class="col-sm-6 ">
+ <select name="clientId" id="clientId" class="form-control" disabled="disabled">
+ <!%=GetClientOptions(GwOrder.ClientId)%>
+ </select>
+ </div>
+ </div>
+ -->
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 鐭俊璐﹀彿</label>
+ <div class="col-sm-6 ">
+ <select name="spId" id="spId" class="form-control" onchange="getGwSp(this);" >
+ <%=GetSpOptions()%>
+ </select>
+ </div>
+ </div>
+ <%}
+ else { %>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 鐭俊璐﹀彿</label>
+ <div class="col-sm-6 ">
+ <input type="text" class="form-control" name="spId" id="spId" value="<%=GwOrder.SpId %>" readonly="readonly"/>
+ </div>
+ </div>
+ <%} %>
<div class="form-group">
<label class="col-sm-2 control-label">
- 浜у搧ID</label>
+ 浜у搧鍚嶇О</label>
<div class="col-sm-6 ">
- <select name="productId" id="productId" class="form-control" disabled="disabled">
- <%=GetProductOptions(GwOrder.ProductId)%>
- </select>
+ <input type="text" class="form-control" name="productName" id="productName" value="<%=GwOrder.ProductName %>" readonly="readonly"/>
+ <input type="hidden" class="form-control" name="productId" id="productId" value="<%=GwOrder.ProductId %>" />
</div>
</div>
<div class="form-group">
@@ -45,7 +75,7 @@
鍩烘湰鏉℃暟浣欓</label>
<div class="col-sm-6">
<div class="input-group">
- <input type="text" class="form-control" value="<%=GwOrder.BasicNum %>"
+ <input type="text" class="form-control" name="_basicNum" id="_basicNum" value="<%=GwOrder.BasicNum %>"
onkeyup="value=value.replace(/[^\d\.]/g,'')" onpaste="value=value.replace(/[^\d\.]/g,'')"
oncontextmenu="return false" readonly="readonly" /><span class="input-group-addon">鏉� </span>
</div>
@@ -56,7 +86,7 @@
璧犻�佹潯鏁颁綑棰�</label>
<div class="col-sm-6">
<div class="input-group">
- <input type="text" class="form-control" value="<%=GwOrder.GivingNum %>"
+ <input type="text" class="form-control" name="_givingNum" id="_givingNum" value="<%=GwOrder.GivingNum %>"
onkeyup="value=value.replace(/[^\d\.]/g,'')" onpaste="value=value.replace(/[^\d\.]/g,'')"
oncontextmenu="return false" readonly="readonly" /><span class="input-group-addon">鏉� </span>
</div>
@@ -75,12 +105,23 @@
</div>
<div class="form-group classes-span classes-span-1">
<label class="col-sm-2 control-label">
- 鐢ㄦ埛浣欓</label>
+ 瀹㈡埛浣欓</label>
<div class="col-sm-6">
<div class="input-group">
- <input type="text" class="form-control" value="<%=(double)Balance/1000 %>"
+ <input type="text" class="form-control" name="balance" id="balance" value="<%=(double)GwOrder.Balance/1000 %>"
onkeyup="value=value.replace(/[^\d\.]/g,'')" onpaste="value=value.replace(/[^\d\.]/g,'')"
oncontextmenu="return false" readonly="readonly" /><span class="input-group-addon">鍏� </span>
+ </div>
+ </div>
+ </div>
+ <div class="form-group classes-span classes-span-1">
+ <label class="col-sm-2 control-label">
+ 鍏呭�奸噾棰�</label>
+ <div class="col-sm-6">
+ <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>
@@ -89,7 +130,7 @@
璁㈠崟鍩烘湰鏉℃暟</label>
<div class="col-sm-6">
<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>
@@ -100,7 +141,7 @@
璁㈠崟璧犻�佹潯鏁�</label>
<div class="col-sm-6">
<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>
@@ -115,9 +156,8 @@
</div>
</div>
<div class="modal-footer">
- <input class="btn btn-default" value="杩斿洖" onclick="return window.location = 'GwSp.aspx'" type="button" />
- <button class="btn btn-primary action-save">
- 淇濆瓨</button>
+ <a class="btn btn-primary action-save" href="javascript:;">淇濆瓨</a>
+ <a class="btn btn-default action-back" href="javascript:;" onclick="return window.location = '<%=backUrl %>'">杩斿洖</a>
</div>
</div>
</div>
@@ -129,40 +169,60 @@
$(document).on("click", ".action-save", function () {
- var spId = $("#spId").val();
- var clientId = $("#clientId").val();
- var productId = $("#productId").val();
- var basicNum = $("#basicNum").val();
- var givingNum = $("#givingNum").val();
- var remark = $("#remark").val();
+ var spId = $("#spId").val();
+ var clientId = $("#clientId").val();
+ var productId = $("#productId").val();
+ var price = $("#price").val();
+ var payAmount = $("#payAmount").val();
+ var basicNum = $("#basicNum").val();
+ var givingNum = $("#givingNum").val();
+ var remark = $("#remark").val();
- mytek.confirm("鏄惁纭畾鍏呭�硷紵", "鏄惁鎿嶄綔锛�", function (b) {
+ mytek.confirm("鏄惁纭畾鍏呭�硷紵", "鏄惁鎿嶄綔锛�", function (b) {
- if (b) {
+ if (b) {
- $.post("gwOrder.ashx", { action: "add", spId: spId, clientId: clientId, productId: productId, basicNum: basicNum, givingNum: givingNum, remark: remark }, function (r) {
- /**
+ $.post("gwOrder.ashx", { action: "add", spId: spId, clientId: clientId, productId: productId, price: price, payAmount:payAmount, basicNum: basicNum, givingNum: givingNum, remark: remark }, function (r) {
+
+ mytek.alert(r.Message, r.OK, function () {
if (r.OK) {
- mytek.alert(r.Message);
- //window.location = history.back();
+ window.location = "GwSp.aspx";
} else {
- mytek.alert(r.Message);
+ mytek.alert(r.Message, false);
}
- **/
-
- mytek.alert(r.Message, r.OK, function () {
- //loadPageList();
- });
-
});
- }
+ });
- });
+ }
+
});
+ });
//}
+
+ function getGwSp(obj) {
+ if (obj.value != "") {
+ $.get("gwOrder.ashx", { "action": "getOrderBySpId", spId: obj.value }, function (r) {
+
+ //$("#orderId").val(r.Message.OrderId).attr("readonly", "readonly");
+ $("#clientId").val(r.Message.ClientId).attr("disabled", "disabled");
+ $("#company").val(r.Message.Company).attr("disabled", "disabled");
+ $("#spId").val(r.Message.SpId);
+ $("#productId").val(r.Message.ProductId).attr("disabled", "disabled");
+ $("#productName").val(r.Message.ProductName).attr("disabled", "disabled");
+ $("#_basicNum").val(r.Message.BasicNum, 0);
+ $("#_givingNum").val(r.Message.GivingNum, 0);
+ $("#price").val(r.Message.Price / 1000, 0.00).attr("readonly", "readonly");
+ $("#balance").val(r.Message.Balance / 1000, 0.00).attr("readonly", "readonly");
+ //$("#payAmount").val(r.Message.PayAmount / 1000, 0);
+ $("#remark").val(r.Message.Remark);
+
+ }, "json");
+ }
+ }
+
</script>
--
Gitblit v1.9.1