diff --git a/src/views/archivesMIOD/miodLibrary/index.vue b/src/views/archivesMIOD/miodLibrary/index.vue index d6fd8ad..88511c4 100644 --- a/src/views/archivesMIOD/miodLibrary/index.vue +++ b/src/views/archivesMIOD/miodLibrary/index.vue @@ -7,11 +7,28 @@
-
-
+
+
- + + + + + + + + + + + + + + + + + + 搜索 重置
@@ -158,12 +175,14 @@ import detail from './module/detail' import { exportFile } from '@/utils/index' import qs from 'qs' import { mapGetters } from 'vuex' - +import DateRangePicker from '@/components/DateRangePicker' import PdfDialog from './module/pdfDialog' +import { FetchDictionaryTree } from '@/api/system/dict' +import { FetchInitBorrowerListOrderNo } from '@/api/system/borrower' export default { name: 'MiodLibrary', - components: { TreeList, PreviewForm, detail, crudOperation, pagination, PdfDialog }, + components: { TreeList, PreviewForm, detail, crudOperation, pagination, PdfDialog, DateRangePicker }, cruds() { return [ CRUD({ @@ -229,7 +248,13 @@ export default { parentInfo: null, pageType: null, allDownloadLoading: false, - isMiodSaveBind: null + isMiodSaveBind: null, + securityClassOptions: [], + emergencyDegreeOptions: [], + readTypeOptions: [], + blurryTime: [], + distributorsOptions: [], + distributorIds: [] } }, computed: { @@ -244,8 +269,54 @@ export default { } }, created() { + this.getDictsList() }, methods: { + getDictsList() { + FetchDictionaryTree().then((res) => { + const filterCodes = ['security_class'] + const filteredItems = JSON.parse(JSON.stringify(res)).filter(item => filterCodes.includes(item.dictionaryCode)) + this.securityClassOptions = filteredItems[0].childDictionarys + + const filterCodes2 = ['emergency_degree'] + const filteredItems2 = JSON.parse(JSON.stringify(res)).filter(item => filterCodes2.includes(item.dictionaryCode)) + this.emergencyDegreeOptions = filteredItems2[0].childDictionarys + + const filterCodes3 = ['read_type'] + const filteredItems3 = JSON.parse(JSON.stringify(res)).filter(item => filterCodes3.includes(item.dictionaryCode)) + this.readTypeOptions = filteredItems3[0].childDictionarys + }).catch(err => { + console.log(err) + }) + }, + handleClear() { + this.distributorIds = [] + this.crud.query.distributorIds = null + }, + fetchDeptsList() { + console.log('this.selectedDocument', this.selectedDocument) + let documentId + if (this.selectedDocument.isType === 2) { + documentId = this.selectedDocument.id + } else { + documentId = this.selectedDocument.documentId + } + const param = { + 'documentId': documentId + } + console.log('param', param) + FetchInitBorrowerListOrderNo(param) + .then(res => { + console.log('res', res) + this.distributorsOptions = res || [] + }) + .catch(error => { + this.$message.error('获取数据失败，请稍后重试') + console.error('获取部门/人员列表失败', error) + }) + .finally(() => { + }) + }, handleSearch() { this.crud.query.search = this.search this.crud.toQuery() @@ -254,6 +325,9 @@ export default { this.$refs.treeList.refreshData() }, resetQuery() { + this.crud.query.securityClass = '' + this.crud.query.emergencyDegree = '' + this.crud.query.readType = '' this.search = '' this.crud.query.search = '' if (this.selectedDocument.isType === 3) { @@ -266,6 +340,11 @@ export default { this.crud.query.docDepartment = null this.crud.query.archiveYear = null } + this.blurryTime = [] + this.crud.query.startTime = null + this.crud.query.endTime = null + this.distributorIds = [] + this.crud.query.distributorIds = null this.crud.toQuery() }, [CRUD.HOOK.beforeRefresh]() { @@ -274,6 +353,21 @@ export default { } else { this.crud.query.documentId = this.selectedDocument.documentId } + + if (this.blurryTime.length !== 0) { + this.crud.query.startTime = this.blurryTime[0].split(' ')[0] + this.crud.query.endTime = this.blurryTime[1].split(' ')[0] + } else { + this.crud.query.startTime = null + this.crud.query.endTime = null + } + + if (this.distributorIds.length !== 0) { + this.crud.query.distributorIds = this.distributorIds.join(',') + } else { + this.crud.query.distributorIds = null + } + this.crud.query.isdel = this.isdel // this.crud.query.ignore = false this.crud.query.fondsAffiliation = this.selectedDocument.fondsId @@ -283,12 +377,12 @@ export default { this.archivesBtnLoading = loadingType }, handleNodeClick(data, type) { - if (type && type === 'targetNode') { - console.log('非手动点击tree') - } else { - this.search = '' - this.crud.query.search = '' - } + // if (type && type === 'targetNode') { + // console.log('非手动点击tree') + // } else { + // this.search = '' + // this.crud.query.search = '' + // } this.selectedDocument = data let documentId = null if (data.isType === 2) { @@ -296,6 +390,7 @@ export default { } else { documentId = data.documentId } + this.fetchDeptsList() this.getInitDocumentsViewTable(documentId, type) }, // table字段项 @@ -655,7 +750,13 @@ export default { 'ids': ids, 'docDepartment': type === '1' ? (this.selectedDocument.isType === 4 ? this.selectedDocument.dictionaryName : this.selectedDocument.label) : null, 'archivesYear': type === '1' ? (this.selectedDocument.isType === 4 ? this.selectedDocument.label : null) : null, - 'search': type === '1' ? this.search : null + 'search': type === '1' ? this.search : null, + 'securityClass': type === '1' ? this.crud.query.securityClass : null, + 'emergencyDegree': type === '1' ? this.crud.query.emergencyDegree : null, + 'readType': type === '1' ? this.crud.query.readType : null, + 'startTime': type === '1' ? (this.blurryTime.length !== 0 ? this.blurryTime[0].split(' ')[0] : null) : null, + 'endTime': type === '1' ? (this.blurryTime.length !== 0 ? this.blurryTime[1].split(' ')[0] : null) : null, + 'distributorIds': type === '1' ? (this.blurryTime.distributorIds !== 0 ? this.distributorIds.join(',') : null) : null } console.log('exportFile', params) exportFile(this.baseApi + '/api/documentArchives/downloadDocumentArchives?' + qs.stringify(params, { indices: false, allowDots: true, skipNulls: false })) diff --git a/src/views/archivesMIOD/miodLibrary/module/detail.vue b/src/views/archivesMIOD/miodLibrary/module/detail.vue index f82b51e..c27c51d 100644 --- a/src/views/archivesMIOD/miodLibrary/module/detail.vue +++ b/src/views/archivesMIOD/miodLibrary/module/detail.vue @@ -33,25 +33,29 @@
主办部门： - - {{ tag.borrowName }} - +
+ + {{ tag.borrowName }} + +
传阅者： - - {{ tag.borrowName }} - +
+ + {{ tag.borrowName }} + +
@@ -66,7 +70,7 @@ v-loading="archivesFiledataLoading" :data="archivesFiledata" style="min-width: 100%;" - height="calc(100vh - 756px)" + height="calc(100vh - 796px)" > @@ -984,6 +988,9 @@ export default { // color: #545B65; // } .childDevice-item{ + display: flex; + justify-items: flex-start; + align-items: first baseline; padding-bottom: 10px; .tag-name{ display: inline-block; diff --git a/src/views/archivesMIOD/miodLibrary/treeList.vue b/src/views/archivesMIOD/miodLibrary/treeList.vue index c6f328e..7577cf7 100644 --- a/src/views/archivesMIOD/miodLibrary/treeList.vue +++ b/src/views/archivesMIOD/miodLibrary/treeList.vue @@ -5,7 +5,7 @@
- + {{ data.label }} @@ -63,7 +63,20 @@ export default { computed: { ...mapGetters([ 'user' - ]) + ]), + expandedKeys() { + const keys = [] + const collectKeys = (nodes) => { + nodes.forEach(node => { + if (node.expanded) { + keys.push(node.id) + if (node.children) collectKeys(node.children) + } + }) + } + collectKeys(this.crud.data) + return keys + } }, created() { }, @@ -95,15 +108,18 @@ export default { id: item.id, pid: item.pid, isType: item.isType, + expanded: item.isType === 1, children: item.children?.map(child => ({ label: child.cnName, id: child.id, pid: child.pid, isType: child.isType, + expanded: child.isType === 2, children: child.docDepartments?.map(department => ({ label: department.dictionaryName, id: department.dictionaryId, isType: 3, + expanded: false, documentId: child.id, dictionaryId: department.dictionaryId, dictionaryCode: department.dictionaryCode, @@ -119,14 +135,6 @@ export default { })) })) })) - // 初始化默认找到第一个document节点选中 - // this.$nextTick(() => { - // const defaultSelectedNode = this.findFirstIsType2Node(this.crud.data) - // if (defaultSelectedNode) { - // this.$refs.tree.setCurrentKey(defaultSelectedNode.id) - // this.handleNodeClick(defaultSelectedNode) - // } - // }) // 节点选择逻辑 this.$nextTick(() => { let targetNode = null @@ -174,12 +182,40 @@ export default { if (targetNode) { this.$refs.tree.setCurrentKey(targetNode.id) this.handleNodeClick(targetNode, 'targetNode') - } + if (targetNode.isType === 4) { + this.$nextTick(() => { + const parentNode = this.findParentNode(this.crud.data, targetNode) + if (parentNode) { + parentNode.expanded = true + + if (!this.expandedKeys.includes(parentNode.id)) { + this.expandedKeys = [...this.expandedKeys, parentNode.id] + } + + const treeNode = this.$refs.tree.getNode(parentNode.id) + if (treeNode) { + treeNode.expanded = true + } + } + }) + } + } // 重置节点选择信息 this.nodeToSelect = null }) }, + // 递归查找父节点 + findParentNode(nodes, targetNode) { + for (const node of nodes) { + if (node.children && node.children.some(child => child.id === targetNode.id)) { + return node + } + const found = this.findParentNode(node.children || [], targetNode) + if (found) return found + } + return null + }, // 查找函数 findNodeById(nodes, id) { if (!nodes || nodes.length === 0) return null diff --git a/src/views/archivesMIOD/miodRecord/index.vue b/src/views/archivesMIOD/miodRecord/index.vue index 1083bf8..8d4a6de 100644 --- a/src/views/archivesMIOD/miodRecord/index.vue +++ b/src/views/archivesMIOD/miodRecord/index.vue @@ -6,7 +6,7 @@ v-model="typeValue" size="small" clearable - placeholder="请输入题名搜索关键字" + placeholder="请输入关键字搜索" style="width: 300px;" class="input-prepend filter-item" @clear="crud.toQuery" @@ -47,7 +47,7 @@ height="calc(100vh - 288px)" @cell-dblclick="tableDoubleClick" > - +