From f512b0475560ed449f936e0b7a27ba197e6bafe5 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 15:16:08 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
HTML/views/SystemSettings/UserManage.html | 109 ++++++++++++++++++++++++------------------------------
1 files changed, 48 insertions(+), 61 deletions(-)
diff --git a/HTML/views/SystemSettings/UserManage.html b/HTML/views/SystemSettings/UserManage.html
index 45be757..68bb20d 100644
--- a/HTML/views/SystemSettings/UserManage.html
+++ b/HTML/views/SystemSettings/UserManage.html
@@ -17,10 +17,10 @@
});
</script>
</head>
- <body>
+ <body id="body">
<div class="layui-fluid" style="padding-bottom: 0;">
<div class="layui-card">
- <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
<div class="layui-form-item" >
<div class="layui-inline">
<label class="layui-form-label">鐧诲綍鍚�</label>
@@ -59,6 +59,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<!-- <div style="padding-bottom: 5px;display: flex; flex-direction: row-reverse;">
<button class="layui-btn layui-btn-sm layuiadmin-btn-list layui-hide layui-btn-danger" data-type="hide">
@@ -107,6 +110,7 @@
laypage = layui.laypage,
layer = layui.layer;
+ var h1 = GetTableHeight();
refreshTable("", "", "", "");
var tableIns;
//鑾峰彇瑙掕壊淇℃伅
@@ -151,6 +155,47 @@
curr: 1
}
tableIns = table.render(infoOptions);
+ sendData(IP + "/basis/GetRoleRightList", {}, 'get', function(res) {
+ $(function() {
+ $("#approvalBtn").hide();
+ });
+ $(function() {
+ $(".approvalBtndel").hide();
+ });
+ $(function() {
+ $(".approvalBtnupt").hide();
+ });
+ if (res.code == 0) //鎴愬姛
+ {
+ for (var k = 0; k < res.data.length; k++)
+ {
+ if (res.data[k].MenuName == "娣诲姞鐢ㄦ埛") {
+ $(function() {
+ $("#approvalBtn").show();
+ });
+ }
+ if (res.data[k].MenuName == "鍒犻櫎鐢ㄦ埛") {
+ $(function() {
+ $(".approvalBtndel").show();
+ });
+ }
+ if (res.data[k].MenuName == "缂栬緫鐢ㄦ埛") {
+ $(function() {
+ $(".approvalBtnupt").show();
+ });
+ }
+ }
+ }
+ else //涓嶆垚鍔�
+ {
+ layer.msg('鑾峰彇淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ });
+ }
+ })
}
else //涓嶆垚鍔�
@@ -189,67 +234,9 @@
}
}
}
- sendData(IP + "/basis/GetRoleRightList", {}, 'get', function(res) {
- $(function() {
- $("#approvalBtn").hide();
- });
- $(function() {
- $(".approvalBtndel").hide();
- });
- $(function() {
- $(".approvalBtnupt").hide();
- });
- if (res.code == 0) //鎴愬姛
- {
- var list = res.data.filter(item => item.Layer == 0);
- if (list)
- {
- for (var i = 0; i < list.length; i++)
- {
- xml = xml + '<li class="layui-nav-item">' + '<a href="javascript:;" lay-tips=' + list[i].Icon + ' lay-direction="2">' + '<span class="iconfont ' + list[i].Icon + '"></span>' + '<cite>' + list[i].MenuName + '</cite>' + '</a>';
- var id = list[i].Id;
- //鏌ヨ鏈夋棤瀛愯彍鍗�
- var count = res.data.filter(item => item.ParentId == id).length;
- if (count > 0) {
- xml = xml + '<dl class="layui-nav-child">';
- getchiled(res.data, id);
- xml = xml + '</dl>';
- }
- xml = xml + '</li>'
- }
- }
- for (var k = 0; k < res.data.length; k++)
- {
- if (res.data[k].MenuName == "娣诲姞鐢ㄦ埛") {
- $(function() {
- $("#approvalBtn").show();
- });
- }
- if (res.data[k].MenuName == "鍒犻櫎鐢ㄦ埛") {
- $(function() {
- $(".approvalBtndel").show();
- });
- }
- if (res.data[k].MenuName == "缂栬緫鐢ㄦ埛") {
- $(function() {
- $(".approvalBtnupt").show();
- });
- }
- }
- }
- else //涓嶆垚鍔�
- {
- layer.msg('鑾峰彇淇℃伅澶辫触', {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function() {
- //鍥炶皟
- });
- }
- })
var infoOptions = {
elem: '#LAY-app-content-list',
- height: 'full-95',
+ height: h1,
id: 'LAY-app-content-list',
page: true,
limit: pageCnt,
--
Gitblit v1.8.0