11

TradeManageNew/DingDan/DT_SecondHand2.aspx

@@ -79,21 +79,19 @@ DingDan/DD_OrderListForTM2.aspx
             justify-self: flex-start;
             align-items: flex-start;
         }
-
         @media print {
             @page {
-                margin: 0;
+                margin: 0px;
             }
             body * {
                 visibility: hidden;
             }
             #printArea, #printArea * {
                 visibility: visible;
-                width: 100% !important;
+                width: 100vh !important;
-                height:unset !important;
+                height:100vw !important;
-                max-width: 100vw;
+                max-width: 100vh;
-                max-height: 100vh;
+                max-height: 100vw;
-                aspect-ratio: 900 / 660;
                 object-fit: cover;
             }
             #printArea {
@@ -104,17 +102,19 @@ DingDan/DD_OrderListForTM2.aspx
                 top: 0;
                 max-width: 100vw;
                 max-height: 100vh;
-                overflow: hidden;
                 page-break-after: avoid;
-                display:flex;
+            }
-                justify-content:center;
+            #printArea *{
+                position: absolute;
+                transform-origin: top left;
+                transform: rotate(90deg) translateY(-100vw);
             }
         }
     </style>
     <script src="https://cdn.jsdelivr.net/npm/jsbarcode@3.11.5/dist/JsBarcode.all.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/file-saver@2.0.5/dist/FileSaver.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.print/1.6.2/jQuery.print.min.js" integrity="sha512-t3XNbzH2GEXeT9juLjifw/5ejswnjWWMMDxsdCg4+MmvrM+MwqGhxlWeFJ53xN/SBHPDnW0gXYvBx/afZZfGMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.print/1.6.2/jQuery.print.min.js" integrity="sha512-t3XNbzH2GEXeT9juLjifw/5ejswnjWWMMDxsdCg4+MmvrM+MwqGhxlWeFJ53xN/SBHPDnW0gXYvBx/afZZfGMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
     <script src="../Scripts/MicrosoftAjax.js" type="text/javascript"></script>
     <script src="../Scripts/jquery.min.js" type="text/javascript"></script>
     <script src="../Scripts/jquery.easyui.min.js" type="text/javascript"></script>
@@ -502,6 +502,8 @@ DingDan/DD_OrderListForTM2.aspx
             model.date = formatDate(model.CreationTime)
             console.log(model)
             const canvas = await generateImage(model);
+            // var base64String = canvas.toDataURL();
+            // $('#BarcodeImg').attr('src',base64String)
             document.getElementById('printArea').appendChild(canvas);
             window.print()
             document.getElementById('printArea').removeChild(canvas);
@@ -593,7 +595,7 @@ DingDan/DD_OrderListForTM2.aspx
             // 创建画布 - 使用A4横向比例
             const canvas = document.createElement('canvas');
             canvas.width = 1000;
-            canvas.height = 707;
+            canvas.height = 666;
             const ctx = canvas.getContext('2d');
             
             // 填充白色背景
@@ -899,7 +901,7 @@ DingDan/DD_OrderListForTM2.aspx
     </div>
 
     <!-- 图片预览弹框 -->
-    <div id="test3" title="货物图片" style="width: 700px; height: 500px;">
+    <div id="test3" title="货物图片" style="display:none;width: 700px; height: 500px;">
         <table width="95%" class="tableAll" border="1" ellspacing="0" cellpadding="2">
             <tr>
                 <td colspan="2" align="center">