From 87a422f77025f07bb282d4ce19c565ff39eb7c02 Mon Sep 17 00:00:00 2001 From: x_ying <2438792676@qq.com> Date: Tue, 21 Jun 2022 17:33:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=80=9F=E9=98=85=E7=AE=A1=E7=90=86/=E5=9B=9E?= =?UTF-8?q?=E6=94=B6=E7=AB=99=20=E8=A1=A8=E5=8D=95=E9=AA=8C=E8=AF=81=20?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lendManage/borrowerManage/index.vue | 50 ++-- .../archivesManage/lendManage/data1.json | 215 +++++++++--------- .../archivesManage/lendManage/data2.json | 214 ++++++++--------- .../archivesManage/lendManage/data3.json | 214 ++++++++--------- .../lendManage/lendConfirm/index.vue | 24 +- .../lendConfirm/module/archiveDetail.vue | 14 +- .../lendConfirm/module/lendDialog.vue | 16 +- .../lendManage/lendQuery/index.vue | 22 +- .../lendQuery/module/archiveDetail.vue | 16 +- .../lendManage/returnArchives/index.vue | 30 +-- .../returnArchives/module/archiveDetail.vue | 16 +- .../lendManage/toLend/index.vue | 58 ++--- .../toLend/module/archiveDetail.vue | 14 +- src/views/archivesManage/recycleBin/index.vue | 65 +++++- 14 files changed, 522 insertions(+), 446 deletions(-) diff --git a/src/views/archivesManage/lendManage/borrowerManage/index.vue b/src/views/archivesManage/lendManage/borrowerManage/index.vue index 7814721..e6fefe3 100644 --- a/src/views/archivesManage/lendManage/borrowerManage/index.vue +++ b/src/views/archivesManage/lendManage/borrowerManage/index.vue @@ -35,7 +35,7 @@ - + @@ -49,19 +49,19 @@
- + - + @@ -99,18 +99,14 @@ - - -
@@ -138,7 +134,7 @@ style="width: 420px" /> - + @@ -196,7 +192,7 @@

您确定要删除当前借阅人信息吗?

