From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index e7958e4..212fd0c 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -35,7 +35,11 @@
   columns:[
 
   ],
-  mergeCells:[]
+  mergeCells:[],
+  toolbarConfig: {
+    zoom: true,
+    custom: true
+  }
 
 
 })

--
Gitblit v1.8.0