diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue index 8ebadbfe..58b99a81 100644 --- a/pages/issue/record/issueRecord.vue +++ b/pages/issue/record/issueRecord.vue @@ -136,7 +136,6 @@ this.toInventoryStatuses = res.toInventoryStatuses this.goScan(true) } else { - this.showErrorMessage(res.message) } }); diff --git a/pages/unPlanned/coms/comReceiptRequestPopup.vue b/pages/unPlanned/coms/comReceiptRequestPopup.vue index 8021e91f..1bfeafbe 100644 --- a/pages/unPlanned/coms/comReceiptRequestPopup.vue +++ b/pages/unPlanned/coms/comReceiptRequestPopup.vue @@ -68,7 +68,7 @@ - + @@ -126,6 +126,10 @@ type: String, default: '申请信息' }, + itemCodeTypeList: { + type: Array, + default: [] + }, }, methods: { checkNum(e) { @@ -146,7 +150,7 @@ openRequestPopup(editPosition) { this.editPosition = editPosition; if (!editPosition) { - this.itemCode = ""; + this.itemCode = "请扫描物料信息"; this.uom = "" this.qty = 0 this.counQty = undefined; @@ -175,10 +179,6 @@ itemCodeLoseFocus() { this.itemCodeFocus = false; }, - selectedItem(item) { - this.itemCode = item.itemCode; - this.checkItemCode(); - }, confirm() { if (this.toLocationCode == "") { @@ -186,7 +186,7 @@ return } - if (this.itemCode == "" || !this.isCheckItemCode) { + if (this.itemCode == "请扫描物料信息" ) { this.showErrorMessage("请输入物料", "itemCode") return } @@ -203,28 +203,6 @@ this.callback('add'); }, - checkItemCode(itemCode) { - //校验物料 - getBasicItemByCode(itemCode).then(res => { - uni.hideLoading(); - this.$refs.itemPopup.closeScanPopup(); - if (res.data != null && res.data.list.length > 0) { - this.itemCode = res.data.list[0].code; - this.itemName = res.data.list[0].name - this.isCheckItemCode = true; - this.numberFocus = true - this.uom = res.data.list[0].uom - } else { - this.showErrorMessage('未查找到物料【' + itemCode + '】', "itemCode"); - } - - }).catch(error => { - uni.hideLoading(); - this.showErrorMessage(error, "itemCode"); - }) - }, - - callback(action) { let item = { toLocationCode: this.toLocationCode, @@ -259,18 +237,17 @@ this.closeRequestPopup(); }, - getItemCode(code, scanResult) { - if (code == "") { - this.showErrorMessage('物料号不能为空') - return; - } - this.itemCode = ""; - this.checkItemCode(code) - this.stdPackInfo = scanResult.package; - }, getLocationCode(location, code) { this.toLocationCode = code; }, + + getItemScanResult(code, scanResult) { + this.itemCode = code; + this.itemName = scanResult.name + this.uom =scanResult.uom + this.stdPackInfo = scanResult.package; + this.numberFocus = true + } } } diff --git a/pages/unPlanned/request/receiptRequestCreate.vue b/pages/unPlanned/request/receiptRequestCreate.vue index 1fd5e8d3..a73aae91 100644 --- a/pages/unPlanned/request/receiptRequestCreate.vue +++ b/pages/unPlanned/request/receiptRequestCreate.vue @@ -39,7 +39,7 @@ - +