From 76bf2824bf55e8f4c3ccbc14b3b2719bf8fb219f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 03 九月 2024 10:10:47 +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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 f705f29..730b4b0 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
@@ -62,12 +62,12 @@
{field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged},
- {field: 'order_number', width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged},
- {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
- slots: {filter: 'num1_filter'},
- filterMethod: filterChanged},
+ // {field: 'order_number', width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
+ // slots: {filter: 'num1_filter'},
+ // filterMethod: filterChanged},
+ // {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},
--
Gitblit v1.8.0