From 3112a2cacb090aaa7a25edcf48be047249ff9d1d Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 18:14:46 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
index 574cf4b..dc89591 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -8,8 +8,8 @@
@cancel="handleCancel"
>
<a-spin :spinning="confirmLoading">
- <!-- tab -->
- <a-tabs default-active-key="1" @change="callback">
+ <!-- tab @change="callback"-->
+ <a-tabs default-active-key="1" >
<a-tab-pane key="1" tab="鍩烘湰淇℃伅">
<add-form ref="addForm" @ok="handleOk" />
</a-tab-pane>
@@ -20,14 +20,14 @@
Content of Tab Pane 3
</a-tab-pane>
<a-tab-pane key="4" tab="鏇夸唬鍝佺鐞�">
- Content of Tab Pane 4
+ <add-form-sub ref="addFormWmsSubstituteGood" @ok="handleOk" />
</a-tab-pane>
<a-tab-pane key="5" tab="瀹㈡埛">
<add-form-base-customer ref="addFormBaseCustomer" @ok="handleOk" />
</a-tab-pane>
-
+
<a-tab-pane key="7" tab="鍖呰鍏崇郴">
- Content of Tab Pane 6
+ <add-form-container-packaging ref="addFormContainerPackaging" @ok="handleOk" />
</a-tab-pane>
</a-tabs>
@@ -39,15 +39,15 @@
import { WmsMaterialAdd, GetAreas, GetStations } from '@/api/modular/main/WmsMaterialManage'
import addForm from './tabItem/addForm.vue'
import addFormBaseCustomer from './tabItem/addFormBaseCustomer.vue'
+import addFormContainerPackaging from './tabItem/addFormContainerPackaging.vue'
+import addFormSub from './tabItem/addFormWmsSubstituteGood.vue'
export default {
components: {
- // STable,
addForm,
addFormBaseCustomer,
-
- // editForm,
- // excelForm
+ addFormContainerPackaging,
+ addFormSub
},
data() {
return {
@@ -71,6 +71,9 @@
}
},
methods: {
+ handleOk(){
+
+ },
// 鍒濆鍖栨柟娉�
add(record) {
this.visible = true
--
Gitblit v1.9.3