From 41c2e9f0a5a14382bbc696021fa5ec0ad6ec7e51 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 14 十二月 2022 12:01:51 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/mat/mat.html |   88 +++++++++++++++++++++++++-------------------
 1 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index da02f1f..f5b5767 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -86,19 +86,25 @@
                     <!-- 琛ㄦ牸宸ュ叿鏍�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>
                         </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">瑙勬牸:</label>
+                            <div class="layui-input-inline">
+                                <input name="specs" class="layui-input" placeholder="杈撳叆瑙勬牸"/>
+                            </div>
+                        </div>
                         <div class="layui-inline">&emsp;
-                            <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">&#xe615;</i>鎼滅储
                             </button>
                             <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
@@ -161,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">
@@ -186,68 +190,75 @@
                 </div>
 
                 <div class="layui-form-item">
-                    <label class="layui-form-label layui-form-required">鍟嗗搧鍚嶇О</label>
+                    <label class="layui-form-label">鐗╂枡鍙�</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">
                     </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="name" 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 name="weight" placeholder="璇疯緭鍏ュ崟绠卞噣閲嶆牸" class="layui-input">
+                        <input type="number" name="weight" 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 name="volume" placeholder="璇疯緭鍏ュ崟绠变綋绉�" class="layui-input">
+                        <input name="origin" 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>
 
             <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="model" type="number" placeholder="璇疯緭鍏ヤ唬鐮�" class="layui-input">
+                        <input name="specs" 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 name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+                        <input name="model" 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 name="length" placeholder="璇疯緭鍏ュ崟绠辨瘺閲�" class="layui-input">
+                        <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 name="threeCode" placeholder="璇疯緭鍏ョ瀛愬昂瀵�" class="layui-input">
+                        <input type="number" name="units" placeholder="璇疯緭鍏ュ寘鏁�" class="layui-input">
                     </div>
                 </div>
 
@@ -279,7 +290,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;">
@@ -290,7 +301,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>
@@ -304,7 +315,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;">
@@ -332,7 +343,7 @@
                             </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>
@@ -358,7 +369,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">
@@ -369,8 +380,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}}
@@ -384,8 +395,8 @@
             <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">
@@ -405,14 +416,10 @@
         <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;
                     ">
@@ -426,8 +433,13 @@
             </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>
+            <td align="center" colspan="1">瑙勬牸</td>
+            <td align="center" colspan="1" style="
+                overflow:hidden;
+                text-overflow:ellipsis;
+                -webkit-line-clamp: 3;
+                -webkit-box-orient: vertical;
+            ">{{this.specs}}</td>
         </tr>
     </table>
     {{/each}}

--
Gitblit v1.9.1