From c3acb0bf589ba6de244e4eae737152688e5d3e61 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期三, 23 十一月 2022 16:41:29 +0800
Subject: [PATCH] 优化待审核页面
---
web/web/SysUser.aspx | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 316 insertions(+), 20 deletions(-)
diff --git a/web/web/SysUser.aspx b/web/web/SysUser.aspx
index 45918c6..11ee926 100644
--- a/web/web/SysUser.aspx
+++ b/web/web/SysUser.aspx
@@ -18,7 +18,35 @@
var html = [];
$.each(result.Message.Table, function(i) {
html.push("<tr>");
- html.push("<td>" + this.Account + "</td>");
+ html.push("<td>" + this.Account + "</td>");
+ html.push("<td>" + this.UserName + "</td>");
+ html.push("<td>" + this.RoleNames + "</td>");
+
+ //if (this.UserType == 1) {
+ // html.push("<td>" + "绠＄悊鍛�" + "</td>");
+ //}
+ //else if (this.UserType == 2) {
+ // html.push("<td>" + "涓氬姟鍛�" + "</td>");
+ //}
+ //else if (this.UserType == 3) {
+ // html.push("<td>" + "涓氬姟涓荤" + "</td>");
+ //}
+ //else if (this.UserType == 4) {
+ // html.push("<td>" + "涓氬姟鎬荤洃" + "</td>");
+ //}
+ //else if (this.UserType == 5) {
+ // html.push("<td>" + "瀹㈡湇浜哄憳" + "</td>");
+ //}
+ //else if (this.UserType == 6) {
+ // html.push("<td>" + "璐㈠姟浜哄憳" + "</td>");
+ //}
+ //else if (this.UserType == 99) {
+ // html.push("<td>" + "鍏朵粬" + "</td>");
+ //}
+ //else {
+ // html.push("<td>" + "" + "</td>");
+ //}
+
html.push("<td>" + this.Mobile + "</td>");
html.push("<td>" + formatFlagIcon(this.MobileFlag) + "</td>");
@@ -27,15 +55,24 @@
html.push("<td>" + this.ClientIp + "</td>");
html.push("<td>" + (this.IsVerification == 1 ? "<span class='label label-primary'>寮�鍚�</span>" : "<span class='label label-default'>鍏抽棴</span>") + "</td>");
html.push("<td>" + this.CreateTime + "</td>");
- html.push("<td >");
- html.push("<a href='javascript:;' class='btn btn-success btn-xs action-edit' data-id='" + this.UserID + "'><i class='fa fa-edit'></i> 缂栬緫</a> ");
- html.push("<a href='javascript:;' data-id='" + this.UserID + "' class='action-permission btn btn-info btn-xs'><i class='fa fa-edit'></i> 鏉冮檺</a> ");
+ html.push("<td>" + (this.Status == 1 ? "<span class='label label-primary'>鍚敤</span>" : "<span class='label label-default'>鍋滅敤</span>") + "</td>");
+ //html.push("<td>" + (this.Status == 1 ? "<a href='javascript:;' class='btn btn-primary btn-xs action-update-status' data-id=" + this.UserID + " data-status=0 ><i class='fa fa-toggle-off'></i> 鍚敤</a>" : "<a href='javascript:;' class='btn btn-default btn-xs action-update-status' data-id=" + this.UserID + " data-status=1 ><i class='fa fa-toggle-on'></i>鍋滅敤</a>") + "</td>");
+ html.push("<td class='text-right' >");
+ if (this.Status == 0) {
+ html.push("<a href='javascript:;' class='btn btn-primary btn-xs action-update-status' data-id=" + this.UserID + " data-status=1 ><i class='fa fa-toggle-off'></i>鍚敤</a> " );
+ }
+ else {
+ html.push("<a href='javascript:;' class='btn btn-default btn-xs action-update-status' data-id=" + this.UserID + " data-status=0 ><i class='fa fa-toggle-on'></i>鍋滅敤</a> ");
+ }
+ html.push("<a href='javascript:;' class='btn btn-success btn-xs action-edit' data-id='" + this.UserID + "'><i class='fa fa-edit'></i> 缂栬緫</a> ");
+ html.push("<a href='javascript:;' data-id='" + this.Account + "' class='action-modal-updatePwd btn btn-primary btn-xs'><i class='fa fa-edit'></i> 淇敼瀵嗙爜</a> ");
+ html.push("<a href='javascript:;' data-id='" + this.UserID + "' class='action-permission btn btn-info btn-xs'><i class='fa fa-edit'></i> 鏉冮檺</a> ");
html.push("<a href='javascript:;' data-id='" + this.UserID + "' class='action-delete btn btn-default btn-xs'><i class='fa fa-trash'></i> 鍒犻櫎</a>");
html.push("</td>");
html.push("</tr>");
});
if (result.Message.TotalCount == 0) {
- html.push("<tr><td colspan=\"10\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>");
+ html.push("<tr><td colspan=\"11\" style=\"padding-left:5px; text-align: center;\">鏆傛棤淇℃伅</td></tr>");
}
$("#mainTable>tbody").html(html.join(""));
@@ -68,10 +105,27 @@
});
});
+ $(document).on("click", ".action-update-status", function () {
+ //data鐨勫睘鎬у弬鏁颁笉鑳藉惈鏈夊ぇ鍐欏瓧姣嶃��
+ var userId = $(this).data("id");
+ var status = $(this).data("status");
+ mytek.confirm("鏄惁鏇存柊淇℃伅鐘舵�侊紵", "璇疯皑鎱庢搷浣滐紒", function (b) {
+ if (b) {
+ $.post("sysuser.ashx", { "action": "updateStatus", userId: userId, status: status }, function (r) {
+ mytek.alert(r.Message, r.OK, function () {
+ loadUserList();
+ });
+ });
+ }
+ });
+ });
+
$(document).on("click", ".action-save", function() {
var userid = $("#userDialog").data("id");
var account = $("#userDialog #account").val();
var password = $("#userDialog #password").val();
+ var userName = $("#userDialog #userName").val();
+ var userType = $("#userDialog #userType").val();
var mobile = $("#userDialog #mobile").val();
var email = $("#userDialog #email").val();
var emailFlag = $("#userDialog #emailFlag").val();
@@ -79,8 +133,15 @@
var isVerification = $("#userDialog #isVerification").prop("checked");
var clientIp = $("#userDialog #clientIp").val();
+ var userRoleArray = [];
+ $("#userDialog #_UserRole").each(function () {
+ if ($(this).is(":checked")) {
+ userRoleArray.push($(this).val());
+ }
+ });
+ userType = $.toJSON(userRoleArray);
- $.post("sysuser.ashx", { action: "saveUser", userid: userid, account: account, password: password, mobile: mobile, email: email, mobileFlag: mobileFlag, emailFlag: emailFlag, isVerification: isVerification, clientIp: clientIp },
+ $.post("sysuser.ashx", { action: "saveUser", userid: userid, account: account, password: password, userName: userName, userType: userType, mobile: mobile, email: email, mobileFlag: mobileFlag, emailFlag: emailFlag, isVerification: isVerification, clientIp: clientIp },
function(result) {
mytek.alert(result.Message, result.OK, function() {
if (result.OK) {
@@ -95,11 +156,20 @@
$("#userDialog .modal-title").html("鍒涘缓璐︽埛");
$("#userDialog").data("id", 0);
$("#userDialog #account").val("");
- $("#userDialog #password").val("");
+ //$("#userDialog #password").val("");
+ $("#userDialog #userName").val("");
+ //$("#userDialog #userType").val("");
+ $("#userDialog #_UserRole").iCheck("uncheck");
+
$("#userDialog #mobile").val("");
$("#userDialog #email").val("");
$("#userDialog input[name=isVerification]").iCheck("uncheck");
$("#userDialog #clientIp").val("");
+
+ //鍒锋柊涓�娆￠殢鏈哄瘑鐮�
+ $("#userDialog #password").val(randomString(8));
+ $(".pwdCss").show();
+
$("#userDialog").modal("show");
});
@@ -111,9 +181,9 @@
}
else {
$("#permissionDialog").data("id", id);
- $("#permissionDialog #MenuID").prop("checked", false);
+ $("#permissionDialog #MenuID").prop("checked", false).attr("disabled", "disabled");
$.each(result.Message, function(i) {
- $("#permissionDialog #MenuID[value='" + this + "']").prop("checked", true);
+ $("#permissionDialog #MenuID[value='" + this + "']").prop("checked", true).attr("disabled", "disabled");
});
}
$("#permissionDialog").modal("show");
@@ -168,19 +238,161 @@
var user = result.Message;
$("#userDialog").data("id", id);
$("#userDialog #account").val(user.Account);
- $("#userDialog #password").val(user.Password);
+ //$("#userDialog #password").val(user.Password);
+ $("#userDialog #password").val("");
+ //缂栬緫鏃跺瘑鐮佹闅愯棌
+ $(".pwdCss").hide();
+ $("#userDialog #userName").val(user.UserName);
+ //$("#userDialog #userType").val(user.UserType);
+ $.get("sysuser.ashx", { action: "arrayStrToDict", "userId": id, "userType": user.UserType }, function (r) {
+ if (!r.OK) {
+ mytek.alert(r.Message, r.OK);
+ }
+ else {
+ $("#userDialog #_UserRole").prop("checked", false);
+ $.each(r.Message, function (i) {
+ $("#userDialog #_UserRole[value='" + this + "']").prop("checked", true);
+ });
+ }
+ }, "json");
+
$("#userDialog #mobile").val(user.Mobile);
$("#userDialog #email").val(user.Email);
$("#userDialog #emailFlag").val(user.EmailFlag);
$("#userDialog #mobileFlag").val(user.MobileFlag);
$("#userDialog #isVerification").iCheck(user.IsVerification == 1 ? "check" : "uncheck");
$("#userDialog #clientIp").val(user.ClientIp);
+
$("#userDialog").modal("show");
}, "json");
});
loadUserList();
+ });
+
+ //鐢熸垚闅忔満鐮�
+ function randomString(len) {
+ len = len || 32;
+ var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; /****榛樿鍘绘帀浜嗗鏄撴贩娣嗙殑瀛楃oOLl,9gq,Vv,Uu,I1****/
+ var maxPos = $chars.length;
+ var pwd = '';
+ for (i = 0; i < len; i++) {
+ pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
+ }
+ return pwd;
+ }
+
+ //娣诲姞绯荤粺璐﹀彿锛氱敓鎴愬瘑鐮�
+ $(document).on("click", ".action-generate-password", function () {
+ $("#password").val(randomString(8));
+ });
+
+ //娣诲姞绯荤粺璐﹀彿锛氬鍒跺瘑鐮�
+ $(document).on("click", ".action-copyPwd", function () {
+ var value = $("#password").val();
+ if (value == "") {
+ mytek.alert("璇风敓鎴愬瘑鐮侊紒");
+ return false;
+ }
+ // for ie
+ if (window.clipboardData) {
+ window.clipboardData.clearData();
+ window.clipboardData.setData('text', value);
+ }
+ // for modern browser
+ else if (document.execCommand) {
+ var element = document.createElement('SPAN');
+ element.textContent = value;
+ document.body.appendChild(element);
+ if (document.selection) {
+ var range = document.body.createTextRange();
+ range.moveToElementText(element);
+ range.select();
+ } else if (window.getSelection) {
+ var range = document.createRange();
+ range.selectNode(element);
+ window.getSelection().removeAllRanges();
+ window.getSelection().addRange(range);
+ }
+ document.execCommand('copy');
+ element.remove ? element.remove() : element.removeNode(true);
+ }
+ mytek.alert("澶嶅埗鎴愬姛锛�", false);
+
+ });
+
+ //淇敼瀵嗙爜锛氭墦寮�鐣岄潰
+ $(document).on("click", ".action-modal-updatePwd", function () {
+ //$("#updatePwdDialog .modal-title").text("淇敼瀹㈡埛璧勬枡");
+ $("#updatePwdDialog input[name=action]").val("updatePwd");
+ var account = $(this).data("id");
+
+ $("#updatePwdDialog input[name='account']").val(account);
+ $("#updatePwdDialog #newPwd").val("");
+
+ $("#updatePwdDialog").modal("show");
+
+ });
+
+ //淇敼瀵嗙爜锛氱敓鎴愬瘑鐮�
+ $(document).on("click", ".action-generate-newPwd", function () {
+ $("#newPwd").val(randomString(8));
+ });
+
+ //淇敼瀵嗙爜锛氬鍒跺瘑鐮�
+ $(document).on("click", ".action-copyNewPwd", function () {
+ var value = $("#newPwd").val();
+ if (value == "") {
+ mytek.alert("璇风敓鎴愬瘑鐮侊紒");
+ return false;
+ }
+
+ // for ie
+ if (window.clipboardData) {
+ window.clipboardData.clearData();
+ window.clipboardData.setData('text', value);
+ }
+ // for modern browser
+ else if (document.execCommand) {
+ var element = document.createElement('SPAN');
+ element.textContent = value;
+ document.body.appendChild(element);
+ if (document.selection) {
+ var range = document.body.createTextRange();
+ range.moveToElementText(element);
+ range.select();
+ } else if (window.getSelection) {
+ var range = document.createRange();
+ range.selectNode(element);
+ window.getSelection().removeAllRanges();
+ window.getSelection().addRange(range);
+ }
+ document.execCommand('copy');
+ element.remove ? element.remove() : element.removeNode(true);
+ }
+ mytek.alert("澶嶅埗鎴愬姛锛�", false);
+
+ });
+
+ /**
+ //闈㈡澘椤垫彁浜わ細闅愯棌闈㈡澘锛堢櫧鍚嶅崟锛岄粦鍚嶅崟锛屼慨鏀瑰瘑鐮侊級
+ $("#blackForm, #whiteForm").ajaxForm({
+ success: function (r) {
+ mytek.alert(r.Message, r.OK, function () {
+ $("#whiteDialog, #blackDialog").modal("hide");
+ });
+ }
+ });
+ **/
+
+ //闈㈡澘椤垫彁浜わ細閲嶆柊鍔犺浇鍒楄〃
+ $("#updatePwdForm").ajaxForm({
+ success: function (r) {
+ mytek.alert(r.Message, r.OK, function () {
+ r.OK && (window.location.reload());
+ });
+ }
});
</script>
@@ -200,16 +412,45 @@
<div class="modal-body">
<div class="form-group">
<label class="col-sm-2 control-label">
- 璐︽埛</label>
+ 璐︽埛 <span style="color:red">*</span></label>
<div class="col-sm-10">
<input type="text" name="account" id="account" value="" class="form-control" />
</div>
</div>
+ <div class="form-group pwdCss">
+ <label class="col-sm-2 control-label">
+ 瀵嗙爜 <span style="color:red">*</span></label>
+ <div class="col-sm-4">
+ <input type="password" name="password" id="password" value="" class="form-control" />
+ </div>
+ <div class="col-sm-6">
+ <a class="btn btn-xs btn-primary action-generate-password ">鐢熸垚瀵嗙爜</a>
+ <a class="btn btn-xs btn-success action-copyPwd " >澶嶅埗瀵嗙爜</a>
+ </div>
+ </div>
<div class="form-group">
<label class="col-sm-2 control-label">
- 瀵嗙爜</label>
+ 璐︽埛鍚嶇О <span style="color:red">*</span></label>
<div class="col-sm-10">
- <input type="password" name="password" id="password" value="" class="form-control" />
+ <input type="text" name="userName" id="userName" value="" class="form-control" />
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">
+ 璐︽埛绫诲瀷 <span style="color:red">*</span>
+ </label>
+ <div class="col-sm-10">
+ <%=UserRoleList() %>
+ <!--
+ <select name="userType" id="userType" class="form-control">
+ <option value=""></option>
+ <option value="1">绠＄悊鍛�</option>
+ <option value="2">涓氬姟鍛�</option>
+ <option value="3">瀹㈡埛缁忕悊</option>
+ <option value="4">瀹㈡湇浜哄憳</option>
+ <option value="5">璐㈠姟浜哄憳</option>
+ </select>
+ -->
</div>
</div>
<div class="form-group">
@@ -281,7 +522,7 @@
<div class="modal-dialog">
<div class="modal-content animated bounceInRight">
<div class="modal-header">
- <span class="title">璁剧疆璐︽埛鏉冮檺</span><a class="close" data-dismiss="modal" aria-hidden="true">脳</a></div>
+ <span class="title">鏌ョ湅璐︽埛鏉冮檺</span><a class="close" data-dismiss="modal" aria-hidden="true">脳</a></div>
<div class="modal-body">
<%=RenderFunctionTree() %>
@@ -289,19 +530,69 @@
<div class="modal-footer">
<button class="btn-default btn" data-dismiss="modal" aria-hidden="true">
鍙栨秷</button>
+ <!--
<button class="btn btn-primary action-update-permission">
淇濆瓨</button>
+ -->
</div>
</div>
</div>
</div>
- <form name="DefaultForm" method="post" action="GwSpUpdate.aspx" id="DefaultForm">
- <div class="listCanvas">
+
+
+ <!--閲嶇疆瀵嗙爜鎴栦慨鏀瑰瘑鐮� -->
+ <div class="modal inmodal fade" id="updatePwdDialog" tabindex="-1" role="dialog" aria-hidden="true">
+ <form name="updatePwdForm" method="post" action="sysuser.ashx?action=updatePwd" id="updatePwdForm"
+ class="form-horizontal">
+ <div class="modal-dialog modal-lg">
+ <div class="modal-content ">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal">
+ <span aria-hidden="true">×</span><span class="sr-only">Close</span></button>
+ <h4 class="modal-title">绯荤粺璐﹀彿瀵嗙爜淇敼
+ </h4>
+ 璇峰厛鎵ц銆愮敓鎴愬瘑鐮併�戝悗锛屽啀鎵ц銆愬鍒跺瘑鐮併�戙��
+ </div>
+ <div class="modal-body">
+ <input type="hidden" value="" name="account" />
+ <div class="form-group">
+ <label class="control-label col-sm-2">
+ 鐧诲綍瀵嗙爜 <span style="color:red">*</span>
+ </label>
+ <div class="col-sm-4">
+ <input type="password" name="newPwd" id="newPwd" value="" class="form-control" />
+ </div>
+ <div class="col-sm-6">
+ <a class="btn btn-xs btn-primary action-generate-newPwd ">鐢熸垚瀵嗙爜</a>
+ <a class="btn btn-xs btn-success action-copyNewPwd " >澶嶅埗瀵嗙爜</a>
+ </div>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-warning" data-dismiss="modal" aria-hidden="true">
+ 鍙栨秷</button>
+ <button class="btn btn-primary action-save-pwd">
+ 淇濆瓨</button>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+
+ <!--form name="DefaultForm" method="post" action="GwSpUpdate.aspx" id="DefaultForm" -->
+ <div class="listCanvas">
+ <button class="btn btn-warning action-create "> 鍒涘缓璐︽埛</button>
<table id="mainTable" class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th>
璐﹀彿
+ </th>
+ <th>
+ 鐢ㄦ埛鍚嶇О
+ </th>
+ <th>
+ 鐢ㄦ埛绫诲瀷
</th>
<th>
鎵嬫満
@@ -324,7 +615,10 @@
<th>
鍒涘缓鏃堕棿
</th>
- <th style="width: 200px;">
+ <th>
+ 鐘舵��
+ </th>
+ <th style="width: 320px;">
鎿嶄綔
</th>
</tr>
@@ -335,7 +629,7 @@
</div>
<div id="pagination">
</div>
- </form>
+ <!--
<div class="row">
<div class="col-sm-7">
<div class="ibox float-e-margins">
@@ -344,6 +638,7 @@
</div>
</div>
</div>
+ -->
<div>
<h5>
</h5>
@@ -353,6 +648,7 @@
<div id="mask" class="mask">
<span></span>
- <img src="img/spinning-circles.svg" alt="杞藉叆涓�..." /></div>
- </div>
+ <img src="img/spinning-circles.svg" alt="杞藉叆涓�..." />
+
+ </div>
</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.1