Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

zyx

2023-12-25 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078

 src/main/webapp/views/mat/mat.html

@@ -86,15 +86,15 @@
                    <!-- 表格工具栏2 -->
                    <div id="search-box" class="layui-form toolbar"  style="padding-top: 5px">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">单据号:</label>
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">物料号:</label>
                            <div class="layui-input-inline">
                                <input name="matnr" class="layui-input" placeholder="输入商品编号"/>
                                <input name="matnr" class="layui-input" placeholder="输入物料号"/>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">物料号:</label>
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">物料名称:</label>
                            <div class="layui-input-inline">
                                <input name="maktx" class="layui-input" placeholder="输入商品名称"/>
                                <input name="maktx" class="layui-input" placeholder="输入物料名称"/>
                            </div>
                        </div>
                        <div class="layui-inline">
@@ -147,7 +147,7 @@
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="edit">修改</a>
    <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary btn-modify" lay-event="edit" style="display: none">修改</a>
    <button class="layui-btn layui-btn-xs btn-print" lay-event="btnPrint">打印</button>
</script>

@@ -178,7 +178,9 @@
        <input name="createBy" type="hidden">
        <input name="updateTime$" type="hidden">
        <input name="updateBy" type="hidden">
        <input name="status" type="hidden">
        <div class="layui-row">


            <div class="layui-col-md6">

@@ -190,75 +192,110 @@
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">物料号</label>
                    <label class="layui-form-label layui-form-required">存货名称</label>
                    <div class="layui-input-block">
                        <input name="maktx" placeholder="请输入物料号" class="layui-input">
                        <input name="maktx" placeholder="请输入存货名称" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">移动类型</label>
                    <label class="layui-form-label">库存上限</label>
                    <div class="layui-input-block">
                        <input name="name" placeholder="请输入移动类型" class="layui-input">
                        <input name="storeMax" placeholder="库存上限" type="number" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">重量</label>
                    <label class="layui-form-label">库龄上限(天)</label>
                    <div class="layui-input-block">
                        <input type="number" name="weight" placeholder="请输入重量" class="layui-input">
                        <input name="storeMaxDate" placeholder="库龄上限(天)" type="number" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">状态</label>
                    <label class="layui-form-label">存货分类编码</label>
                    <div class="layui-input-block">
                        <input name="origin" placeholder="请输入状态" class="layui-input">
                        <input name="brand" placeholder="请输入存货分类编码" class="layui-input">
                    </div>
                </div>

<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">备注</label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input name="memo" placeholder="请输入备注" class="layui-input">-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label">计量单位</label>
                    <div class="layui-input-block">
                        <input name="unit" placeholder="请输入计量单位" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">进项税</label>
                    <div class="layui-input-block">
                        <input name="price" placeholder="请输入进项税" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">状态:</label>
                    <div class="layui-input-block">
                        <select name="status">
                            <option value="1">正常</option>
                            <option value="0" selected>禁用</option>
                        </select>
                    </div>
                </div>

            </div>

            <div class="layui-col-md6">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">单据号</label>
                    <label class="layui-form-label layui-form-required">存货编码</label>
                    <div class="layui-input-block">
                        <input id="matnr" name="matnr" placeholder="请输入单据号" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                        <input id="matnr" name="matnr" placeholder="请输入存货编码" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">规格</label>
                    <label class="layui-form-label">规格型号</label>
                    <div class="layui-input-block">
                        <input name="specs" placeholder="请输入规格" class="layui-input">
                        <input name="specs" placeholder="请输入规格型号" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">批次</label>
                    <label class="layui-form-label">库存下限</label>
                    <div class="layui-input-block">
                        <input name="model" placeholder="请输入批次" class="layui-input">
                        <input name="storeMin" placeholder="库存下限" type="number" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">通用型号</label>
                    <div class="layui-input-block">
                        <input name="model" placeholder="请输入备注" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">单据时间</label>
                    <label class="layui-form-label">存货分类名称</label>
                    <div class="layui-input-block">
                        <input name="manuDate" placeholder="请输入单据时间" class="layui-input">
                        <input name="color" placeholder="请输入备注" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">包数</label>
                    <label class="layui-form-label">销项税</label>
                    <div class="layui-input-block">
                        <input type="number" name="units" placeholder="请输入包数" class="layui-input">
                        <input name="units" placeholder="请输入销项税" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">建档人</label>
                    <div class="layui-input-block">
                        <input name="supp" placeholder="请输入建档人" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">备注</label>
                    <div class="layui-input-block">
                        <input name="memo" placeholder="请输入备注" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">物料频率</label>
                    <div class="layui-input-block">
                        <input name="beBatch" type="number" placeholder="1为高频，其他均为低频" class="layui-input">
                    </div>
                </div>

@@ -278,19 +315,20 @@
        <hr>
        <!--单选框-->
        <div class="layui-form-item" style="display: inline-block; margin-bottom: 10px">
            <input type="radio" name="selectTemplate" value="1" title="模板一"  lay-filter="selectTemplateRadio" checked="">
            <input type="radio" name="selectTemplate" value="2" title="模板二" lay-filter="selectTemplateRadio">
            <input type="radio" name="selectTemplate" value="3" title="模板三" lay-filter="selectTemplateRadio">
