From ff735489d5dd579cbcffc0eb599638bd97f7063e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 01 七月 2020 12:42:54 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/matCode/matCode.html   |   16 ++++++++--------
 src/main/webapp/static/js/matCode/matCode.js |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/static/js/matCode/matCode.js b/src/main/webapp/static/js/matCode/matCode.js
index fc21fd5..09a58d7 100644
--- a/src/main/webapp/static/js/matCode/matCode.js
+++ b/src/main/webapp/static/js/matCode/matCode.js
@@ -14,7 +14,7 @@
         headers: {token: localStorage.getItem('token')},
         url: baseUrl+'/matCode/list/auth',
         page: true,
-        limit: 3,
+        limit: 16,
         limits: [16, 50, 100, 200, 500],
         even: true,
         toolbar: '#toolbar',
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 415aac6..355cbaf 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -259,21 +259,21 @@
 <!-- 妯℃澘1 -->
 <script type="text/template" id="templatePreview1" class="template-barcode">
     {{#each data}}
-    <table class="contain" width="296" style="overflow: hidden;font-size: xx-small">
-        <tr style="height: 80px">
+    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small">
+        <tr style="height: 55px">
             <td align="center" colspan="1" scope="col">鐗╂枡缂栫爜</td>
             <td align="center" class="barcode" colspan="3" scope="col">
                 <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
-                <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
                     <span>{{this.matNo}}</span>
                 </div>
             </td>
         </tr>
-        <tr style="height: 80px">
-            <td align="center" width="25%">鐗╂枡鍚嶇О</td>
-            <td align="center" width="25%">{{this.matName}}</td>
-            <td align="center" width="25%">鐗╂枡鍗曚綅</td>
-            <td align="center" width="25%">{{this.str1}}</td>
+        <tr style="height: 55px">
+            <td align="center" width="25%">鍚嶇О</td>
+            <td align="center" width="35%">{{this.matName}}</td>
+            <td align="center" width="20%">鍗曚綅</td>
+            <td align="center" width="20%">{{this.str1}}</td>
         </tr>
     </table>
     {{/each}}

--
Gitblit v1.9.1