zhaowc
2024-08-21 4ad4a4263add81327ac0b6cd642019d2920cc837
修改用户权限错误页面,质量变更记录查询页面
8个文件已修改
336 ■■■■■ 已修改文件
HTML/views/BaseSetting/Materials.html 77 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/HouseWithinSetting/FreezeUnfreeze.html 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/QualityControl/QualityChangeLog.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/QualityControl/QualityInformation.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/SystemSettings/Category.html 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/SystemSettings/Dictionary.html 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/SystemSettings/Role.html 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/SystemSettings/UserManage.html 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/BaseSetting/Materials.html
@@ -264,35 +264,79 @@
                            }, function() {});
                        }
                    });
                }
                sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
                    $(function() {
                        $("#approvalBtn").hide();
                    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 () {
                                    //回调
                                }
                            );
                        }
                    });
                    $(function() {
                }
                sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
                    $(function () {
                        $(".approvalBtn").hide();
                    });
                    $(function () {
                        $(".approvalBtndel").hide();
                    });
                    $(function() {
                    $(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 () {
                                    $(".approvalBtn").show();
                                });
                            }
                            if (res.data[k].MenuName == "删除物料")
                            {
                                $(function() {
                            if (res.data[k].MenuName == "删除物料") {
                                $(function () {
                                    $(".approvalBtndel").show();
                                });
                            }
                            if (res.data[k].MenuName == "编辑物料")
                            {
                                $(function() {
                            if (res.data[k].MenuName == "编辑物料") {
                                $(function () {
                                    $(".approvalBtnupt").show();
                                });
                            }
@@ -313,6 +357,7 @@
                    }
                });
                
                var infoOptions = {
                    elem: "#LAY-app-content-list",
                    height: h1,
HTML/views/HouseWithinSetting/FreezeUnfreeze.html
@@ -114,8 +114,8 @@
                            <li class="layui-this">冻结记录</li>
                            <li>解冻记录</li>
                            <div style="float: right;">
                                <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-dong">冻结</button>
                                <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-jie">解冻</button>
                                <button class="layui-btn layui-btn-sm layuiadmin-btn-list Frozen" lay-submit lay-filter="LAY-app-contlist-dong">冻结</button>
                                <button class="layui-btn layui-btn-sm layuiadmin-btn-list Unfrozen" lay-submit lay-filter="LAY-app-contlist-jie">解冻</button>
                            </div>
                           
                        </ul>
@@ -297,7 +297,8 @@
                        limits: pageLimits,
                        even: true,
                        cellMinWidth: 80, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                        done: function(){
                        done: function(){
                            setRight();
                            //自定义列宽
                            SetTableColW('LAY-app-content-list','BllCheck/GetDataFreezeList',TotalColsSysArr);
                        }, 
@@ -384,6 +385,7 @@
                        even: true,
                        cellMinWidth: 80, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                        done: function(){
                            setRight();
                            //自定义列宽
                            SetTableColW('LAY-app-content-list2','BllCheck/GetDataUnFreezeList',DetailColsSysArr);
                        },     
@@ -421,6 +423,34 @@
                });
                //#endregion                
            }
            // 权限设置
            function setRight() {
                $(function () {
                    $(".Frozen").hide();
                    $(".Unfrozen").hide();
                });
                sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
                    if (res.code == 0) { //成功
                        for (var k = 0; k < res.data.length; k++) {
                            if (res.data[k].MenuName == "冻结") {
                                $(function () {
                                    $(".Frozen").show();
                                });
                            }
                            if (res.data[k].MenuName == "解冻") {
                                $(function () {
                                    $(".Unfrozen").show();
                                });
                            }
                        }
                    } else { //不成功
                        layer.msg('获取权限信息失败', {
                            icon: 2,
                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                        }, function () { });
                    }
                });
            }
            
            //var url = IP + "/Statistical/GetInventoryList1";
HTML/views/QualityControl/QualityChangeLog.html
@@ -165,7 +165,7 @@
                            LotNo: LotNo,
                            SkuNo: SkuNo,
                            SkuName: SkuName,
                            Origin:'Time'
                            Origin:'WMS'
                        };
                        // console.log(param)
                        var url  = "/BllQuality/GetBllQualityList";
HTML/views/QualityControl/QualityInformation.html
@@ -290,8 +290,9 @@
                // 权限设置
                function setRight() {
                    $(function() {
                        $("#approvalBtn").hide();
                        $(".approvalBtn").hide();
                    });
                    sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
                        if (res.code == 0) { //成功 
@@ -299,7 +300,7 @@
                                if (res.data[k].MenuName == "添加质检结果")
                                {
                                    $(function() {
                                        $("#approvalBtn").show();
                                        $(".approvalBtn").show();
                                    });
                                }
                            }
HTML/views/SystemSettings/Category.html
@@ -125,10 +125,49 @@
                            }, function() {});
                        }
                    });
                    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 () {
                                //回调
                            });
                        }
                    });
                }
                sendData(IP + "/basis/GetRoleRightList", {}, 'get', function(res) {
                    $(function() {
                        $("#approvalBtn").hide();
                        $(".approvalBtn").hide();
                    });
                    $(function() {
                        $(".approvalBtnupt").hide();
@@ -140,7 +179,7 @@
                        for (var k = 0; k < res.data.length; k++) {
                            if (res.data[k].MenuName == "新增类别") {
                                $(function() {
                                    $("#approvalBtn").show();
                                    $(".approvalBtn").show();
                                });
                            }
                            if (res.data[k].MenuName == "删除类别") {
HTML/views/SystemSettings/Dictionary.html
@@ -206,10 +206,49 @@
                            }, function() {});
                        }
                    });
                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 == "编辑字典") {
                                    $(function () {
                                        $(".approvalBtnupt").show();
                                    });
                                }
                            }
                        }
                        else { //不成功
                            layer.msg('获取信息失败', {
                                icon: 2,
                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                            }, function () {
                                //回调
                            });
                        }
                    });
                }
                sendData(IP + "/basis/GetRoleRightList", {}, 'get', function(res) {
                    $(function() {
                        $("#approvalBtn").hide();
                        $(".approvalBtn").hide();
                    });
                    $(function() {
                        $(".approvalBtnupt").hide();
@@ -221,7 +260,7 @@
                        for (var k = 0; k < res.data.length; k++) {
                            if (res.data[k].MenuName == "添加字典") {
                                $(function() {
                                    $("#approvalBtn").show();
                                    $(".approvalBtn").show();
                                });
                            }
                            if (res.data[k].MenuName == "删除字典") {
HTML/views/SystemSettings/Role.html
@@ -122,6 +122,58 @@
                            );
                        }
                    });
                    sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
                        $(function () {
                            $("#approvalBtn").hide();
                        });
                        $(function () {
                            $(".editClass").hide();
                        });
                        $(function () {
                            $(".roleClass").hide();
                        });
                        $(function () {
                            $(".approvalBtndel").hide();
                        });
                        if (res.code == 0) {
                            //成功
                            for (var k = 0; k < res.data.length; k++) {
                                if (res.data[k].MenuName == "编辑角色") {
                                    $(function () {
                                        $(".editClass").show();
                                    });
                                }
                                if (res.data[k].MenuName == "分配权限") {
                                    $(function () {
                                        $(".roleClass").show();
                                    });
                                }
                                if (res.data[k].MenuName == "添加角色") {
                                    $(function () {
                                        $("#approvalBtn").show();
                                    });
                                }
                                if (res.data[k].MenuName == "删除角色") {
                                    $(function () {
                                        $(".approvalBtndel").show();
                                    });
                                }
                            }
                        }
                        else {
                            //不成功
                            layer.msg(
                                "获取信息失败",
                                {
                                    icon: 2,
                                    time: 2000, //2秒关闭(如果不配置,默认是3秒)
                                },
                                function () {
                                    //回调
                                }
                            );
                        }
                    });
                }
                sendData(IP + "/basis/GetRoleRightList", {}, "get", function (res) {
                    $(function() {
HTML/views/SystemSettings/UserManage.html
@@ -165,7 +165,83 @@
                            }, function() {});
                        }
                    });
                    var xml = '';
                    function getchiled(data, mainId) {
                        if (data) {
                            var list = data.filter(item => item.ParentId == mainId);
                            if (list) {
                                for (var i = 0; i < list.length; i++) {
                                    var id = list[i].Id;
                                    //查询有无子菜单
                                    var count = data.filter(item => item.ParentId == id).length;
                                    if (count > 0) {
                                        xml = xml + '<dd>' + '<a href="javascript:;">' + list[i].Name + '</a>' + '<dl class="layui-nav-child">';
                                        getchiled(data, id);
                                        xml = xml + '</dl></dd>';
                                    }
                                    else {
                                        xml = xml + '<dd>' + '<a lay-href="' + list[i].Url + '">' + list[i].Name + '</a>' + '</dd>';
                                    }
                                }
                            }
                        }
                    }
                    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 xml = '';
                function getchiled(data, mainId) {
@@ -193,6 +269,7 @@
                        }
                    }
                }
                sendData(IP + "/basis/GetRoleRightList", {}, 'get', function(res) {
                    $(function() {
                        $("#approvalBtn").hide();
@@ -251,6 +328,7 @@
                        });
                    }
                })
                var infoOptions = {
                    elem: '#LAY-app-content-list',
                    height: h1,