Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

zzr99

2021-11-11 a3d3518af36d676d1fd21ebda0963c5385b5a676

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/views/PublicPage/PowerInformation.html

@@ -33,7 +33,7 @@
                        <div class="layui-card-header">
                            <div class="layui-btn-group">

                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">授权</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>

                            </div>
@@ -72,7 +72,7 @@
            var TreeFlag = true;//操作类型
        } else {
            debugger;
            var TreeFlag = params[params[0]];//操作类型
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HSouceBillType = params[params[2]];//源单类型
        }
@@ -96,13 +96,12 @@
                , laydate = layui.laydate
                , util = layui.util
                , tree = layui.tree
            if (TreeFlag == "false")
            {
            var sGnbm = "";
            if (TreeFlag == "false") {
                //$(".layui-col-xs3").css("display", "none"); //隐藏树型
                //$(".layui-col-xs9").css("width", "100%"); //设置宽度
            }
            else
            {
            else {
                tree.render({
                    elem: '#treeUser',
                    data: getData(),
@@ -111,8 +110,8 @@
                    isJump: false, //是否允许点击节点时弹出新窗口跳转
                    showLine: true,//是否开启连接线
                    onlyIconControl: true,   //点击后不收缩
                    isopen: true,  //加载完毕后的展开状态，默认值：true
                    accordion: true,
                    isopen: false,  //加载完毕后的展开状态，默认值：true
                    accordion: false,
                    click: function (obj) {
                        //点击高光
                        if (obj.data.id !== treeCkData.id) {
@@ -128,26 +127,8 @@
                        //    TagId = "";
                        //    TagParentId = "";
                        //}


                        $.ajax({
                            url: GetWEBURL() + '/PublicPageMethod/PowerList',
                            type: "GET",
                            data: { "czybm": "998", "sGnbm": obj.data.id},
                            success: function (data1) {
                                if (data1.count == 1) {
                                    option.data = data1.data;
                                    table.render(option);
                                    layer.close(index);
                                } else {
                                    layer.close(index);
                                    layer.alert(data1.code + data1.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.close(index);
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                        sGnbm = obj.data.id;
                        get_Display(sGnbm);
                    }
                });
            }
@@ -155,77 +136,178 @@


            var option = {
                elem: '#mainTable'
                id: 'mainTable'
                ,elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: '650'
                , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                , page: false
                , cellMinWidth: 90
                , cols: [[
                    { type: 'checkbox', fixed: 'left', width: 60 }
                    , { field: 'hid', title: 'hid', sort: true, hide: true }
                    , { field: 'gnbm', title: 'gnbm', sort: true, hide: true }
                    , { field: 'AuthorityHID', title: 'AuthorityHID', edit: 'text', sort: true, hide: true }
                    , {
                        field: '是否权限', title: '是否权限', templet: function (row) {
                            console.log(row);
                            var html = "<input type='checkbox' lay-skin='primary' lay-filter='checkboxIsSelected' table-index='" + row.LAY_TABLE_INDEX + "' class='checkboxIsSelected' value='" + row.是否权限 + "' ";
                            if (row.是否权限 == 1) {
                                html += " checked ";
                        field: 'AuthorityID', title: '是否权限', templet: function (row) {
                            if (row.AuthorityID == 1) {
                                return "<span style='color:green;'>是</span>";
                            }
                            html += ">";
                            return html;
                        }}
                    , { field: '功能说明', title: '功能说明' }
                ]]
                            else {
                                return "否";
                            }
                        }
                    }
                    //, {
                    //    field: 'AuthorityHID', title: '是否权限', templet: function (row) {
                    //        var html = "<input type='checkbox' lay-skin='primary' lay-filter='checkboxIsSelected' table-index='" + row.LAY_TABLE_INDEX + "' class='checkboxIsSelected' value='" + row.AuthorityHID + "' ";
                    //        if (row.AuthorityID == 1) {
                    //            html += " checked ";
                    //        }
                    //        html += ">";
                    //        return html;
                    //    }}
                    , { field: 'gnms', title: '功能说明' }
                ]], done: function (res, page, count) {

                    //可以自行添加判断的条件是否选中
                    //这句才是真正选中，通过设置关键字LAY_CHECKED为true选中，这里只对第一行选中
                    for (var i = 0; i < res.data.length; i++) {
                        if (res.data[i].AuthorityID == 1) {
                            res.data[i]["LAY_CHECKED"] = 'true';
                            //下面三句是通过更改css来实现选中的效果
                            var index = res.data[i]['LAY_TABLE_INDEX'];
                            $('tr[data-index=' + index + '] input[type="checkbox"]').prop('checked', true);
                            $('tr[data-index=' + index + '] input[type="checkbox"]').next().addClass('layui-form-checked');
                        }
                    }
                   
                }
            };

            var index = layer.load(0, { shade: false });
            //进入页面显示的缓存列表
            get_Display(sGnbm);


            //退出
            form.on('submit(Exit)', function (data) {
                if (OperationType == 1) {
                    //关闭页签
                    Pub_Close(2);
                }
                else {
                    //关闭页签
                    Pub_Close(1);
                }
            });

            //监听选中数据
            table.on('checkbox(mainTable)', function (obj) {
                //console.log(obj.checked); //当前是否选中状态
                //console.log(obj.data); //选中行的相关数据
                //console.log(obj.type); //如果触发的是全选，则为：all，如果触发的是单选，则为：one
                if (obj.type == 'one') {
                    if (obj.checked) {
                        //同步更新表格和缓存对应的值
                        obj.update({
                            AuthorityHID: 1,
                        });
                    }
                    else {
                        //同步更新表格和缓存对应的值
                        obj.update({
                            AuthorityHID: 0,
                        });
                    }
                }
                else {
                    if (obj.checked) {
                        //同步更新表格和缓存对应的值
                        var tableBak = table.cache["mainTable"]; //获取表格数据
                        buttonArr = [];//清空数组
                        for (var i = 0; i < tableBak.length; i++) {
                            tableBak[i].AuthorityHID = 1;
                            buttonArr.push(tableBak[i]);  //将之前的数据存储
                        }
                        //table.reload("mainTable", {
                        //    data: buttonArr    //将数据重新载入表格
                        //})
                    }
                    else {
                        //同步更新表格和缓存对应的值
                        var tableBak = table.cache["mainTable"]; //获取表格数据
                        buttonArr = [];//清空数组
                        for (var i = 0; i < tableBak.length; i++) {
                            tableBak[i].AuthorityHID = 0;
                            buttonArr.push(tableBak[i]);  //将之前的数据存储
                        }
                        //table.reload("mainTable", {
                        //    data: buttonArr    //将数据重新载入表格
                        //})
                    
                      
                    }
                }

            });

            //保存
            form.on('submit(Saver)', function (data) {
                if (TagId == "" || TagId == null) {
                    layer.alert("左侧点击树型数据已失效!", { icon: 5 });
                    return false;
                }
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = TagId + ';' + sSubStr + ';' + linterid;
                //console.log(sMainSub);
                //return false;
                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "/Gy_MaintenanceMode/SaverPower", //方法所在页面和方法名
                        async: true,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                    get_Display(sGnbm);
                                });
                            }
                            else {
                                layer.alert(data.Message);
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err);
                        }
                    });



            });

            //加载数据表格
            function get_Display(sGnbm) {
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/PowerList',
                type: "GET",
                data: { "czybm": "998","sGnbm":"" },
                    data: { "czybm": linterid, "sGnbm": sGnbm },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });

            //退出
            form.on('submit(Exit)', function (data) {
                if (OperationType == 1) {
                    Pub_Close(closeType);//直接新增closeType值为2，列表调新增closeType值从列表传递
                }
                else if (OperationType == 3) {
                    Pub_Close(closeType);
                }
                else {
                    Pub_Close(2);
                }
            });

            //保存
            form.on('submit(Saver)', function (data) {
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];

                if (!AllowLoadData(sSubStr))//数据验证
                {
                    return false;
                }
               
            });


            //以上是layui模块
        });
