From 09891cea3bd0c4c6182a786c302dc20921f07ccd Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期二, 11 二月 2025 18:01:50 +0800 Subject: [PATCH] 设备结构树: 1、实现点击设备关联NC程序展示文档详细信息、文件内容预览以及文档内容对比功能 2、实现设备层级导入已接收NC程序功能 全局: 1、解决类似文档出库弹窗在路由跳转后点击后会同时出现多个问题 --- src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue b/src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue index 22d4d31..e73697e 100644 --- a/src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue +++ b/src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue @@ -1,7 +1,7 @@ <template> <div> <a-table :columns="columns" :data-source="dataSource" bordered :pagination="ipagination" - :scroll="{y:189}" :customRow="customRow" :size="size" rowKey="docId"> + :scroll="{y:189}" :customRow="customRow" :size="size" rowKey="docId" @change="handleTableChange"> </a-table> @@ -12,7 +12,7 @@ <script> import { getAction } from '@/api/manage' import { JeecgListMixin } from '@/mixins/JeecgListMixin' - import DocumentModal from './DocumentModal' + import DocumentModal from '../../../../common/DocumentModal' export default { name: 'OtherDocumentTableList', @@ -42,15 +42,24 @@ }, { title: '鏂囦欢鍚嶇О', dataIndex: 'docName', align: 'center' }, { title: '璁惧缂栧彿', dataIndex: 'docCode', align: 'center' }, - { title: '鍑哄簱鐘舵��', dataIndex: 'pullStatus', align: 'center' }, - { title: '鐘� 鎬�', dataIndex: 'docStatus', align: 'center' }, + { title: '鍑哄簱鐘舵��', dataIndex: 'pullStatus_dictText', align: 'center' }, + { title: '鐘� 鎬�', dataIndex: 'docStatus_dictText', align: 'center' }, { title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center' }, { title: '涓婁紶鏃堕棿', dataIndex: 'createTime', align: 'center' } ], dataSource: [], + currentClickedDocumentInfo: {}, url: { list: '/nc/doc/find/page' } + } + }, + watch: { + currentTreeNodeInfo: { + handler(value) { + this.currentClickedDocumentInfo = {} + }, + immediate: true } }, created() { @@ -65,16 +74,18 @@ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭 if (arg === 1) this.ipagination.current = 1 var params = this.getQueryParams()//鏌ヨ鏉′欢 + console.log('currentTreeNodeInfo', this.currentTreeNodeInfo) params.attributionId = this.currentTreeNodeInfo.id params.attributionType = this.currentTreeNodeInfo.type params.docClassCode = 'OTHER' if (!params) return false + this.dataSource = [] this.loading = true getAction(this.url.list + `/${this.ipagination.current}/${this.ipagination.pageSize}`, params).then((res) => { if (res.success) { - this.dataSource = res.page.records - if (res.page.total) { - this.ipagination.total = res.page.total + this.dataSource = res.result.records + if (res.result.total) { + this.ipagination.total = res.result.total } else { this.ipagination.total = 0 } @@ -91,10 +102,12 @@ on: { contextmenu: event => { event.preventDefault() - this.$emit('handleTableContextMenuOpen', { ...record, param: 'document' }) + this.$emit('handleTableContextMenuOpen', { ...record, param: 'OTHER' }) }, click: () => { - this.$bus.$emit('sendCurrentLevelInfo', record) + if (this.currentClickedDocumentInfo.docId === record.docId) return + this.currentClickedDocumentInfo = Object.assign({}, record) + this.$bus.$emit('sendCurrentClickedDocumentInfo', record) } } } @@ -105,8 +118,12 @@ this.$refs.modalForm.title = modalTitle }, + handleDelete() { + // 姝ゅ鍑芥暟涓哄睆钄絤ixins涓殑鍚屽悕鍑芥暟锛岄�氱敤鍑芥暟鍐欏湪鐖剁骇涓� + }, + triggerCorrespondingMethod({ methodName, level, modalTitle, tableRowInfo }) { - if (this[methodName] && tableRowInfo.attributionType === 1) this[methodName](tableRowInfo, modalTitle) + if (this[methodName] && tableRowInfo.param === 'OTHER') this[methodName](tableRowInfo, modalTitle) } } } -- Gitblit v1.9.3