diff --git a/klp-ui/src/views/wms/move/do.vue b/klp-ui/src/views/wms/move/do.vue index 0f4254a93..453b57d71 100644 --- a/klp-ui/src/views/wms/move/do.vue +++ b/klp-ui/src/views/wms/move/do.vue @@ -17,11 +17,11 @@ - + :value="item.orderId" /> @@ -32,7 +32,7 @@ 查询 - 批量执行 + 批量执行 清空 @@ -46,7 +46,7 @@ + @refreshData="handleBatchConfirmDone"> @@ -103,7 +103,7 @@ export default { currentCoilNo: '', warehouseIdBefore: '', warehouseIdAfter: '', - transferNo: '', + transferId: '', isTransferred: '0', pageSize: 20, pageNum: 1, @@ -114,6 +114,7 @@ export default { transferOrderOptions: [], transferOrderLoading: false, loading: false, + batchConfirmLoading: false, total: 0, dialogVisible: false, }; @@ -171,7 +172,7 @@ export default { currentCoilNo: '', warehouseIdBefore: '', warehouseIdAfter: '', - transferNo: '', + transferId: '', isTransferred: '0', pageSize: 20, pageNum: 1, @@ -192,7 +193,18 @@ export default { } }, handleConfirmBatch() { - this.$refs.transferItemTable.handleBatchConfirm(); + this.$confirm('确定要批量执行调拨吗?', '确认操作', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.batchConfirmLoading = true; + this.$refs.transferItemTable.handleBatchConfirm(); + }).catch(() => {}); + }, + handleBatchConfirmDone() { + this.batchConfirmLoading = false; + this.handleRegularSearch(); }, }, mounted() { diff --git a/klp-ui/src/views/wms/move/record.vue b/klp-ui/src/views/wms/move/record.vue index 5de416f7d..c6c56b37c 100644 --- a/klp-ui/src/views/wms/move/record.vue +++ b/klp-ui/src/views/wms/move/record.vue @@ -30,11 +30,11 @@ - + :label="item.transferNo" :value="item.orderId" /> @@ -105,7 +105,7 @@ export default { currentCoilNo: '', warehouseIdBefore: '', warehouseIdAfter: '', - transferNo: '', + transferId: '', isTransferred: '', pageSize: 20, pageNum: 1, @@ -173,7 +173,7 @@ export default { currentCoilNo: '', warehouseIdBefore: '', warehouseIdAfter: '', - transferNo: '', + transferId: '', isTransferred: '', pageSize: 20, pageNum: 1,