From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/mat/mat.html | 231 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 178 insertions(+), 53 deletions(-)
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index a0503dd..933ceb3 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/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">
@@ -104,7 +104,7 @@
</div>
</div>
<div class="layui-inline"> 
- <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <button class="layui-btn icon-btn" id="search" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
</button>
<button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
@@ -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>
@@ -167,8 +167,6 @@
<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">
@@ -180,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">
@@ -192,16 +192,48 @@
</div>
<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 name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <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="memo" 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>
+ <div class="layui-input-block">
+ <input name="storeMaxDate" 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="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="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>
@@ -209,16 +241,61 @@
<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>
+ <div class="layui-input-block">
+ <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>
+ <div class="layui-input-block">
+ <input name="color" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">閿�椤圭◣</label>
+ <div class="layui-input-block">
+ <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>
@@ -238,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;">
@@ -261,7 +339,7 @@
<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">瑙勬牸</td>
<td align="center" colspan="2">xx</td>
</tr>
</table>
@@ -275,7 +353,7 @@
<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="20%">瑙勬牸</td>
<td align="center" width="80%">xxxxxxxx</td>
</tr>
<tr style="height: 75px;">
@@ -303,8 +381,30 @@
</td>
</tr>
<tr style="height: 74px">
- <td align="center" colspan="1">澶囨敞</td>
+ <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>
+
+ <!-- 棰勮鍥� 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>
@@ -329,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">
@@ -340,8 +440,8 @@
<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>
+ <td align="center" colspan="2">瑙勬牸</td>
+ <td align="center" colspan="2">{{this.specs}}</td>
</tr>
</table>
{{/each}}
@@ -355,13 +455,13 @@
<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>
+ <td align="center" width="20%">瑙勬牸</td>
+ <td align="center" width="80%">{{this.specs}}</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">
+ <div style="letter-spacing: 2px;margin-top: 1px; text-align: center" >
<span>{{this.matnr}}</span>
</div>
</td>
@@ -372,33 +472,58 @@
<!-- 妯℃澘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">
+ <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>
- <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.memo}}</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>
{{/each}}
--
Gitblit v1.9.1