From c172f50f28cb37b982eb39a0a9a257cbc60b3a3e Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 18 三月 2025 18:04:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue
index 518c220..1c1145a 100644
--- a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue
+++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue
@@ -1,5 +1,5 @@
<template>
- <div v-if="+currentLevelInfo.type!==4" style="height: 100%">
+ <div style="height: 100%">
<a-tabs style="height: 100%" v-model="activeTabKey" v-if="Object.keys(currentLevelInfo).length>0"
@change="handleTabChange">
<a-tab-pane :key="1" tab="灞炴�т俊鎭�" v-if="+currentLevelInfo.type===1">
@@ -12,6 +12,10 @@
<a-tab-pane :key="1" tab="闆朵欢灞炴��" v-if="+currentLevelInfo.type===3">
<PartInfo :currentLevelDetails="currentLevelInfo.entity" :size="containerSize"/>
+ </a-tab-pane>
+
+ <a-tab-pane :key="1" tab="灞炴�т俊鎭�" v-if="+currentLevelInfo.type===4">
+ <ProcessSpecVersionInfo :currentLevelDetails="currentLevelInfo.entity" :size="containerSize"/>
</a-tab-pane>
<a-tab-pane :key="1" tab="宸ュ簭灞炴��" v-if="+currentLevelInfo.type===5">
@@ -72,13 +76,16 @@
import UseDocumentEquipmentTableList from './Document/UseNcDocumentEquipmentTableList'
import FilePreview from '../../../common/FilePreview'
import TableContextMenu from '../../../common/TableContextMenu'
-import { getAction } from '@/api/manage'
import UseDeviceCustomTypeEquipmentTableList
from '@views/dnc/base/modules/ProductStructure/DeviceCustomType/UseDeviceCustomTypeEquipmentTableList.vue'
+import ProcessSpecVersionInfo
+ from '@views/dnc/base/modules/ProductStructure/ProcessSpecVersion/ProcessSpecVersionInfo.vue'
+import { getAction } from '@/api/manage'
export default {
name: 'ProductStructureMainBottom',
components: {
+ ProcessSpecVersionInfo,
UseDeviceCustomTypeEquipmentTableList,
CutterTableList,
TableContextMenu,
--
Gitblit v1.9.3