diff --git a/src/assets/styles/lend-manage.scss b/src/assets/styles/lend-manage.scss index 9e53e97..1044d0a 100644 --- a/src/assets/styles/lend-manage.scss +++ b/src/assets/styles/lend-manage.scss @@ -51,4 +51,7 @@ color:#F65163; color: #F65163; border: 1px solid #F65163; } +.svg-style{ + margin-right: 5px; +} diff --git a/src/views/archivesManage/archivesCheck/index.vue b/src/views/archivesManage/archivesCheck/index.vue index 642f985..3b59348 100644 --- a/src/views/archivesManage/archivesCheck/index.vue +++ b/src/views/archivesManage/archivesCheck/index.vue @@ -17,11 +17,11 @@ size="small" clearable placeholder="请输入关键词" - style="width: 300px" - class="input-prepend" + style="width: 300px;margin-right:10px" + class="input-prepend filter-item" @keyup.enter.native="crud.toQuery" > - + @import '~@/assets/styles/lend-manage.scss'; +@import "~@/assets/styles/archives-manage.scss"; + .head-container { color: #fff; } -::v-deep .input-prepend { - margin: 0 10px 0 0; - background-color: #021941; - border-radius: 3px; - border: 1px solid #339cff; - .el-select { - background-color: #021941; - color: #fff; - } - .el-input__inner { - background-color: #021941; - border: none; - caret-color: #fff; - height: 28px; - line-height: 28px; - } - .el-input-group__prepend { - border: none; - } -} ::v-deep .el-dialog__footer { background-color: #031435; } diff --git a/src/views/archivesManage/lendManage/lendConfirm/index.vue b/src/views/archivesManage/lendManage/lendConfirm/index.vue index 78eec98..3eb8cb4 100644 --- a/src/views/archivesManage/lendManage/lendConfirm/index.vue +++ b/src/views/archivesManage/lendManage/lendConfirm/index.vue @@ -97,7 +97,7 @@ export default { }, // 档案详情 handleDbClick(row) { - this.$refs.table.clearSelection() + // this.$refs.table.clearSelection() const archiveDetailDom = this.$refs.archiveDetailDom archiveDetailDom.detailVisible = true const arr = data1.rows.filter(item => item.docNum === row.docNum) @@ -154,7 +154,4 @@ export default { padding: 0; margin: 0; } -.svg-style{ - margin-right: 5px; -} diff --git a/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue b/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue index 59412db..8d0c24c 100644 --- a/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue +++ b/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue @@ -19,15 +19,16 @@

借阅日期:{{ rowData.borrowDays }}

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

