From 940cd25b0cff38cb1ac25123339ebdb62951783a Mon Sep 17 00:00:00 2001 From: x_ying <2438792676@qq.com> Date: Fri, 24 Jun 2022 08:51:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=80=9F=E9=98=85=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=80=9F=E8=BF=98=E5=8E=9F=E5=9E=8B=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/lend-manage.scss | 17 +- .../archivesManage/archivesCheck/data1.json | 151 +++++++++--------- .../archivesManage/archivesCheck/index.vue | 40 +++-- .../archivesCheck/module/checkDetail.vue | 42 +++-- .../lendManage/borrowerManage/index.vue | 3 +- .../archivesManage/lendManage/data1.json | 12 ++ .../archivesManage/lendManage/data3.json | 17 +- src/views/archivesManage/lendManage/index.vue | 42 ++--- .../lendManage/lendConfirm/index.vue | 32 ++-- .../lendConfirm/module/archiveDetail.vue | 6 +- .../lendConfirm/module/lendDialog.vue | 3 +- .../lendManage/lendQuery/index.vue | 13 +- .../lendQuery/module/archiveDetail.vue | 2 +- .../lendManage/returnArchives/index.vue | 50 +++--- .../returnArchives/module/archiveDetail.vue | 8 +- .../returnArchives/module/returnDialog.vue | 60 +++++++ .../lendManage/toLend/index.vue | 11 +- 17 files changed, 312 insertions(+), 197 deletions(-) create mode 100644 src/views/archivesManage/lendManage/returnArchives/module/returnDialog.vue diff --git a/src/assets/styles/lend-manage.scss b/src/assets/styles/lend-manage.scss index e7d4f57..9e53e97 100644 --- a/src/assets/styles/lend-manage.scss +++ b/src/assets/styles/lend-manage.scss @@ -1,24 +1,23 @@ +.cell-lend{ + display: inline-block; + height: 26px; + line-height: 26px; + border-radius: 13px; + text-align: center; +} .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; diff --git a/src/views/archivesManage/archivesCheck/data1.json b/src/views/archivesManage/archivesCheck/data1.json index 7f5f107..f37d05f 100644 --- a/src/views/archivesManage/archivesCheck/data1.json +++ b/src/views/archivesManage/archivesCheck/data1.json @@ -3,99 +3,106 @@ "rows":[ { "id":"29f16d62bc7242d5ba8dc84de5451f93", - "isCheckNum":"PD-202205250840", - "isContainPath":"父区域-子区域，父区域-子区域1", - "isCheckState":"已执行", - "isStoreNum":"233", - "isCheckedNum":"230", - "isNoCheckNum":"3", - "isLendNum":"111", - "isMisplaceNum":"20", - "isBuildTime":"2022-5-25 08:40" + "checkNum":"PD-202205250840", + "containPath":"父区域-子区域，父区域-子区域1", + "checkState":"已执行", + "storeNum":"233", + "CheckedNum":"230", + "noCheckNum":"3", + "haveLendNum":"111", + "misplaceNum":"20", + "CreateTime":"2022-5-25 08:40", + "checkResult":"在库" }, { "id":"3d6d548d30db426ea3d95d63f589b294", - "isCheckNum":"PD-202205250840", - "isContainPath":"父区域-子区域，父区域-子区域1", - "isCheckState":"已执行", - "isStoreNum":"233", - "isCheckedNum":"230", - "isNoCheckNum":"3", - "isLendNum":"111", - "isMisplaceNum":"20", - "isBuildTime":"2022-5-25 08:41" + "checkNum":"PD-202205250840", + "containPath":"父区域-子区域，父区域-子区域1", + "checkState":"已执行", + "storeNum":"233", + "CheckedNum":"230", + "noCheckNum":"3", + "haveLendNum":"111", + "misplaceNum":"20", + "CreateTime":"2022-5-25 08:41", + "checkResult":"在库" }, { "id":"45ff597e7cc64d11803ac422816b1e23", - "isCheckNum":"PD-202205250840", - "isContainPath":"父区域-子区域，父区域-子区域1", - "isCheckState":"待执行", - "isStoreNum":"233", - "isCheckedNum":"230", - "isNoCheckNum":"3", - "isLendNum":"111", - "isMisplaceNum":"20", - "isBuildTime":"2022-5-25 08:42" + "checkNum":"PD-202205250840", + "containPath":"父区域-子区域，父区域-子区域1", + "checkState":"待执行", + "storeNum":"233", + "CheckedNum":"230", + "noCheckNum":"3", + "haveLendNum":"111", + "misplaceNum":"20", + "CreateTime":"2022-5-25 08:42", + "checkResult":"已借" }, { "id":"49106aa0d1534a7a900843d0c4531840", - "isCheckNum":"PD-202205250840", - "isContainPath":"父区域-子区域，父区域-子区域1", - "isCheckState":"待执行", - "isStoreNum":"233", - "isCheckedNum":"230", - "isNoCheckNum":"3", - "isLendNum":"111", - "isMisplaceNum":"20", - "isBuildTime":"2022-5-25 08:50" + "checkNum":"PD-202205250840", + "containPath":"父区域-子区域，父区域-子区域1", + "checkState":"待执行", + "storeNum":"233", + "CheckedNum":"230", + "noCheckNum":"3", + "haveLendNum":"111", + "misplaceNum":"20", + "CreateTime":"2022-5-25 08:50", + "checkResult":"错位" }, { "id":"6e604355ff1e47e8b48117dca36420c7", - "isCheckNum":"PD-202205250841", - "isContainPath":"父区域-子区域，父区域-子区域1", - "isCheckState":"执行中", - "isStoreNum":"233", - "isCheckedNum":"230", - "isNoCheckNum":"3", - "isLendNum":"111", - "isMisplaceNum":"20", - "isBuildTime":"2022-5-25 08:40" + "checkNum":"PD-202205250841", + "containPath":"父区域-子区域，父区域-子区域1", + "checkState":"执行中", + "storeNum":"233", + "CheckedNum":"230", + "noCheckNum":"3", + "haveLendNum":"111", + "misplaceNum":"20", + "CreateTime":"2022-5-25 08:40", + "checkResult":"错位" }, { "id":"6f4a6631d9d3424b960793704f3757b3", - "isCheckNum":"PD-202205250841", - "isContainPath":"父区域-子区域，父区域-子区域1", - "isCheckState":"执行中", - "isStoreNum":"233", - "isCheckedNum":"230", - "isNoCheckNum":"3", - "isLendNum":"111", - "isMisplaceNum":"20", - "isBuildTime":"2022-5-25 08:40" + "checkNum":"PD-202205250841", + "containPath":"父区域-子区域，父区域-子区域1", + "checkState":"执行中", + "storeNum":"233", + "CheckedNum":"230", + "noCheckNum":"3", + "haveLendNum":"111", + "misplaceNum":"20", + "CreateTime":"2022-5-25 08:40", + "checkResult":"错位" + }, { "id":"76e29d5c0a0541bfb1ee9da432183b15", - "isCheckNum":"PD-202205250842", - "isContainPath":"父区域-子区域，父区域-子区域1", - "isCheckState":"已执行", - "isStoreNum":"233", - "isCheckedNum":"230", - "isNoCheckNum":"3", - "isLendNum":"111", - "isMisplaceNum":"20", - "isBuildTime":"2022-5-25 08:40" + "checkNum":"PD-202205250842", + "containPath":"父区域-子区域，父区域-子区域1", + "checkState":"已执行", + "storeNum":"233", + "CheckedNum":"230", + "noCheckNum":"3", + "haveLendNum":"111", + "misplaceNum":"20", + "CreateTime":"2022-5-25 08:40" }, { "id":"a0ffdd94161146c49161662c3f9a70cd", - "isCheckNum":"PD-202205250842", - "isContainPath":"父区域-子区域，父区域-子区域1", - "isCheckState":"已执行", - "isStoreNum":"233", - "isCheckedNum":"230", - "isNoCheckNum":"3", - "isLendNum":"111", - "isMisplaceNum":"20", - "isBuildTime":"2022-5-25 08:40" + "checkNum":"PD-202205250842", + "containPath":"父区域-子区域，父区域-子区域1", + "checkState":"已执行", + "storeNum":"233", + "CheckedNum":"230", + "noCheckNum":"3", + "haveLendNum":"111", + "misplaceNum":"20", + "CreateTime":"2022-5-25 08:40" } ], "footer":null, diff --git a/src/views/archivesManage/archivesCheck/index.vue b/src/views/archivesManage/archivesCheck/index.vue index 78ffcbf..64b3e87 100644 --- a/src/views/archivesManage/archivesCheck/index.vue +++ b/src/views/archivesManage/archivesCheck/index.vue @@ -46,25 +46,20 @@ > - - - + + + - - - - - - - + + + + + + @@ -100,6 +95,7 @@ import addCheck from './module/addCheck.vue' import checkDetail from './module/checkDetail.vue' export default { + name: 'ArchivesCheck', components: { pagination, rrOperation, addCheck, checkDetail }, mixins: [header(), presenter()], cruds() { @@ -146,11 +142,11 @@ export default { console.log('close') }, cell({ row, columnIndex }) { - if (row.isCheckState === '已执行' && columnIndex === 4) { + if (row.checkState === '已执行' && columnIndex === 4) { return 'have-clear' - } else if (row.isCheckState === '待执行' && columnIndex === 4) { + } else if (row.checkState === '待执行' && columnIndex === 4) { return 'fail-clear' - } else if (row.isCheckState === '执行中' && columnIndex === 4) { + } else if (row.checkState === '执行中' && columnIndex === 4) { return 'no-clear' } }, @@ -165,14 +161,14 @@ export default { const checkDetailDom = this.$refs.checkDetailDom checkDetailDom.detailVisible = true checkDetailDom.rowData = row - const arr = data1.rows.filter(item => item.isCheckNum === row.isCheckNum) + const arr = data1.rows.filter(item => item.checkNum === row.checkNum) checkDetailDom.tableData = arr // 状态类名 - if (row.isCheckState === '已执行') { + if (row.checkState === '已执行') { checkDetailDom.classLend = 'have-clear' - } else if (row.isCheckState === '待执行') { + } else if (row.checkState === '待执行') { checkDetailDom.classLend = 'fail-clear' - } else if (row.isCheckState === '执行中') { + } else if (row.checkState === '执行中') { checkDetailDom.classLend = 'no-clear' } } diff --git a/src/views/archivesManage/archivesCheck/module/checkDetail.vue b/src/views/archivesManage/archivesCheck/module/checkDetail.vue index f055c30..7ab9de3 100644 --- a/src/views/archivesManage/archivesCheck/module/checkDetail.vue +++ b/src/views/archivesManage/archivesCheck/module/checkDetail.vue @@ -5,21 +5,26 @@
-

盘点单号:{{ rowData.isCheckNum }}

-

盘点状态:{{ rowData.isCheckState }}

-

已盘档案:{{ rowData.isCheckedNum }}

-

已借档案:{{ rowData.isLendNum }}

+

盘点单号:{{ rowData.checkNum }}

+

盘点状态:{{ rowData.checkState }}

+

已盘档案:{{ rowData.CheckedNum }}

+

已借档案:{{ rowData.haveLendNum }}

-

所在区域:{{ rowData.isContainPath }}

-

在库档案:{{ rowData.isStoreNum }}

-

未盘档案:{{ rowData.isNoCheckNum }}

-

错位档案:{{ rowData.isMisplaceNum }}

+

所在区域:{{ rowData.containPath }}

+

在库档案:{{ rowData.storeNum }}

+

未盘档案:{{ rowData.noCheckNum }}

+

错位档案:{{ rowData.misplaceNum }}

-

创建时间:{{ rowData.isBuildTime }}

- +

创建时间:{{ rowData.CreateTime }}

+ - + + + @@ -29,8 +34,8 @@ - - + +
@@ -45,6 +50,17 @@ export default { rowData: {}, classLend: '' } + }, + methods: { + cell({ row, columnIndex }) { + if (row.checkResult === '已借' && columnIndex === 1) { + return 'have-clear' + } else if (row.checkResult === '错位' && columnIndex === 1) { + return 'fail-clear' + } else if (row.checkResult === '在库' && columnIndex === 1) { + return 'no-clear' + } + } } } diff --git a/src/views/archivesManage/lendManage/borrowerManage/index.vue b/src/views/archivesManage/lendManage/borrowerManage/index.vue index e6fefe3..3aeb34c 100644 --- a/src/views/archivesManage/lendManage/borrowerManage/index.vue +++ b/src/views/archivesManage/lendManage/borrowerManage/index.vue @@ -13,7 +13,7 @@ size="small" placeholder="请输入关键词" prefix-icon="el-icon-search" - style="width: 200px; margin-left: 10px" + style="width: 200px; margin:0 10px 0 10px;" class="filter-item" @keyup.enter.native="crud.toQuery" /> @@ -209,6 +209,7 @@ import rrOperation from '@crud/RR.operation' // import crudOperation from '@crud/CRUD.operation' import data1 from '../data1.json' export default { + name: 'BorrowerManage', components: { headSlot, pagination, rrOperation }, mixins: [presenter(), header()], cruds() { diff --git a/src/views/archivesManage/lendManage/data1.json b/src/views/archivesManage/lendManage/data1.json index 44c668f..c73e648 100644 --- a/src/views/archivesManage/lendManage/data1.json +++ b/src/views/archivesManage/lendManage/data1.json @@ -10,6 +10,7 @@ "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", "lendStatus":"", + "noLendStatus":"待借阅", "operationTime":"2022-05-26 14:02", "borrowerName":"李四", "borrowDays":"2022-5-25至2022-6-25", @@ -32,6 +33,7 @@ "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", "lendStatus":"已借", + "noLendStatus":"待借阅", "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -53,6 +55,7 @@ "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", "lendStatus":"待借", + "noLendStatus":"待借阅", "operationTime":"2022-05-27 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -75,6 +78,7 @@ "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", "lendStatus":"待借", + "noLendStatus":"待借阅", "operationTime":"2022-05-28 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -97,6 +101,7 @@ "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", "lendStatus":"待借", + "noLendStatus":"待借阅", "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -118,6 +123,7 @@ "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", "lendStatus":"已借", + "noLendStatus":"待借阅", "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -139,6 +145,7 @@ "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", "lendStatus":"待借", + "noLendStatus":"待借阅", "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -158,6 +165,7 @@ "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", "lendStatus":"已借", + "noLendStatus":"待借阅", "operationTime":"2022-07-25 14:02", "borrowerName":"王五", "borrowDays":"2022-5-25至2022-6-25", @@ -177,6 +185,7 @@ "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", "lendStatus":"待借", + "noLendStatus":"待借阅", "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -195,6 +204,7 @@ "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", "lendStatus":"", + "noLendStatus":"待借阅", "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -213,6 +223,7 @@ "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", "lendStatus":"", + "noLendStatus":"待借阅", "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -231,6 +242,7 @@ "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", "lendStatus":"待借", + "noLendStatus":"待借阅", "operationTime":"2022-06-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", diff --git a/src/views/archivesManage/lendManage/data3.json b/src/views/archivesManage/lendManage/data3.json index 7c6727e..f8fc0ea 100644 --- a/src/views/archivesManage/lendManage/data3.json +++ b/src/views/archivesManage/lendManage/data3.json @@ -19,6 +19,7 @@ "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", "warnState":"已解除", + "warnRestoreState":"已恢复", "docNum":"JY202205050001", "archiveNum":"1", "lendHandler":"管理员" @@ -41,6 +42,7 @@ "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", "warnState":"已解除", + "warnRestoreState":"已恢复", "docNum":"JY202205050002", "lendHandler":"管理员" }, @@ -62,6 +64,7 @@ "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", "warnState":"未解除", + "warnRestoreState":"未恢复", "docNum":"JY202205050003", "archiveNum":"1", "lendHandler":"管理员" @@ -84,6 +87,7 @@ "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", "warnState":"未解除", + "warnRestoreState":"未恢复", "docNum":"JY202205050004", "archiveNum":"1", "lendHandler":"管理员" @@ -96,7 +100,7 @@ "titleName":"这是一份文件的标题标题...", "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", - "lendStatus":"待还", + "lendStatus":"待归还", "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -128,6 +132,7 @@ "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", "warnState":"解除失败", + "warnRestoreState":"恢复失败", "docNum":"JY202205050006", "archiveNum":"1" }, @@ -158,7 +163,7 @@ "titleName":"这是一份文件的标题标题...", "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", - "lendStatus":"待还", + "lendStatus":"待归还", "operationTime":"2022-07-25 14:02", "borrowerName":"王五", "borrowDays":"2022-5-25至2022-6-25", @@ -177,7 +182,7 @@ "titleName":"这是一份文件的标题标题...", "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", - "lendStatus":"待还", + "lendStatus":"待归还", "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -195,7 +200,7 @@ "titleName":"这是一份文件的标题标题...", "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", - "lendStatus":"待还", + "lendStatus":"待归还", "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -213,7 +218,7 @@ "titleName":"这是一份文件的标题标题...", "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", - "lendStatus":"待还", + "lendStatus":"待归还", "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", @@ -231,7 +236,7 @@ "titleName":"这是一份文件的标题标题...", "fieldName":"文书-文件-2022", "storagePath":"库房A-库区A-01列-1节1层-左", - "lendStatus":"待还", + "lendStatus":"待归还", "operationTime":"2022-06-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", diff --git a/src/views/archivesManage/lendManage/index.vue b/src/views/archivesManage/lendManage/index.vue index caf210b..b220305 100644 --- a/src/views/archivesManage/lendManage/index.vue +++ b/src/views/archivesManage/lendManage/index.vue @@ -6,36 +6,12 @@
    -
  • - 待借档案 -
    • -
  • - 借出确认 -
    • -
  • - 归还档案 -
    • -
  • - 借阅查询 -
    • -
  • - 借阅者管理 -
    • +
  • 待借档案
    • +
  • 借出确认
    • +
  • 归还确认
    • +
  • 借还记录
    • +
  • 借阅者管理
    • +
  • 借阅流程管理
@@ -52,6 +28,7 @@ import lendConfirm from './lendConfirm/index.vue' import returnArchives from './returnArchives/index.vue' import lendQuery from './lendQuery/index.vue' import borrowerManage from './borrowerManage/index.vue' +import lendProcess from './lendProcess/index.vue' export default { name: 'BorrowManage', @@ -60,7 +37,8 @@ export default { lendConfirm, returnArchives, lendQuery, - borrowerManage + borrowerManage, + lendProcess }, data() { return { @@ -80,6 +58,8 @@ export default { return 'lendQuery' } else if (this.activeIndex === 4) { return 'borrowerManage' + } else if (this.activeIndex === 5) { + return 'lendProcess' } return 'toLend' } diff --git a/src/views/archivesManage/lendManage/lendConfirm/index.vue b/src/views/archivesManage/lendManage/lendConfirm/index.vue index 87a59b8..769d437 100644 --- a/src/views/archivesManage/lendManage/lendConfirm/index.vue +++ b/src/views/archivesManage/lendManage/lendConfirm/index.vue @@ -32,10 +32,10 @@ - + @@ -123,20 +123,30 @@ export default { }, // 移出 handleRemove() { - this.$refs.delConfirmDom.deleteVisible = true + if (this.selections.length > 0) { + this.$refs.delConfirmDom.deleteVisible = true + } else { + this.$message({ + message: '请选择要移出当前列表的档案', + type: 'warning' + }) + } }, cell({ row, columnIndex }) { - if (row.lendStatus === '待借' && columnIndex === 11) { + if (columnIndex === 11) { return 'no-lend' - } else if (row.lendStatus === '已借' && columnIndex === 11) { - return 'have-lend' - } else if (row.lendStatus === '' && columnIndex === 11) { - return 'other-lend' } }, handleLendBtn() { - this.$refs.lendDialogDom.table = this.selections - this.$refs.lendDialogDom.lendFormVisible = true + if (this.selections.length > 0) { + this.$refs.lendDialogDom.table = this.selections + this.$refs.lendDialogDom.lendFormVisible = true + } else { + this.$message({ + message: '请选择要借出的档案', + type: 'warning' + }) + } } } } diff --git a/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue b/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue index 429130e..5b32c50 100644 --- a/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue +++ b/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue @@ -7,7 +7,7 @@

借阅人:{{ rowData[0].borrowerName }}

所属部门:{{ rowData[0].borrowerDepartment }}

-

借阅状态:{{ rowData[0].lendStatus }}

+

借阅状态:{{ rowData[0].lendStatus }}

证件类型:{{ rowData[0].borrowerIdType }}

@@ -54,7 +54,8 @@ export default { } ::v-deep .el-dialog .el-dialog__header .el-dialog__close::before{ position: absolute; - right: -280px; + right: -283px; + bottom: -10px; } p{ display: flex; @@ -83,6 +84,7 @@ p{ flex: 1; .cell-lend{ margin-left: 20px; + width: 76px; } } } diff --git a/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue b/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue index 7dce781..baf295a 100644 --- a/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue +++ b/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue @@ -53,7 +53,8 @@ export default { } ::v-deep .el-dialog .el-dialog__header .el-dialog__close::before{ position: absolute; - right: -154px; + right: -163px; + bottom: -4px; } diff --git a/src/views/archivesManage/lendManage/lendQuery/index.vue b/src/views/archivesManage/lendManage/lendQuery/index.vue index 52ccc1f..c5c59bf 100644 --- a/src/views/archivesManage/lendManage/lendQuery/index.vue +++ b/src/views/archivesManage/lendManage/lendQuery/index.vue @@ -55,10 +55,11 @@ - + + @@ -66,7 +67,7 @@ - + @@ -84,6 +85,7 @@ import crudOperation from '@crud/CRUD.operation' import data3 from '../data3.json' import archiveDetail from '../returnArchives/module/archiveDetail.vue' export default { + name: 'LendQuery', components: { headSlot, pagination, rrOperation, crudOperation, archiveDetail }, mixins: [presenter()], cruds() { @@ -141,7 +143,7 @@ export default { cell({ row, columnIndex }) { if (row.lendStatus === '逾期' && columnIndex === 2) { return 'no-lend' - } else if (row.lendStatus === '待还' && columnIndex === 2) { + } else if (row.lendStatus === '待归还' && columnIndex === 2) { return 'have-lend' } }, @@ -153,7 +155,7 @@ export default { const arr = data3.rows.filter(item => item.docNum === row.docNum) archiveDetailDom.rowData = arr // 借阅状态样式类名 - if (arr[0].lendStatus === '待还') { + if (arr[0].lendStatus === '待归还') { archiveDetailDom.classLend = 'have-lend' } else if (arr[0].lendStatus === '逾期') { archiveDetailDom.classLend = 'no-lend' @@ -179,6 +181,7 @@ export default { background-color: #021941; border: none; caret-color: #fff; + color: #fff; height: 28px; line-height: 28px; } diff --git a/src/views/archivesManage/lendManage/lendQuery/module/archiveDetail.vue b/src/views/archivesManage/lendManage/lendQuery/module/archiveDetail.vue index d2625ea..33ffa69 100644 --- a/src/views/archivesManage/lendManage/lendQuery/module/archiveDetail.vue +++ b/src/views/archivesManage/lendManage/lendQuery/module/archiveDetail.vue @@ -21,7 +21,7 @@

借阅目的:{{ rowData[0].borrowGoal }}

-

借阅状态:{{ rowData[0].lendStatus }}

+

借阅状态:{{ rowData[0].lendStatus }}

操作时间:{{ rowData[0].operationTime }}

diff --git a/src/views/archivesManage/lendManage/returnArchives/index.vue b/src/views/archivesManage/lendManage/returnArchives/index.vue index 3302f4e..093efc7 100644 --- a/src/views/archivesManage/lendManage/returnArchives/index.vue +++ b/src/views/archivesManage/lendManage/returnArchives/index.vue @@ -1,7 +1,7 @@