From 49037e3b7d4564284fea45e39cac851052f2b3a2 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Wed, 6 Dec 2023 17:40:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/collect/collect.js | 11 +- src/assets/styles/archives-manage.scss | 6 + src/utils/upload.js | 2 +- .../archivesManage/archivesList/index.vue | 1 - .../collectionLibrary/anjuan/content.vue | 8 +- .../collectionLibrary/anjuan/index.vue | 10 +- .../collectionLibrary/anjuan/tableList.vue | 12 +- .../collectionLibrary/file/index.vue | 19 ++- .../collectionLibrary/index.vue | 146 ++++++++++++++---- .../collectionLibrary/juannei/index.vue | 12 +- .../collectionLibrary/mixins/index.js | 114 +++++++++----- .../module/collectHeader.vue | 45 ++++-- .../module/uploadOriginal/index.vue | 138 ++++++++++++++--- .../collectionLibrary/project/index.vue | 10 +- 14 files changed, 416 insertions(+), 118 deletions(-) diff --git a/src/api/collect/collect.js b/src/api/collect/collect.js index 60f5418..8184e91 100644 --- a/src/api/collect/collect.js +++ b/src/api/collect/collect.js @@ -63,4 +63,13 @@ export function FetchRemoveArchivesSingle(data) { }) } -export default { collectAdd, collectEdit, collectDel, FetchInitCategoryViewTable, FetchInitCategoryView, FetchDetailsById, FetchRemoveArchivesSingle } +// 添加电子原文 +export function FetchAddArchivesFile(data) { + return request({ + url: 'api/collect/addArchivesFile', + method: 'post', + data + }) +} + +export default { collectAdd, collectEdit, collectDel, FetchInitCategoryViewTable, FetchInitCategoryView, FetchDetailsById, FetchRemoveArchivesSingle, FetchAddArchivesFile } diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index ddf4e1b..a0577be 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -6,12 +6,18 @@ &:hover{ @include btn_blue_hover; } + &:focus{ + @include btn_blue_style; + } } .filter-refresh{ @include btn_white_style; &:hover{ @include btn_white_hover; } + &:focus{ + @include btn_white_style; + } } .head-archives{ diff --git a/src/utils/upload.js b/src/utils/upload.js index 3d4b14c..3c2c4fd 100644 --- a/src/utils/upload.js +++ b/src/utils/upload.js @@ -21,7 +21,7 @@ export function archivesUpload(api, file, categoryId) { return axios.post(api, data, config) } -// 档案上传附件 +// 预归档档案上传附件 export function reDocumentUpload(api, file, documentId) { var data = new FormData() data.append('file', file) diff --git a/src/views/archivesManage/archivesList/index.vue b/src/views/archivesManage/archivesList/index.vue index a1404e7..3ca5837 100644 --- a/src/views/archivesManage/archivesList/index.vue +++ b/src/views/archivesManage/archivesList/index.vue @@ -272,7 +272,6 @@ export default { this.isHasProject = false } this.handleTableList() - // 缓存当前的选中的 localStorage.setItem('currentArchivesKey', JSON.stringify(val)) } diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue index a93039d..be9356a 100644 --- a/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue +++ b/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue @@ -6,7 +6,7 @@ - + @@ -29,6 +29,12 @@ export default { isRecycle: { type: Boolean, default: false + }, + smartQuery: { + type: Object, + default: function() { + return {} + } } }, data() { diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue index 59a5e28..4a6620b 100644 --- a/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue @@ -1,6 +1,6 @@