+ + + + + + + + - - - - - - - - + diff --git a/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue b/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue index baf295a..b5ffcdd 100644 --- a/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue +++ b/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue @@ -33,9 +33,9 @@ export default { }, methods: { cellWarn({ row, columnIndex }) { - if (row.warnState === '已解除' && columnIndex === 4) { + if (row.warnState === '未解除' && columnIndex === 4) { return 'no-clear' - } else if (row.warnState === '未解除' && columnIndex === 4) { + } else if (row.warnState === '已解除' && columnIndex === 4) { return 'have-clear' } 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 0faae1c..fb05d71 100644 --- a/src/views/archivesManage/lendManage/lendQuery/index.vue +++ b/src/views/archivesManage/lendManage/lendQuery/index.vue @@ -17,18 +17,16 @@ :value="item.value" />
- - - + item.docNum === row.docNum) archiveDetailDom.rowData = row @@ -164,28 +162,8 @@ export default { diff --git a/src/views/archivesManage/outInStorage/data1.json b/src/views/archivesManage/outInStorage/data1.json new file mode 100644 index 0000000..31605ec --- /dev/null +++ b/src/views/archivesManage/outInStorage/data1.json @@ -0,0 +1,110 @@ +{ + "total":8, + "rows":[ + { + "id":"29f16d62bc7242d5ba8dc84de5451f93", + "checkNum":"PD-202205250840", + "inState":"未入", + "havePutIn":"0", + "fieldName":"文书-文件-2022", + "TID":"E2806894200040159AF8AD06", + "barCode":"|||||||||||||||||||||||||", + "storagePath":"库房A-库区A-01列-1节1层-左", + "misplaceNum":"20", + "operationTime":"2022-5-25 08:40", + "checkResult":"在库" + }, + { + "id":"3d6d548d30db426ea3d95d63f589b294", + "checkNum":"PD-202205250840", + "containPath":"未入", + "havePutIn":"0", + "fieldName":"文书-文件-2022", + "TID":"E2806894200040159AF8AD06", + "barCode":"|||||||||||||||||||||||||", + "storagePath":"库房A-库区A-01列-1节1层-左", + "misplaceNum":"20", + "operationTime":"2022-5-25 08:41", + "checkResult":"在库" + }, + { + "id":"45ff597e7cc64d11803ac422816b1e23", + "checkNum":"PD-202205250840", + "inState":"待入", + "havePutIn":"2", + "fieldName":"文书-文件-2022", + "TID":"E2806894200040159AF8AD06", + "barCode":"|||||||||||||||||||||||||", + "storagePath":"库房A-库区A-01列-1节1层-左", + "misplaceNum":"20", + "operationTime":"2022-5-25 08:42", + "checkResult":"已借" + }, + { + "id":"49106aa0d1534a7a900843d0c4531840", + "checkNum":"PD-202205250840", + "inState":"待入", + "havePutIn":"2", + "fieldName":"文书-文件-2022", + "TID":"E2806894200040159AF8AD06", + "barCode":"|||||||||||||||||||||||||", + "storagePath":"库房A-库区A-01列-1节1层-左", + "misplaceNum":"20", + "operationTime":"2022-5-25 08:50", + "checkResult":"错位" + }, + { + "id":"6e604355ff1e47e8b48117dca36420c7", + "checkNum":"PD-202205250841", + "inState":"未入", + "havePutIn":"2", + "fieldName":"文书-文件-2022", + "TID":"E2806894200040159AF8AD06", + "barCode":"|||||||||||||||||||||||||", + "storagePath":"库房A-库区A-01列-1节1层-左", + "misplaceNum":"20", + "operationTime":"2022-5-25 08:40", + "checkResult":"错位" + }, + { + "id":"6f4a6631d9d3424b960793704f3757b3", + "checkNum":"PD-202205250841", + "inState":"待入", + "havePutIn":"2", + "fieldName":"文书-文件-2022", + "TID":"E2806894200040159AF8AD06", + "barCode":"|||||||||||||||||||||||||", + "storagePath":"库房A-库区A-01列-1节1层-左", + "misplaceNum":"20", + "operationTime":"2022-5-25 08:40", + "checkResult":"错位" + + }, + { + "id":"76e29d5c0a0541bfb1ee9da432183b15", + "checkNum":"PD-202205250842", + "inState":"待入", + "havePutIn":"0", + "fieldName":"文书-文件-2022", + "TID":"E2806894200040159AF8AD06", + "barCode":"|||||||||||||||||||||||||", + "storagePath":"库房A-库区A-01列-1节1层-左", + "misplaceNum":"20", + "operationTime":"2022-5-25 08:40" + }, + { + "id":"a0ffdd94161146c49161662c3f9a70cd", + "checkNum":"PD-202205250842", + "inState":"未入", + "havePutIn":"0", + "fieldName":"文书-文件-2022", + "TID":"E2806894200040159AF8AD06", + "barCode":"|||||||||||||||||||||||||", + "storagePath":"库房A-库区A-01列-1节1层-左", + "misplaceNum":"20", + "operationTime":"2022-5-25 08:40" + } + ], + "footer":null, + "postparam":null +} \ No newline at end of file diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue new file mode 100644 index 0000000..dd2a231 --- /dev/null +++ b/src/views/archivesManage/outInStorage/inStorage/index.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/src/views/archivesManage/outInStorage/inStorage/module/fieldDetail.vue b/src/views/archivesManage/outInStorage/inStorage/module/fieldDetail.vue new file mode 100644 index 0000000..b708584 --- /dev/null +++ b/src/views/archivesManage/outInStorage/inStorage/module/fieldDetail.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue new file mode 100644 index 0000000..549d008 --- /dev/null +++ b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue @@ -0,0 +1,152 @@ + + + + + diff --git a/src/views/archivesManage/outInStorage/index.vue b/src/views/archivesManage/outInStorage/index.vue new file mode 100644 index 0000000..c9e9e79 --- /dev/null +++ b/src/views/archivesManage/outInStorage/index.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/views/archivesManage/outInStorage/outInHistory/index.vue b/src/views/archivesManage/outInStorage/outInHistory/index.vue new file mode 100644 index 0000000..5a05b2d --- /dev/null +++ b/src/views/archivesManage/outInStorage/outInHistory/index.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/views/archivesManage/outInStorage/outStorage/index.vue b/src/views/archivesManage/outInStorage/outStorage/index.vue new file mode 100644 index 0000000..c2c6ca5 --- /dev/null +++ b/src/views/archivesManage/outInStorage/outStorage/index.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/views/archivesManage/recycleBin/index.vue b/src/views/archivesManage/recycleBin/index.vue index 82731ea..a58f739 100644 --- a/src/views/archivesManage/recycleBin/index.vue +++ b/src/views/archivesManage/recycleBin/index.vue @@ -128,6 +128,7 @@ export default { }, created() { this.getData() + console.log(this.crud, '1111111111') }, methods: { // 获取表格数据 @@ -185,7 +186,4 @@ export default { height: 30px; line-height: 30px; } - .svg-style{ - margin-right: 5px; - }