@@ -253,11 +335,11 @@
            let map = {};
            let treeData = [];
            data.forEach(it => {
                map[it.id] = it;    //ID为每个节点的id
                map[it.id.toUpperCase()] = it;    //ID为每个节点的id
            })
            //生成结果集
            data.forEach(it => {
                const parent = map[it.ParentID];   //ParentID为父节点的id
                const parent = map[it.ParentID.toUpperCase()];   //ParentID为父节点的id
                if (parent) {
                    if (!Array.isArray(parent.children)) parent.children = [];
                    parent.children.push(it);

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserList.html

@@ -308,38 +308,24 @@
                    var linterid = data[0].用户编码.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2,
                        skin: 'layui-layer-rim', //加上边框
                        title: '用户权限关联',
                        closeBtn: 1,
                        shift: 2,
                        area: ['100%', '100%'],
                        maxmin: true,
                        content: ['../../PublicPage/PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=', 'yes'],
                        btn: ['确定', '取消']
                        , btn1: function (index, layero) {

                            //按钮【按钮一】的回调
                            var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                            var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                            if (checkStatus.data.length === 0) {
                                return layer.msg('请选择数据');
                            }
                            $("#HSupName").val(checkStatus.data[0].HName);
                            $("#HSupID").val(checkStatus.data[0].HItemID);
                            layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        }
                        , btn2: function (index, layero) {
                            //按钮【按钮二】的回调
                            //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                        },
                        type: 2
                        ,skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '用户权限关联'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../PublicPage/PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , resize: false,
                        end: function () {

                        },
                        success: function (layero, index) {

                            //刷新页面,
                            location.reload();
                        }
                    });
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })

                } else {
                    layer.msg('请选择一行数据编辑！');

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -237,6 +237,7 @@
                    , { field: 'HSupID', title: 'HSupID', hide: true }
                    , { field: '业务状态', title: '业务状态', width: 100 }
                    , { field: '供应商协同状态', title: '供应商协同状态', width: 135 }
                    , { field: '反馈状态', title: '供应商反馈状态', width: 135 }
                    , { field: '供应商代码', title: '供应商代码', width: 120}
                    , { field: '供应商', title: '供应商', width: 100 }
                    , { field: '业务员代码', title: '业务员代码', width: 100 }