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 | 80 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 103d755..37210a1 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -86,13 +86,13 @@
<!-- 琛ㄦ牸宸ュ叿鏍�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>
</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="杈撳叆鍟嗗搧鍚嶇О"/>
</div>
@@ -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>
@@ -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">
@@ -197,11 +197,25 @@
<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">
+ <select name="status">
+ <option value="1">姝ｅ父</option>
+ <option value="0" selected>绂佺敤</option>
+ </select>
</div>
</div>
@@ -219,6 +233,21 @@
<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="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="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
</div>
</div>
@@ -250,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;">
@@ -329,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">
@@ -361,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>
@@ -372,32 +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="
- 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;">
+ <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