From 2c3fddeac17fb2edf05325faacee71fa97f7cc2f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 14 七月 2023 10:58:16 +0800
Subject: [PATCH] 完善AGV相关功能
---
src/main/webapp/views/mat/mat.html | 82 +++++++++++++++-------------------------
1 files changed, 31 insertions(+), 51 deletions(-)
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 128f3c5..37210a1 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -86,7 +86,7 @@
<!-- 琛ㄦ牸宸ュ叿鏍�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="杈撳叆鍟嗗搧缂栧彿"/>
</div>
@@ -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,47 +192,40 @@
</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">
+ <select name="status">
+ <option value="1">姝ｅ父</option>
+ <option value="0" selected>绂佺敤</option>
+ </select>
</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>
<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>
@@ -242,23 +237,17 @@
</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="manuDate" 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="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
</div>
</div>
@@ -290,7 +279,7 @@
<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 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;">
@@ -369,7 +358,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 +390,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,28 +401,19 @@
<!-- 妯℃澘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;">
+ <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;
--
Gitblit v1.9.1