diff --git a/src/pages/product/inbound/finishProductOffline/index.vue b/src/pages/product/inbound/finishProductOffline/index.vue index 4931f91..cf38853 100644 --- a/src/pages/product/inbound/finishProductOffline/index.vue +++ b/src/pages/product/inbound/finishProductOffline/index.vue @@ -143,6 +143,7 @@ export default class finishProductOfflineDom extends BasePage { onReady() { this.$form.setRules(this.rules); model.queryReturningTypeList(); + this.form.aimWl = model.firstLocation; } /** * 处理选择行 选中一条执行一次 diff --git a/src/pages/product/inbound/finishProductOffline/model.ts b/src/pages/product/inbound/finishProductOffline/model.ts index 6a5b9e0..1a79079 100644 --- a/src/pages/product/inbound/finishProductOffline/model.ts +++ b/src/pages/product/inbound/finishProductOffline/model.ts @@ -28,6 +28,7 @@ export class PickingModule extends VuexModule { * 库位列表 */ returningTypeList: any[] = []; + firstLocation: any = {}; /** * 物料列表 */ @@ -57,7 +58,11 @@ export class PickingModule extends VuexModule { label: item.locationCode, value: item.locationCode + '(' + item.sendSpot + ')', })); - return { returningTypeList }; + const firstLocation = returningTypeList[0]; + // const firstLocation = data.data[0]; + // firstLocation.label = firstLocation.locationCode; + // firstLocation.value = firstLocation.locationCode + '(' + firstLocation.sendSpot + ')'; + return { returningTypeList, firstLocation }; } /** * 查询条码号 diff --git a/src/pages/product/warehouse/wholeTransfer/index.vue b/src/pages/product/warehouse/wholeTransfer/index.vue index be6bd79..42839fe 100644 --- a/src/pages/product/warehouse/wholeTransfer/index.vue +++ b/src/pages/product/warehouse/wholeTransfer/index.vue @@ -117,6 +117,7 @@ export default class productCheckReceipt extends BasePage { onReady() { this.$form.setRules(this.rules); this.model.queryLocation(); + this.form.aimWl.value = this.model.WlList[0].value; this.model.empty(); this.userDefined4 = JSON.parse(sessionStorage.getItem('userDefined4')); sessionStorage.removeItem('userDefined4'); diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue index 450e30a..6170114 100644 --- a/src/pages/raw/commission/entrant/index.vue +++ b/src/pages/raw/commission/entrant/index.vue @@ -225,7 +225,7 @@ export default class dnReceiptDom extends BasePage { poNo: this.form.documentNo, }; await this.model.querydetaildlist(content); - this.redirectTo(this.page.raw.commission.entrant.detail); + this.toPage(this.page.raw.commission.entrant.detail); } //添加和删除操作的时候 计算累计收货数量 business() { diff --git a/src/pages/raw/commission/goOut/detail.vue b/src/pages/raw/commission/goOut/detail.vue index c48fa6e..a0e89c3 100644 --- a/src/pages/raw/commission/goOut/detail.vue +++ b/src/pages/raw/commission/goOut/detail.vue @@ -2,7 +2,7 @@ - + {{ $t('message.Pi_QueryResults') }} diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue index 1b394b8..7b16725 100644 --- a/src/pages/raw/commission/goOut/index.vue +++ b/src/pages/raw/commission/goOut/index.vue @@ -298,7 +298,7 @@ export default class dnReceiptDom extends BasePage { factoryCode: person.session.user.factoryCode, }; await this.model.querydetaildlist(content); - this.redirectTo(this.page.raw.commission.goOut.detail); + this.toPage(this.page.raw.commission.goOut.detail); } } diff --git a/src/pages/raw/handover/virtual/model.ts b/src/pages/raw/handover/virtual/model.ts index 45943c2..84a00d5 100644 --- a/src/pages/raw/handover/virtual/model.ts +++ b/src/pages/raw/handover/virtual/model.ts @@ -113,8 +113,8 @@ export class VirtualModule extends VuexModule { */ @MutationAction async queryProOrder(params: any) { - const {list}: any = await http.post(url.virtual.query.orderno, params); - const proOrderList = list.map((v: string) => ({ prdOrder: v })); + const { list: proOrderList }: any = await http.post(url.virtual.query.orderno, params); + //const proOrderList = list.map((v: any) => ({ prdOrder: v.prdOrder, amount: v.amount, materialCode: v.materialCode, materialDesc: v.materialDesc })); proOrderList.forEach((_: any) => (_.checked = true)); if (!proOrderList.length) { vm.customToast(vm.$t('message.Pi_NoDataFound') as any); diff --git a/src/pages/raw/ingoods/dnReturnGoods/Location.vue b/src/pages/raw/ingoods/dnReturnGoods/Location.vue index 2c739bd..a4407cf 100644 --- a/src/pages/raw/ingoods/dnReturnGoods/Location.vue +++ b/src/pages/raw/ingoods/dnReturnGoods/Location.vue @@ -468,11 +468,12 @@ export default class RawReceiptDetail extends BasePage { height: 100%; display: flex; view { - width: 100rpx; + width: 70rpx; line-height: 100rpx; + text-align: center; } .search { - padding-left: 19px; + padding-left: 0px; text-align: left; } }