diff --git a/src/views/inventory/InvGoodsPlacement.vue b/src/views/inventory/InvGoodsPlacement.vue index d1a7197..667fa7f 100644 --- a/src/views/inventory/InvGoodsPlacement.vue +++ b/src/views/inventory/InvGoodsPlacement.vue @@ -251,7 +251,6 @@ import {filterSubByInv} from "@/api/basic/invSubWarehouse"; import {getSpaceCodeList} from "@/api/inventory/invSpace"; import {getPlacementDetailList, bindInvSpace, checkCodeSpace} from "@/api/inventory/InvProducts"; import {isBlank} from "@/utils/strUtil"; -import {enterCodeWeb} from "@/api/inout/order"; export default { @@ -432,7 +431,7 @@ export default { invWarehouseCode: this.formData.invWarehouseCode, invSpaceCode: this.formData.invSpaceCode } - this.checkCode(tQuery); + this.addCode(event); this.$refs.inputRef.focus(); this.$refs.inputRef.select(); }, @@ -443,17 +442,17 @@ export default { } this.actionEnable = true; this.$refs.inputRef.select(); - if (this.$isBlank(this.formData.invStorageCode)) { + if (isBlank(this.formData.invStorageCode)) { this.$message.error('当前仓库不能为空'); return; } - if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') { + if (isBlank(this.formData.invWarehouseCode)) { this.$message.error('当前分库不能为空'); return; } - if (this.$isBlank(this.formData.invSpaceCode)) { + if (isBlank(this.formData.invSpaceCode)) { this.$message.error('当前货位不能为空'); return; } @@ -500,7 +499,8 @@ export default { if (res.code === 20000) { this.codeArray.push(this.formData.code); } else if (res.code === 8){ - this.$message.error(res.data); + this.loading = false; + this.$message.error(res.message); } else if (res.code === 7) { this.$confirm(res.data, '提示', { confirmButtonText: '确定', @@ -509,6 +509,7 @@ export default { }).then(() => { this.codeArray.push(this.formData.code); }).catch(() => { + this.loading = false; this.$message({ type: 'info', message: '已取消' diff --git a/src/views/inventory/addCountOrder.vue b/src/views/inventory/addCountOrder.vue index a4093fd..93e7cda 100644 --- a/src/views/inventory/addCountOrder.vue +++ b/src/views/inventory/addCountOrder.vue @@ -14,7 +14,7 @@ v-if="countType == 2" type="primary" :disabled="this.codeArray.length > 0" - @click.native="saveOrder()" + @click.native="startCount()" >录入产品 查询 --> - 添加盘点设置 @@ -179,7 +179,7 @@ export default { if (res.code === 20000) { this.settingFormVisible = false; this.getList(); - this.addBtnEnabled = true; + this.addBtnEnabled = false; } else { this.$message.error(res.data.message); }