From 4cc035c54128321346f4baea2145262d53ef5bb4 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Tue, 2 Aug 2022 16:24:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86-=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/archives-manage.scss | 14 ++++++++- .../archivesList/archivesAnjuan/index.vue | 2 ++ .../archivesList/archivesJuannei/index.vue | 2 ++ .../archivesList/archivesProject/index.vue | 2 ++ .../module/archivesInfo/index.vue | 29 +++++++++++++++++-- .../components/lendArchivesList.vue | 6 +++- 6 files changed, 50 insertions(+), 5 deletions(-) diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 6fd6b09..224f965 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -157,7 +157,8 @@ $arcCyan: #0FBED9; } } -.archives-table{ +.archives-table, +.base-info{ ::v-deep td.el-table__cell .row-state{ display: block; height: 26px; @@ -206,6 +207,17 @@ $arcCyan: #0FBED9; max-height: calc(100vh - 434px) !important; } } +.base-info .row-state{ + width: 68px; + height: 26px; + line-height: 24px; + text-align: center; + margin-top: -6px; + border-width: 1px; + border-style: solid; + border-radius: 26px; +} + ::v-deep .archives-table.el-table .el-table__fixed-right{ background-color: #031435 !important; box-shadow: -5px 5px 10px 1px rgba(15,164,222,0.16); diff --git a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue index d78e04b..f24c02f 100644 --- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue +++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue @@ -332,6 +332,8 @@ export default { } else { this.$refs.archivesInfo.isHasFile = true } + this.$refs.archivesInfo.isDetailsInfo = true + this.$refs.archivesInfo.isTidOrBorrow = true this.arcId = row.id this.$refs.archivesInfo.detailTitle = '档案详情' this.$refs.archivesInfo.archivesInfoVisible = true diff --git a/src/views/archivesManage/archivesList/archivesJuannei/index.vue b/src/views/archivesManage/archivesList/archivesJuannei/index.vue index a93c26f..62c0d9b 100644 --- a/src/views/archivesManage/archivesList/archivesJuannei/index.vue +++ b/src/views/archivesManage/archivesList/archivesJuannei/index.vue @@ -248,6 +248,8 @@ export default { tableDoubleClick(row) { this.$refs.archivesInfo.isHasFile = true this.arcId = row.id + this.$refs.archivesInfo.isDetailsInfo = true + this.$refs.archivesInfo.isTidOrBorrow = false this.$refs.archivesInfo.detailTitle = '档案详情' this.$refs.archivesInfo.archivesInfoVisible = true this.$refs.archivesInfo.archivesTabIndex = 0 diff --git a/src/views/archivesManage/archivesList/archivesProject/index.vue b/src/views/archivesManage/archivesList/archivesProject/index.vue index 92d7c32..a085f6c 100644 --- a/src/views/archivesManage/archivesList/archivesProject/index.vue +++ b/src/views/archivesManage/archivesList/archivesProject/index.vue @@ -193,6 +193,8 @@ export default { // table - 双击查看详情 tableDoubleClick(row) { this.$refs.archivesInfo.isHasFile = false + this.$refs.archivesInfo.isDetailsInfo = false + this.$refs.archivesInfo.isTidOrBorrow = false this.arcId = row.id this.$refs.archivesInfo.detailTitle = '项目详情' this.$refs.archivesInfo.archivesInfoVisible = true diff --git a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue index 8b3da6b..bdaa40c 100644 --- a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue +++ b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue @@ -18,10 +18,10 @@

{{ item.context }}

- + {{ item.fieldCnName }}： -

{{ item.context }}

+

{{ item.context }}

 @@ -69,7 +69,9 @@ export default { data() { return { detailTitle: '', - isHasFile: false, + isHasFile: false, // 卷内/文件才有附件 + isDetailsInfo: false, // 项目不显示最下面5行基本信息 + isTidOrBorrow: true, // 卷内不显示tid/借阅状态 archivesInfoVisible: false, archivesTabIndex: 0, archivesDetailsData: [], @@ -87,6 +89,27 @@ export default { } FetchArchivesDetails(params).then(data => { this.archivesDetailsData = data + // 案卷 / 文件的借阅状态 + this.archivesDetailsData.forEach(item => { + if (item.fieldName === 'borrow_type') { + if (item.context === 1) { + item.context = '待登记' + } else if (item.context === 2) { + item.context = '待借阅' + } else if (item.context === 3) { + item.context = '待归还' + } else if (item.context === 4 || item.context === '') { + item.context = '-' + } + } + }) + // 如果是卷内 - 不显示‘tid’/'借阅状态' + if (!this.isTidOrBorrow) { + const indexBorrow = this.archivesDetailsData.findIndex(item => item.fieldName === 'borrow_type') + const indexTid = this.archivesDetailsData.findIndex(item => item.fieldName === 'tid') + this.archivesDetailsData.splice(indexBorrow, 1) + this.archivesDetailsData.splice(indexTid, 1) + } }) FetchArchivesMetadata(params).then(data => { this.archivesDetailsMetadata = data diff --git a/src/views/archivesManage/lendManage/components/lendArchivesList.vue b/src/views/archivesManage/lendManage/components/lendArchivesList.vue index c7d0431..6f8fce7 100644 --- a/src/views/archivesManage/lendManage/components/lendArchivesList.vue +++ b/src/views/archivesManage/lendManage/components/lendArchivesList.vue @@ -21,7 +21,11 @@ {{ scope.row.borrowType | borrowStatus }} - + + +