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

yangle

2023-08-21 f2316fee56e5dfbf9cac317e8459a0b4a541a6df

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Gy_BarCodeBill.html

@@ -226,6 +226,7 @@

            //监听当前处于哪一个页签，传 HModName å€¼
            element.on('tab(tab-TabTest)', function (data) {
                HMaterInfo = table.cache['mainTable'];
                var cur_title = data.elem.context.innerText;
                if (cur_title == "物料信息") {
                    HModName = "Gy_BarCodeBill";
@@ -1414,7 +1415,7 @@
                                shift: 2,
                                area: ['80%', '80%'],
                                maxmin: true,
                                content: ['../../Baseset/基础资料/Gy_MaterialList_LSQP.html', 'yes'],
                                content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {