From 28279a3c41c12fc548120d7c3ff8fc2ea2854ff6 Mon Sep 17 00:00:00 2001 From: x_ying <2438792676@qq.com> Date: Thu, 16 Jun 2022 13:44:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=80=9F=E9=98=85=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E7=8A=B6=E6=80=81style=20=E6=8E=92=E5=BA=8F=20=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=8A=9F=E8=83=BD=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/lend-manage.scss | 55 +++++++++++++++++++ .../archivesManage/archivesCheck/index.vue | 3 - .../lendManage/borrowerManage/index.vue | 40 ++++++++------ .../lendManage/components/archiveDetail.vue | 15 ----- .../archivesManage/lendManage/data1.json | 38 +++++++------ src/views/archivesManage/lendManage/index.vue | 3 +- .../lendManage/lendConfirm/index.vue | 44 +++++++++++++-- .../lendManage/lendQuery/index.vue | 19 ++++++- .../lendManage/returnArchives/index.vue | 30 ++++++++-- .../lendManage/toLend/index.vue | 29 ++++------ 10 files changed, 193 insertions(+), 83 deletions(-) create mode 100644 src/assets/styles/lend-manage.scss delete mode 100644 src/views/archivesManage/lendManage/components/archiveDetail.vue diff --git a/src/assets/styles/lend-manage.scss b/src/assets/styles/lend-manage.scss new file mode 100644 index 0000000..e7d4f57 --- /dev/null +++ b/src/assets/styles/lend-manage.scss @@ -0,0 +1,55 @@ +.no-lend .cell-lend{ + color:#F65163; + border: 1px solid #F65163; + padding: 2px 8px; + border-radius: 11px; +} +.have-lend .cell-lend{ + color: #fff; + padding: 2px 8px; + border-radius: 11px; + background-color: #F65163; +} +.other-lend .cell-lend{ +color:#F65163; + border: 1px solid #F65163; + padding: 2px 8px; + border-radius: 11px; + position: relative; + display: inline-block; + width: 46px; + height: 22px; + &::after{ + content: ''; + display: block; + height: 2px; + width: 20px; + background-color: #F65163; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%,-50%); + } +} + +.clear{ + border-radius: 13px; + width: 80px; + height: 26px; + line-height: 26px; + display: inline-block; + text-align: center; +} +.no-clear .clear{ + color: #FD8042; + border: 1px solid #FD8042; +} +.have-clear .clear{ + color: #1AAE93; + border: 1px solid #1AAE93; +} +.fail-clear .clear{ + color: #F65163; + border: 1px solid #F65163; +} + diff --git a/src/views/archivesManage/archivesCheck/index.vue b/src/views/archivesManage/archivesCheck/index.vue index 2b98d7e..6956ca3 100644 --- a/src/views/archivesManage/archivesCheck/index.vue +++ b/src/views/archivesManage/archivesCheck/index.vue @@ -262,9 +262,6 @@ export default { padding: 0; margin: 0; } -// ::v-deep .el-dialog{ -// width: 1340px; -// } .el-form{ display: flex; diff --git a/src/views/archivesManage/lendManage/borrowerManage/index.vue b/src/views/archivesManage/lendManage/borrowerManage/index.vue index 792295b..8b3cf66 100644 --- a/src/views/archivesManage/lendManage/borrowerManage/index.vue +++ b/src/views/archivesManage/lendManage/borrowerManage/index.vue @@ -3,8 +3,8 @@ 新增 - 修改 - 删除 + 修改 + 删除 - - + + - + - + - - + + - + @@ -90,7 +90,6 @@ export default { }, // 重新登记 callBack(val) { - console.log(val, '-------------------') this.activeIndex = val.index } } diff --git a/src/views/archivesManage/lendManage/lendConfirm/index.vue b/src/views/archivesManage/lendManage/lendConfirm/index.vue index 23bbfdc..aadf7a7 100644 --- a/src/views/archivesManage/lendManage/lendConfirm/index.vue +++ b/src/views/archivesManage/lendManage/lendConfirm/index.vue @@ -3,7 +3,7 @@ 借出 重新登记 - 移出 + 移出 @@ -12,6 +12,8 @@ :data="tableData" style="min-width: 100%" height="calc(100vh - 355px)" + :cell-class-name="cell" + :default-sort="{ prop: 'isOperationTime', order: 'descending' }" @selection-change="selectionChangeHandler" @row-click="clickRowHandler" @row-dblclick="handleDbClick" @@ -26,19 +28,29 @@ - - + + + + - + - + + +
解除警报 @@ -110,6 +122,7 @@ export default { }, // 重新登记返回上一级 handelReRecord() { + console.log(11) this.$emit('callBack', { index: 0 }) }, // 移出 @@ -120,13 +133,31 @@ export default { const dialogTableDom = this.$refs.dialogTable const targetDialog = dialogTableDom.$refs.dialog targetDialog.style.width = '800px' + }, + cell({ row, columnIndex }) { + if (row.isLendStatus === '待借' && columnIndex === 10) { + return 'no-lend' + } else if (row.isLendStatus === '已借' && columnIndex === 10) { + return 'have-lend' + } else if (row.isLendStatus === '' && columnIndex === 10) { + return 'other-lend' + } + }, + cellWarn({ row, columnIndex }) { + if (row.isWarnState === '已解除' && columnIndex === 4) { + return 'no-clear' + } else if (row.isWarnState === '未解除' && columnIndex === 4) { + return 'have-clear' + } else if (row.isWarnState === '解除失败' && columnIndex === 4) { + return 'fail-clear' + } } } } diff --git a/src/views/archivesManage/lendManage/lendQuery/index.vue b/src/views/archivesManage/lendManage/lendQuery/index.vue index daa8d48..8d735b2 100644 --- a/src/views/archivesManage/lendManage/lendQuery/index.vue +++ b/src/views/archivesManage/lendManage/lendQuery/index.vue @@ -45,12 +45,18 @@ style="min-width: 100%" height="calc(100vh - 355px)" :data="tableData" + :cell-class-name="cell" @selection-change="selectionChangeHandler" @row-click="clickRowHandler" > - + + + @@ -59,6 +65,7 @@ + @@ -126,12 +133,22 @@ export default { }, clickRowHandler(row) { this.$refs.table.toggleRowSelection(row) + }, + cell({ row, columnIndex }) { + if (row.isLendStatus === '待借' && columnIndex === 2) { + return 'no-lend' + } else if (row.isLendStatus === '已借' && columnIndex === 2) { + return 'have-lend' + } else if (row.isLendStatus === '' && columnIndex === 2) { + return 'other-lend' + } } } } diff --git a/src/views/archivesManage/lendManage/toLend/index.vue b/src/views/archivesManage/lendManage/toLend/index.vue index 9d34167..d5a75ba 100644 --- a/src/views/archivesManage/lendManage/toLend/index.vue +++ b/src/views/archivesManage/lendManage/toLend/index.vue @@ -1,8 +1,8 @@