@@ -237,10 +233,18 @@ export default { editFormVisible: false, deleteVisible: false, borrowerForm: {}, - permission: { - add: ['admin', 'lend:add'], - edit: ['admin', 'lend:edit'], - del: ['admin', 'lend:del'] + // permission: { + // add: ['admin', 'lend:add'], + // edit: ['admin', 'lend:edit'], + // del: ['admin', 'lend:del'] + // }, + rules: { + addName: [ + { required: true, message: '请输入姓名', trigger: 'blur' } + ], + addTel: [ + { required: true, message: '请输入电话号码', trigger: 'blur' } + ] } } }, @@ -260,12 +264,26 @@ export default { handleAdd() { this.addFormVisible = true }, - handleConfirm() { + handleDelConfirm() { this.deleteVisible = false }, handelEdit() { this.borrowerForm = this.selections[0] this.editFormVisible = true + }, + handleAddConfirm() { + this.$refs.borrowerFormDom.validate((valid) => { + if (valid) { + this.$message({ + message: '新增成功!', + type: 'success' + }) + this.addFormVisible = false + } else { + this.$message.error('新增失败!') + return false + } + }) } } } diff --git a/src/views/archivesManage/lendManage/data1.json b/src/views/archivesManage/lendManage/data1.json index 7484eb2..44c668f 100644 --- a/src/views/archivesManage/lendManage/data1.json +++ b/src/views/archivesManage/lendManage/data1.json @@ -3,14 +3,14 @@ "rows":[ { "id":"29f16d62bc7242d5ba8dc84de5451f93", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"", - "isOperationTime":"2022-05-26 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"", + "operationTime":"2022-05-26 14:02", "borrowerName":"李四", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -18,21 +18,21 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"已解除", - "isDocNum":"JY202205050001", - "isArchiveNum":"1", - "isHandler":"管理员" + "warnState":"已解除", + "docNum":"JY202205050001", + "archiveNum":"1", + "lendHandler":"管理员" }, { "id":"3d6d548d30db426ea3d95d63f589b294", - "isCategoryName":"文书档案-卷案级", + "categoryName":"文书档案-卷案级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"已借", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"已借", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -40,20 +40,20 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"已解除", - "isDocNum":"JY202205050002", - "isHandler":"管理员" + "warnState":"已解除", + "docNum":"JY202205050002", + "lendHandler":"管理员" }, { "id":"45ff597e7cc64d11803ac422816b1e23", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待借", - "isOperationTime":"2022-05-27 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待借", + "operationTime":"2022-05-27 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -61,21 +61,21 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"未解除", - "isDocNum":"JY202205050003", - "isArchiveNum":"1", - "isHandler":"管理员" + "warnState":"未解除", + "docNum":"JY202205050003", + "archiveNum":"1", + "lendHandler":"管理员" }, { "id":"49106aa0d1534a7a900843d0c4531840", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待借", - "isOperationTime":"2022-05-28 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待借", + "operationTime":"2022-05-28 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -83,21 +83,21 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"未解除", - "isDocNum":"JY202205050004", - "isArchiveNum":"1", - "isHandler":"管理员" + "warnState":"未解除", + "docNum":"JY202205050004", + "archiveNum":"1", + "lendHandler":"管理员" }, { "id":"6e604355ff1e47e8b48117dca36420c7", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待借", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待借", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -105,21 +105,20 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"解除失败", - "isDocNum":"JY202205050005", - "isArchiveNum":"1" - + "warnState":"解除失败", + "docNum":"JY202205050005", + "archiveNum":"1" }, { "id":"6f4a6631d9d3424b960793704f3757b3", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"已借", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"已借", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -127,20 +126,20 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"解除失败", - "isDocNum":"JY202205050006", - "isArchiveNum":"1" + "warnState":"解除失败", + "docNum":"JY202205050006", + "archiveNum":"1" }, { "id":"76e29d5c0a0541bfb1ee9da432183b15", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待借", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待借", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -148,18 +147,18 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isDocNum":"JY202205050007" + "docNum":"JY202205050007" }, { "id":"a0ffdd94161146c49161662c3f9a70cd", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"已借", - "isOperationTime":"2022-07-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"已借", + "operationTime":"2022-07-25 14:02", "borrowerName":"王五", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -167,18 +166,18 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isDocNum":"JY202205050008" + "docNum":"JY202205050008" }, { "id":"a79e0d67165a4b08b089b309dd947908", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待借", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待借", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -189,14 +188,14 @@ }, { "id":"ca9b850145b74eeda3c22a997696c979", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -207,14 +206,14 @@ }, { "id":"dff5529c0d0f45b2b19f2adec7ca0102", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -225,14 +224,14 @@ }, { "id":"f3f6ff94c26a4a54967de9cfc56a3b01", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待借", - "isOperationTime":"2022-06-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待借", + "operationTime":"2022-06-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", diff --git a/src/views/archivesManage/lendManage/data2.json b/src/views/archivesManage/lendManage/data2.json index b3cc026..0860045 100644 --- a/src/views/archivesManage/lendManage/data2.json +++ b/src/views/archivesManage/lendManage/data2.json @@ -3,14 +3,14 @@ "rows":[ { "id":"29f16d62bc7242d5ba8dc84de5451f93", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待登记", - "isOperationTime":"2022-05-26 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待登记", + "operationTime":"2022-05-26 14:02", "borrowerName":"李四", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -18,21 +18,21 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"已解除", - "isDocNum":"JY202205050001", - "isArchiveNum":"1", - "isHandler":"管理员" + "warnState":"已解除", + "docNum":"JY202205050001", + "archiveNum":"1", + "lendHandler":"管理员" }, { "id":"3d6d548d30db426ea3d95d63f589b294", - "isCategoryName":"文书档案-卷案级", + "categoryName":"文书档案-卷案级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待登记", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待登记", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -40,20 +40,20 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"已解除", - "isDocNum":"JY202205050002", - "isHandler":"管理员" + "warnState":"已解除", + "docNum":"JY202205050002", + "lendHandler":"管理员" }, { "id":"45ff597e7cc64d11803ac422816b1e23", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待登记", - "isOperationTime":"2022-05-27 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待登记", + "operationTime":"2022-05-27 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -61,21 +61,21 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"未解除", - "isDocNum":"JY202205050003", - "isArchiveNum":"1", - "isHandler":"管理员" + "warnState":"未解除", + "docNum":"JY202205050003", + "archiveNum":"1", + "lendHandler":"管理员" }, { "id":"49106aa0d1534a7a900843d0c4531840", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待登记", - "isOperationTime":"2022-05-28 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待登记", + "operationTime":"2022-05-28 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -83,21 +83,21 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"未解除", - "isDocNum":"JY202205050004", - "isArchiveNum":"1", - "isHandler":"管理员" + "warnState":"未解除", + "docNum":"JY202205050004", + "archiveNum":"1", + "lendHandler":"管理员" }, { "id":"6e604355ff1e47e8b48117dca36420c7", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待登记", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待登记", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -105,21 +105,21 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"解除失败", - "isDocNum":"JY202205050005", - "isArchiveNum":"1" + "warnState":"解除失败", + "docNum":"JY202205050005", + "archiveNum":"1" }, { "id":"6f4a6631d9d3424b960793704f3757b3", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待登记", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待登记", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -127,20 +127,20 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"解除失败", - "isDocNum":"JY202205050006", - "isArchiveNum":"1" + "warnState":"解除失败", + "docNum":"JY202205050006", + "archiveNum":"1" }, { "id":"76e29d5c0a0541bfb1ee9da432183b15", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待登记", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待登记", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -148,18 +148,18 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isDocNum":"JY202205050007" + "docNum":"JY202205050007" }, { "id":"a0ffdd94161146c49161662c3f9a70cd", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待登记", - "isOperationTime":"2022-07-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待登记", + "operationTime":"2022-07-25 14:02", "borrowerName":"王五", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -167,18 +167,18 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isDocNum":"JY202205050008" + "docNum":"JY202205050008" }, { "id":"a79e0d67165a4b08b089b309dd947908", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待登记", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待登记", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -189,14 +189,14 @@ }, { "id":"ca9b850145b74eeda3c22a997696c979", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待登记", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待登记", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -207,14 +207,14 @@ }, { "id":"dff5529c0d0f45b2b19f2adec7ca0102", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待登记", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待登记", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -225,14 +225,14 @@ }, { "id":"f3f6ff94c26a4a54967de9cfc56a3b01", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待登记", - "isOperationTime":"2022-06-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待登记", + "operationTime":"2022-06-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", diff --git a/src/views/archivesManage/lendManage/data3.json b/src/views/archivesManage/lendManage/data3.json index 7e665ac..7c6727e 100644 --- a/src/views/archivesManage/lendManage/data3.json +++ b/src/views/archivesManage/lendManage/data3.json @@ -3,14 +3,14 @@ "rows":[ { "id":"29f16d62bc7242d5ba8dc84de5451f93", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"逾期", - "isOperationTime":"2022-05-26 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"逾期", + "operationTime":"2022-05-26 14:02", "borrowerName":"李四", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -18,21 +18,21 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"已解除", - "isDocNum":"JY202205050001", - "isArchiveNum":"1", - "isHandler":"管理员" + "warnState":"已解除", + "docNum":"JY202205050001", + "archiveNum":"1", + "lendHandler":"管理员" }, { "id":"3d6d548d30db426ea3d95d63f589b294", - "isCategoryName":"文书档案-卷案级", + "categoryName":"文书档案-卷案级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"逾期", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"逾期", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -40,20 +40,20 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"已解除", - "isDocNum":"JY202205050002", - "isHandler":"管理员" + "warnState":"已解除", + "docNum":"JY202205050002", + "lendHandler":"管理员" }, { "id":"45ff597e7cc64d11803ac422816b1e23", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"逾期", - "isOperationTime":"2022-05-27 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"逾期", + "operationTime":"2022-05-27 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -61,21 +61,21 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"未解除", - "isDocNum":"JY202205050003", - "isArchiveNum":"1", - "isHandler":"管理员" + "warnState":"未解除", + "docNum":"JY202205050003", + "archiveNum":"1", + "lendHandler":"管理员" }, { "id":"49106aa0d1534a7a900843d0c4531840", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"逾期", - "isOperationTime":"2022-05-28 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"逾期", + "operationTime":"2022-05-28 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -83,21 +83,21 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"未解除", - "isDocNum":"JY202205050004", - "isArchiveNum":"1", - "isHandler":"管理员" + "warnState":"未解除", + "docNum":"JY202205050004", + "archiveNum":"1", + "lendHandler":"管理员" }, { "id":"6e604355ff1e47e8b48117dca36420c7", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待还", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待还", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -105,21 +105,21 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"解除失败", - "isDocNum":"JY202205050005", - "isArchiveNum":"1" + "warnState":"解除失败", + "docNum":"JY202205050005", + "archiveNum":"1" }, { "id":"6f4a6631d9d3424b960793704f3757b3", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"逾期", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"逾期", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -127,20 +127,20 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isWarnState":"解除失败", - "isDocNum":"JY202205050006", - "isArchiveNum":"1" + "warnState":"解除失败", + "docNum":"JY202205050006", + "archiveNum":"1" }, { "id":"76e29d5c0a0541bfb1ee9da432183b15", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"逾期", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"逾期", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -148,18 +148,18 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isDocNum":"JY202205050007" + "docNum":"JY202205050007" }, { "id":"a0ffdd94161146c49161662c3f9a70cd", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待还", - "isOperationTime":"2022-07-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待还", + "operationTime":"2022-07-25 14:02", "borrowerName":"王五", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -167,18 +167,18 @@ "borrowerIdType":"身份证", "borrowerIdNum":"420880190011115636", "borrowerTel":"027-5955 7085", - "isDocNum":"JY202205050008" + "docNum":"JY202205050008" }, { "id":"a79e0d67165a4b08b089b309dd947908", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待还", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待还", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -189,14 +189,14 @@ }, { "id":"ca9b850145b74eeda3c22a997696c979", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待还", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待还", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -207,14 +207,14 @@ }, { "id":"dff5529c0d0f45b2b19f2adec7ca0102", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待还", - "isOperationTime":"2022-05-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待还", + "operationTime":"2022-05-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", @@ -225,14 +225,14 @@ }, { "id":"f3f6ff94c26a4a54967de9cfc56a3b01", - "isCategoryName":"文书档案-文件级", + "categoryName":"文书档案-文件级", "fieldCnName":"盒号", - "isArchivesID":"FTZN-2022-BGS-D30-0001", - "isTitleName":"这是一份文件的标题标题...", - "isFieldName":"文书-文件-2022", - "isStoragePath":"库房A-库区A-01列-1节1层-左", - "isLendStatus":"待还", - "isOperationTime":"2022-06-25 14:02", + "archivesID":"FTZN-2022-BGS-D30-0001", + "titleName":"这是一份文件的标题标题...", + "fieldName":"文书-文件-2022", + "storagePath":"库房A-库区A-01列-1节1层-左", + "lendStatus":"待还", + "operationTime":"2022-06-25 14:02", "borrowerName":"张三", "borrowDays":"2022-5-25至2022-6-25", "borrowGoal":"工作考察", diff --git a/src/views/archivesManage/lendManage/lendConfirm/index.vue b/src/views/archivesManage/lendManage/lendConfirm/index.vue index e03c8af..87a59b8 100644 --- a/src/views/archivesManage/lendManage/lendConfirm/index.vue +++ b/src/views/archivesManage/lendManage/lendConfirm/index.vue @@ -16,15 +16,15 @@ style="min-width: 100%" height="calc(100vh - 355px)" :cell-class-name="cell" - :default-sort="{ prop: 'isOperationTime', order: 'descending' }" + :default-sort="{ prop: 'operationTime', order: 'descending' }" @selection-change="selectionChangeHandler" @row-click="clickRowHandler" @row-dblclick="handleDbClick" > - - + + @@ -32,13 +32,13 @@ - + - + @@ -100,13 +100,13 @@ export default { this.$refs.table.clearSelection() const archiveDetailDom = this.$refs.archiveDetailDom archiveDetailDom.detailVisible = true - const arr = data1.rows.filter(item => item.isDocNum === row.isDocNum) + const arr = data1.rows.filter(item => item.docNum === row.docNum) archiveDetailDom.rowData = arr console.log(arr[0]) // 借阅状态样式类名 - if (arr[0].isLendStatus === '已借') { + if (arr[0].lendStatus === '已借') { archiveDetailDom.classLend = 'have-lend' - } else if (arr[0].isLendStatus === '待借') { + } else if (arr[0].lendStatus === '待借') { archiveDetailDom.classLend = 'no-lend' } else { archiveDetailDom.classLend = 'other-lend' @@ -126,11 +126,11 @@ export default { this.$refs.delConfirmDom.deleteVisible = true }, cell({ row, columnIndex }) { - if (row.isLendStatus === '待借' && columnIndex === 11) { + if (row.lendStatus === '待借' && columnIndex === 11) { return 'no-lend' - } else if (row.isLendStatus === '已借' && columnIndex === 11) { + } else if (row.lendStatus === '已借' && columnIndex === 11) { return 'have-lend' - } else if (row.isLendStatus === '' && columnIndex === 11) { + } else if (row.lendStatus === '' && columnIndex === 11) { return 'other-lend' } }, diff --git a/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue b/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue index 6c0e731..429130e 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].isLendStatus }}

+

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

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

@@ -17,16 +17,16 @@

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

借阅日期:{{ rowData[0].borrowDays }}

-

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

+

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

- - - - - + + + + + diff --git a/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue b/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue index eafcca6..7dce781 100644 --- a/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue +++ b/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue @@ -6,13 +6,13 @@

以下档案需要先解除电子标签警报

- - - - + + + + @@ -33,11 +33,11 @@ export default { }, methods: { cellWarn({ row, columnIndex }) { - if (row.isWarnState === '已解除' && columnIndex === 4) { + if (row.warnState === '已解除' && columnIndex === 4) { return 'no-clear' - } else if (row.isWarnState === '未解除' && columnIndex === 4) { + } else if (row.warnState === '未解除' && columnIndex === 4) { return 'have-clear' - } else if (row.isWarnState === '解除失败' && columnIndex === 4) { + } else if (row.warnState === '解除失败' && columnIndex === 4) { return 'fail-clear' } } diff --git a/src/views/archivesManage/lendManage/lendQuery/index.vue b/src/views/archivesManage/lendManage/lendQuery/index.vue index ebcc2e1..7bc66cb 100644 --- a/src/views/archivesManage/lendManage/lendQuery/index.vue +++ b/src/views/archivesManage/lendManage/lendQuery/index.vue @@ -52,21 +52,21 @@ > - + - - - - - + + + + + - + @@ -139,9 +139,9 @@ export default { this.$refs.table.toggleRowSelection(row) }, cell({ row, columnIndex }) { - if (row.isLendStatus === '逾期' && columnIndex === 2) { + if (row.lendStatus === '逾期' && columnIndex === 2) { return 'no-lend' - } else if (row.isLendStatus === '待还' && columnIndex === 2) { + } else if (row.lendStatus === '待还' && columnIndex === 2) { return 'have-lend' } }, @@ -149,7 +149,7 @@ export default { handleDbClick(row) { this.$refs.table.clearSelection() this.$refs.archiveDetailDom.detailVisible = true - const arr = data3.rows.filter(item => item.isDocNum === row.isDocNum) + const arr = data3.rows.filter(item => item.docNum === row.docNum) this.$refs.archiveDetailDom.rowData = arr } } diff --git a/src/views/archivesManage/lendManage/lendQuery/module/archiveDetail.vue b/src/views/archivesManage/lendManage/lendQuery/module/archiveDetail.vue index b224c15..d2625ea 100644 --- a/src/views/archivesManage/lendManage/lendQuery/module/archiveDetail.vue +++ b/src/views/archivesManage/lendManage/lendQuery/module/archiveDetail.vue @@ -5,7 +5,7 @@
-

单据号{{ rowData[0].isDocNum }}

+

单据号{{ rowData[0].docNum }}

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

@@ -21,17 +21,17 @@

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

-

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

-

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

+

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

+

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

-

所属门类:{{ rowData[0].isCategoryName }}

-

档号:{{ rowData[0].isArchivesID }}

+

所属门类:{{ rowData[0].categoryName }}

+

档号:{{ rowData[0].archivesID }}

-

题名:{{ rowData[0].isTitleName }}

+

题名:{{ rowData[0].titleName }}

-

盒名称:{{ rowData[0].isFieldName }}

-

存放位置:{{ rowData[0].isStoragePath }}

+

盒名称:{{ rowData[0].fieldName }}

+

存放位置:{{ rowData[0].storagePath }}

diff --git a/src/views/archivesManage/lendManage/returnArchives/index.vue b/src/views/archivesManage/lendManage/returnArchives/index.vue index 9979063..cbe28b5 100644 --- a/src/views/archivesManage/lendManage/returnArchives/index.vue +++ b/src/views/archivesManage/lendManage/returnArchives/index.vue @@ -12,30 +12,30 @@ height="calc(100vh - 355px)" :data="tableData" :cell-class-name="cell" - :default-sort="{ prop: 'isOperationTime', order: 'descending' }" + :default-sort="{ prop: 'operationTime', order: 'descending' }" @selection-change="selectionChangeHandler" @row-click="clickRowHandler" @row-dblclick="handleDbClick" > - - - - - - + + + + + + - + - - + + @@ -122,11 +122,11 @@ export default { this.returnAgainVisible = false }, cell({ row, columnIndex }) { - if (row.isLendStatus === '待借' && columnIndex === 11) { + if (row.lendStatus === '待借' && columnIndex === 11) { return 'no-lend' - } else if (row.isLendStatus === '已借' && columnIndex === 11) { + } else if (row.lendStatus === '已借' && columnIndex === 11) { return 'have-lend' - } else if (row.isLendStatus === '' && columnIndex === 11) { + } else if (row.lendStatus === '' && columnIndex === 11) { return 'other-lend' } }, @@ -134,7 +134,7 @@ export default { handleDbClick(row) { this.$refs.table.clearSelection() this.$refs.archiveDetailDom.detailVisible = true - const arr = data1.rows.filter(item => item.isDocNum === row.isDocNum) + const arr = data1.rows.filter(item => item.docNum === row.docNum) this.$refs.archiveDetailDom.rowData = arr } } diff --git a/src/views/archivesManage/lendManage/returnArchives/module/archiveDetail.vue b/src/views/archivesManage/lendManage/returnArchives/module/archiveDetail.vue index 4dae4ce..e10c8d9 100644 --- a/src/views/archivesManage/lendManage/returnArchives/module/archiveDetail.vue +++ b/src/views/archivesManage/lendManage/returnArchives/module/archiveDetail.vue @@ -5,7 +5,7 @@
-

单据号{{ rowData[0].isDocNum }}

+

单据号{{ rowData[0].docNum }}

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

@@ -22,17 +22,17 @@

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

-

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

-

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

+

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

+

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

-

所属门类:{{ rowData[0].isCategoryName }}

-

档号:{{ rowData[0].isArchivesID }}

+

所属门类:{{ rowData[0].categoryName }}

+

档号:{{ rowData[0].archivesID }}

-

题名:{{ rowData[0].isTitleName }}

+

题名:{{ rowData[0].titleName }}

-

盒名称:{{ rowData[0].isFieldName }}

-

存放位置:{{ rowData[0].isStoragePath }}

+

盒名称:{{ rowData[0].fieldName }}

+

存放位置:{{ rowData[0].storagePath }}

diff --git a/src/views/archivesManage/lendManage/toLend/index.vue b/src/views/archivesManage/lendManage/toLend/index.vue index 1110b0c..f2553ff 100644 --- a/src/views/archivesManage/lendManage/toLend/index.vue +++ b/src/views/archivesManage/lendManage/toLend/index.vue @@ -14,38 +14,33 @@ style="min-width: 100%" height="calc(100vh - 355px)" :data="tableData" - :default-sort="{ prop: 'isOperationTime', order: 'descending' }" + :default-sort="{ prop: 'operationTime', order: 'descending' }" @selection-change="selectionChangeHandler" @row-click="clickRowHandler" @row-dblclick="handleDbClick" > - - - - - - + + + + + + - + - +
@@ -164,7 +155,7 @@ export default { return { lendDates: '', tableData: [], - selections: [], + selections: [], // 选中列表 listName: '借出列表', recordFormVisible: false, recordForm: { @@ -209,18 +200,29 @@ export default { this.selections = val }, clickRowHandler(row) { - this.$refs.table.toggleRowSelection(row) + this.$refs.table.toggleRowSelection(row) // 单击选中 }, handleRecordConfirm() { - this.recordFormVisible = false - console.log(this.lendDates) + // console.log(this.lendDates) + this.$refs.recordFormDom.validate((valid) => { + if (valid) { + this.$message({ + message: '登记成功!', + type: 'success' + }) + this.recordFormVisible = false + } else { + this.$message.error('登记失败!') + return false + } + }) } // cell({ row, columnIndex }) { - // if (row.isLendStatus === '待借' && columnIndex === 7) { + // if (row.lendStatus === '待借' && columnIndex === 7) { // return 'no-lend' - // } else if (row.isLendStatus === '已借' && columnIndex === 7) { + // } else if (row.lendStatus === '已借' && columnIndex === 7) { // return 'have-lend' - // } else if (row.isLendStatus === '' && columnIndex === 7) { + // } else if (row.lendStatus === '' && columnIndex === 7) { // return 'other-lend' // } // } diff --git a/src/views/archivesManage/lendManage/toLend/module/archiveDetail.vue b/src/views/archivesManage/lendManage/toLend/module/archiveDetail.vue index fa3d205..95a377e 100644 --- a/src/views/archivesManage/lendManage/toLend/module/archiveDetail.vue +++ b/src/views/archivesManage/lendManage/toLend/module/archiveDetail.vue @@ -4,13 +4,13 @@
-

所属门类:{{ rowData.isCategoryName }}

-

档号:{{ rowData.isArchivesID }}

-

题名:{{ rowData.isTitleName }}

-

盒名称:{{ rowData.isFieldName }}

-

借阅状态:{{ rowData.isLendStatus }}

-

存放位置:{{ rowData.isStoragePath }}

-

操作时间:{{ rowData.isOperationTime }}

+

所属门类:{{ rowData.categoryName }}

+

档号:{{ rowData.archivesID }}

+

题名:{{ rowData.titleName }}

+

盒名称:{{ rowData.fieldName }}

+

借阅状态:{{ rowData.lendStatus }}

+

存放位置:{{ rowData.storagePath }}

+

操作时间:{{ rowData.operationTime }}

diff --git a/src/views/archivesManage/recycleBin/index.vue b/src/views/archivesManage/recycleBin/index.vue index 6522094..aab5c61 100644 --- a/src/views/archivesManage/recycleBin/index.vue +++ b/src/views/archivesManage/recycleBin/index.vue @@ -23,8 +23,8 @@
- 彻底删除 - + 彻底删除 + 还原 @@ -46,15 +46,17 @@ :data="tableData" style="min-width: 100%" height="calc(100vh - 355px)" + @selection-change="selectionChangeHandler" + @row-click="clickRowHandler" > - + - + @@ -62,6 +64,30 @@ + + + + +
+

确定要彻底删除当前档案数据吗?

+

数据来源:文件1条数据

+

提示:确定彻底删除后,该档案数据及所属文件不能还原

+ +
+
+ + + + +
+

确定将当前选择的档案数据进行还原?

+ +
+
@@ -97,6 +123,9 @@ export default { dicts: ['user_status'], data() { return { + selections: [], // 选中列表 + deleteVisible: false, + restoreVisible: false, tableData: [], deptName: '', depts: [], @@ -169,6 +198,34 @@ export default { this.query.deptId = data.id } this.crud.toQuery() + }, + // 彻底删除 + handleDelete() { + if (this.selections.length > 0) { + this.deleteVisible = true + } else { + this.$message({ + message: '请选择要删除的数据', + type: 'warning' + }) + } + }, + // 还原 + handleRestore() { + if (this.selections.length > 0) { + this.restoreVisible = true + } else { + this.$message({ + message: '请选择要还原的数据', + type: 'warning' + }) + } + }, + clickRowHandler(row) { + this.$refs.table.toggleRowSelection(row) // 单击选中 + }, + selectionChangeHandler(val) { + this.selections = val } } }