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/Category.html | 93 ++++++++++++++++++++++++----------------------
1 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/HTML/views/SystemSettings/Category.html b/HTML/views/SystemSettings/Category.html
index 661dc76..e4a110f 100644
--- a/HTML/views/SystemSettings/Category.html
+++ b/HTML/views/SystemSettings/Category.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" style="width: 60px;">绫诲埆鍚嶇О</label>
@@ -48,6 +48,9 @@
</div>
</div>
</div>
+
+ <div id="center"></div>
+
<div class="layui-card-body">
<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
@@ -78,6 +81,7 @@
laypage = layui.laypage,
layer = layui.layer;
+ var h1 = GetTableHeight();
var tableIns;
//鑾峰彇鍖哄煙淇℃伅
@@ -112,6 +116,46 @@
curr: 1
}
tableIns = table.render(infoOptions);
+ sendData(IP + "/basis/GetRoleRightList", {}, 'get', function(res) {
+ $(function() {
+ $("#approvalBtn").hide();
+ });
+ $(function() {
+ $(".approvalBtnupt").hide();
+ });
+ $(function() {
+ $(".approvalBtndel").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 == "缂栬緫绫诲埆") {
+ console.log(1)
+ $(function() {
+ $(".approvalBtnupt").show();
+ });
+ }
+ }
+ }
+ else
+ { //涓嶆垚鍔�
+ layer.msg('鑾峰彇淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ });
+ }
+ });
}
else //涓嶆垚鍔�
{
@@ -122,50 +166,11 @@
}
});
}
- sendData(IP + "/basis/GetRoleRightList", {}, 'get', function(res) {
- $(function() {
- $("#approvalBtn").hide();
- });
- $(function() {
- $(".approvalBtnupt").hide();
- });
- $(function() {
- $(".approvalBtndel").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 == "缂栬緫绫诲埆") {
- console.log(1)
- $(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,
@@ -177,7 +182,7 @@
title: '搴忓彿', type: 'numbers', fixed: 'left', width:65
},
{
- field: 'CategoryNo', title: '绫诲埆缂栧彿', align: 'center', fixed: 'left',width:100
+ field: 'CategoryNo', title: '绫诲埆缂栫爜', align: 'center', fixed: 'left',width:100
},
{
field: 'CategoryName', title: '绫诲埆鍚嶇О', align: 'center',width:100
--
Gitblit v1.8.0