From 837b8ca50613eb454c6c09173e434066fb17dfee Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 08 七月 2024 15:32:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue | 6 ++++++
north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
index a597c71..9869534 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue
@@ -264,5 +264,11 @@
color: black;
}
+@page {
+ size: auto; /* auto is the initial value */
+ margin: 8mm 16mm 16mm 16mm /* this affects the margin in the printer settings */
+
+}
+
</style>
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
index 2dc8c04..fd4f368 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
@@ -144,13 +144,13 @@
otherMoney:{}
})
onMounted(()=>{
- if(Object.keys(prop.otherMoney).length === 0 || prop.otherMoney===null){
+ if(Object.keys(prop.otherMoney).length === 0){
return
}
xGrid.value.reloadData(prop.otherMoney.filter(item => item.column.indexOf('M')>-1))
})
watch(prop,(newVal)=>{
- if(Object.keys(prop.otherMoney).length === 0 || prop.otherMoney===null){
+ if(Object.keys(prop.otherMoney).length === 0){
return
}
xGrid.value.reloadData(prop.otherMoney.filter(item => item.column.indexOf('M')>-1))
--
Gitblit v1.8.0