diff --git a/src/api/archivesManage/outInStorage.js b/src/api/archivesManage/outInStorage.js
index 15686e7..abd147f 100644
--- a/src/api/archivesManage/outInStorage.js
+++ b/src/api/archivesManage/outInStorage.js
@@ -26,6 +26,24 @@ export function collect(params) {
})
}
+// 入库 预人工确认
+export function readyCollectConfirm(params) {
+ return request({
+ url: 'api/storage/readyCollectConfirm',
+ method: 'post',
+ data: params
+ })
+}
+
+// 入库 人工确认
+export function collectConfirm(params) {
+ return request({
+ url: 'api/storage/collectConfirm',
+ method: 'post',
+ data: params
+ })
+}
+
// 出库
export function grant(params) {
return request({
@@ -34,6 +52,7 @@ export function grant(params) {
data: params
})
}
+
// 出入库记录 导出
export function exportStorageLogList(params) {
return request({
@@ -41,4 +60,12 @@ export function exportStorageLogList(params) {
method: 'get'
})
}
-export default { initCaseByArchives, isOccupy, collect, grant, exportStorageLogList }
+export default {
+ initCaseByArchives,
+ isOccupy,
+ collect,
+ grant,
+ exportStorageLogList,
+ readyCollectConfirm,
+ collectConfirm
+}
diff --git a/src/views/archivesManage/outInStorage/inStorage/index.vue b/src/views/archivesManage/outInStorage/inStorage/index.vue
index 22e9ca9..87feb39 100644
--- a/src/views/archivesManage/outInStorage/inStorage/index.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/index.vue
@@ -24,7 +24,7 @@
入库
- 人工确认
+ 人工确认
@@ -77,16 +77,9 @@
当前档案盒正在入库,请勿重复操作
-
-
-
-
-
-
入库成功
-
提示:如果当前设备不在线或者未勾选联动操作,请人工完成上架操作
-
-
-
+
+
+
@@ -103,10 +96,11 @@ import CRUD, { presenter, crud } from '@crud/crud'
import pagination from '@crud/Pagination'
import fieldDetail from './module/fieldDetail.vue'
import inDialog from './module/inDialog.vue'
-import { initCaseByArchives } from '@/api/archivesManage/outInStorage'
+import handDialog from './module/handDialog.vue'
+import { initCaseByArchives, readyCollectConfirm, collectConfirm } from '@/api/archivesManage/outInStorage'
export default {
name: 'InStorage',
- components: { rrOperation, pagination, fieldDetail, inDialog },
+ components: { rrOperation, pagination, fieldDetail, inDialog, handDialog },
mixins: [presenter(), crud()],
cruds() {
return CRUD({
@@ -118,7 +112,6 @@ export default {
data() {
return {
msgVisible: false,
- msgSuccessVisible: false,
msgFailVisible: false,
tableData: [],
selections: [],
@@ -178,11 +171,28 @@ export default {
}
},
// 人工确认
- handleManual() {
+ handleHand() {
if (this.selections.length > 0) {
const bool = this.selections.every(item => item.storageType === 1)
if (bool) { // 全是'待入'状态弹出成功提示
- this.msgSuccessVisible = true
+ const params = this.selections.map(item => item.id)
+ readyCollectConfirm(params).then(res => {
+ console.log(res, '预人工确认res')
+ const handDialogDom = this.$refs.handDialogDom
+ if (res.length === 1) {
+ const params = res.map(item => item.caseId)
+ collectConfirm(params).then(data => {
+ handDialogDom.singleVisible = true
+ this.crud.refresh()
+ })
+ } else if (res.length > 1) {
+ handDialogDom.tableData = res
+ this.$nextTick(() => { // 默认多选
+ handDialogDom.$refs.table.toggleAllSelection()
+ })
+ handDialogDom.manyVisible = true
+ }
+ })
} else { // 否则提示
this.msgFailVisible = true
}
diff --git a/src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue b/src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue
new file mode 100644
index 0000000..6bcbc47
--- /dev/null
+++ b/src/views/archivesManage/outInStorage/inStorage/module/handDialog.vue
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
入库成功
+
提示:如果当前设备不在线或者未勾选联动操作,请人工完成上架操作
+
+
+
+
+
+
+
+
该案卷存在多个档案盒,请确认全部入库!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+