diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 5f5223f..c1ad598 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -173,7 +173,7 @@ export default class LoginPage extends BasePage { //修改俄罗斯版本号 this.Version = '1.1.12'; } else { - this.Version = '1.0.45'; + this.Version = '1.0.46'; } console.log('////', this.Version); } diff --git a/src/pages/product/inbound/finishProductOffline/index.vue b/src/pages/product/inbound/finishProductOffline/index.vue index f075786..94780b9 100644 --- a/src/pages/product/inbound/finishProductOffline/index.vue +++ b/src/pages/product/inbound/finishProductOffline/index.vue @@ -158,7 +158,7 @@ export default class finishProductOfflineDom extends BasePage { await this.model.queryReturningTypeList(); this.form.aimWl = model.firstLocation; this.areaCode = model.firstLocation.areaCode; - console.log('this.areaCode', this.areaCode); + //console.log('this.areaCode', this.areaCode); } /** * 处理选择行 选中一条执行一次 @@ -257,6 +257,7 @@ export default class finishProductOfflineDom extends BasePage { this.customToast(this.$t('message.barcode') as string); return; } + console.log('扫描标志', this.model.searchCode); if (this.model.searchCode == '') { this.customToast(this.$t('message.barcode_PleaseScan') as string); return; @@ -315,6 +316,7 @@ export default class finishProductOfflineDom extends BasePage { this.materielList.push(this.model.materielList[0]); this.materielList[this.materielList.length - 1].locCode = this.form.aimWl.label; this.materielList[this.materielList.length - 1].index = this.materielList.length; + this.model.setSearchCode(); } else { let flag = 0; for (let i = 0; i < this.materielList.length; i++) { @@ -327,7 +329,9 @@ export default class finishProductOfflineDom extends BasePage { this.materielList.push(this.model.materielList[0]); this.materielList[this.materielList.length - 1].locCode = this.form.aimWl.label; this.materielList[this.materielList.length - 1].index = this.materielList.length; + this.model.setSearchCode(); } else { + this.model.setSearchCode(); this.customToast(this.$t('message.product_Tip7') as string); } }