From a85adf40d5e30d3b9e2a848cf8fd073998ff5c8b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 29 五月 2024 15:26:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index 68b8c89..677f3b2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -61,7 +61,7 @@
{field: 'glass_child',width: 130, title: '鍗曠墖鍚嶇О' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
{field: 'order_type', width: 120,title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
{field: 'process_id',width: 110, title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: 'technology_number', width: 90,title: '鏍囪',showOverflow:"ellipsis"},
+ {field: 'technology_number', width: 90,title: '灏忕墖椤哄簭',showOverflow:"ellipsis"},
{field: 'quantity', width: 90,title: '鏁伴噺'},
{field: 'broken_num',width: 90, title: '娆＄牬鏁伴噺'},
{field: 'inventoryArea',width: 120, title: '鍏ュ簱闈㈢Н'},
@@ -150,7 +150,7 @@
// }],
// import: false,
// export: true,
- print: true,
+ // print: true,
zoom: true,
custom: true
},
@@ -184,6 +184,8 @@
const mergeCells = ref([
])
+
+
</script>
@@ -229,6 +231,7 @@
</template>
+
<template #num1_filter="{ column, $panel }">
<div>
<div v-for="(option, index) in column.filters" :key="index">
--
Gitblit v1.8.0