From f52dcf88c9a3c267b0dd3712ca5f1f9c5d9c20e4 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 19 二月 2025 09:21:55 +0800
Subject: [PATCH] 修改标签打印边距跟发货打印
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 2 +-
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue | 33 +++++++++++++++++++++++++++------
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index eb30d22..7f6f020 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -122,7 +122,7 @@
"{display:none}@media print{" +
"@page {" +
" size: auto; " +
- " margin: 13mm 4mm 0mm 4mm; " +
+ " margin: 13mm 4mm 2mm 4mm; " +
" }body>:not(#" +
printId +
"){display:none !important}body>#" +
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
index 1009735..6b17992 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue
@@ -214,9 +214,20 @@
ElMessage.warning(t('order.orderNotApproved'))
}
}else{
- flowData.value.delivery=selectRecords
- dialogTableVisible.value = true
- sheetIndex.value=1
+ let a=0
+ selectRecords.forEach((item) => {
+ if(item.deliveryState==0){
+ ElMessage.warning(t('order.orderNotApproved'))
+ a=1
+ }
+ })
+ if(a==0){
+ flowData.value.delivery=selectRecords
+ dialogTableVisible.value = true
+ sheetIndex.value=1
+ }
+
+
}
break
@@ -236,9 +247,19 @@
ElMessage.warning(t('order.orderNotApproved'))
}
}else{
- flowData.value.delivery=selectRecords
- dialogTableVisible.value = true
- sheetIndex.value=2
+ let a=0
+ selectRecords.forEach((item) => {
+ if(item.deliveryState==0){
+ ElMessage.warning(t('order.orderNotApproved'))
+ a=1
+ }
+ })
+ if(a==0){
+ flowData.value.delivery=selectRecords
+ dialogTableVisible.value = true
+ sheetIndex.value=2
+ }
+
}
break
}
--
Gitblit v1.8.0