From b47a2f210d940eff8c7de4185305bc4e0184c590 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 17 十二月 2025 23:26:10 +0800
Subject: [PATCH] 新增空箱与回库功能，优化打印样式与逻辑printView1.vue**: 修复数据绑定拼写错误，优化打印逻辑与样式，调整二维码布局与大小。outboundOrder.js移除无用代码，清理gridBody` 和 `rowId`。 - **outPicking.vue**: 引入 `stationManager`，在 API 参数中增加 `station` 字段，优化样式。 - **ReturnToWarehouseDTO.cs**: 新增 DTO，支持 `palletCode`、`orderNo` 和 `station`。 - **IOutboundService.cs**: 定义 `EmptyBox` 和 `ReturnToWarehouse` 接口。 - **Dt_StockInfo_Hty.cs**: 修改继承关系，新增字段与导航属性。 - **OutboundService.cs**: 实现 `EmptyBox` 和 `ReturnToWarehouse` 方法，使用 `Mapster` 进行实体转换。 - **WIDESEA_OutboundService.csproj**: 引入 `Mapster` 依赖。 - **OutboundController.cs**: 新增 `EmptyBox` 和 `ReturnToWarehouse` 的 API 路由。
---
项目代码/WIDESEA_WMSClient/src/extension/basic/extend/printView.vue | 94 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/basic/extend/printView.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/basic/extend/printView.vue"
index 5b7a400..b0c3c09 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/basic/extend/printView.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/basic/extend/printView.vue"
@@ -59,13 +59,97 @@
print() {
let printContent = document.getElementById("printContent");
let palletcode=document.getElementById("palletcode");
- var printWindow = window.open("", "");
- printWindow.document.write(printContent.innerHTML);
- printWindow.document.write(palletcode.innerHTML);
+ var printWindow = window.open("", "", "width=400,height=400");
+
+ // 鍒涘缓瀹屾暣鐨凥TML缁撴瀯浠ラ伩鍏嶇┖鐧介〉
+ printWindow.document.write(`
+ <!DOCTYPE html>
+ <html>
+ <head>
+ <meta charset="UTF-8">
+ <title>鎵撳嵃</title>
+ <style>
+ @page {
+ size: auto;
+ margin: 0;
+ }
+
+ body {
+ margin: 0;
+ padding: 10px;
+ font-family: Arial, sans-serif;
+ background: white;
+ }
+
+ .print-container {
+ width: 100%;
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ page-break-after: avoid;
+ }
+
+ .qrcode-container {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-bottom: 20px;
+ }
+
+ .pallet-code {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 18px;
+ font-weight: bold;
+ }
+
+ canvas {
+ display: block !important;
+ margin: auto !important;
+ }
+
+ @media print {
+ body {
+ margin: 0;
+ padding: 5mm;
+ }
+
+ .print-container {
+ width: 100%;
+ height: 100vh;
+ page-break-after: avoid;
+ page-break-inside: avoid;
+ }
+ }
+ </style>
+ </head>
+ <body>
+ <div class="print-container">
+ <div class="qrcode-container">
+ ${printContent.innerHTML}
+ </div>
+ <div class="pallet-code">
+ ${palletcode.innerHTML}
+ </div>
+ </div>
+ <script>
+ window.onload = function() {
+ setTimeout(function() {
+ window.print();
+ window.close();
+ }, 500);
+ };
+ <\/script>
+ </body>
+ </html>
+ `);
+
printWindow.document.close();
printWindow.focus();
- printWindow.print();
- printWindow.close();
+
this.http
.post("api/palletCodeInfo/PrintStatusUp?printCode="+this.palletCode, null, "鏁版嵁澶勭悊涓�")
.then((x) => {
--
Gitblit v1.9.3