From b7ad54294da15dccc59f7b6c879af3e000024d9d Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期四, 19 六月 2025 17:51:30 +0800 Subject: [PATCH] 1、全局树组件多选设备抽屉组件增加点击树节点名称也可以选中当前节点 2、设备监控页面布局图查看设备详情时首次进入清空上一次设备信息(由于数据为定时刷新不能每次获取数据均清空) 3、设备类型管理页面调整设备类型图片尺寸以解决表格错行问题 4、设备管理页面添加或编辑设备弹窗选择设备时增加点击行即可选中 --- src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue index 1c1145a..142d54b 100644 --- a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue +++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainBottom.vue @@ -31,12 +31,6 @@ :currentLevelDetails="currentLevelInfo" :size="containerSize"/> </a-tab-pane> - <!--绯荤粺鍙傛暟閰嶇疆涓嫢鍙傛暟涓�1鏃舵墠灞曠ず瀵瑰簲灞傜骇鐨勫垁鍏峰垪琛�--> - <a-tab-pane :key="2" tab="鍒�鍏峰垪琛�" - v-if="+currentLevelInfo.type===5&&isProcessHasCutterList||+currentLevelInfo.type===6&&isProcessStepHasCutterList"> - <CutterTableList ref="cutterTableListRef" :currentLevelInfo="currentLevelInfo" :size="containerSize"/> - </a-tab-pane> - <template v-if="currentLevelInfo.hasOwnProperty('docId')"> <a-tab-pane :key="1" tab="鏂囨。灞炴��"> <DocumentInfo :currentLevelDetails="currentLevelInfo" :size="containerSize"/> @@ -53,10 +47,24 @@ :size="containerSize"/> </a-tab-pane> - <a-tab-pane :key="4" tab="浣跨敤璁惧" v-if="+currentLevelInfo.attributionType===5"> + <a-tab-pane :key="4" tab="浣跨敤璁惧" v-if="currentLevelInfo.classificationId_dictText==='nc'"> <UseDocumentEquipmentTableList ref="useDocumentEquipmentTableRef" :currentDocumentInfo="currentLevelInfo" :size="containerSize"/> </a-tab-pane> + + <a-tab-pane :key="5" tab="鍒�鍏峰垪琛�" v-if="currentLevelInfo.classificationId_dictText==='nc'"> + <CutterTableList ref="cutterTableListRef" :currentLevelInfo="currentLevelInfo" :size="containerSize"/> + </a-tab-pane> + + <a-tab-pane :key="6" tab="瀹$璇︽儏"> + <DocumentInfoFlow ref="flowTableListRef" :currentLevelDetails="currentLevelInfo" :size="containerSize"/> + </a-tab-pane> + + <a-tab-pane :key="7" tab="鎵规鍒楄〃" v-if="currentLevelInfo.classificationId_dictText==='nc'"> + <GuideCardBatchList ref="guideCardBatchInfoRef" :guideCardBatchInfo="currentLevelInfo" :size="containerSize"/> + </a-tab-pane> + + </template> </a-tabs> @@ -72,6 +80,7 @@ import ProcessStepInfo from './ProcessStep/ProcessStepInfo' import CutterTableList from './Cutter/CutterTableList' import DocumentInfo from '../../../common/DocumentInfo' +import DocumentInfoFlow from '../../../common/DocumentInfoFlow.vue' import DocumentVersionTableList from '../../../common/DocumentVersionTableList' import UseDocumentEquipmentTableList from './Document/UseNcDocumentEquipmentTableList' import FilePreview from '../../../common/FilePreview' @@ -81,10 +90,12 @@ import ProcessSpecVersionInfo from '@views/dnc/base/modules/ProductStructure/ProcessSpecVersion/ProcessSpecVersionInfo.vue' import { getAction } from '@/api/manage' +import GuideCardBatchList from '@views/dnc/base/modules/ProductStructure/GuideCardBatch/GuideCardBatchList.vue' export default { name: 'ProductStructureMainBottom', components: { + GuideCardBatchList, ProcessSpecVersionInfo, UseDeviceCustomTypeEquipmentTableList, CutterTableList, @@ -94,6 +105,7 @@ UseDocumentEquipmentTableList, DocumentVersionTableList, DocumentInfo, + DocumentInfoFlow, ProcessInfo, PartInfo, ProductInfo, @@ -170,6 +182,14 @@ case 4: this.$nextTick(() => this.$refs.useDocumentEquipmentTableRef.loadData()) break + case 5: + this.$nextTick(() => this.$refs.cutterTableListRef.setQueryParamAndLoadData(1)) + break + case 6: + this.$nextTick(() => this.$refs.flowTableListRef.getAllApproveData()) + break + case 7: + this.$nextTick(() => this.$refs.guideCardBatchInfoRef.getGuideCardBatchList()) default: } // 闃绘鎺ュ彛鍦ㄥ悓涓�鏂囨。涓�娆$偣鍑诲唴澶氭瑙﹀彂 -- Gitblit v1.9.3