diff --git a/src/views/archivesManage/archivesList/archivesDetail.vue b/src/views/archivesManage/archivesList/archivesDetail.vue index 75caea1..2d336a4 100644 --- a/src/views/archivesManage/archivesList/archivesDetail.vue +++ b/src/views/archivesManage/archivesList/archivesDetail.vue @@ -171,11 +171,10 @@ import PreviewForm from '@/views/components/category/PreviewForm' import UploadFile from './module/uploadFile/index' import ArchivesInfo from './module/archivesInfo/index' import Packing from './module/packing/index' -import Binding from './module/binding/index' export default { name: 'ArchivesDetail', - components: { crudOperation, rrOperation, pagination, PreviewForm, UploadFile, ArchivesInfo, Packing, Binding }, + components: { crudOperation, rrOperation, pagination, PreviewForm, UploadFile, ArchivesInfo, Packing }, mixins: [ presenter(), header(), diff --git a/src/views/archivesManage/archivesList/index.vue b/src/views/archivesManage/archivesList/index.vue index 20cd9e1..d015486 100644 --- a/src/views/archivesManage/archivesList/index.vue +++ b/src/views/archivesManage/archivesList/index.vue @@ -393,7 +393,9 @@ export default { this.$refs.anjuan.getTableDisplayFields() this.$refs.file.getTableDisplayFields() } - this.$refs.project.getTableList() + setTimeout(() => { + this.$refs.project.getTableList() + }, 200) if (!this.treeCurrentNode) { this.getYear('project') } @@ -406,7 +408,9 @@ export default { if (this.selectedCategory.children.length !== 0) { this.$refs.file.getTableDisplayFields() } - this.$refs.anjuan.getTableList() + setTimeout(() => { + this.$refs.anjuan.getTableList() + }, 200) if (!this.treeCurrentNode) { this.getYear('anjuan') } @@ -415,7 +419,9 @@ export default { this.$nextTick(() => { this.$refs.file.junneiData = [] this.$refs.file.getTableDisplayFields() - this.$refs.file.getTableList() + setTimeout(() => { + this.$refs.file.getTableList() + }, 200) if (!this.treeCurrentNode) { this.getYear('file') } @@ -424,7 +430,9 @@ export default { this.$nextTick(() => { this.$refs.anjuan.anjuanData = [] this.$refs.anjuan.getTableDisplayFields() - this.$refs.anjuan.getTableList() + setTimeout(() => { + this.$refs.anjuan.getTableList() + }, 200) if (!this.treeCurrentNode) { this.getYear('anjuan') } diff --git a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue index a0cf9c6..3786c17 100644 --- a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue +++ b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue @@ -28,7 +28,7 @@ - + { if (data) { + this.arrySort = [] this.tableDisplayFields = data this.getTableDisplayFieldsLoading = false - this.tableDisplayFields.map(item => { - if (item.queue) { - this.arrySort.push(item.fieldName + ', ' + (item.displayOrder === 1 ? 'asc' : 'desc')) - } + const orderSortArry = this.tableDisplayFields.filter(item => item.queue).sort((a, b) => a.queue - b.queue) + orderSortArry.forEach(item => { + this.arrySort.push(item.fieldName + ',' + item.displayOrderBy) }) } }) @@ -394,9 +400,17 @@ export default { switch (this.anjuanInputSelect) { case 'queryTitle': // 题名 this.query.queryTitle = this.anjuanQuery[this.anjuanInputSelect] + this.query.archiveNo = '' break case 'archiveNo': // 档号 this.query.archiveNo = this.anjuanQuery[this.anjuanInputSelect] + this.query.queryTitle = '' + break + case 'archiveCtgNo': // 实体分类号 + this.query.archiveCtgNo = this.juanneiQuery[this.juanneiInputSelect] + break + case 'responsibleby': // 责任者 + this.query.responsibleby = this.juanneiQuery[this.juanneiInputSelect] break } this.page.page = isNaN(page - 1) ? 0 : page - 1 @@ -418,6 +432,7 @@ export default { 'queryTitle': this.query.queryTitle, 'recordNo': this.query.recordNo, 'archiveCtgNo': this.query.archiveCtgNo, + 'responsibleby': this.query.responsibleby, 'archiveNo': this.query.archiveNo, 'archiveYear': this.smartQuery.archiveYear, 'department': this.smartQuery.department, diff --git a/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue b/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue index adecb29..26ce0b1 100644 --- a/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue +++ b/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue @@ -22,7 +22,7 @@