From 15d69d9f596a7529ce5a8b8d5a38b94e5c50b6b6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 六月 2021 09:21:56 +0800
Subject: [PATCH] # 库存跳转上报erp

---
 src/main/webapp/views/matCode/matCode.html |   45 ++++++++++++++++++++++++++++++---------------
 1 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index e6e3654..87666d6 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -54,7 +54,7 @@
 <div id="search-box" class="layui-form layui-card-header">
     <div class="layui-inline">
         <div class="layui-input-inline">
-            <input class="layui-input" type="text" name="mat_no" placeholder="鐗╂枡缂栫爜" autocomplete="off">
+            <input class="layui-input" type="text" name="mat_no" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
         </div>
     </div>
     <!-- 鏃ユ湡鑼冨洿 -->
@@ -81,14 +81,16 @@
 </div>
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
-        <button class="layui-btn layui-btn-normal" id="btn-export" lay-event="exportData" style="float: inherit">瀵煎嚭</button>
-        <button class="layui-btn " id="btn-into" lay-event="intoData">瀵煎叆</button>
-        <button class="layui-btn layui-btn-danger" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
+        <button class="layui-btn layui-btn-normal layui-btn-sm" id="btn-export" lay-event="exportData" style="float: inherit">瀵煎嚭</button>
+        <button class="layui-btn layui-btn-sm" id="btn-into" lay-event="intoData">瀵煎叆</button>
+        <button class="layui-btn layui-btn-danger layui-btn-sm" id="btn-print-batch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
+        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
     </div>
 </script>
 
 <script type="text/html" id="operate">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
+<!--    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>-->
     <button class="layui-btn layui-btn-danger layui-btn-xs btn-print" lay-event="btnPrint">鎵撳嵃</button>
 </script>
 
@@ -159,7 +161,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;">
@@ -168,7 +170,7 @@
                             </td>
                         </tr>
                         <tr style="height: 74px">
-                            <td align="center" colspan="3">鐗╂枡鍚嶇О</td>
+                            <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">xx</td>
@@ -180,7 +182,7 @@
                 <div id="template-preview-2" class="template-preview" style="display: none">
                     <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                         <tr style="height: 30px">
-                            <td align="center" width="20%">鐗╂枡鍚嶇О</td>
+                            <td align="center" width="20%">鍟嗗搧鍚嶇О</td>
                             <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
                         </tr>
                         <tr style="height: 30px">
@@ -202,7 +204,7 @@
                 <div id="template-preview-3" 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 align="center" scope="col" colspan="1">鐗╂枡鍚嶇О</td>
+                            <td align="center" scope="col" colspan="1">鍟嗗搧鍚嶇О</td>
                             <td align="center" scope="col" colspan="1" style="">xxxxxx-xx/xx</td>
                             <td align="center" scope="col" colspan="2" rowspan="2">
                                 <img class="template-code template-qrcode" src="" width="80%">
@@ -238,7 +240,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">
@@ -247,7 +249,7 @@
             </td>
         </tr>
         <tr style="height: 74px">
-            <td align="center" colspan="3">鐗╂枡鍚嶇О</td>
+            <td align="center" colspan="3">鍟嗗搧鍚嶇О</td>
             <td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">{{this.matName}}</td>
             <td align="center" colspan="2">鍗曚綅</td>
             <td align="center" colspan="2">{{this.str1}}</td>
@@ -260,7 +262,7 @@
     {{#each data}}
     <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
         <tr style="height: 35px">
-            <td align="center" width="20%">鐗╂枡鍚嶇О</td>
+            <td align="center" width="20%">鍟嗗搧鍚嶇О</td>
             <td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.matName}}</td>
         </tr>
         <tr style="height: 35px">
@@ -282,9 +284,22 @@
 <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="">{{this.matName}}</td>
+        <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.matName}}
+            </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">

--
Gitblit v1.9.1