From 6ad83847aee58c0efb2a77ca40789f70013bb04c Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期三, 08 五月 2024 23:54:10 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/console/basic-data/material-warehousing-data/material-info.vue | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/views/console/basic-data/material-warehousing-data/material-info.vue b/src/views/console/basic-data/material-warehousing-data/material-info.vue
index 8c4e8ff..53dd963 100644
--- a/src/views/console/basic-data/material-warehousing-data/material-info.vue
+++ b/src/views/console/basic-data/material-warehousing-data/material-info.vue
@@ -1,12 +1,31 @@
<template>
- <div>
- 鐗╂枡淇℃伅
- </div>
+ <el-main style="height: 100%;">
+ <el-card shadow="never" style="height: 100%;" body-style="height: 100%">
+ <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+ <el-tab-pane label="鐗╂枡淇℃伅" name="1">
+ <materialInfoComp1 />
+ </el-tab-pane>
+ <el-tab-pane label="鐗╂枡绫诲瀷" name="2">
+ <materialInfoComp2 />
+ </el-tab-pane>
+ </el-tabs>
+ </el-card>
+ </el-main>
</template>
<script>
+import materialInfoComp1 from './material-infoComp1.vue';
+import materialInfoComp2 from './material-infoComp2.vue';
export default {
-
+ components: {
+ materialInfoComp1,
+ materialInfoComp2
+ },
+ data() {
+ return {
+ activeName: '1'
+ }
+ },
}
</script>
--
Gitblit v1.9.3