diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index f9d7441..2635746 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.171'; //正式版本号 + version = '0.0.172'; //正式版本号 //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 b8e7c24..53a687b 100644 --- a/src/pages/wms/Raw/ReturnMaterials/index.vue +++ b/src/pages/wms/Raw/ReturnMaterials/index.vue @@ -12,12 +12,12 @@ - + @@ -143,14 +143,14 @@ export default class ReturnMaterials extends BasePage { itemdetail: any = ''; outNumber: any = 0; realityaddNumber = 0; - async queryloc() { - let params = { - factoryCode: session.FactoryCode, - areaCode: this.areaCode, - }; - await this.model.getworkloc(params); - this.waCodeList = model.workloclist; - } + // async queryloc() { + // let params = { + // factoryCode: session.FactoryCode, + // areaCode: this.areaCode, + // }; + // await this.model.getworkloc(params); + // this.waCodeList = model.workloclist; + // } //查询货单关联采购单信息 async query() { if (this.orderNo == '' || this.orderNo.length == 0) { @@ -234,20 +234,20 @@ export default class ReturnMaterials extends BasePage { }); return; } - if (this.areaCode == '') { - (this.$refs.uToast as any).show({ - title: '请先扫描或输入库区', - type: 'default', - }); - return; - } - if (Object.keys(this.waCodeList).length == 0) { - (this.$refs.uToast as any).show({ - title: '没有仓库信息', - type: 'default', - }); - return; - } + // if (this.areaCode == '') { + // (this.$refs.uToast as any).show({ + // title: '请先扫描或输入库区', + // type: 'default', + // }); + // return; + // } + // if (Object.keys(this.waCodeList).length == 0) { + // (this.$refs.uToast as any).show({ + // title: '没有仓库信息', + // type: 'default', + // }); + // return; + // } if (this.list.length == 0 || this.list == '') { (this.$refs.uToast as any).show({ @@ -261,8 +261,8 @@ export default class ReturnMaterials extends BasePage { params.push({ createBy: session.loginName, factoryCode: session.FactoryCode, - whCode: this.waCodeList.warehouseCode, - waCode: this.areaCode, + // whCode: this.waCodeList.warehouseCode, + // waCode: this.areaCode, planNumber: item.planNumber, procureCode: item.procureCode, userDefined6: item.userDefined1, @@ -292,8 +292,8 @@ export default class ReturnMaterials extends BasePage { mepty() { this.list = []; this.materilist = []; - this.areaCode = ''; - this.waCodeList = {}; + //this.areaCode = ''; + //this.waCodeList = {}; this.query(); } delet(deletobj, index) {