diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index e4c2830..18005fb 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -163,9 +163,9 @@ export default class LoginPage extends BasePage { console.log('......', server.serverAddress); if (server.serverAddress.includes('https://eurmom.haier.net')) { //修改俄罗斯版本号 - this.Version = '1.1.8'; + this.Version = '1.1.9'; } else { - this.Version = '1.0.39'; + this.Version = '1.0.40'; } console.log('////', this.Version); } diff --git a/src/pages/product/inbound/finishProductOffline/index.vue b/src/pages/product/inbound/finishProductOffline/index.vue index d8f49d2..f075786 100644 --- a/src/pages/product/inbound/finishProductOffline/index.vue +++ b/src/pages/product/inbound/finishProductOffline/index.vue @@ -118,6 +118,7 @@ export default class finishProductOfflineDom extends BasePage { barCode: '', aimWl: {} as OptionType, }; + areaCode: ''; //表格数据 materielList: any = []; //被选中的表格数据 @@ -132,7 +133,10 @@ export default class finishProductOfflineDom extends BasePage { dockName: [{ required: false, message: this.$t('message.product_Tip1') as string }], }; bookTypeChange(e: any) { + console.log(e.pickerName); this.form.aimWl = e.pickerName; + this.areaCode = e.pickerName.areaCode; + console.log('shifougaibian', this.areaCode); } change(status: any) { console.log(status); @@ -153,6 +157,8 @@ export default class finishProductOfflineDom extends BasePage { this.$form.setRules(this.rules); await this.model.queryReturningTypeList(); this.form.aimWl = model.firstLocation; + this.areaCode = model.firstLocation.areaCode; + console.log('this.areaCode', this.areaCode); } /** * 处理选择行 选中一条执行一次 @@ -227,7 +233,8 @@ export default class finishProductOfflineDom extends BasePage { item.factoryCode = session.factoryCode; item.warehouseCode = session.warehouseCode; //仓库 item.regionCode = session.regionCode; //区域 - item.areaCode = session.regionCode; //库区 + //item.areaCode = session.regionCode; //库区 + item.areaCode = this.areaCode; //库区 item.operator = session.loginName; //操作人 item.loginName = session.loginName; //操作人 }); diff --git a/src/pages/product/inbound/finishProductOffline/model.ts b/src/pages/product/inbound/finishProductOffline/model.ts index daa37d8..7f8bd02 100644 --- a/src/pages/product/inbound/finishProductOffline/model.ts +++ b/src/pages/product/inbound/finishProductOffline/model.ts @@ -40,6 +40,7 @@ export class PickingModule extends VuexModule { /** * 查询库位列表 */ + alldata = []; @MutationAction async queryReturningTypeList() { const data: any = await http.get(url.inbound.finishProductOffline.kuwei, { @@ -53,12 +54,14 @@ export class PickingModule extends VuexModule { const returningTypeList = data.data.map((item: any) => ({ label: item.locationCode, value: item.locationCode + '(' + item.sendSpot + ')', + areaCode: item.areaCode, })); + const alldata = data; const firstLocation = returningTypeList[0]; // const firstLocation = data.data[0]; // firstLocation.label = firstLocation.locationCode; // firstLocation.value = firstLocation.locationCode + '(' + firstLocation.sendSpot + ')'; - return { returningTypeList, firstLocation }; + return { returningTypeList, firstLocation, alldata }; } //根据扫描的条码推荐库位 @MutationAction diff --git a/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue b/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue index 1c05c01..456cb8f 100644 --- a/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue +++ b/src/pages/raw/Semi-finished/Semi-finished-offline/index.vue @@ -11,7 +11,7 @@ - +