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

Administrator

3 天以前 8bd4e49b8ffb54b8039c528f347f3996e766d8a9

 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%;">
@@ -43,12 +43,12 @@
                 
                <table border="1" id="table" style="width: 90%; height:480px; margin: 0 auto; text-align: center;border-collapse: collapse;table-layout: fixed;">
                     
                    <tr> 
                    <!-- <tr> 
                        <td colspan="2" id="Logo">
                            <img src="../../img/LiNuo.jpg" style="width: 90%; height: 30px;" />
                        </td>
                        <td colspan="2" style="padding: 1px 0px;">SMP-ST002-R08-01</td> 
                    </tr>
                    </tr> -->
                    <tr> 
                        <td colspan="4" id="department">物料标签</td>
                    </tr>
@@ -56,23 +56,23 @@
                        <td>品名</td>
                        <td colspan="3" id="SkuName"></td>
                    </tr>
                    <tr>
                    <!-- <tr>
                        <td>规格/型号</td>
                        <td  id="Standard"></td>
                        <td>包装规格</td>
                        <td id="PackageStandard"></td>
                    </tr>
                    </tr> -->
                    <tr>
                        <td>进厂编号</td>
                        <td id="LotNo" style="padding: 1px 0px;"></td>
                        <td>物料代码</td>
                        <td id="SkuNo"> </td>
                    </tr>
                    <tr>
                        <td>原厂批号</td>
                        <td id="SupplierLot"></td> 
                        <td>数   量</td>
                        <td id="qty"></td> 
                    </tr>
                    <tr>
                        <td>物料代码</td>
                        <td colspan="3" id="SkuNo"></td>
                        <!-- <td>数   量</td>
                        <td id="qty"></td>  -->
                    </tr>
                    <tr>
                        <td>有效期至</td>