From 926a1e8b90381c7aa085d5462d78de9d2cc6034d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 二月 2024 08:58:15 +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/SelectAddProcess.vue |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
index c5b29b8..2c22f9f 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectAddProcess.vue
@@ -205,16 +205,16 @@
     {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
     {title: '鎿嶄綔', width: 80, slots: { default: 'button_slot' },fixed:"left"},
     { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
-    {field: 'order.orderId',  title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
-    {field: 'order.customerName', title: '瀹㈡埛鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-    {field: 'order.project', title: '椤圭洰鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-    {field: 'order.batch', title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'order.otherRemarks', title: '鍘熺墖瑕佹眰', sortable: true,showOverflow:"ellipsis"},
-    {field: 'order.icon', title: '鍟嗘爣閫夐」', sortable: true},
-    {field: 'order.orderType', title: '璁㈠崟绫诲瀷', sortable: true},
-    {field: 'order.salesman', title: '涓氬姟鍛�', sortable: true},
-    {field: 'order.processingNote', title: '鍔犲伐瑕佹眰', sortable: true,showOverflow:"ellipsis"},
-    {field: 'order.deliveryAddress', title: '閫佽揣鍦板潃', sortable: true},
+    {field: 'order.orderId',  title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' } , },
+    {field: 'order.customerName', title: '瀹㈡埛鍚嶇О',showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'order.project', title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'order.batch', title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
+    {field: 'order.otherRemarks', title: '鍘熺墖瑕佹眰' ,showOverflow:"ellipsis",filters:[{ data: '' },],slots: { filter: 'num1_filter' }},
+    {field: 'order.icon', title: '鍟嗘爣閫夐」',filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
+    {field: 'order.orderType', title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
+    {field: 'order.salesman', title: '涓氬姟鍛�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'order.processingNote', title: '鍔犲伐瑕佹眰',showOverflow:"ellipsis"},
+    {field: 'order.deliveryAddress', title: '閫佽揣鍦板潃',},
   ],//琛ㄥご鎸夐挳
 
   toolbarConfig: {

--
Gitblit v1.8.0