From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/externalService/serviceAndSupplyPro/index.vue | 63 +++++++++++++++----------------
1 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/src/views/CNAS/externalService/serviceAndSupplyPro/index.vue b/src/views/CNAS/externalService/serviceAndSupplyPro/index.vue
index 836d07a..4a8cb64 100644
--- a/src/views/CNAS/externalService/serviceAndSupplyPro/index.vue
+++ b/src/views/CNAS/externalService/serviceAndSupplyPro/index.vue
@@ -23,36 +23,40 @@
</el-tree>
</div>
<div class="purchase-right">
- <el-tabs v-model="activeName" @tab-click="handleClick">
+ <el-tabs v-model="activeName">
<el-tab-pane label="鑰楁潗鎬昏" name="first" :lazy="true">
<ConsumableOverview v-if="activeName == 'first'" :contentsId="contentsId"></ConsumableOverview>
</el-tab-pane>
-<!-- <el-tab-pane label="鑰楁潗鍒楄〃" name="second" :lazy="true">-->
-<!-- <ConsumableList v-if="activeName == 'second'" :contentsId="contentsId"></ConsumableList>-->
-<!-- </el-tab-pane>-->
-<!-- <el-tab-pane label="鑰楁潗鍏ュ簱" name="third" :lazy="true">-->
-<!-- <Store v-if="activeName == 'third'" :contentsId="contentsId"></Store>-->
-<!-- </el-tab-pane>-->
-<!-- <el-tab-pane label="鐩綍缁存姢" name="fourth" :lazy="true">-->
-<!-- <Contents-->
-<!-- v-if="activeName == 'fourth'"-->
-<!-- :id="contentsId"-->
-<!-- @contentsUpdate="contentsUpdate"-->
-<!-- :treeData="treeData"-->
-<!-- from="鑰楁潗鏍�"-->
-<!-- ></Contents>-->
-<!-- </el-tab-pane>-->
+ <el-tab-pane label="鑰楁潗鍒楄〃" name="second" :lazy="true">
+ <ConsumableList v-if="activeName == 'second'" :contentsId="contentsId"></ConsumableList>
+ </el-tab-pane>
+ <el-tab-pane label="鑰楁潗鍏ュ簱" name="third" :lazy="true">
+ <Store v-if="activeName == 'third'" :contentsId="contentsId"></Store>
+ </el-tab-pane>
+ <el-tab-pane label="鐩綍缁存姢" name="fourth" :lazy="true">
+ <Contents
+ v-if="activeName == 'fourth'"
+ :id="contentsId"
+ @contentsUpdate="contentsUpdate"
+ :treeData="treeData"
+ from="鑰楁潗鏍�"
+ ></Contents>
+ </el-tab-pane>
</el-tabs>
</div>
</div>
</template>
<script>
-// import Contents from "@/components/do/a6.service-and-supply-purchase/contents.vue";
-// import Store from "@/components/do/a6.service-and-supply-purchase/store.vue";
-import ConsumableOverview from "../serviceAndSupplyPro/component/ConsumableOverview.vue";
-// import ConsumableList from "@/components/do/a6.service-and-supply-purchase/ConsumableList.vue"
+import Contents from "./component/contents.vue";
+import Store from "./component/Store.vue";
+import ConsumableOverview from "./component/ConsumableOverview.vue";
+import ConsumableList from "./component/ConsumableList.vue"
+import {
+ directoryListing
+} from '@/api/cnas/externalService/serviceAndSupplyPro/serviceAndSupplyPro'
export default {
+ name: 'ServiceAndSupplyPro',
data() {
return {
tabsKey: 0,
@@ -70,10 +74,10 @@
};
},
components: {
- // Contents,
- // Store,
- ConsumableOverview
- // ConsumableList
+ Contents,
+ Store,
+ ConsumableOverview,
+ ConsumableList
},
watch: {
contentsId(newVal, oldVal) {
@@ -129,18 +133,13 @@
},
// 鏌ヨ鎵�鏈夌洰褰�
getTreeData() {
- this.$axios
- .get(this.$api.procurementSuppliesContents.directoryListing)
- .then((res) => {
+ directoryListing().then((res) => {
this.treeData = res.data;
});
},
// 鐐瑰嚮鏍戣妭鐐�
handleNodeClick(data) {
this.contentsId = data.id;
- },
- handleClick(tab, event) {
- console.log(tab, event);
},
},
created() {
@@ -154,7 +153,6 @@
width: 250px;
height: 100%;
background: #fff;
- margin-right: 10px;
border-radius: 16px;
box-sizing: border-box;
padding: 10px 16px;
@@ -164,9 +162,8 @@
background: #fff;
width: calc(100% - 15em);
height: 100%;
- border-radius: 16px;
box-sizing: border-box;
- padding: 10px 16px;
+ padding: 0 20px 0 10px;
}
.purchase-page {
display: flex;
--
Gitblit v1.9.3