From ccd63e19706f1f205b80abbfff1d5e3908b291cc Mon Sep 17 00:00:00 2001 From: guoshuang Date: Wed, 9 Feb 2022 10:21:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E5=BA=93=E5=BA=93=E4=BD=8D=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E8=B5=8B=E5=80=BC=E7=AC=AC=E4=B8=80=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/product/inbound/finishProductOffline/index.vue | 1 + src/pages/product/warehouse/wholeTransfer/index.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pages/product/inbound/finishProductOffline/index.vue b/src/pages/product/inbound/finishProductOffline/index.vue index 4931f91..71b7072 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.value = this.model.returningTypeList[0].value; } /** * 处理选择行 选中一条执行一次 diff --git a/src/pages/product/warehouse/wholeTransfer/index.vue b/src/pages/product/warehouse/wholeTransfer/index.vue index 505293c..b2753b4 100644 --- a/src/pages/product/warehouse/wholeTransfer/index.vue +++ b/src/pages/product/warehouse/wholeTransfer/index.vue @@ -116,6 +116,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'); From 4e2bb8a7f47549ff97e20170a52762d0a162b109 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Wed, 9 Feb 2022 10:23:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E4=B8=8A=E4=B8=80=E9=A1=B5=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/raw/commission/entrant/index.vue | 2 +- src/pages/raw/commission/goOut/detail.vue | 2 +- src/pages/raw/commission/goOut/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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); } } From cbad6da0019a52a17c4fad4fd366ea8ed4d2869b Mon Sep 17 00:00:00 2001 From: guoshuang Date: Wed, 9 Feb 2022 10:41:12 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=8D=95=E4=BA=A4?= =?UTF-8?q?=E6=8E=A5=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/raw/handover/virtual/model.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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); From 137da309c3cc28e276b1b4132342c3da81657441 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Wed, 9 Feb 2022 17:58:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=88=90=E5=93=81=E4=B8=8B=E7=BA=BF?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/product/inbound/finishProductOffline/index.vue | 2 +- src/pages/product/inbound/finishProductOffline/model.ts | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pages/product/inbound/finishProductOffline/index.vue b/src/pages/product/inbound/finishProductOffline/index.vue index 71b7072..cf38853 100644 --- a/src/pages/product/inbound/finishProductOffline/index.vue +++ b/src/pages/product/inbound/finishProductOffline/index.vue @@ -143,7 +143,7 @@ export default class finishProductOfflineDom extends BasePage { onReady() { this.$form.setRules(this.rules); model.queryReturningTypeList(); - this.form.aimWl.value = this.model.returningTypeList[0].value; + 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 }; } /** * 查询条码号 From 3fd3fafec5f1d94444afd5d622fffbe3a58f66c6 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Wed, 9 Feb 2022 18:00:08 +0800 Subject: [PATCH 5/5] =?UTF-8?q?PO=E9=80=80=E8=B4=A7=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/raw/ingoods/dnReturnGoods/Location.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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; } }