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

zyx

2024-04-12 b922fe4d80f7e278b1ff958c4c95626b27cf8266

 src/main/webapp/views/nodeLoc/nodeLoc.html

@@ -88,7 +88,13 @@
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">库区:</label>
                            <div class="layui-input-inline">
                                <input name="parent_name" class="layui-input" placeholder="输入商品编号"/>
                                <input name="parent_name" class="layui-input" placeholder="输入库区编号"/>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">库位号:</label>
                            <div class="layui-input-inline">
                                <input name="name" class="layui-input" placeholder="输入库位编号"/>
                            </div>
                        </div>
                        <div class="layui-inline">&emsp;
@@ -116,19 +122,19 @@
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-sm" id="btn-print-batch" lay-event="printBatch">批量打印</button>
        <!-- 商品/物料 数据中心 -->
<!--        <div class="dropdown-menu" style="float: right">-->
<!--            <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm">&nbsp;数据同步 <i class="layui-icon layui-icon-drop"></i></button>-->
<!--            <ul class="dropdown-menu-nav dark">-->
<!--                <div class="dropdown-anchor"></div>-->
<!--                <li class="title">1st menu</li>-->
<!--                <li><a onclick="excelMouldDownload()" style="font-size: 12px"><i class="layui-icon layui-icon-template-1"></i>模板下载</a></li>-->
<!--                <li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>导入 Excel</a></li>-->
<!--                <li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li>-->
<!--                <hr>-->
<!--                <li class="title">2nd menu</li>-->
<!--                <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>导出 Excel</a></li>-->
<!--            </ul>-->
<!--        </div>-->
        <!--        <div class="dropdown-menu" style="float: right">-->
        <!--            <button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm">&nbsp;数据同步 <i class="layui-icon layui-icon-drop"></i></button>-->
        <!--            <ul class="dropdown-menu-nav dark">-->
        <!--                <div class="dropdown-anchor"></div>-->
        <!--                <li class="title">1st menu</li>-->
        <!--                <li><a onclick="excelMouldDownload()" style="font-size: 12px"><i class="layui-icon layui-icon-template-1"></i>模板下载</a></li>-->
        <!--                <li><a onclick="importExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-upload"></i>导入 Excel</a></li>-->
        <!--                <li style="display: none"><input id="importExcel" type="file" onchange="upload(this)" ></li>-->
        <!--                <hr>-->
        <!--                <li class="title">2nd menu</li>-->
        <!--                <li><a onclick="exportExcel()" style="font-size: 12px"><i class="layui-icon layui-icon-export"></i>导出 Excel</a></li>-->
        <!--            </ul>-->
        <!--        </div>-->
        <!--        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right;margin-right: -10px">导出</button>-->
    </div>
</script>
@@ -206,7 +212,7 @@
<!-- 模板1 -->
<script type="text/template" id="templatePreview1" class="template-barcode">
    {{#each data}}
    <table class="contain" width="400px" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
    <table class="contain" width="400px" style="overflow: hidden;font-size: xx-large;table-layout: fixed; color:#000;">
        <tr style="height: 150px; border: none">
            <td class="barcode" colspan="12" align="center" scope="col" style=" border: none">
                <img class="template-code template-barcode" src="{{this.barcodeUrl}}" width="90%;">
@@ -221,11 +227,11 @@
<!-- 模板2 -->
<script type="text/template" id="templatePreview2" class="template-barcode">
    {{#each data}}
    <table class="contain" width="400px" style="overflow: hidden;table-layout: fixed; border: none; font-size: xx-large">
    <table class="contain" width="400px" style="overflow: hidden;table-layout: fixed; border: none; font-size: xxx-large; color:#000;">
        <tr style="height: 150px">
            <td class="barcode" colspan="9" align="center" scope="col" style="border: none">
                <img class="template-code template-barcode" src="{{this.barcodeUrl}}" width="90%;"> ↓
                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center; font-size: xx-small">
                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center; font-size: xx-large">
                    <span>{{this.item}}</span>
                </div>
            </td>