diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index a174a19..bf58864 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -326,9 +326,6 @@ $arcCyan: #0FBED9; text-align: right; color: #3A99FD; } - p{ - // flex: 1; - } } } ::v-deep.hljs{ diff --git a/src/views/archivesManage/archivesList/index.vue b/src/views/archivesManage/archivesList/index.vue index eac9b74..ab9c356 100644 --- a/src/views/archivesManage/archivesList/index.vue +++ b/src/views/archivesManage/archivesList/index.vue @@ -144,6 +144,7 @@ export default { } return null }, + // 展开选中的父级 expandParents(node) { node.expanded = true @@ -195,14 +196,9 @@ export default { getIntellClassify() { getDicts().then(data => { if (data) { - this.intellClassifyTree = data - // this.intellClassifyTree.filter(item => { - // if (item.childMenus !== null) { - // item.childMenus.map(val => { - // val.ifChild = true - // }) - // } - // }) + this.intellClassifyTree = data.filter(item => { + return item.dicCode === 'Search_MJ' || item.dicCode === 'Search_BGQX' || item.dicCode === 'Search_JGWT' || item.dicCode === 'Search_BM' + }) } }) }, @@ -317,7 +313,7 @@ export default { json.ifChild = true return json }) - this.intellClassifyTree.unshift({ id: -1, dicName: '年度', childMenus: newYearArr }) + this.intellClassifyTree.unshift({ id: -1, dicName: '年度', dicCode: 'Search_year', childMenus: newYearArr }) } this.intellClassifyLoading = false }, 500) @@ -326,72 +322,63 @@ export default { // 智能分类 handleIntellNodeClick(data, node, ele) { if (data) { - const selectedKey = this.$refs.smartTree.getCurrentNode() - const selectedParentVal = this.$refs.smartTree.getNode(selectedKey).parent.label - this.treeCurrentNode = ele.$el - - // if (data.ifChild) { - // this.treeCurrentNode = ele.$el - // const eles = document.querySelectorAll('.el-tree-node__children .el-tree-node.is-focusable') - // for (let i = 0; i < eles.length; i++) { - // eles[i].classList.remove('is-current') - // } - // this.treeCurrentNode.classList.add('is-current') - // } else { - // ele.$el.classList.remove('is-current') - // console.log(this.treeCurrentNode) - // if (this.treeCurrentNode) { - // this.treeCurrentNode.classList.add('is-current') - // } - // } - - if (ele.$el.classList.contains('is-current')) { - this.treeCurrentNode.classList.remove('is-current') - this.smartQuery = { - 'archiveYear': null, - 'department': null, - 'retention': null, - 'securityClass': null, - 'organizationMatter': null - } - this.handleTableList() - } else { - this.treeCurrentNode.classList.add('is-current') - switch (selectedParentVal) { - case '年度': - this.treeCurrentNode.classList.remove('is-current') - if (selectedKey.dicName !== '年度') { - this.smartQuery.archiveYear = selectedKey.dicName - } - break - case '部门名称': - if (selectedKey.dicName !== '部门名称') { - this.smartQuery.department = selectedKey.dicName - } - break - case '保管期限': - if (selectedKey.dicName !== '保管期限') { - this.smartQuery.retention = selectedKey.dicName - } - break - case '密级': - if (selectedKey.dicName !== '密级') { - this.smartQuery.securityClass = selectedKey.dicName - } - break - case ' 机构（问题）': - if (selectedKey.dicName !== '机构（问题）') { - this.smartQuery.organizationMatter = selectedKey.dicName - } - break - default: - this.smartQuery = { - 'archiveYear': null, - 'department': null, - 'retention': null, - 'securityClass': null, - 'organizationMatter': null - } + if (node.childNodes.length === 0) { + const selectedKey = this.$refs.smartTree.getCurrentNode() + const selectedParentVal = this.$refs.smartTree.getNode(selectedKey).parent.data.dicCode + this.treeCurrentNode = ele.$el + // if (data.ifChild) { + // this.treeCurrentNode = ele.$el + // const eles = document.querySelectorAll('.el-tree-node__children .el-tree-node.is-focusable') + // for (let i = 0; i < eles.length; i++) { + // eles[i].classList.remove('is-current') + // } + // this.treeCurrentNode.classList.add('is-current') + // } else { + // ele.$el.classList.remove('is-current') + // console.log(this.treeCurrentNode) + // if (this.treeCurrentNode) { + // this.treeCurrentNode.classList.add('is-current') + // } + // } + if (ele.$el.classList.contains('is-current')) { + this.treeCurrentNode.classList.remove('is-current') + this.smartQuery = { + 'archiveYear': null, + 'department': null, + 'retention': null, + 'securityClass': null, + 'organizationMatter': null + } + } else { + this.treeCurrentNode.classList.add('is-current') + console.log(this.$refs.smartTree.getNode(selectedKey).parent.data) + switch (selectedParentVal) { + case 'Search_year': + if (selectedKey.dicCode !== 'Search_year') { + this.smartQuery.archiveYear = selectedKey.dicName + } + break + case 'Search_BM': + if (selectedKey.dicCode !== 'Search_BM') { + this.smartQuery.department = selectedKey.dicName + } + break + case 'Search_BGQX': + if (selectedKey.dicCode !== 'Search_BGQX') { + this.smartQuery.retention = selectedKey.dicName + } + break + case 'Search_MJ': + if (selectedKey.dicCode !== 'Search_MJ') { + this.smartQuery.securityClass = selectedKey.dicName + } + break + default: + if (selectedKey.dicCode !== 'Search_JGWT') { + console.log(selectedKey.dicName) + this.smartQuery.organizationMatter = selectedKey.dicName + } + } } this.handleTableList() } diff --git a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue index 3b7756e..314ccff 100644 --- a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue +++ b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue @@ -125,7 +125,7 @@ @@ -143,7 +143,7 @@ @@ -549,7 +549,6 @@ export default { this.crud.delAllLoading = false this.$message.success('删除成功!') this.selections = [] - debugger this.getTableList() this.crud.refresh() }) diff --git a/src/views/archivesManage/archivesList/module/packing/index.vue b/src/views/archivesManage/archivesList/module/packing/index.vue index f9fa92b..560e040 100644 --- a/src/views/archivesManage/archivesList/module/packing/index.vue +++ b/src/views/archivesManage/archivesList/module/packing/index.vue @@ -249,7 +249,6 @@ export default { } archivesParentsId = this.caseData.selections[0].id } - const arrParams = packingData.map(item => { const json = {} json.archivesId = item.id @@ -269,6 +268,7 @@ export default { this.tableData = [] }) }, + // 分卷装盒 handlePartParking(row, index) { if (!this.selections.length) { this.$message.error('请选择要装盒的档案！') @@ -276,31 +276,24 @@ export default { } this.selectTableData.push(row) this.tableData.splice(index, 1) - - this.archivesTable.splice(this.archivesTable.findIndex((item, i) => item.id === this.selections[i].id), this.selections.length) - console.log(row) this.selections.forEach(item => { item.caseId = row.id item.caseName = row.caseName + this.archivesTable.splice(this.archivesTable.findIndex(val => val.id === item.id), 1) this.selectArchivesTable.push(item) }) }, + // 撤回装盒 cancelParking(row, index) { this.tableData.unshift(row) this.selectTableData.splice(index, 1) - - const returnArr = [] this.selectArchivesTable.forEach((item, i) => { if (item.caseId === row.id) { console.log(item.id) - returnArr.push(item) + this.archivesTable.push(item) } }) - console.log(returnArr) - this.selectArchivesTable.splice(this.selectArchivesTable.findIndex((item, i) => item.id === returnArr[i].id), returnArr.length) - returnArr.forEach(item => { - this.archivesTable.unshift(item) - }) + this.selectArchivesTable.splice(this.selectArchivesTable.findIndex((item, i) => item.caseId === row.id), this.archivesTable.length) }, handleComfireCartoning() { if (this.archivesTable.length) { @@ -322,7 +315,6 @@ export default { json.categoryId = jnCategoryId return json }) - console.log(arrParams) this.FetchCartioning(arrParams) }, clearTableData() { @@ -339,7 +331,7 @@ export default { // dialog - close handleClose(done) { this.showCoverVisible = false - // this.caseQuery[this.inputSelect] = '' + this.$set(this.caseQuery, this.inputSelect, '') this.tableData = [] this.selectTableData = [] this.archivesTable = [] diff --git a/src/views/archivesManage/archivesList/module/uploadFile/index.vue b/src/views/archivesManage/archivesList/module/uploadFile/index.vue index 1fb8a50..441d846 100644 --- a/src/views/archivesManage/archivesList/module/uploadFile/index.vue +++ b/src/views/archivesManage/archivesList/module/uploadFile/index.vue @@ -19,9 +19,9 @@ @row-click="clickRowHandler" @selection-change="selectionChangeHandler" > - + - + - +