diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 4c0f2a0..f9d7441 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -142,7 +142,7 @@ export default class LoginPage extends BasePage { // console.log('Version////', this.Version); } ///********版本号修改区域********** - version = '0.0.170'; //正式版本号 + version = '0.0.171'; //正式版本号 //version = '0.0.14'; //测试版本号 //***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本**************** //isTest = true; diff --git a/src/pages/wms/Raw/ReturnMaterials/index.vue b/src/pages/wms/Raw/ReturnMaterials/index.vue index 286e61f..b8e7c24 100644 --- a/src/pages/wms/Raw/ReturnMaterials/index.vue +++ b/src/pages/wms/Raw/ReturnMaterials/index.vue @@ -192,16 +192,24 @@ export default class ReturnMaterials extends BasePage { await this.model.getByidcard(item); if (model.getidcardcode == '200') { let alreadyList = model.byidcardobj; - alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/)); - this.materilist.forEach((item) => { - if (item.id == alreadyList.userDefined4) { - item.returnNumber = item.returnNumber + alreadyList.planNumber; - //alreadyList.produceCode = item.produceCode; - } - }); - //alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/)); - this.list.push(alreadyList); - this.Idcard = ''; + if (alreadyList.userDefined10 === '1') { + (this.$refs.uToast as any).show({ + title: '标识卡已经收货完成', + // url: '/pages/user/index' + }); + this.Idcard = ''; + } else { + alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/)); + this.materilist.forEach((item) => { + if (item.id == alreadyList.userDefined4) { + item.returnNumber = item.returnNumber + alreadyList.planNumber; + //alreadyList.produceCode = item.produceCode; + } + }); + //alreadyList.handlematerialCode = alreadyList.materialCode.slice(alreadyList.materialCode.search(/[1-9]/)); + this.list.push(alreadyList); + this.Idcard = ''; + } } } confirmNumber(changeobj) {