From 6f0ffcf4a6e75ac3a76c6cfd75e02de3a17d46e3 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期二, 31 三月 2026 10:05:32 +0800
Subject: [PATCH] 同库区移库
---
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue | 76 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 29 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
index c7c216f..a33c195 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
@@ -6,7 +6,8 @@
<div class="print-page" v-for="(item, index) in printData" :key="index">
<div class="material-card">
<div class="dual-column header-section">
- <div class="header">鍗撳姏鑳界墿鏂欐爣璇嗗崱(灏忓寘)</div>
+ <!-- 鍔ㄦ�佺粦瀹氭墦鍗板尯鍩熸爣棰� -->
+ <div class="header">{{ getHeaderTitle(item.factoryArea) }}</div>
<VueQrcode :value="generateQr(item)" :size="60" class="qrcode" />
</div>
<div class="content">
@@ -18,6 +19,10 @@
<div class="column">
<span class="label">渚涘簲鍟嗙紪鐮�</span>
<span class="value full-width">{{ item.suplierCode }}</span>
+ </div>
+ <div class="column">
+ <span class="label">鏁伴噺/鎬绘暟</span>
+ <span class="value full-width">{{ item.quantity }}</span>
</div>
</div>
@@ -37,10 +42,7 @@
<span class="label">瑙勬牸</span>
<span class="value full-width">{{ item.materialSpec }}</span>
</div>
- <div class="column">
- <span class="label">鏁伴噺/鎬绘暟</span>
- <span class="value full-width">{{ item.quantity }}</span>
- </div>
+
</div>
<div class="row dual-column">
@@ -69,13 +71,14 @@
</div>
</div>
- <!-- 棰勮鍖哄煙淇濇寔涓嶅彉 -->
<div id="previewContent" class="preview-container">
- <div class="preview-header">鍗撳姏鑳界墿鏂欐爣璇嗗崱(灏忓寘) - 棰勮 (鍏眥{ printData.length }}涓�)</div>
+ <!-- 鍔ㄦ�佺粦瀹氶瑙堝尯鍩熸�绘爣棰� -->
+ <div class="preview-header">{{ printData.length > 0 ? getHeaderTitle(printData[0].factoryArea) : '鐗╂枡鏍囪瘑鍗�' }} - 棰勮 (鍏眥{ printData.length }}涓�)</div>
<div class="preview-scroll">
<div v-for="(item, idx) in printData" :key="idx" class="preview-card">
<div class="dual-column preview-card-header-qrcode">
- <div class="preview-card-header">鍗撳姏鑳界墿鏂欐爣璇嗗崱(灏忓寘)</div>
+ <!-- 鍔ㄦ�佺粦瀹氶瑙堝崱鐗囨爣棰� -->
+ <div class="preview-card-header">{{ getHeaderTitle(item.factoryArea) }}</div>
<VueQrcode :value="generateQr(item)" :size="40" class="qrcode-preview" />
</div>
<div class="preview-wrapper">
@@ -88,6 +91,10 @@
<div class="column-preview">
<span class="label-preview">渚涘簲鍟嗙紪鐮�</span>
<span class="value-preview full-width">{{ item.suplierCode }}</span>
+ </div>
+ <div class="column-preview">
+ <span class="label-preview">鏁伴噺/鎬绘暟</span>
+ <span class="value-preview full-width">{{ item.quantity }}</span>
</div>
</div>
@@ -107,10 +114,7 @@
<span class="label-preview">瑙勬牸</span>
<span class="value-preview full-width">{{ item.materialSpec }}</span>
</div>
- <div class="column-preview">
- <span class="label-preview">鏁伴噺/鎬绘暟</span>
- <span class="value-preview full-width">{{ item.quantityTotal }}</span>
- </div>
+
</div>
<div class="row-preview dual-column">
@@ -145,7 +149,6 @@
<span class="print-count">鍏� {{ printData.length }} 涓墿鏂欏崱寰呮墦鍗�</span>
<div>
<el-button type="primary" size="small" @click="print">鎵撳嵃鍏ㄩ儴</el-button>
- <el-button type="danger" size="small" @click="showDetialBox = false">鍏抽棴</el-button>
</div>
</div>
</template>
@@ -166,6 +169,13 @@
}
},
methods: {
+ getHeaderTitle(factoryArea) {
+ if (!factoryArea) return '鐗╂枡鏍囪瘑鍗�(灏忓寘)'
+ return factoryArea === '04'
+ ? '鏍奸浘鐗╂枡鏍囪瘑鍗�(灏忓寘)'
+ : '鍗撳姏鑳界墿鏂欐爣璇嗗崱(灏忓寘)'
+ },
+
generateQr(item) {
return `${item.barcode}`
},
@@ -191,7 +201,7 @@
this.$message.error('鏃犳硶鎵撳紑鎵撳嵃绐楀彛锛岃妫�鏌ユ祻瑙堝櫒寮圭獥璁剧疆')
return
}
-
+
printWindow.document.write(`
<!DOCTYPE html>
<html>
@@ -235,27 +245,40 @@
margin: 0 !important;
padding: 0 !important;
}
-
- body {
+
+ html {
+ height: auto !important;
width: 80mm !important;
- height: 60mm !important;
margin: 0 !important;
padding: 0 !important;
background: white !important;
}
-
+
+ body {
+ height: auto !important;
+ width: 80mm !important;
+ margin: 0 !important;
+ padding: 0 !important;
+ background: white !important;
+ overflow: visible !important;
+ min-height: 0 !important;
+ max-height: none !important;
+ }
+
.print-page {
width: 80mm !important;
height: 60mm !important;
- page-break-after: always !important;
margin: 0 !important;
padding: 1mm !important;
display: block !important;
background: white !important;
+ page-break-inside: avoid !important;
+ position: relative !important;
+ page-break-after: always !important;
}
-
+
.print-page:last-child {
- page-break-after: avoid !important;
+ page-break-after: auto !important;
}
.material-card {
@@ -285,14 +308,13 @@
}
.content {
- height: calc(100% - 10mm) !important;
position: relative !important;
}
.row {
display: flex !important;
margin-bottom: 1.2mm !important;
- min-height: 6.5mm !important;
+ min-height: 5.5mm !important;
align-items: stretch !important;
}
@@ -305,15 +327,11 @@
flex: 1 !important;
display: flex !important;
align-items: center !important;
- min-height: 5mm !important;
+ min-height: 4mm !important;
}
- .column:first-child {
- margin-right: 2.5mm !important;
- }
.label {
- flex: 0 0 8mm !important;
white-space: nowrap !important;
font-size: 2.5mm !important;
line-height: 1.3 !important;
@@ -528,4 +546,4 @@
color: #409eff;
font-weight: bold;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.9.3