Merge remote-tracking branch '惠信/develop' into develop

nflg-wms-admin/src/main/resources/template/生产领料单.html

@@ -7,19 +7,18 @@
     <style>
         @media print {
             @page {
-                size: landscape;
-                margin: 0;
+                size: A4 landscape;
             }
         }
         @page {
-            /*size: A4 landscape;*/
-            size: landscape;
-            margin: 0;
+            size: A4 landscape;
         }
 
         body {
-            width: 1425px;
-            height: 825px;
+            /*width: 1425px;*/
+            /*height: 825px;*/
+            width: 100%;
+            height: 100%;
             font-family: SimSun, monospace;
             font-size: 12pt;
             margin: 0;
@@ -141,7 +140,7 @@
         }
 
         .package-logo {
-            width: 300px;
+            width: 250px;
             margin: 0 auto 20px;
             position: absolute;
         }