From 30c55facc6eefd660cab0d74c8a15a87338120b7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 10:15:05 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/matCode/matCode.html |  109 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index bb9697b..22558f0 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -26,11 +26,11 @@
             border: 1px solid #000;
             /*width: 100%;*/
         }
-        /*.contain td {*/
-        /*    border: 1px solid #000;*/
-        /*    line-height: 46px;*/
-        /*    text-align: center;*/
-        /*}*/
+        .contain td {
+            border: 1px solid #000;
+            /*line-height: 46px;*/
+            text-align: center;
+        }
         /*.qrcode {*/
         /*    margin: 3px;*/
         /*}*/
@@ -75,6 +75,7 @@
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
 <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/matCode/matCode.js" charset="utf-8"></script>
@@ -122,52 +123,66 @@
 
 <!-- 鎵撳嵃鎿嶄綔寮圭獥 -->
 <div id="printDataDiv" style="display: none;padding: 20px">
-    <div id="template-container">
-        <!-- 棰勮鍥� 1 -->
-        <div id="template-preview-1" class="template-preview">
-            <table height="317" width="317" style="overflow: hidden">
-                <tr><td valign="middle">
-                    <table class="contain">
-                        <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>
-                        </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="{{this.qrCodeUrl}}" 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>
-                </td></tr>
-            </table>
+    <div class="layui-form">
+        <div id="template-container">
+            <!-- 棰勮鍥� 1 -->
+            <div id="template-preview-1" class="template-preview">
+                <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="20%" 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>
+            </div>
+            <!-- 棰勮鍥� 2 -->
+            <div class="template-preview"></div>
+            <!-- 棰勮鍥� 3 -->
+            <div class="template-preview"></div>
         </div>
-        <!-- 棰勮鍥� 2 -->
-        <div class="template-preview"></div>
-        <!-- 棰勮鍥� 3 -->
-        <div class="template-preview"></div>
+        <div class="select-template">
+            <label><input type="radio" name="templateSelect" value="1" checked>妯℃澘涓�</label>
+            <label><input type="radio" name="templateSelect" value="2">&nbsp;妯℃澘浜�</label>
+        </div>
+        <button class="layui-btn layui-btn-danger" id="doPrint" lay-submit lay-filter="doPrint">纭畾</button>
     </div>
 </div>
 
+<!-- 妯℃澘寮曟搸 -->
+<!-- 妯℃澘1 -->
+<script type="text/template" id="templatePreview1">
+</script>
+<!-- 妯℃澘2 -->
+<script type="text/template" id="templatePreview2">
+</script>
+<!-- 妯℃澘3 -->
+<script type="text/template" id="templatePreview3">
+</script>
+
 </body>
 </html>
 

--
Gitblit v1.9.1