diff --git a/README.md b/README.md
index ccf2578..d97ac9f 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@
│ │ ├── archivesConfig # 档案配置
│ │ ├── archivesManage # 档案管理
│ │ ├── category # 门类管理
+│ │ ├── environmentalScreen # 环境监测大屏
│ │ ├── components # views内页面组件
│ │ │ ├── field # 字段管理组件
│ │ │ ├── category # 门类管理
diff --git a/src/assets/styles/lend-manage.scss b/src/assets/styles/lend-manage.scss
index 3dc268c..8da91e2 100644
--- a/src/assets/styles/lend-manage.scss
+++ b/src/assets/styles/lend-manage.scss
@@ -62,7 +62,6 @@
border: 1px solid #1AAE93;
}
-
.clear {
border-radius: 13px;
width: 80px;
diff --git a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
index e1e1a0c..1d79384 100644
--- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
+++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
@@ -45,7 +45,7 @@
确定将当前档案加入借阅列表?
@@ -179,6 +179,7 @@ import { header, form } from '@crud/crud' import { mapGetters } from 'vuex' import { archivesCrud } from '../mixins/archives' +import { FetchIsExistBorrow, FetchAddArchivesWaitRegister } from '@/api/archivesManage/lendManage' import PreviewForm from '@/views/components/category/PreviewForm' import ArchivesInfo from '../module/archivesInfo/index' import Packing from '../module/packing/index' @@ -364,6 +365,31 @@ export default { this.$refs.packing.archivesTable = JSON.parse(JSON.stringify(this.recycleMain.$refs.file.junneiData)) } this.getTotalSumAll() + }, + // 借阅 + handleLending() { + const params = this.selections.map(item => { + return item.id + }) + FetchIsExistBorrow(params).then(data => { + if (data.length === 0) { + this.lengingVisible = true + } else { + this.$message.error('部分档案不可借阅') + } + }) + }, + // 确认借阅 + handleLendingConfirm() { + const params = this.selections.map(item => { + return item.id + }) + FetchAddArchivesWaitRegister(params).then(data => { + if (data.length !== 0) { + this.$message.success('借阅成功') + this.lengingVisible = false + } + }) } } } diff --git a/src/views/archivesManage/lendManage/lendConfirm/module/lendArchivesList.vue b/src/views/archivesManage/lendManage/components/lendArchivesList.vue similarity index 74% rename from src/views/archivesManage/lendManage/lendConfirm/module/lendArchivesList.vue rename to src/views/archivesManage/lendManage/components/lendArchivesList.vue index 8a8232c..453e70b 100644 --- a/src/views/archivesManage/lendManage/lendConfirm/module/lendArchivesList.vue +++ b/src/views/archivesManage/lendManage/components/lendArchivesList.vue @@ -1,5 +1,7 @@ -