diff --git a/src/api/prearchiveLibrary/prearchiveLibrary.js b/src/api/prearchiveLibrary/prearchiveLibrary.js index a297c96..880c577 100644 --- a/src/api/prearchiveLibrary/prearchiveLibrary.js +++ b/src/api/prearchiveLibrary/prearchiveLibrary.js @@ -109,4 +109,12 @@ export function FetchArchivesMetadata(params) { }) } -export default { add, prearchEdit, del, FetchInitPreDocument, FetchInitDocumentsViewTable, FetchDoeditDocument, FetchBatchToFile, FetchMergeToFile, FetchMove, FetchArchivesDetails, FetchFileListByDocumentId, FetchArchivesMetadata } +export function FetchReDocumentBase64ByFileId(params) { + return request({ + url: 'api/re-document/getBase64ByFileId', + method: 'get', + params + }) +} + +export default { add, prearchEdit, del, FetchInitPreDocument, FetchInitDocumentsViewTable, FetchDoeditDocument, FetchBatchToFile, FetchMergeToFile, FetchMove, FetchArchivesDetails, FetchFileListByDocumentId, FetchArchivesMetadata, FetchReDocumentBase64ByFileId } diff --git a/src/views/archiveUtilize/archiveSearch/index.vue b/src/views/archiveUtilize/archiveSearch/index.vue index 87d3f82..edd238f 100644 --- a/src/views/archiveUtilize/archiveSearch/index.vue +++ b/src/views/archiveUtilize/archiveSearch/index.vue @@ -552,7 +552,7 @@ export default { display: flex; justify-content: flex-start; flex-wrap: wrap; - height: 200px; + max-height: 200px; overflow: hidden; overflow-y: scroll; span{ diff --git a/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue b/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue index a3c5fdb..af402c7 100644 --- a/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue +++ b/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue @@ -123,6 +123,9 @@ export default { 'archiveNo': this.parentInfo.find(item => item.fieldName === 'archive_no').context }}) window.open(routeData.href, '_blank') + if (localStorage.getItem('documentId')) { + localStorage.removeItem('documentId') + } localStorage.setItem('fileParentInfo', JSON.stringify(this.parentInfo)) localStorage.setItem('fileTables', JSON.stringify(this.tableData)) localStorage.setItem('fileCurrent', JSON.stringify(row)) diff --git a/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue b/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue index d633ffa..25b6044 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue @@ -283,6 +283,9 @@ export default { 'archiveNo': this.parentInfo.find(item => item.fieldName === 'archive_no').context }}) window.open(routeData.href, '_blank') + if (localStorage.getItem('documentId')) { + localStorage.removeItem('documentId') + } localStorage.setItem('fileParentInfo', JSON.stringify(this.parentInfo)) localStorage.setItem('fileTables', JSON.stringify(this.tableData)) localStorage.setItem('fileCurrent', JSON.stringify(row)) diff --git a/src/views/components/archivesDetail/detail.vue b/src/views/components/archivesDetail/detail.vue index 12a923b..4df81a0 100644 --- a/src/views/components/archivesDetail/detail.vue +++ b/src/views/components/archivesDetail/detail.vue @@ -38,7 +38,7 @@ - + @@ -137,6 +137,10 @@ export default { this.archivesTabIndex = index if (this.archivesTabIndex === 2) { this.setXml() + } else if (this.archivesTabIndex === 3) { + console.log(this.$refs.fourTestInfoRefs) + this.$refs.fourTestInfoRefs.currentArcId = this.arcId + this.$refs.fourTestInfoRefs.getFourCheckRecord(this.arcId) } else if (this.archivesTabIndex === 5) { if (this.isTitleType === 2) { this.$refs.archivesListModuleRef.detailLevel = 2 diff --git a/src/views/components/archivesDetail/fourTestInfo/index.vue b/src/views/components/archivesDetail/fourTestInfo/index.vue index 234f59e..b76886e 100644 --- a/src/views/components/archivesDetail/fourTestInfo/index.vue +++ b/src/views/components/archivesDetail/fourTestInfo/index.vue @@ -1,16 +1,17 @@ - - - + 双击列表数据查看报告详情 + + + - {{ scope.row.createTime | parseTime }} + {{ scope.row.create_time | parseTime }} - + - + @@ -20,9 +21,9 @@ - + - + @@ -32,14 +33,15 @@ - + - 共检测{{ scope.row.totalNum }}项,通过{{ scope.row.successNum }}条,未通过{{ scope.row.errorNum }}条 + 共检测{{ scope.row.checkNum }}项,通过{{ scope.row.passNum }}条,未通过{{ scope.row.failNum }}条