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

wtt

14 小时以前 09e20ef6818207c2560b6177e5794563f1ba0559

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_WorkShiftList.html

@@ -282,6 +282,27 @@
            })
            //#endregion

            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;
                if (obj.event == '班次代码') {
                    var HInterID = data.HInterID.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '班次-编辑'
                        , shift: 0  //弹出动画
                        , content: '../生产基础资料/Gy_WorkShiftEdit.html?OperationType=3&HInterID=' + HInterID
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btn_Search").trigger('click');
                        }
                    })
                }
            });

            //#region åŒå‡»è¿”回数据
            table.on('rowDouble(mainTable)', function (obj) {
                var data = [];
@@ -736,6 +757,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