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

wtt

7 天以前 cab050ef2ac6f2deb6d207d7685e4cc26fc9ab59

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

@@ -553,15 +553,6 @@
            })
            //#endregion

            //#region åŒå‡»è¿”回数据
            //table.on('rowDouble(mainTable)', function (obj) {
            //  var data = [];
            //   data.push(obj.data);
            //  parent.GetMaterValue(data);
            //  var index = parent.layer.getFrameIndex(window.name);
            //   parent.layer.close(index);
            //   });
            //#endregion

            //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„所有方法

@@ -593,20 +584,20 @@
                    , page: false
                    , limit: 50
                    , done: function (res, curr, count) {
                        var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
                        var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
                        var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
                        for (var i = 0; i < $data.length; i++) {
                            var l1 = $data.eq(i).find('div').width();
                            var l2 = $head.eq(i).find('div').width();
                            if (l1 > l2) {
                                $head.eq(i).find('div').width(l1);
                                $total.eq(i).find('div').width(l1);
                            } else {
                                $data.eq(i).find('div').width(l2);
                                $total.eq(i).find('div').width(l2);
                            }
                        }
                        //var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
                        //var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
                        //var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
                        //for (var i = 0; i < $data.length; i++) {
                        //    var l1 = $data.eq(i).find('div').width();
                        //    var l2 = $head.eq(i).find('div').width();
                        //    if (l1 > l2) {
                        //        $head.eq(i).find('div').width(l1);
                        //        $total.eq(i).find('div').width(l1);
                        //    } else {
                        //        $data.eq(i).find('div').width(l2);
                        //        $total.eq(i).find('div').width(l2);
                        //    }
                        //}
                    }
                };
                optionPage = {
@@ -773,6 +764,11 @@
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else if (data[i].name == '物料名称' || data[i].name == '规格型号') {//添加超链接
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 300
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int