diff --git a/.env.development b/.env.development
index 14fa9ae..8770ba2 100644
--- a/.env.development
+++ b/.env.development
@@ -3,16 +3,16 @@ ENV = 'development'
# 接口地址
#内网服务地址
-VUE_APP_BASE_API = 'http://192.168.99.207:7070'
-VUE_APP_WS_API = 'ws://192.168.99.207:7071'
+#VUE_APP_BASE_API = 'http://192.168.99.207:7070'
+#VUE_APP_WS_API = 'ws://192.168.99.207:7071'
# 刘力-本地服地址
#VUE_APP_BASE_API = 'http://192.168.99.65:7070'
#VUE_APP_WS_API = 'ws://192.168.99.65:7071'
# 许镇-本地服地址
-#VUE_APP_BASE_API = 'http://192.168.99.84:7070'
-#VUE_APP_WS_API = 'ws://192.168.99.84:7070'
+VUE_APP_BASE_API = 'http://192.168.99.84:7070'
+VUE_APP_WS_API = 'ws://192.168.99.84:7070'
# 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/archivesManage/lendManage/components/archiveDetail.vue b/src/views/archivesManage/lendManage/components/archiveDetail.vue
index 79b316d..a06077d 100644
--- a/src/views/archivesManage/lendManage/components/archiveDetail.vue
+++ b/src/views/archivesManage/lendManage/components/archiveDetail.vue
@@ -13,7 +13,7 @@
电话号码:{{ borrowerInfo.phone }}
借阅目的:{{ otherInfo.purpose }}
借阅日期:{{ lendDatesInfo }}
- 借阅状态:{{ otherInfo.borrow_type | borrowStatus }}
+ 借阅状态:{{ otherInfo.borrow_type | borrowStatus }}
操作时间:{{ otherInfo.create_time | parseTime }}
@@ -42,7 +42,7 @@
- {{ scope.row.borrowType | borrowStatus }}
+ {{ scope.row.borrowType | borrowStatus }}
diff --git a/src/views/archivesManage/lendManage/components/lendArchivesList.vue b/src/views/archivesManage/lendManage/components/lendArchivesList.vue
index 906e1e1..fa97045 100644
--- a/src/views/archivesManage/lendManage/components/lendArchivesList.vue
+++ b/src/views/archivesManage/lendManage/components/lendArchivesList.vue
@@ -39,7 +39,7 @@
- {{ scope.row.borrowType | borrowStatus }}
+ {{ scope.row.borrowType | borrowStatus }}
@@ -49,6 +49,7 @@
+
@@ -101,17 +102,22 @@ export default {
methods: {
// 档案异常处理
handleBorrowException() {
- this.exceptionVisible = true
+ const index = this.selections.findIndex(item => item.borrowType === -1)
+ if (index === -1) {
+ this.exceptionVisible = true
+ } else {
+ this.$message.error('当前档案为异常状态,请勿重复操作!')
+ return
+ }
},
// 确认加入异常
handleExceptionConfirm() {
- this.tableLoading = true
- const params = this.selections.map(item => item.archivesId)
+ const params = this.selections.map(item => item.id)
FetchBorrowException(params).then(data => {
if (data === this.selections.length) {
this.$message.success('已成功加入异常!')
this.exceptionVisible = false
- this.tableLoading = false
+ this.getArchivesTable()
}
})
},
diff --git a/src/views/archivesManage/lendManage/mixins/lending.js b/src/views/archivesManage/lendManage/mixins/lending.js
index 4758886..c54dff4 100644
--- a/src/views/archivesManage/lendManage/mixins/lending.js
+++ b/src/views/archivesManage/lendManage/mixins/lending.js
@@ -78,6 +78,12 @@ export const lendingCrud = {
return 'cell-lend have-lend'
case '已归还':
return 'cell-lend has-return'
+ case -1:
+ return 'cell-lend have-lend'
+ case 5:
+ return 'cell-lend have-lend'
+ case 4:
+ return 'cell-lend has-return'
default:
return 'cell-lend no-lend '
}
diff --git a/src/views/archivesManage/outInStorage/outInHistory/index.vue b/src/views/archivesManage/outInStorage/outInHistory/index.vue
index 211bfe8..e3b4604 100644
--- a/src/views/archivesManage/outInStorage/outInHistory/index.vue
+++ b/src/views/archivesManage/outInStorage/outInHistory/index.vue
@@ -50,10 +50,10 @@
-
+
-
-
+
+