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

wtt

18 小时以前 09e20ef6818207c2560b6177e5794563f1ba0559

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_Material.html

@@ -463,6 +463,26 @@
                table.render(option);
            });

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '物料代码') {
                    var hID = data.HItemID.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑物料设置'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_Material.html?hID=' + hID + "&OperationType=3"
                        , resize: false
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });


            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
@@ -701,6 +721,13 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if (data[i].name == '物料代码') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '物料代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.物料代码 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int