From 861a5688d913f9c454e2cc97dc2e755df70001b0 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Mon, 11 Dec 2023 17:40:20 +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 | 32 ++++- src/utils/upload.js | 18 ++- .../module/archivesInfo/index.vue | 5 +- .../module/blukEditing/index.vue | 2 +- .../module/bulkImport/index.vue | 113 ++++++++++++++---- .../module/collectHeader.vue | 61 ++++++---- 6 files changed, 176 insertions(+), 55 deletions(-) diff --git a/src/api/collect/collect.js b/src/api/collect/collect.js index 3354e33..bb4e0eb 100644 --- a/src/api/collect/collect.js +++ b/src/api/collect/collect.js @@ -99,10 +99,37 @@ export function FetchDeleteArchivesFile(data) { }) } +// 批量导入-导出模板 +export function FetchExportTemplate(params) { + return request({ + url: 'api/collect/exportTemplate', + method: 'get', + params + }) +} + +// 批量导入-导入 +export function FetchBatchImport(data) { + return request({ + url: 'api/collect/batchImport', + method: 'post', + data + }) +} + // 批量修改 export function FetchBatchUpdate(data) { return request({ - url: '/api/collect/batchUpdate', + url: 'api/collect/batchUpdate', + method: 'post', + data + }) +} + +// 档号更新 +export function FetchUpdateArchivesNo(data) { + return request({ + url: 'api/collect/updateArchivesNo', method: 'post', data }) @@ -120,5 +147,6 @@ export default { FetchRemoveArchivesSingle, FetchAddArchivesFile, FetchDeleteArchivesFile, - FetchBatchUpdate + FetchBatchUpdate, + FetchUpdateArchivesNo } diff --git a/src/utils/upload.js b/src/utils/upload.js index 0eef283..05090ed 100644 --- a/src/utils/upload.js +++ b/src/utils/upload.js @@ -10,7 +10,22 @@ export function upload(api, file) { return axios.post(api, data, config) } -// 档案上传附件 +// 收集库 - 批量导入 +export function BatchImport(api, params) { + var data = new FormData() + data.append('file', params.file) + data.append('categoryId', params.categoryId) + data.append('categoryLevel', params.categoryLevel) + data.append('replicated', params.replicated) + const config = { + headers: { + 'Authorization': getToken() + } + } + return axios.post(api, data, config) +} + +// 收集库 - 原文上传 export function archivesUpload(api, file, categoryId) { var data = new FormData() // data.append('files', file) // 之前 @@ -47,3 +62,4 @@ export function modelUpload(api, file, name) { } return axios.post(api, data, config) } + diff --git a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue index 67390b7..94c9d3c 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue @@ -215,12 +215,13 @@ export default { .base-info, .metadata-cont{ background-color: #F6F8FC; - overflow: hidden; - overflow-y: scroll; + } // 档案详情 .base-info{ padding: 20px 0; + overflow: hidden; + overflow-y: scroll; .base-info-item{ display: flex; flex-direction: row; diff --git a/src/views/collectReorganizi/collectionLibrary/module/blukEditing/index.vue b/src/views/collectReorganizi/collectionLibrary/module/blukEditing/index.vue index 9fbb164..00c8258 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/blukEditing/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/blukEditing/index.vue @@ -350,8 +350,8 @@ export default { } console.log(params) FetchBatchUpdate(params).then(res => { - this.bulkEditingVisible = false this.$emit('close-dialog') + this.handleCloseDialog() }) } else { console.log('error submit!!') diff --git a/src/views/collectReorganizi/collectionLibrary/module/bulkImport/index.vue b/src/views/collectReorganizi/collectionLibrary/module/bulkImport/index.vue index 243f46b..f41583f 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/bulkImport/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/bulkImport/index.vue @@ -4,14 +4,15 @@