Merge branch 'wxw'

wxw

1 天以前 f3a9a3ad429d86028c884e3476dc0badcd8da966

 HTML/views/ASNSetting/LabelPrint.html

@@ -32,10 +32,10 @@
                <button id="btnAdd" class="layui-btn layui-btn-sm" lay-event="Add2"><i
                        class="layui-icon">&#xe654;</i>生成标签</button>
            </div> 
            <div class="layui-inline">
            <!-- <div class="layui-inline">
                <button id="btnPrint" class="layui-btn layui-btn-sm" lay-event="Add"><i
                        class="layui-icon">&#xe654;</i>打印</button>
            </div> 
            </div>  -->
        </div>
        <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="print"
            style="width: 100%;height:100%; text-align: right;padding-top: 5px;margin-left: 0%;">
@@ -70,9 +70,9 @@
                    </tr>
                    <tr>
                        <td>物料代码</td>
                        <td id="SkuNo"></td>
                        <td>数   量</td>
                        <td id="qty"></td> 
                        <td colspan="3" id="SkuNo"></td>
                        <!-- <td>数   量</td>
                        <td id="qty"></td>  -->
                    </tr>
                    <tr>
                        <td>有效期至</td>