From a2819979199972d051eb920973e247d65cc4701c Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Thu, 7 Dec 2023 17:33:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=BA=93api1207?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/collect/collect.js | 45 +++- src/api/system/category/category.js | 2 +- src/assets/styles/archives-manage.scss | 13 +- src/utils/upload.js | 9 +- .../collectionLibrary/anjuan/tableList.vue | 40 ++-- .../collectionLibrary/file/index.vue | 168 ++++++++------ .../collectionLibrary/juannei/index.vue | 23 +- .../collectionLibrary/mixins/index.js | 44 +++- .../module/archivesInfo/data.json | 126 ----------- .../module/archivesInfo/index.vue | 94 +++----- .../module/archivesInfo/metadata.json | 6 - .../module/blukEditing/index.vue | 205 +++++++++++------- .../module/collectHeader.vue | 86 +++++--- .../module/uploadFile/index.vue | 62 +++--- .../module/uploadOriginal/index.vue | 150 +++++++------ .../collectionLibrary/project/index.vue | 27 ++- 16 files changed, 577 insertions(+), 523 deletions(-) delete mode 100644 src/views/collectReorganizi/collectionLibrary/module/archivesInfo/data.json delete mode 100644 src/views/collectReorganizi/collectionLibrary/module/archivesInfo/metadata.json diff --git a/src/api/collect/collect.js b/src/api/collect/collect.js index 8184e91..d1a3d32 100644 --- a/src/api/collect/collect.js +++ b/src/api/collect/collect.js @@ -27,7 +27,7 @@ export function collectAdd(data) { }) } -// 添加项目/卷内/文件 +// 编辑项目/卷内/文件 export function collectEdit(data) { return request({ url: 'api/collect/editArchives', @@ -45,7 +45,7 @@ export function collectDel(data) { }) } -// 根据门类父id获取卷内列表 +// 根据id获取详细信息 export function FetchDetailsById(params) { return request({ url: 'api/collect/getDetailsById', @@ -54,6 +54,15 @@ export function FetchDetailsById(params) { }) } +// 根据门类父id获取电子原文列表 +export function FetchInitFileCategoryView(params) { + return request({ + url: 'api/collect/initFileCategoryView', + method: 'get', + params + }) +} + // 移出卷内 export function FetchRemoveArchivesSingle(data) { return request({ @@ -72,4 +81,34 @@ export function FetchAddArchivesFile(data) { }) } -export default { collectAdd, collectEdit, collectDel, FetchInitCategoryViewTable, FetchInitCategoryView, FetchDetailsById, FetchRemoveArchivesSingle, FetchAddArchivesFile } +// 删除电子原文 +export function FetchDeleteArchivesFile(data) { + return request({ + url: 'api/collect/deleteArchivesFile', + method: 'post', + data + }) +} + +// 批量修改 +export function FetchBatchUpdate(data) { + return request({ + url: '/api/collect/batchUpdate', + method: 'post', + data + }) +} + +export default { + collectAdd, + collectEdit, + collectDel, + FetchInitCategoryViewTable, + FetchInitCategoryView, + FetchDetailsById, + FetchInitFileCategoryView, + FetchRemoveArchivesSingle, + FetchAddArchivesFile, + FetchDeleteArchivesFile, + FetchBatchUpdate +} diff --git a/src/api/system/category/category.js b/src/api/system/category/category.js index 250438d..95a3be1 100644 --- a/src/api/system/category/category.js +++ b/src/api/system/category/category.js @@ -113,7 +113,7 @@ export function FetchUpardicSort(data) { }) } -// 著录界面排序 +// 根据父级门类id获取门类字段 export function FetchInitCategoryFieldByPid(params) { return request({ url: 'api/category/initCategoryFieldByPid', diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index a0577be..17c99ec 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -260,10 +260,10 @@ display: block; width: 66px; height: 28px; - line-height: 28px; + line-height: 26px; padding: 0; color: #fff; - border-radius: 2px; + border-radius: 3px; margin: 0 auto; &::before{ margin-right: 5px; @@ -271,8 +271,13 @@ } .file-down{ padding: 0 !important; - background-color: $mainColor; - border-color: $mainColor; + @include btn_blue_style; + &:hover{ + @include btn_blue_hover; + } + &:focus{ + @include btn_blue_style; + } } .packing-handle-btn{ background-color: $arcPurple; diff --git a/src/utils/upload.js b/src/utils/upload.js index 3c2c4fd..0eef283 100644 --- a/src/utils/upload.js +++ b/src/utils/upload.js @@ -13,10 +13,15 @@ export function upload(api, file) { // 档案上传附件 export function archivesUpload(api, file, categoryId) { var data = new FormData() - data.append('file', file) + // data.append('files', file) // 之前 + for (const item in file) { // 现在 + data.append('files', file[item]) + } data.append('categoryId', categoryId) const config = { - headers: { 'Authorization': getToken() } + headers: { + 'Authorization': getToken() + } } return axios.post(api, data, config) } diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue index 304212d..d4195c0 100644 --- a/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue +++ b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue @@ -49,7 +49,7 @@ /> - + @@ -182,24 +182,36 @@ export default { clearTimeout(this.timer) } this.arcId = row.id - if (this.selectedCategory.arrangeType !== 1) { - this.$refs.archivesInfo.isHasFile = false - if (this.activeIndex === 1) { - this.$refs.archivesInfo.detailTitle = '文件详情' - this.$refs.archivesInfo.isHasFile = true + this.$nextTick(() => { + if (this.selectedCategory.arrangeType !== 1) { + this.$refs.archivesInfo.isHasFile = false + if (this.activeIndex === 1) { + this.$refs.archivesInfo.detailTitle = '文件详情' + this.$refs.archivesInfo.isHasFile = true + this.$refs.archivesInfo.getDetial(3, row.id) + } else { + this.$refs.archivesInfo.detailTitle = '案卷详情' + this.$refs.archivesInfo.getDetial(2, row.id) + } } else { - this.$refs.archivesInfo.detailTitle = '案卷详情' + this.$refs.archivesInfo.isHasFile = true + this.$refs.archivesInfo.detailTitle = '文件详情' + this.$refs.archivesInfo.getDetial(3, row.id) } - } else { - this.$refs.archivesInfo.isHasFile = true - this.$refs.archivesInfo.detailTitle = '文件详情' - } - this.$refs.archivesInfo.archivesInfoVisible = true - this.$refs.archivesInfo.archivesTabIndex = 0 - // this.$refs.archivesInfo.getDetial(row.id) + this.$refs.archivesInfo.archivesInfoVisible = true + this.$refs.archivesInfo.archivesTabIndex = 0 + }) }, // table - 当前选中得row clickRowHandler(row) { + this.parentsData.smartQuery = { + 'retention': null, + 'security_class': null, + 'doc_type': null, + 'medium_type': null, + 'archive_year': null, + 'fonds_no': null + } if (this.timer) { clearTimeout(this.timer) } diff --git a/src/views/collectReorganizi/collectionLibrary/file/index.vue b/src/views/collectReorganizi/collectionLibrary/file/index.vue index 181e59f..4510ba0 100644 --- a/src/views/collectReorganizi/collectionLibrary/file/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/file/index.vue @@ -1,71 +1,82 @@