diff --git a/src/api/collect/collect.js b/src/api/collect/collect.js index fcb0e4b..555bb4c 100644 --- a/src/api/collect/collect.js +++ b/src/api/collect/collect.js @@ -232,6 +232,24 @@ export function FetchFourCheck(data) { }) } +// 根据档案获取四性检测记录列表 +export function FetchFourCheckRecord(params) { + return request({ + url: 'api/collect/getFourCheckRecord', + method: 'get', + params + }) +} + +// 根据检测单id获取四性检测记录 +export function FetchFourCheckRecordTreeByReportId(params) { + return request({ + url: 'api/collect/getFourCheckRecordTreeByReportId', + method: 'get', + params + }) +} + // 彻底删除档案 export function FetchCompleteDelArchives(data) { return request({ @@ -319,6 +337,8 @@ export default { FetchReturnReDocument, FetchPreFastToArchives, FetchFourCheck, + FetchFourCheckRecord, + FetchFourCheckRecordTreeByReportId, FetchBecomeDocumentConfirm, FetchCompleteDelArchives, FetchRestoreArchives, diff --git a/src/views/archiveKeeping/caseManage/caseList/index.vue b/src/views/archiveKeeping/caseManage/caseList/index.vue index 4f67092..3533725 100644 --- a/src/views/archiveKeeping/caseManage/caseList/index.vue +++ b/src/views/archiveKeeping/caseManage/caseList/index.vue @@ -73,7 +73,12 @@ @selection-change="crud.selectionChangeHandler" > - + + + {{ (crud.page.page === 1 ? 0 : (crud.page.page === 0 ? 0 : crud.page.page - 1)) * crud.page.size + scope.$index + 1 }} + + + {{ scope.row.storageType | storageTypeStatus }} diff --git a/src/views/archiveKeeping/caseManage/caseLog/index.vue b/src/views/archiveKeeping/caseManage/caseLog/index.vue index 89414be..df1566a 100644 --- a/src/views/archiveKeeping/caseManage/caseLog/index.vue +++ b/src/views/archiveKeeping/caseManage/caseLog/index.vue @@ -56,7 +56,12 @@ @row-click="clickRowHandler" > - + + + {{ (crud.page.page === 1 ? 0 : (crud.page.page === 0 ? 0 : crud.page.page - 1)) * crud.page.size + scope.$index + 1 }} + + + {{ scope.row.operationType === 1 ? '装盒' : '拆盒' }} diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/tableList.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/tableList.vue index 5def1e1..235321f 100644 --- a/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/tableList.vue +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/tableList.vue @@ -19,7 +19,12 @@ @select="handleCurrentChange" > - + + + {{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }} + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/file/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/file/index.vue index f9bb91c..50015ef 100644 --- a/src/views/archiveKeeping/inStorage/pendingInArchive/file/index.vue +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/file/index.vue @@ -30,7 +30,12 @@ @select="handleCurrentChange" > - + + + {{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }} + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/juannei/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/juannei/index.vue index d8e4227..3464384 100644 --- a/src/views/archiveKeeping/inStorage/pendingInArchive/juannei/index.vue +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/juannei/index.vue @@ -28,7 +28,12 @@ @select="handleCurrentChange" > - + + + {{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }} + + + {{ scope.row.child === '' ? 0 : scope.row.child }} diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/project/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/project/index.vue index df2e191..94f2976 100644 --- a/src/views/archiveKeeping/inStorage/pendingInArchive/project/index.vue +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/project/index.vue @@ -19,7 +19,12 @@ @select="handleCurrentChange" > - + + + {{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }} + + + {{ scope.row.child === '' ? 0 : scope.row.child }} diff --git a/src/views/archiveKeeping/inStorage/pendingInCase/index.vue b/src/views/archiveKeeping/inStorage/pendingInCase/index.vue index 88136e0..c1604a7 100644 --- a/src/views/archiveKeeping/inStorage/pendingInCase/index.vue +++ b/src/views/archiveKeeping/inStorage/pendingInCase/index.vue @@ -62,7 +62,12 @@ @selection-change="selectionChangeHandler" > - + + + {{ (crud.page.page === 1 ? 0 : (crud.page.page === 0 ? 0 : crud.page.page - 1)) * crud.page.size + scope.$index + 1 }} + + + {{ scope.row.storageType | storageTypeStatus }} diff --git a/src/views/archiveKeeping/tidManage/tidList/index.vue b/src/views/archiveKeeping/tidManage/tidList/index.vue index ce07c6d..61ade16 100644 --- a/src/views/archiveKeeping/tidManage/tidList/index.vue +++ b/src/views/archiveKeeping/tidManage/tidList/index.vue @@ -56,7 +56,12 @@ @selection-change="crud.selectionChangeHandler" > - + + + {{ (crud.page.page === 1 ? 0 : (crud.page.page === 0 ? 0 : crud.page.page - 1)) * crud.page.size + scope.$index + 1 }} + + + 档案 diff --git a/src/views/archiveKeeping/tidManage/tidLog/index.vue b/src/views/archiveKeeping/tidManage/tidLog/index.vue index 0f63974..f9aa4e0 100644 --- a/src/views/archiveKeeping/tidManage/tidLog/index.vue +++ b/src/views/archiveKeeping/tidManage/tidLog/index.vue @@ -70,7 +70,12 @@ @row-click="clickRowHandler" > - + + + {{ (crud.page.page === 1 ? 0 : (crud.page.page === 0 ? 0 : crud.page.page - 1)) * crud.page.size + scope.$index + 1 }} + + + 绑定 diff --git a/src/views/archivesManage/managementLibrary/anjuan/tableList.vue b/src/views/archivesManage/managementLibrary/anjuan/tableList.vue index 8318c12..2dd5305 100644 --- a/src/views/archivesManage/managementLibrary/anjuan/tableList.vue +++ b/src/views/archivesManage/managementLibrary/anjuan/tableList.vue @@ -19,7 +19,12 @@ @select="handleCurrentChange" > - + + + {{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }} + + + {{ scope.row.child === '' ? 0 : scope.row.child }} diff --git a/src/views/archivesManage/managementLibrary/file/index.vue b/src/views/archivesManage/managementLibrary/file/index.vue index 340021d..dc94ef6 100644 --- a/src/views/archivesManage/managementLibrary/file/index.vue +++ b/src/views/archivesManage/managementLibrary/file/index.vue @@ -30,7 +30,12 @@ @select="handleCurrentChange" > - + + + {{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }} + + + diff --git a/src/views/archivesManage/managementLibrary/juannei/index.vue b/src/views/archivesManage/managementLibrary/juannei/index.vue index 8344ead..4d1ca09 100644 --- a/src/views/archivesManage/managementLibrary/juannei/index.vue +++ b/src/views/archivesManage/managementLibrary/juannei/index.vue @@ -28,7 +28,12 @@ @select="handleCurrentChange" > - + + + {{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }} + + + {{ scope.row.child === '' ? 0 : scope.row.child }} diff --git a/src/views/archivesManage/managementLibrary/project/index.vue b/src/views/archivesManage/managementLibrary/project/index.vue index 17aa740..dd105c4 100644 --- a/src/views/archivesManage/managementLibrary/project/index.vue +++ b/src/views/archivesManage/managementLibrary/project/index.vue @@ -20,7 +20,12 @@ @select="handleCurrentChange" > - + + + {{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }} + + + {{ scope.row.child === '' ? 0 : scope.row.child }} diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue index e4c2cfb..db7e20a 100644 --- a/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue +++ b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue @@ -19,7 +19,12 @@ @select="handleCurrentChange" > - + + + {{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }} + + + {{ scope.row.child === '' ? 0 : scope.row.child }} diff --git a/src/views/collectReorganizi/collectionLibrary/file/index.vue b/src/views/collectReorganizi/collectionLibrary/file/index.vue index 939c0e6..4418ca9 100644 --- a/src/views/collectReorganizi/collectionLibrary/file/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/file/index.vue @@ -29,7 +29,12 @@ @select="handleCurrentChange" > - + + + {{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }} + + + diff --git a/src/views/collectReorganizi/collectionLibrary/juannei/index.vue b/src/views/collectReorganizi/collectionLibrary/juannei/index.vue index 70ce0a8..f2a9a6a 100644 --- a/src/views/collectReorganizi/collectionLibrary/juannei/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/juannei/index.vue @@ -27,7 +27,12 @@ @select="handleCurrentChange" > - + + + {{ (page.page === 1 ? 0 : (page.page === 0 ? 0 : page.page - 1)) * page.size + scope.$index + 1 }} + + + {{ scope.row.child === '' ? 0 : scope.row.child }} diff --git a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue index 5c381d1..272cea9 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue @@ -39,7 +39,7 @@ - + @@ -140,6 +140,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 @@ -160,6 +164,20 @@ export default { } }) }, + // getFourCheckRecord() { + // const params = { + // 'archivesId': this.arcId + // } + // FetchFourCheckRecord(params).then(data => { + // console.log(data) + // if (data.content && data.content.length !== 0) { + // this.$refs.fourTestInfoRefs.tableData = data.content + // this.$refs.fourTestInfoRefs.page.total = data.totalElements + // } else { + // this.$refs.fourTestInfoRefs.tableData = [] + // } + // }) + // }, // 删除 - 关闭 handleClose(done) { this.archivesInfoVisible = false diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue index a03646a..975c187 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue @@ -1044,6 +1044,9 @@ export default { return false } this.$refs.fourTestRef.fourTestVisible = true + this.selections.forEach((item, index) => { + this.$set(this.selections[index], 'reportResult', {}) + }) this.$refs.fourTestRef.tableData = this.selections }, // 目录下载 diff --git a/src/views/collectReorganizi/collectionLibrary/module/fourTest/index.vue b/src/views/collectReorganizi/collectionLibrary/module/fourTest/index.vue index 733ca0f..32c2957 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/fourTest/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/fourTest/index.vue @@ -1,29 +1,43 @@ - + - + - - - - + + + + + - + + + + + + + - + + + + + + + - + + + + + + + - + + - - -