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 @@ - - + + + + - + - + + +