From dc3af0cbb4a6d105bdff497b510cc0a87b3e8d0a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 28 二月 2025 17:53:44 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/externalService/serviceAndSupplyPro/index.vue | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/src/views/CNAS/externalService/serviceAndSupplyPro/index.vue b/src/views/CNAS/externalService/serviceAndSupplyPro/index.vue
index 836d07a..9efac6d 100644
--- a/src/views/CNAS/externalService/serviceAndSupplyPro/index.vue
+++ b/src/views/CNAS/externalService/serviceAndSupplyPro/index.vue
@@ -27,30 +27,33 @@
<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 {
data() {
@@ -70,10 +73,10 @@
};
},
components: {
- // Contents,
- // Store,
- ConsumableOverview
- // ConsumableList
+ Contents,
+ Store,
+ ConsumableOverview,
+ ConsumableList
},
watch: {
contentsId(newVal, oldVal) {
@@ -129,9 +132,7 @@
},
// 鏌ヨ鎵�鏈夌洰褰�
getTreeData() {
- this.$axios
- .get(this.$api.procurementSuppliesContents.directoryListing)
- .then((res) => {
+ directoryListing().then((res) => {
this.treeData = res.data;
});
},
--
Gitblit v1.9.3