From de18cca83738bdf6b279046e34b910ccd5b73a84 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 08:17:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
index 991620b..aaec092 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
@@ -101,13 +101,12 @@
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
{field: 'select',type:'checkbox',title: '閫夋嫨', width: 80,fixed:"left"},
{type: 'seq', fixed: "left", title: '鑷簭', width: 50},
-
{field: 'reworkTeam', width: 120, title: '杩斿伐鐝粍', slots: {default: 'responsibleTeam_default', edit: 'responsibleTeam'}, editRender: {}},
{field: 'orderId', width: 120, title: '閿�鍞崟鍙�', sortable: true, showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
{field: 'processId', width: 120, title: '娴佺▼鍗″彿', sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
{field: 'project', width: 120, title: '椤圭洰鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'batch', width: 80, title: '鎵规', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
- {field: 'orderNumber', width: 80, title: '搴忓彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'orderSort', width: 80, title: '搴忓彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
{field: 'productName', width: 120, title: '鍗曠墖鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
{field: 'technologyNumber', width: 80, title: '鏍囪', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
{field: 'glassAddress', width: 90, title: '鐗囨爣璁�', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
--
Gitblit v1.8.0