From b96d0e41cb4d68074fef53ae0ef10ee0c6be1b07 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 28 二月 2025 15:46:20 +0800
Subject: [PATCH] DNC模块： 1、解决点击tabs栏空白处出现空内容组件问题 2、新增树内容搜索时若清空内容后还原为搜索前展开的树节点的功能 产品结构树： 1、工艺和工步层级开放其他文档列表的展示 2、零件层级下新增工艺规程版本层级，并实现工艺规程版本层级的相应功能（增删改） 3、解决因设备结构树数据未加载完成就跳转至产品结构树页面导致接口获取到的前页面方法影响后页面从而出现混乱问题
---
src/views/dnc/base/modules/DeviceStructure/DeviceStructureTree.vue | 72 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 31 deletions(-)
diff --git a/src/views/dnc/base/modules/DeviceStructure/DeviceStructureTree.vue b/src/views/dnc/base/modules/DeviceStructure/DeviceStructureTree.vue
index 1b86a5b..5e53cf4 100644
--- a/src/views/dnc/base/modules/DeviceStructure/DeviceStructureTree.vue
+++ b/src/views/dnc/base/modules/DeviceStructure/DeviceStructureTree.vue
@@ -41,8 +41,7 @@
</template>
<script>
- import { mapActions } from 'vuex'
- import { deleteAction } from '@/api/manage'
+ import dncApi from '@/api/dnc'
import DeviceStructureTreeContextMenu from './DeviceStructureTreeContextMenu'
import AssignPermissionModal from './Permission/AssignPermissionModal'
@@ -60,6 +59,7 @@
treeDataSource: [],
selectedKeys: [],
expandedKeys: [],
+ beforeSearchExpandedKeys: [],
searchValue: '',
dataList: [],
autoExpandParent: true,
@@ -79,26 +79,26 @@
this.$bus.$on('handleSwitchDeviceDocClassCode', this.setCurrentDeviceDocClassCode)
},
methods: {
- ...mapActions(['QueryProduction']),
-
getTreeDataByApi() {
this.loading = true
this.cardLoading = true
- this.QueryProduction('DNC').then(res => {
- if (res.success) {
- this.dataList = []
- this.allTreeKeys = []
- this.treeDataSource = res.result
- this.generateList(this.treeDataSource)
- this.expandedKeys = this.allTreeKeys
- this.$bus.$emit('sendCurrentTreeNodeInfo', this.treeDataSource[0])
- } else {
- this.$message.warn(res.message)
- }
- }).finally(() => {
- this.loading = false
- this.cardLoading = false
- })
+ dncApi.getDeviceTreeDataApi()
+ .then(res => {
+ if (res.success) {
+ this.dataList = []
+ this.allTreeKeys = []
+ this.treeDataSource = res.result
+ this.generateList(this.treeDataSource)
+ this.expandedKeys = this.beforeSearchExpandedKeys = this.allTreeKeys
+ this.$bus.$emit('sendDeviceTreeNodeInfo', this.treeDataSource[0])
+ } else {
+ this.$message.warn(res.message)
+ }
+ })
+ .finally(() => {
+ this.loading = false
+ this.cardLoading = false
+ })
},
setCurrentDeviceDocClassCode(documentActiveTabKey) {
@@ -116,7 +116,7 @@
this.currentSelected = Object.assign({}, record)
this.selectedKeys = selectedKeys
// 鍚戝彸渚х埗绾х粍浠跺彂閫佸綋鍓嶉�変腑鏍戣妭鐐逛俊鎭�
- this.$bus.$emit('sendCurrentTreeNodeInfo', this.currentSelected)
+ this.$bus.$emit('sendDeviceTreeNodeInfo', this.currentSelected)
},
/**
@@ -136,27 +136,37 @@
* @param expandedKeys 灞曞紑椤筴ey
*/
handleTreeExpand(expandedKeys) {
- this.expandedKeys = expandedKeys
+ this.expandedKeys = this.beforeSearchExpandedKeys = expandedKeys
+ console.log('beforeSearchExpandedKeys', this.beforeSearchExpandedKeys)
this.autoExpandParent = false
},
/* 杈撳叆鏌ヨ鍐呭鍙樺寲鏃惰Е鍙� */
handleSearchInputChange() {
let search = this.searchInput
- let expandedKeys = this.dataList
- .map(item => {
- if (item.title != null) {
- if (item.title.indexOf(search) > -1) {
- return this.getParentKey(item.key, this.treeDataSource)
+ let expandedKeys
+ let autoExpandParent
+ if (search !== '') {
+ expandedKeys = this.dataList
+ .map(item => {
+ if (item.title != null) {
+ if (item.title.indexOf(search) > -1) {
+ return this.getParentKey(item.key, this.treeDataSource)
+ }
+ return null
}
- return null
- }
- })
- .filter((item, i, self) => item && self.indexOf(item) === i)
+ })
+ .filter((item, i, self) => item && self.indexOf(item) === i)
+ autoExpandParent = true
+ } else {
+ expandedKeys = this.beforeSearchExpandedKeys
+ autoExpandParent = false
+ }
+
Object.assign(this, {
expandedKeys,
searchValue: search,
- autoExpandParent: true
+ autoExpandParent
})
},
--
Gitblit v1.9.3