From 6465284c2be13a30785c8dccc7c2eba3b52d5a46 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 27 十二月 2023 10:23:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue | 9 +++++----
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue | 3 ++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
index f473470..fed6891 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue
@@ -81,10 +81,11 @@
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [{
- 'name': '纭鍏ュ簱',
- 'code':'add',
- status: 'primary'
- }],
+ 'name': '纭鍏ュ簱',status: 'primary',
+
+ 'code':'add'
+ }
+ ],
import: false,
export: true,
print: true,
diff --git a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
index 2485b1b..f192b1d 100644
--- a/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
+++ b/north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue
@@ -82,7 +82,8 @@
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [{
- 'name': '纭鍑哄簱',status: 'primary'
+ 'name': '纭鍑哄簱',
+ status: 'primary'
}],
import: false,
export: true,
--
Gitblit v1.8.0