From bc20e7dc43b97367b7b70b678e71140a33846ff0 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期三, 30 七月 2025 22:36:49 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/mat/mat.html |   57 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index f5fba90..e801f91 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -92,6 +92,12 @@
                             </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="matnr2" 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="maktx" class="layui-input" placeholder="杈撳叆鐗╂枡鍚嶇О"/>
@@ -147,7 +153,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>
 
@@ -246,6 +252,12 @@
                         <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 layui-form-required">鏃у瓨璐х紪鐮�</label>
+                    <div class="layui-input-block">
+                        <input id="matnr2" name="matnr2" placeholder="璇疯緭鍏ユ棫瀛樿揣缂栫爜" class="layui-input">
+                    </div>
+                </div>
 
                 <div class="layui-form-item">
                     <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
@@ -286,11 +298,16 @@
                         <input name="supp" placeholder="璇疯緭鍏ュ缓妗d汉" 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>
 
@@ -310,17 +327,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>
@@ -383,15 +400,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>
@@ -492,15 +513,19 @@
 <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="3" 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>
@@ -511,6 +536,14 @@
                 -webkit-box-orient: vertical;
                 word-break: break-all;
             ">{{this.specs}}</td>
+            <td align="center" colspan="1" style="
+                overflow:hidden;
+                text-overflow:ellipsis;
+                -webkit-line-clamp: 3;
+                -webkit-box-orient: vertical;
+                word-break: break-all;
+                font-size: 11px;
+            ">{{this.date}}</td>
         </tr>
     </table>
     {{/each}}

--
Gitblit v1.9.1