<!--            <input type="radio" name="selectTemplate" value="1" title="模板一"  lay-filter="selectTemplateRadio" checked="">-->
<!--            <input type="radio" name="selectTemplate" value="2" title="模板二" lay-filter="selectTemplateRadio">-->
<!--            <input type="radio" name="selectTemplate" value="3" title="模板三" lay-filter="selectTemplateRadio">-->
            <input type="radio" name="selectTemplate" value="4" title="模板四" lay-filter="selectTemplateRadio" checked="checked">
        </div>
        <fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left;">
            <legend>打印预览</legend>
            <div id="template-container" style="margin: 20px;text-align: center">

                <!-- 预览图 1 -->
                <div id="template-preview-1" class="template-preview" style="display: inline-block">
                <div id="template-preview-1" class="template-preview" style="display: none">
                    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                        <tr style="height: 74px">
                            <td colspan="3" align="center" scope="col">单据号</td>
                            <td colspan="3" align="center" scope="col">物料号</td>
                            <td class="barcode" colspan="9" align="center" scope="col">
                                <img class="template-code template-barcode" src="" width="90%;">
                                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
@@ -348,6 +386,28 @@
                        </tr>
                    </table>
                </div>

                <!-- 预览图 4 -->
                <div id="template-preview-4" class="template-preview" style="display: inline-block">
                    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                        <tr style="height: 37px">
                            <td align="center" scope="col" >商品</td>
                            <td align="center" scope="col" style="">xxxxxx-xx/xx</td>
                            <td align="center" scope="col" colspan="2" rowspan="2">
                                <img class="template-code template-qrcode" src="" width="80%">
                                <div style="letter-spacing: 1px;margin-top: 1px; text-align: center"><span>xxxxxx</span></div>
                            </td>
                        </tr>
                        <tr style="height: 37px">
                            <td align="center" scope="col" >数量</td>
                            <td align="center" scope="col" style=""></td>
                        </tr>
                        <tr style="height: 74px">
                            <td align="center" >规格</td>
                            <td align="center" colspan="3" >xxxxxxx</td>
                        </tr>
                    </table>
                </div>
            </div>
        </fieldset>

@@ -369,7 +429,7 @@
    {{#each data}}
    <table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
        <tr style="height: 74px">
            <td align="center" colspan="3" scope="col">单据号</td>
            <td align="center" colspan="3" scope="col">物料号</td>
            <td align="center" class="barcode" colspan="9" scope="col">
                <img class="template-code" src="{{this.barcodeUrl}}" width="90%">
                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
@@ -401,7 +461,7 @@
        <tr style="height: 79px;">
            <td align="center" colspan="2" width="100%" style="border: none">
                <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center" >
                    <span>{{this.matnr}}</span>
                </div>
            </td>
@@ -412,33 +472,57 @@
<!-- 模板3 -->
<script type="text/template" id="templatePreview3" class="template-qrcode">
    {{#each data}}
    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
        <tr style="height: 74px" >
            <td align="center" scope="col" colspan="1">商品</td>
            <td align="center" scope="col" colspan="1" style="
                border: none;
                border-top: 1px solid #000;
                overflow: hidden;
                text-overflow: ellipsis;
                -webkit-line-clamp: 3;
                -webkit-box-orient: vertical;
                    ">
                {{this.maktx}}
            </td>
            <td align="center" scope="col" colspan="2" rowspan="2">
    <table class="contain" width="400px" style="overflow: hidden;font-size: xx-small;table-layout: fixed; color:#000;">
        <tr style="height: 74px;font-size: 18px; font-weight: 400" >
            <td width="50px" align="center" scope="col" colspan="1">商品</td>
            <td width="170px" align="center" scope="col" colspan="1">{{this.maktx}}</td>
            <td align="center" scope="col" colspan="2" rowspan="2" >
                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
                <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
                <div style="letter-spacing: 1px;margin-top: 1px; text-align: center; font-weight: 400">
                    <span>{{this.matnr}}</span>
                </div>
            </td>
        </tr>
        <tr style="height: 74px">
            <td align="center" colspan="1">规格</td>
        <tr style="height: 74px; font-size: 18px;font-weight: 400">
            <td width="50px" align="center" colspan="1">规格</td>
            <td align="center" colspan="1" style="
                overflow:hidden;
                text-overflow:ellipsis;
                -webkit-line-clamp: 3;
                -webkit-box-orient: vertical;
                word-break: break-all;
            ">{{this.specs}}</td>
        </tr>
    </table>
    {{/each}}
</script>

<!-- 模板4 -->
<script type="text/template" id="templatePreview4" class="template-qrcode">
    {{#each data}}
    <table class="contain" width="400px" style="overflow: hidden;font-size: xx-small;table-layout: fixed; color:#000;">
        <tr style="height: 50px;font-size: 18px; font-weight: 400" >
            <td width="50px" align="center" scope="col" colspan="1">商品</td>
            <td width="170px" align="center" scope="col" colspan="1">{{this.maktx}}</td>
            <td align="center" scope="col" colspan="2" rowspan="2">
                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
                <div style="letter-spacing: 1px;margin-top: 1px; text-align: center; font-weight: 400">
                    <span>{{this.matnr}}</span>
                </div>
            </td>
        </tr>
        <tr style="height: 24px;font-size: 18px; font-weight: 400" >
            <td width="50px" align="center" scope="col" colspan="1">数量</td>
            <td width="170px" align="center" scope="col" colspan="1"></td>
        </tr>
        <tr style="height: 50px; font-size: 18px;font-weight: 400">
            <td width="50px" align="center" colspan="1">规格</td>
            <td align="center" colspan="3" style="
                overflow:hidden;
                text-overflow:ellipsis;
                -webkit-line-clamp: 3;
                -webkit-box-orient: vertical;
                word-break: break-all;
            ">{{this.specs}}</td>
        </tr>
    </table>