Merge branch 'yyk'

yuyou_x

2024-02-05 b79c300768db0aa78723c0b7f5a6a4d6d4c94bc9

 HTML/views/ASNSetting/ArrivalNotice.html

@@ -100,6 +100,7 @@
                        <option value="4">车间余料退回入库</option>
                        <option value="5">其它入库</option>
                        <option value="6">代储入库</option>
                        <option value="7">寄存入库</option>
                        <!-- JC09 -->
                        <!-- <option value="0">标准产品入库</option>
                        <option value="1">非标产品入库</option> -->
@@ -241,6 +242,8 @@
                           html = `其它入库`; 
                        }else if(d.Type=='6') { 
                           html = `代储入库`; 
                        }else if(d.Type=='7') { 
                           html = `寄存入库`; 
                        }else {
                           
                        }
@@ -1184,7 +1187,7 @@
                  layer.open({
                     type: 2,
                     title: '生成标签',
                     content: 'LabelPrintSelect.html',
                     content: 'LabelPrintSelect.html?Id='+id,
                     maxmin: true,
                     area: ['480px', '615px'],
                     btn: ['确定','取消'],