From fe7247af6af58cbc8ea2526e8aa4eedaf545de6c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 01 三月 2024 13:48:16 +0800
Subject: [PATCH] 增加单据页面单位

---
 src/main/webapp/views/pla/plaDetl.html |  132 ++++++++++++++++++++++++++++---------------
 1 files changed, 86 insertions(+), 46 deletions(-)

diff --git a/src/main/webapp/views/pla/plaDetl.html b/src/main/webapp/views/pla/plaDetl.html
index e396bed..1ece2c6 100644
--- a/src/main/webapp/views/pla/plaDetl.html
+++ b/src/main/webapp/views/pla/plaDetl.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" xmlns="http://www.w3.org/1999/html">
 <head>
     <meta charset="utf-8">
     <title></title>
@@ -108,14 +108,15 @@
         }
         /* ------------------------- 鎵撳嵃琛ㄦ牸 -----------------------  */
         .template-preview {
-            height: 200px;
+            height: 400px;
             display: inline-block;
         }
         .contain td {
-            border: 1px solid #000;
+            border: 0px solid #000;
+            white-space:nowrap;
             /*font-family: 榛戜綋;*/
             /*font-weight: bold;*/
-            /*color: #000000;*/
+            color: #000000;
         }
     </style>
 </head>
@@ -170,6 +171,7 @@
                     <option value="鏆傚叆搴�">鏆傚叆搴�</option>
                     <option value="寰呭叆搴�">寰呭叆搴�</option>
                     <option value="宸插叆搴�">宸插叆搴�</option>
+                    <option value="寰呭嚭搴�">寰呭嚭搴�</option>
                     <option value="閮ㄥ垎鍑哄簱">閮ㄥ垎鍑哄簱</option>
                     <option value="鍏ㄩ儴鍑哄簱">鍏ㄩ儴鍑哄簱</option>
                 </select>
@@ -310,28 +312,45 @@
             <div id="template-container" style="margin: 20px;text-align: center">
                 <!-- 棰勮鍥� 3 -->
                 <div id="template-preview-1" class="template-preview" style="display: block">
-                    <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="">xxxxxx-xx/xx</td>
-                            <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: 74px">
-                            <td align="center" colspan="1">閲嶉噺</td>
-                            <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
-                        </tr>
-                        <tr style="height: 74px">
-                            <td align="center" colspan="1">鎵瑰彿</td>
-                            <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
-                            <td align="center" colspan="1">鍖呭彿</td>
-                            <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
-                        </tr>
-                    </table>
+                    <div class="layui-row">
+                        <div class="layui-col-xs4" style="height: auto">
+                            <img src="../../static/image/hneLogo.jpg" style="display: inline-block; width: 40%;height: 30%">
+                        </div>
+                        <div class="layui-col-xs8" style="margin-left: -40px; margin-top: 20px; text-align: left">
+                            娴欐睙鐪佸彴宸炲競鍙板窞婀炬柊鍖哄彴宸炴咕澶ч亾188鍙�</br>
+                            Address锛歂o. 188, Taizhou Bay Avenue, Taizhou Bay New Area, Taizhou City, Zhejiang Province
+                        </div>
+                    </div>
+<!--                    <div class="layui-row" style="font-size: xx-large; text-align: left; margin-left: 40px;">-->
+<!--                        </n>鑱氫钩閰� Polylactic Acid-->
+<!--                    </div>-->
+                    <div class="layui-row" style="alignment: center; margin-left: 65px;">
+                        <table class="contain" width="400" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
+                            <tr style="height: 74px" >
+                                <td align="center" scope="col" colspan="4" style="font-size: x-large; font-weight: bold;"><strong style="font-weight: bold;color: black;">鑱氫钩閰� Polylactic Acid</strong></td>
+                            </tr>
+                            <tr style="height: 74px">
+                                <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%">
+                                    <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
+                                        <span>xxxxxx</span>
+                                    </div>
+                                </td>
+                            </tr>
+                            <tr style="height: 74px">
+                                <td align="center" colspan="1" style="text-align: left; padding-left: 20px" >閲嶉噺</td>
+                                <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
+                            </tr>
+                            <tr style="height: 74px">
+                                <td align="center" colspan="1">鎵瑰彿</td>
+                                <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
+                                <td align="center" colspan="1">鍖呭彿</td>
+                                <td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
+                            </tr>
+                        </table>
+                    </div>
                 </div>
             </div>
         </fieldset>
