From fdce23c7c4ddc9f1aa1257e5e0254c3b66b53eaf Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 24 十二月 2025 17:10:23 +0800
Subject: [PATCH] 调整图片尺寸编辑模板图片间隔
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue | 7 +++----
north-glass-erp/northglass-erp/src/components/ImageSizeEditor.vue | 6 ++++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/ImageSizeEditor.vue b/north-glass-erp/northglass-erp/src/components/ImageSizeEditor.vue
index 9e4465e..27486af 100644
--- a/north-glass-erp/northglass-erp/src/components/ImageSizeEditor.vue
+++ b/north-glass-erp/northglass-erp/src/components/ImageSizeEditor.vue
@@ -80,7 +80,7 @@
maxHeight: { type: Number, default: 3000 },
fit: { type: String, default: 'contain' },
-
+ marginX: { type: String, default: '30px' },
dialogTitle: { type: String, default: '璁剧疆鍥剧墖灏哄' },
showHint: { type: Boolean, default: true }
})
@@ -126,10 +126,12 @@
return {
width: `${w}px`,
height: `${h}px`,
- margin: props.margin,
+ marginLeft: props.marginX,
+ marginRight: props.marginX
}
}
+
const openSizeDialog = (img, index) => {
const key = getKey(img, index)
activeKey.value = key
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue
index ab88f44..348276f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintProgressProcessCard.vue
@@ -325,6 +325,9 @@
{field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged},
+ {field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
{field: 'print_status', width: 120,title: t('processCard.numberTimesProcessCardPrinted')},
{field: 'print_number', width: 110,title: t('processCard.numberLabelPrintingOperations')},
{field: 'order_number', width: 100,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
@@ -333,10 +336,6 @@
// {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
// slots: {filter: 'num1_filter'},
// filterMethod: filterChanged},
- {field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged},
-
{field: 'quantity', width: 90,title: t('order.quantity')},
{field: 'grossArea', width: 90,title: t('order.area')},
{field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
--
Gitblit v1.8.0