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 | 92 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 74 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 4f734c4..933ceb3 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -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>
@@ -192,9 +192,9 @@
</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">
@@ -207,6 +207,24 @@
<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">
@@ -223,16 +241,16 @@
<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>
@@ -242,12 +260,42 @@
<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>
@@ -267,17 +315,17 @@
<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="4" 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>
@@ -340,15 +388,19 @@
</div>
<!-- 棰勮鍥� 4 -->
- <div id="template-preview-4" class="template-preview" style="display: none">
+ <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: 74px">
+ <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">
+ <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>
@@ -449,17 +501,21 @@
<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: 74px;font-size: 18px; font-weight: 400" >
+ <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" >
+ <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: 74px; font-size: 18px;font-weight: 400">
+ <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;
--
Gitblit v1.9.1