Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

wxw

4 天以前 f6d9155a4a0cf27fd5732314b70109cbc090ccf8

 HTML/views/ASNSetting/LabelBox.html

@@ -338,6 +338,27 @@
               // btn: ['取消']
            });
         });
         //拆分标签
         $('#ChaiLabel').on('click', function () {
            layer.open({
               type: 2,
               title: '拆分标签',
               content: 'LabelChai.html',
               maxmin: true,
               area: ['430px', '290px'],
               // btn: ['取消']
            });
         });
         $('#MergeLabel').on('click', function () {
            layer.open({
               type: 2,
               title: '合并标签',
               content: 'LabelMerge.html',
               maxmin: true,
               area: ['430px', '290px'],
               // btn: ['取消']
            });
         });
         $("#AsnNoSelect").on('input', function () {

            if ($("#AsnNoSelect").val() == "" || $("#AsnNoSelect").val().length < 16) {