diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 1b307f1..bc73137 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -218,6 +218,7 @@ export default { logout() { this.$store.dispatch('LogOut').then(() => { location.reload() + localStorage.clear() }) }, handleClose(done) { diff --git a/src/views/collectReorganizi/collectionLibrary/index.vue b/src/views/collectReorganizi/collectionLibrary/index.vue index 44f86d6..a7b1bea 100644 --- a/src/views/collectReorganizi/collectionLibrary/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/index.vue @@ -233,20 +233,21 @@ export default { return { label: category.cnName, cnName: category.cnName, + code: category.code, id: category.id, arrangeType: category.arrangeType, isType: category.isType, fondsId: item.fondsId, fondName: item.fondName, fondsNo: item.fondsNo, - children: this.transformChildren(category.children, item.fondsId, item.fondName, item.fondsNo) + children: this.transformChildren(category.children, category.code, item.fondsId, item.fondName, item.fondsNo) } }) } }) }, // 递归函数,用于处理数据的子节点 - transformChildren(children, fondsId, fondName, fondsNo) { + transformChildren(children, code, fondsId, fondName, fondsNo) { return children.map(child => { return { label: child.cnName, @@ -254,7 +255,7 @@ export default { id: child.id, isType: child.isType, pid: child.pid, - code: child.code, + code: child.code || code, arrangeType: child.arrangeType, fondsId: fondsId, fondName: fondName, @@ -305,6 +306,7 @@ export default { if (currentKey && currentKey.id) { this.$nextTick(() => { // 选中节点的门类详情 + console.log('444') this.handleNodeClick(currentKey) }) } @@ -316,10 +318,17 @@ export default { return node.isType !== 1 }) this.expandAllChildren(this.$refs.categroyTree.getNode(this.crud.data[0]), currentKey) + console.log('currentKey', currentKey) } else { currentKey = this.crud.data[0] this.expandAllChildren(this.$refs.categroyTree.getNode(this.crud.data[0]), currentKey) } + + if (currentKey && currentKey.id) { + this.$nextTick(() => { + this.handleNodeClick(currentKey) + }) + } }, handleNodeClick(val) { localStorage.removeItem('savePrevFromData') diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue index 6b095fa..92c4c68 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue @@ -696,8 +696,9 @@ export default { } else if (this.collectTitle === '卷内' && this.parentsData.parentsAnjuanRow) { // 全宗fonds_no、门类archival_category_code、档案分类archive_ctg_no、年度archive_year、保管期限retention、案卷号record_no、责任者signer const rowAjData = this.parentsData.parentsAnjuanRow - const fields = ['fonds_no', 'archive_ctg_no', 'archive_year', 'retention', 'record_no', 'signer'] - const result = { is_entity: 1, archival_category_code: this.selectedCategory.code } + const fields = ['archive_ctg_no', 'archive_year', 'retention', 'record_no', 'signer'] + console.log('this.selectedCategory', this.selectedCategory) + const result = { is_entity: 1, 'fonds_no': this.selectedCategory.fondsNo, 'archival_category_code': this.selectedCategory.code } fields.forEach(field => { if (rowAjData.hasOwnProperty(field)) { diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue b/src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue index f6d4173..69dc6f7 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue @@ -15,8 +15,8 @@ --> @@ -35,6 +35,17 @@ @row-click="clickRowHandler" > + + + + + + +