From ba73ec7987459b7bc5710798e8b4989cfe0e13a2 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 30 六月 2022 13:04:34 +0800
Subject: [PATCH] 删除日志文件版本控制

---
 web/web/SysUser.aspx |   53 ++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/web/web/SysUser.aspx b/web/web/SysUser.aspx
index 5697391..baf8456 100644
--- a/web/web/SysUser.aspx
+++ b/web/web/SysUser.aspx
@@ -18,8 +18,10 @@
                         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>");
                             }
@@ -43,7 +45,7 @@
                             }
                             else {
                                 html.push("<td>" + "" + "</td>");
-                            }
+                            }**/
 
                             html.push("<td>" + this.Mobile + "</td>");
                             html.push("<td>" + formatFlagIcon(this.MobileFlag) + "</td>");
@@ -131,6 +133,13 @@
                 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, userName: userName, userType: userType, mobile: mobile, email: email, mobileFlag: mobileFlag, emailFlag: emailFlag, isVerification: isVerification, clientIp: clientIp },
              function(result) {
@@ -149,7 +158,9 @@
                 $("#userDialog #account").val("");
                 //$("#userDialog #password").val("");
                 $("#userDialog #userName").val("");
-                $("#userDialog #userType").val("");
+                //$("#userDialog #userType").val("");
+                $("#userDialog #_UserRole").iCheck("uncheck");
+
                 $("#userDialog #mobile").val("");
                 $("#userDialog #email").val("");
                 $("#userDialog input[name=isVerification]").iCheck("uncheck");
@@ -170,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");
@@ -232,13 +243,26 @@
                     //缂栬緫鏃跺瘑鐮佹闅愯棌
                     $(".pwdCss").hide();
                     $("#userDialog #userName").val(user.UserName);
-                    $("#userDialog #userType").val(user.UserType);
+                    //$("#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");
             });
@@ -415,17 +439,18 @@
                         <label class="col-sm-2 control-label">
                             璐︽埛绫诲瀷 <span style="color:red">*</span>
                         </label>
-                        <div class="col-sm-4">
+                        <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>
-                                <option value="6">璐㈠姟浜哄憳</option>
-                                <option value="99">鍏朵粬</option>
+                                <option value="3">瀹㈡埛缁忕悊</option>
+                                <option value="4">瀹㈡湇浜哄憳</option>
+                                <option value="5">璐㈠姟浜哄憳</option>
                             </select>
+                            -->
                         </div>
                     </div>
                     <div class="form-group">
@@ -497,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() %>
@@ -505,8 +530,10 @@
                 <div class="modal-footer">
                     <button class="btn-default btn" data-dismiss="modal" aria-hidden="true">
                         鍙栨秷</button>&nbsp;&nbsp;
+                    <!--
                     <button class="btn btn-primary action-update-permission">
                         淇濆瓨</button>
+                    -->
                 </div>
             </div>
         </div>

--
Gitblit v1.9.1