diff --git a/src/common/myFun.js b/src/common/myFun.js index 0a34d4ae9..68df75b1b 100644 --- a/src/common/myFun.js +++ b/src/common/myFun.js @@ -1,11 +1,31 @@ function getTreeItem(tree, id){ - let result = {} - tree.map(item => { + // 方法1 返回数组 + // let result = [] + // tree.forEach(item => { + // if(item.id === id){ + // result.push(item) + // }else{ + // if(item.children.length > 0){ + // // 内部函数返回值需要传递给最外层函数 + // let res = getTreeItem(item.children, id) + // result = result.concat(res) + // } + // } + // }) + // return result + // 方法2 返回对象 + let result = null + tree.forEach(item => { if(item.id === id){ result = item + // result.push(item) }else{ if(item.children.length > 0){ - getTreeItem(item.children) + // 内部函数返回值需要传递给最外层函数 + let res = getTreeItem(item.children, id) + if(res !== null){ + result = res + } } } }) diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index a23dece6a..636c840c1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -948,7 +948,8 @@ export default { getReplaceLawsNumRow () { this.replaceLawsNumForm.userId = this.$store.getters.userInfo.userId let currentTreeItem = getTreeItem(this.selectTreeList, this.replaceLawsNumForm.menuId) - this.replaceLawsNumForm.treeType = currentTreeItem.treeType + if(currentTreeItem && currentTreeItem.treeType) + this.replaceLawsNumForm.treeType = currentTreeItem.treeType if(this.replaceLawsNumForm.issueTimeArr && this.replaceLawsNumForm.issueTimeArr.length > 0){ this.replaceLawsNumForm.issueTimeStart = this.replaceLawsNumForm.issueTimeArr[0] || null @@ -992,7 +993,8 @@ export default { getReplaceLawsNumRowFirst () { this.replaceLawsNumForm.userId = this.$store.getters.userInfo.userId let currentTreeItem = getTreeItem(this.selectTreeList, this.replaceLawsNumForm.menuId) - this.replaceLawsNumForm.treeType = currentTreeItem.treeType + if(currentTreeItem && currentTreeItem.treeType) + this.replaceLawsNumForm.treeType = currentTreeItem.treeType this.replaceLawsNumForm.page = 1 this.replacePage = 1 diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 2d228c66a..39b2a643c 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -2726,7 +2726,8 @@ export default { getReplaceLawsNumRow () { this.replaceLawsNumForm.userId = this.$store.getters.userInfo.userId let currentTreeItem = getTreeItem(this.selectTreeList, this.replaceLawsNumForm.menuId) - this.replaceLawsNumForm.treeType = currentTreeItem.treeType + if(currentTreeItem && currentTreeItem.treeType) + this.replaceLawsNumForm.treeType = currentTreeItem.treeType if(this.replaceLawsNumForm.issueTimeArr && this.replaceLawsNumForm.issueTimeArr.length > 0){ this.replaceLawsNumForm.issueTimeStart = this.replaceLawsNumForm.issueTimeArr[0] || null @@ -2763,7 +2764,8 @@ export default { getReplaceLawsNumRowFirst () { this.replaceLawsNumForm.userId = this.$store.getters.userInfo.userId let currentTreeItem = getTreeItem(this.selectTreeList, this.replaceLawsNumForm.menuId) - this.replaceLawsNumForm.treeType = currentTreeItem.treeType + if(currentTreeItem && currentTreeItem.treeType) + this.replaceLawsNumForm.treeType = currentTreeItem.treeType this.replaceLawsNumForm.page = 1 this.replacePage = 1