From 8ad6879cfbaf02a1900d5339da3b675ce4520d73 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 13:00:54 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/matCode/matCode.html |   68 ++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 6713871..5bac4a5 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -141,35 +141,55 @@
             <div id="template-container" style="margin: 20px;text-align: center">
                 <!-- 棰勮鍥� 1 -->
                 <div id="template-preview-1" class="template-preview">
-                    <table class="contain" height="317" width="317" style="overflow: hidden">
+<!--                    <table class="contain" height="317" width="317" style="overflow: hidden">-->
+<!--                        <tr>-->
+<!--                            <td width="20%" align="right" scope="col">瀹㈡埛</td>-->
+<!--                            <td class="customer" width="30%" align="left" scope="col">{{this.customer}}</td>-->
+<!--                            <td width="80%" align="right" scope="col">棰滆壊</td>-->
+<!--                            <td class="color" width="30%" align="left" scope="col">1</td>-->
+<!--                        </tr>-->
+<!--                        <tr>-->
+<!--                            <td align="right">鐢熶骇鏃ユ湡</td>-->
+<!--                            <td class="createTime" align="left">{{this.createTime$}}</td>-->
+<!--                            <td align="right">鏁伴噺</td>-->
+<!--                            <td class="amount" align="left">{{this.amount}}</td>-->
+<!--                        </tr>-->
+<!--                        <tr>-->
+<!--                            <td align="right">鍨嬪彿鎵撳瓧</td>-->
+<!--                            <td class="modelType" align="left" colspan="3">{{this.modelType}}</td>-->
+<!--                        </tr>-->
+<!--                        <tr>-->
+<!--                            <td align="right">浜у搧鎵瑰彿</td>-->
+<!--                            <td class="seq" align="left">{{this.seq}}</td>-->
+<!--                            <td colspan="2" rowspan="3" align="right"><img class="qrcode" src="" style="width: 80%"></td>-->
+<!--                        </tr>-->
+<!--                        <tr>-->
+<!--                            <td align="right">瑁呮楠屽彿</td>-->
+<!--                            <td class="boxCheck" align="left">{{this.boxCheck}}</td>-->
+<!--                        </tr>-->
+<!--                        <tr>-->
+<!--                            <td align="right">绠卞彿</td>-->
+<!--                            <td class="boxNumber" align="left">{{this.boxNumber}}</td>-->
+<!--                        </tr>-->
+<!--                    </table>-->
+                    <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
                         <tr>
-                            <td width="20%" align="right" scope="col">瀹㈡埛</td>
-                            <td class="customer" width="30%" align="left" scope="col">{{this.customer}}</td>
-                            <td width="20%" align="right" scope="col">棰滆壊</td>
-                            <td class="color" width="30%" align="left" scope="col">1</td>
+                            <td colspan="1" align="right" scope="col">鏉$爜</td>
+                            <td class="barcode"colspan="3" align="left" scope="col">
+                                <img class="qrcode" src="/macCode/barcode/auth?param=123" width="80%">
+                            </td>
                         </tr>
                         <tr>
-                            <td align="right">鐢熶骇鏃ユ湡</td>
-                            <td class="createTime" align="left">{{this.createTime$}}</td>
-                            <td align="right">鏁伴噺</td>
-                            <td class="amount" align="left">{{this.amount}}</td>
+                            <td align="right" width="25%">鐗╂枡缂栫爜</td>
+                            <td align="right" width="25%">1902980-11/12</td>
+                            <td align="right" width="25%">鐗╂枡鍚嶇О</td>
+                            <td align="right" width="25%">閾濆甫|1100-O|0.33*475|</td>
                         </tr>
                         <tr>
-                            <td align="right">鍨嬪彿鎵撳瓧</td>
-                            <td class="modelType" align="left" colspan="3">{{this.modelType}}</td>
-                        </tr>
-                        <tr>
-                            <td align="right">浜у搧鎵瑰彿</td>
-                            <td class="seq" align="left">{{this.seq}}</td>
-                            <td colspan="2" rowspan="3" align="right"><img class="qrcode" src="" style="width: 80%"></td>
-                        </tr>
-                        <tr>
-                            <td align="right">瑁呮楠屽彿</td>
-                            <td class="boxCheck" align="left">{{this.boxCheck}}</td>
-                        </tr>
-                        <tr>
-                            <td align="right">绠卞彿</td>
-                            <td class="boxNumber" align="left">{{this.boxNumber}}</td>
+                            <td align="right" width="25%">鐗╂枡鍗曚綅</td>
+                            <td align="right" width="25%">701010015907</td>
+                            <td align="right" width="25%">鐗╂枡瑙勬牸</td>
+                            <td align="right" width="25%">榧庤儨閾濅笟棣欐腐_椹潵瑗夸簹UPT</td>
                         </tr>
                     </table>
                 </div>

--
Gitblit v1.9.1