From bc55e59f49229ffa77d2b32dd9fd0a9b6049b9b8 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期五, 14 三月 2025 09:44:25 +0800 Subject: [PATCH] 1、设备类管理页面完成增删改查功能 2、产品结构树工序及工步层级引入设备类概念由系统参数配置决定是否展示,若设备类存在时则NC文档挂载在设备类下不存在时则按照对应工序或工步层级下 3、产品结构树工序及工步层级的刀具列表实现增删改查功能 4、新增设备类管理页面并完成布局 5、产品结构树接口调整,产品结构树节点实体信息通过点击后调取接口获取 6、产品结构树搜素输入框增加防抖机制,避免每次输入都重新计算消耗性能使页面卡顿 7、新增工序及工步层级的刀具列表并添加系统权限 8、用户管理页面移除新增用户时的密码校验 9、产品结构树各层级属性信息展示由每行3列调整为每行4列 10、产品结构树页面在工序和工步层级实现对设备类的增删改查功能 --- src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue | 165 +++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 130 insertions(+), 35 deletions(-) diff --git a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue index 3619a9b..4dcd066 100644 --- a/src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue +++ b/src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue @@ -1,18 +1,23 @@ <template> - <a-tabs v-model="activeTabKey" @contextmenu.native="e=>e.preventDefault()" - v-if="Object.keys(currentTreeNodeInfo).length!==0"> - <a-tab-pane :key="1" tab="NC鏂囨。" v-if="currentTreeNodeInfo.type===5||currentTreeNodeInfo.type===6"> - <NcDocumentTableList ref="ncDocumentTableListRef" :currentTreeNodeInfo="currentTreeNodeInfo" - @handleTableContextMenuOpen="handleTableContextMenuOpen" :size="tableContainerSize"/> - </a-tab-pane> + <div v-if="currentTreeNodeInfo.type!==4"> + <a-tabs v-model="activeTabKey" @contextmenu.native="e=>e.preventDefault()" @change="handleTabChange" + v-if="Object.keys(currentTreeNodeInfo).length!==0"> + <a-tab-pane :key="1" tab="NC鏂囨。" v-if="currentTreeNodeInfo.type===5||currentTreeNodeInfo.type===6"> + <NcDocumentTableList ref="ncDocumentTableListRef" :currentTreeNodeInfo="currentTreeNodeInfo" + @handleTableContextMenuOpen="handleTableContextMenuOpen" :size="tableContainerSize"/> + </a-tab-pane> - <a-tab-pane :key="1" tab="鍏朵粬鏂囨。" v-else> - <OtherDocumentTableList ref="otherDocumentTableListRef" :currentTreeNodeInfo="currentTreeNodeInfo" - @handleTableContextMenuOpen="handleTableContextMenuOpen" :size="tableContainerSize"/> - </a-tab-pane> + <a-tab-pane :key="2" tab="鍏朵粬鏂囨。"> + <OtherDocumentTableList ref="otherDocumentTableListRef" :currentTreeNodeInfo="currentTreeNodeInfo" + @handleTableContextMenuOpen="handleTableContextMenuOpen" :size="tableContainerSize"/> + </a-tab-pane> + </a-tabs> <TableContextMenu :tableRowInfo="currentRightClickedTableRowInfo" ref="tableContextMenuRef"/> - </a-tabs> + + <DocumentBatchDeleteModal :currentDocumentInfo="currentRightClickedTableRowInfo" :size="tableContainerSize" + @reloadDocumentListData="reloadDocumentListData" ref="documentBatchDeleteModalRef"/> + </div> </template> <script> @@ -20,21 +25,23 @@ import NcDocumentTableList from './Document/NcDocumentTableList' import OtherDocumentTableList from './Document/OtherDocumentTableList' import TableContextMenu from '../../../common/TableContextMenu' + import DocumentBatchDeleteModal from '../../../common/DocumentBatchDeleteModal' export default { name: 'ProductStructureMainTop', - components: { TableContextMenu, OtherDocumentTableList, NcDocumentTableList }, + components: { DocumentBatchDeleteModal, TableContextMenu, OtherDocumentTableList, NcDocumentTableList }, data() { return { - activeTabKey: 1, + activeTabKey: 2, tableContainerSize: 'small', currentRightClickedTableRowInfo: {}, - currentTreeNodeInfo: {} + currentTreeNodeInfo: {}, + hasLoadedDataTabKeyArray: [] } }, created() { this.$bus.$on('sendCurrentTreeNodeInfo', this.receiveCurrentTreeNodeInfo) - this.$bus.$on('importFileSuccess', this.reloadDocumentListData) + this.$bus.$on('reloadDocumentListData', this.reloadDocumentListData) this.$bus.$on('tableMenuItemMethodTrigger', this.triggerCorrespondingMethod) }, methods: { @@ -60,17 +67,34 @@ // 浠庢爲缁勪欢鎺ュ彈鏍戣妭鐐逛俊鎭悗浠庣埗缁勪欢娴佸叆瀛愮粍浠� this.currentTreeNodeInfo = treeNodeInfo // 娓呯┖涓婁竴鑺傜偣宸茬粡鍔犺浇杩囧緱鏂囨。鍒楄〃tabKey + this.hasLoadedDataTabKeyArray = [] if (treeNodeInfo.type === 5 || treeNodeInfo.type === 6) { + this.activeTabKey = 1 this.$nextTick(() => { if (this.$refs.ncDocumentTableListRef) this.$refs.ncDocumentTableListRef.loadData(1) }) } else { + this.activeTabKey = 2 this.$nextTick(() => { if (this.$refs.otherDocumentTableListRef) this.$refs.otherDocumentTableListRef.loadData(1) }) } + this.hasLoadedDataTabKeyArray.push(this.activeTabKey) }, + /** + * tab鏍忓垏鎹㈡椂瑙﹀彂 + * @param activeTabKey 鍒囨崲鍚庣殑tabKey + */ + handleTabChange(activeTabKey) { + if (!this.hasLoadedDataTabKeyArray.includes(activeTabKey)) { + this.$nextTick(() => { + if (this.$refs.otherDocumentTableListRef) this.$refs.otherDocumentTableListRef.loadData(1) + }) + // 闃绘鎺ュ彛鍦ㄥ悓涓�鏂囨。涓�娆$偣鍑诲唴澶氭瑙﹀彂 + this.hasLoadedDataTabKeyArray.push(activeTabKey) + } + }, /** * 鏂囨。浠ュ強NC绋嬪簭瀵煎叆/鍑哄簱/鍏ュ簱鎴愬姛鍚庤Е鍙戦噸鏂板姞杞芥枃妗e垪琛� * @param docClassCode 鏂囨。绫诲埆 @@ -86,13 +110,11 @@ } }, - /** - * 鐐瑰嚮涓嬭浇鏃惰Е鍙戜笅杞藉綋鍓嶆枃妗� - */ + // 涓嬭浇褰撳墠鍙抽敭閫変腑鏂囨。 handleDownload() { const that = this const { docId, docName } = this.currentRightClickedTableRowInfo - dncApi.downloadDocumentApi({ id: docId, docName }) + dncApi.downloadDocumentApi({ docId, docName }) .then(res => { if (res && !res.success) { that.$notification.error({ @@ -109,24 +131,69 @@ }) }, + // 鍒犻櫎褰撳墠鍙抽敭閫変腑鏂囨。 + handleDelete() { + const { docId, param, attributionId } = this.currentRightClickedTableRowInfo + const that = this + that.$confirm({ + title: '鎻愮ず', + content: `鍒犻櫎鍚庝笉鍙彇娑堬紝纭鍒犻櫎鍚楋紵`, + okText: '纭', + cancelText: '鍙栨秷', + onOk: () => { + dncApi.deleteDocumentApi(docId) + .then((res) => { + if (res.success) { + that.$notification.success({ + message: '娑堟伅', + description: res.message + }) + that.reloadDocumentListData({ docClassCode: param, attributionId }) + } else { + that.$notification.warning({ + message: '娑堟伅', + description: res.message + }) + } + }) + .finally(() => { + that.$destroyAll() + }) + }, + onCancel: () => { + that.$destroyAll() + } + }) + }, + /** - * 鐐瑰嚮鍑哄簱鏃惰Е鍙戝綋鍓嶆枃妗e嚭搴� + * 鐐瑰嚮鎵归噺鍒犻櫎鍚庡嚭鐜板脊绐� + * @param modalTitle 寮圭獥鏍囬 + */ + handleBatchRemove(modalTitle) { + if (!this.$refs.documentBatchDeleteModalRef) return + this.$refs.documentBatchDeleteModalRef.title = modalTitle + this.$refs.documentBatchDeleteModalRef.visible = true + }, + + /** + * 鍑哄簱褰撳墠鍙抽敭閫変腑鏂囨。 * @param menuLabel */ handlePull(menuLabel) { const that = this const { docId, docName, param, attributionId } = this.currentRightClickedTableRowInfo - this.$confirm({ + that.$confirm({ title: '鎻愮ず', content: `纭${menuLabel}鍚楋紵`, okText: '纭', cancelText: '鍙栨秷', onOk: () => { - dncApi.documentOutboundApi({ id: docId, docName }) + dncApi.documentOutboundApi({ docId, docName }) .then(res => { console.log('res------------------', res) if (res.success) { - this.reloadDocumentListData({ docClassCode: param, attributionId }) + that.reloadDocumentListData({ docClassCode: param, attributionId }) that.$notification.success({ message: '娑堟伅', description: `${menuLabel}鎴愬姛` @@ -144,18 +211,24 @@ description: err.message }) }) + .finally(() => { + that.$destroyAll() + }) + }, + onCancel: () => { + that.$destroyAll() } }) }, /** - * 鐐瑰嚮鍙栨秷鍑哄簱鏃惰Е鍙戝綋鍓嶆枃妗e彇娑堝嚭搴� + * 鍙栨秷鍑哄簱褰撳墠鍙抽敭閫変腑鏂囨。 * @param menuLabel */ handleCancelPull(menuLabel) { const that = this const { docId, param, attributionId } = this.currentRightClickedTableRowInfo - this.$confirm({ + that.$confirm({ title: '鎻愮ず', content: `纭${menuLabel}鍚楋紵`, okText: '纭', @@ -182,19 +255,24 @@ description: err.message }) }) + .finally(() => { + that.$destroyAll() + }) + }, + onCancel() { + that.$destroyAll() } }) }, - /** - * 鐐瑰嚮鍙戝竷鏃惰Е鍙戝綋鍓嶆枃妗e彂甯� + * 鍙戝竷褰撳墠鍙抽敭閫変腑鏂囨。 * @param menuLabel */ handlePublish(menuLabel) { const that = this const { docId, param, attributionId } = this.currentRightClickedTableRowInfo - this.$confirm({ + that.$confirm({ title: '鎻愮ず', content: `纭${menuLabel}鍚楋紵`, okText: '纭', @@ -204,6 +282,7 @@ .then(res => { if (res.success) { this.reloadDocumentListData({ docClassCode: param, attributionId }) + this.$bus.$emit('reloadMainBottomTableData', 'documentVersion') that.$notification.success({ message: '娑堟伅', description: res.message @@ -221,18 +300,24 @@ description: err.message }) }) + .finally(() => { + that.$destroyAll() + }) + }, + onCancel() { + that.$destroyAll() } }) }, /** - * 鐐瑰嚮閲嶆柊鍙戝竷鏃惰Е鍙戝綋鍓嶆枃妗i噸鏂板彂甯冮��鍥炰笂涓�鐗堟湰 + * 閲嶆柊鍙戝竷褰撳墠鍙抽敭閫変腑鏂囨。骞堕噸鏂板彂甯冮��鍥炰笂涓�鏂囨。鐗堟湰 * @param menuLabel */ handleRepublish(menuLabel) { const that = this const { docId, param, attributionId } = this.currentRightClickedTableRowInfo - this.$confirm({ + that.$confirm({ title: '鎻愮ず', content: `纭${menuLabel}鍚楋紵`, okText: '纭', @@ -259,18 +344,24 @@ description: err.message }) }) + .finally(() => { + that.$destroyAll() + }) + }, + onCancel() { + that.$destroyAll() } }) }, /** - * 鐐瑰嚮褰掓。鏃惰Е鍙戝綋鍓嶆枃妗e綊妗d笖鍚庣画鏃犳硶缁х画鍙戝竷鎴栧綊妗� + * 閲嶅綊妗e綋鍓嶅彸閿�変腑鏂囨。涓斿悗缁棤娉曠户缁彂甯冩垨褰掓。 * @param menuLabel */ handlePigeonhole(menuLabel) { const that = this const { docId, param, attributionId } = this.currentRightClickedTableRowInfo - this.$confirm({ + that.$confirm({ title: '鎻愮ず', content: `${menuLabel}鍚庝笉鍙彇娑堬紝纭${menuLabel}鍚楋紵`, okText: '纭', @@ -297,13 +388,17 @@ description: err.message }) }) + .finally(() => { + that.$destroyAll() + }) + }, + onCancel() { + that.$destroyAll() } }) }, - /** - * 鎺у埗鍙抽敭鑿滃崟鐐瑰嚮鍏抽棴 - */ + // 鎺у埗鍙抽敭鑿滃崟鍏抽棴 handleMenuClose() { this.$refs.tableContextMenuRef.menuVisible = false document.body.removeEventListener('click', this.handleMenuClose) -- Gitblit v1.9.3