From 828b592b5f8e31204f93bcc2ea0c5866bdc0dcf0 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 06 十二月 2023 20:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1
---
src/main/webapp/views/nodeLoc/nodeLoc.html | 233 +++++-----------------------------------------------------
1 files changed, 21 insertions(+), 212 deletions(-)
diff --git a/src/main/webapp/views/nodeLoc/nodeLoc.html b/src/main/webapp/views/nodeLoc/nodeLoc.html
index 3b14a5c..0fa9012 100644
--- a/src/main/webapp/views/nodeLoc/nodeLoc.html
+++ b/src/main/webapp/views/nodeLoc/nodeLoc.html
@@ -114,6 +114,7 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<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"> 鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>-->
@@ -146,122 +147,14 @@
<script type="text/javascript" src="../../static/js/nodeLoc/nodeLoc.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/nodeLoc/nodeLocTree.js" charset="utf-8"></script>
-<!-- 琛ㄥ崟寮圭獥 -->
-<script type="text/html" id="editDialog">
- <form id="detail" lay-filter="detail" class="layui-form admin-form">
- <input name="id" type="hidden">
- <input name="uuid" type="hidden">
- <input name="nodeId" type="hidden">
- <input name="tag_id" type="hidden">
- <input name="model" type="hidden">
- <input name="name" type="hidden">
- <input name="batch" type="hidden">
- <input name="docId" type="hidden">
- <input name="docNum" type="hidden">
- <input name="custName" type="hidden">
- <input name="itemNum" type="hidden">
- <input name="count" type="hidden">
- <input name="weight" type="hidden">
- <input name="status" type="hidden">
- <input name="createBy" type="hidden">
- <input name="updateTime$" type="hidden">
- <input name="updateBy" type="hidden">
- <div class="layui-row">
-
- <div class="layui-col-md6">
-
- <div class="layui-form-item">
- <label class="layui-form-label">鍒嗙被</label>
- <div class="layui-input-block">
- <div id="tagSel" class="ew-xmselect-tree"></div>
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍟嗗搧鍚嶇О</label>
- <div class="layui-input-block">
- <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>
- <div class="layui-input-block">
- <input name="specs" placeholder="璇疯緭鍏ラ厤缃�" class="layui-input">
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曠鍑�閲�</label>
- <div class="layui-input-block">
- <input name="weight" placeholder="璇疯緭鍏ュ崟绠卞噣閲嶆牸" class="layui-input">
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曠浣撶Н</label>
- <div class="layui-input-block">
- <input name="volume" placeholder="璇疯緭鍏ュ崟绠变綋绉�" class="layui-input">
- </div>
- </div>
-
- </div>
-
- <div class="layui-col-md6">
- <div class="layui-form-item">
- <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="">
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">瑙勬牸</label>
- <div class="layui-input-block">
- <input name="specs" 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="length" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label">鍗曠浣撶Н</label>
- <div class="layui-input-block">
- <input name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
- </div>
- </div>
-
- </div>
- </div>
- <hr class="layui-bg-gray">
- <div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- </div>
- </form>
-</script>
-
<!-- 鎵撳嵃鎿嶄綔寮圭獥 -->
<div id="printDataDiv" style="display: none;padding: 20px">
<div class="layui-form" style="text-align: center">
<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="1" title="妯℃澘涓�" lay-filter="selectTemplateRadio" checked="checked">
<input type="radio" name="selectTemplate" value="2" title="妯℃澘浜�" lay-filter="selectTemplateRadio">
- <input type="radio" name="selectTemplate" value="3" title="妯℃澘涓�" lay-filter="selectTemplateRadio">
</div>
<fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left;">
<legend>鎵撳嵃棰勮</legend>
@@ -270,62 +163,27 @@
<!-- 棰勮鍥� 1 -->
<div id="template-preview-1" 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: 74px">
- <td colspan="3" align="center" scope="col">鍟嗗搧缂栫爜</td>
- <td class="barcode" colspan="9" align="center" scope="col">
+ <tr style="height: 74px; border: none">
+ <td class="barcode" colspan="12" align="center" scope="col" style=" border: none">
<img class="template-code template-barcode" src="" width="90%;">
<div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
<span>xxxxxx</span>
</div>
</td>
</tr>
- <tr style="height: 74px">
- <td align="center" colspan="3">鍟嗗搧</td>
- <td align="center" colspan="5">xxxxxx-xx/xx</td>
- <td align="center" colspan="2">澶囨敞</td>
- <td align="center" colspan="2">xx</td>
- </tr>
</table>
</div>
<!-- 棰勮鍥� 2 -->
<div id="template-preview-2" class="template-preview" style="display: none">
- <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 30px">
- <td align="center" width="20%">鍟嗗搧</td>
- <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
- </tr>
- <tr style="height: 30px">
- <td align="center" width="20%">澶囨敞</td>
- <td align="center" width="80%">xxxxxxxx</td>
- </tr>
- <tr style="height: 75px;">
- <td align="center" colspan="2" width="100%" style="border: none">
- <img class="template-code template-barcode" src="" width="80%">
- <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
+ <table class="contain" width="280" style="overflow: hidden;table-layout: fixed; border: none; font-size: xx-large">
+ <tr style="height: 74px">
+ <td class="barcode" colspan="9" align="center" scope="col" style="border: none">
+ <img class="template-code template-barcode" src="" width="90%;"> 鈫�
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center; font-size: xx-small">
<span>xxxxxx</span>
</div>
</td>
- </tr>
- </table>
- </div>
-
- <!-- 棰勮鍥� 3 -->
- <div id="template-preview-3" 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 align="center" scope="col" colspan="1">鍟嗗搧</td>
- <td align="center" scope="col" colspan="1" 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: 74px">
- <td align="center" colspan="1">澶囨敞</td>
- <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
</tr>
</table>
</div>
@@ -348,21 +206,14 @@
<!-- 妯℃澘1 -->
<script type="text/template" id="templatePreview1" class="template-barcode">
{{#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" 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">
- <span>{{this.matnr}}</span>
+ <table class="contain" width="400px" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
+ <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%;">
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
+ <span>{{this.item}}</span>
</div>
</td>
- </tr>
- <tr style="height: 74px">
- <td align="center" colspan="3">鍟嗗搧</td>
- <td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">{{this.maktx}}</td>
- <td align="center" colspan="2">澶囨敞</td>
- <td align="center" colspan="2">{{this.memo}}</td>
</tr>
</table>
{{/each}}
@@ -370,56 +221,14 @@
<!-- 妯℃澘2 -->
<script type="text/template" id="templatePreview2" class="template-barcode">
{{#each data}}
- <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
- <tr style="height: 35px">
- <td align="center" width="20%">鍟嗗搧</td>
- <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td>
- </tr>
- <tr style="height: 35px">
- <td align="center" width="20%">澶囨敞</td>
- <td align="center" width="80%">{{this.memo}}</td>
- </tr>
- <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">
- <span>{{this.matnr}}</span>
+ <table class="contain" width="400px" style="overflow: hidden;table-layout: fixed; border: none; font-size: xx-large">
+ <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">
+ <span>{{this.item}}</span>
</div>
</td>
- </tr>
- </table>
- {{/each}}
-</script>
-<!-- 妯℃澘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="
- display: inline-block;
- line-height: 20px;
- vertical-align: middle;
- border: none;
- border-top: 1px solid #000;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 3;
- -webkit-box-orient: vertical;
- ">
- {{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">
- <span>{{this.matnr}}</span>
- </div>
- </td>
- </tr>
- <tr style="height: 74px">
- <td align="center" colspan="1">澶囨敞</td>
- <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.memo}}</td>
</tr>
</table>
{{/each}}
--
Gitblit v1.9.1