@@ -353,28 +372,49 @@
 <script type="text/template" id="templatePreview1" class="template-qrcode">
     <div class="template-preview">
     {{#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" style="font-weight: bold;"><strong style="font-weight: bold;color: black;">鐗屽彿</strong></td>
-            <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:normal; "><strong style="font-weight: bold;color: black;">{{this.brand}}</strong></td>
-            <td align="center" scope="col" colspan="2" rowspan="2">
-                <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
-            </td>
-        </tr>
-        <tr style="height: 74px">
-            <td align="center" colspan="1" style="font-weight: bold;color: black;"><strong style="font-weight: bold;color: black;">閲嶉噺</strong></td>
-            <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.weightAnfme}}</strong></td>
-        </tr>
-        <tr style="height: 74px">
-            <td align="center" colspan="1" style="font-weight: bold;color: black;"><strong style="font-weight: bold;color: black;">鎵瑰彿</strong></td>
-            <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.batch}}</strong></td>
-            <td align="center" colspan="1" style="font-weight: bold;color: black;"><strong style="font-weight: bold;color: black;">鍖呭彿</strong></td>
-            <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.packageNo}}</strong></td>
-        </tr>
-    </table>
+        <div class="layui-row" style="height: 230px;width: 750px; color:#000; margin-top: 40px">
+            <div class="layui-col-xs6" style="height: auto; margin-top: 25px; margin-left: -20px">
+                <img src="../../static/image/hneLogo.png" style="display: inline-block; width: 40%;height: 30%; margin-left: 30px; color:#000;">
+            </div>
+            <div class="layui-col-xs6" style="margin-left: -185px;margin-right: 30px; margin-top: 80px; text-align: left; font-size: 20px; font-weight:bold">
+                娴欐睙鐪佸彴宸炲競鍙板窞婀炬柊鍖哄彴宸炴咕澶ч亾188鍙�</br>
+                No.188 Taizhou Bay Avenue, Taizhou Bay New Area, Taizhou City, Zhejiang Province. P.R.China
+            </div>
+        </div>
+<!--        <div class="layui-row" style="font-size: xx-large; text-align: left; margin-left: 40px;">-->
+<!--            鑱氫钩閰� Polylactic Acid-->
+<!--        </div>-->
+        <div class="layui-row" style="alignment: center; margin-left: 35px; margin-top: -20px; margin-bottom: 3.7px;">
+            <table class="contain" width="500" style="overflow: hidden;table-layout: fixed; color:#000; font-size: 35px;text-align: left">
+                <tr style="height: 100px;" >
+                    <td align="center" scope="col" colspan="4" style="font-weight: bold; text-align: left; padding-left: 20px"><strong style="font-weight: bold;color: black;">鑱氫钩閰� Polylactic Acid</strong></td>
+                </tr>
+                <tr style="height: 100px; text-align: left" >
+                    <td align="center" scope="col" colspan="2" style="font-weight: bold;color: black; text-align: left; padding-left: 20px"><strong>鐗屽彿: REVODE {{this.brand}}</strong></td>
+<!--                    <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:normal; "><strong style="font-weight: bold;color: black;">REVODE {{this.brand}}</strong></td>-->
+                </tr>
+                <tr style="height: 100px;text-align: left">
+                    <td align="center" colspan="2" style="font-weight: bold;color: black; text-align: left; padding-left: 20px"><strong>鎵瑰彿锛歿{this.batch}}</strong></td>
+                    <!--                    <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.weightAnfme}} KG</strong></td>-->
+                </tr>
+                <tr style="height: 100px;text-align: left">
+                    <td align="center" colspan="2" style="font-weight: bold;color: black; text-align: left; padding-left: 20px"><strong>閲嶉噺锛歿{this.weight}} kg</strong></td>
+                    <!--                    <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.weightAnfme}} KG</strong></td>-->
+                    <td align="center" scope="col" colspan="2" rowspan="2">
+                        <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
+                    </td>
+                </tr>
+                <tr style="height: 100px;text-align: left">
+                    <td align="center" colspan="2" rowspan="1" style="font-weight: bold;color: black; text-align: left; padding-left: 20px"><strong>杩借釜鐮侊細{{this.line}} {{this.packageNo$}}</strong></td>
+                    <!--                    <td align="center" colspan="1" style="font-weight: bold;color: black;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;"><strong style="font-weight: bold;color: black;">{{this.weightAnfme}} KG</strong></td>-->
+                </tr>
+                <tr style="height: 100px;text-align: left">
+                </tr>
+            </table>
+        </div>
     </br>
     {{/each}}
-    </div>>
+    </div>
 </script>
 
 </body>

--
Gitblit v1.9.1