From 3ad02364ce97ab8188d18c52695c8b57b1e47ea6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 23 一月 2024 08:40:37 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
index 266412f..e5ca6ad 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/ProductionScheduling.vue
@@ -67,13 +67,13 @@
{ type: 'checkbox',fixed:"left", title: '閫夋嫨', width: 80 },
{ type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
{field: '鎺掍骇缂栧彿', title: '鎺掍骇缂栧彿', sortable: true, width: 120 },
- {field: '閿�鍞崟鍙�', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 100 },
- {field: '瀹㈡埛鍚嶇О', title: '瀹㈡埛鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 110},
- {field: '椤圭洰鍚嶇О', title: '椤圭洰鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 120},
+ {field: '閿�鍞崟鍙�', title: '閿�鍞崟鍙�',slots: { filter: 'num1_filter' }, sortable: true, width: 100 },
+ {field: '瀹㈡埛鍚嶇О', title: '瀹㈡埛鍚嶇О', sortable: true, width: 110},
+ {field: '椤圭洰鍚嶇О', title: '椤圭洰鍚嶇О', sortable: true , width: 100},
{field: '搴忓彿', title: '搴忓彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 90},
- {field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 140},
- {field: '瀹�', title: '瀹�', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, width: 90},
- {field: '楂�', title: '楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true , width: 90},
+ {field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', sortable: true, width: 140},
+ {field: '瀹�', title: '瀹�', sortable: true , width: 70},
+ {field: '楂�', title: '楂�', sortable: true , width: 70},
{field: '鏁伴噺', title: '鏁伴噺', sortable: true , width: 70},
{field: '闈㈢Н', title: '闈㈢Н', sortable: true , width: 90},
{field: '鎺掍骇鏁伴噺' , width: 120,editRender: { name: 'input', attrs: { placeholder: '' } }, title: '鎺掍骇鏁伴噺', sortable: true},
--
Gitblit v1.8.0