From ab259a7a144969bb8ab89ad3d9a72153d7a7e129 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Tue, 4 Jan 2022 16:29:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=87=BA=E5=BA=93=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20=E5=8E=9F=E6=9D=90=E6=96=99=E4=BA=A4=E6=8E=A5?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=B1=95=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/raw/commission/entrant/index.vue | 5 ++-- src/pages/raw/commission/goOut/index.vue | 5 ++-- src/pages/raw/handover/aggregating/config.ts | 31 +++++++++++++++----- src/pages/raw/handover/aggregating/index.vue | 3 +- src/pages/raw/handover/aggregating/model.ts | 18 +++++++++--- 5 files changed, 45 insertions(+), 17 deletions(-) diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue index 2bb82a8..458391f 100644 --- a/src/pages/raw/commission/entrant/index.vue +++ b/src/pages/raw/commission/entrant/index.vue @@ -184,7 +184,7 @@ export default class dnReceiptDom extends BasePage { //所选择的库位 wlCode: any = ""; //页面初始化 - async onShow() { + async onReady() { //页面初始化 获取可选库位 let means: any = JSON.parse( localStorage.getItem("__GWMS_APP_STATE_DATA__") as any @@ -200,7 +200,7 @@ export default class dnReceiptDom extends BasePage { console.log("res res",res[0]); // 库位列表是undefined 委外入库、委外出库都是同样的问题 //guoshuang 修改 库位列表undefiend - res[0].forEach((item: any) => { + res.forEach((item: any) => { let pickerName: any = {}; pickerName.label = item.locationCode; pickerName.value = item.locationCode + "(" + item.sendSpot + ")"; @@ -218,6 +218,7 @@ export default class dnReceiptDom extends BasePage { }); return; } + this.materialList = []; let res = await this.model.queryOutsourcing(this.form.documentNo); this.material = res.data; this.material.forEach((item: any) => { diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue index 8c9d099..7ded4c2 100644 --- a/src/pages/raw/commission/goOut/index.vue +++ b/src/pages/raw/commission/goOut/index.vue @@ -184,7 +184,7 @@ export default class dnReceiptDom extends BasePage { //所选择的库位 wlCode: any = ""; //页面初始化 - async onShow() { + async onReady() { //页面初始化 获取可选库位 let means: any = JSON.parse( localStorage.getItem("__GWMS_APP_STATE_DATA__") as any @@ -199,7 +199,7 @@ export default class dnReceiptDom extends BasePage { let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content); //库位为undefined，打印的res信息格式为[[],[]],且里面两个arry相同 //guoshuang 修改 库位列表undefined - res[0].forEach((item: any) => { + res.forEach((item: any) => { let pickerName: any = {}; pickerName.label = item.locationCode; pickerName.value = item.locationCode + "(" + item.sendSpot + ")"; @@ -216,6 +216,7 @@ export default class dnReceiptDom extends BasePage { }); return; } + this.materialList = []; let res = await this.model.queryOutsourcing(this.form.documentNo); this.material = res.data; this.material.forEach((item: any) => { diff --git a/src/pages/raw/handover/aggregating/config.ts b/src/pages/raw/handover/aggregating/config.ts index f455cd6..91d0511 100644 --- a/src/pages/raw/handover/aggregating/config.ts +++ b/src/pages/raw/handover/aggregating/config.ts @@ -8,6 +8,21 @@ export const headers = [ key: 'prdOrder', width: 550, }, + { + label: vm.$t('message.po_DemandQuantity'), + key: 'amount', //需求数量 + width: 550, + }, + { + label: vm.$t('message.Pi_materielNo'), + key: 'materialCode', //物料号 + width: 550, + }, + { + label: vm.$t('message.CommissionedMaterielDesc'), + key: 'materialDesc', //物料描述 + width: 550, + }, ]; /** @@ -76,10 +91,10 @@ export const summaryHeaders = [ label: vm.$t('message.Summary_QuantityOfThisHandover'), key: 'hvAmount', }, - { - label: vm.$t('message.po_DemandQuantity'), - key: 'amount', - }, + // { + // label: vm.$t('message.po_DemandQuantity'), + // key: 'amount', + // }, { label: vm.$t('message.Pi_CumulativePickingQuantity'), key: 'totalMoAmount', @@ -129,10 +144,10 @@ export const orderHeaders = [ label: vm.$t('message.Summary_QuantityOfThisHandover'), key: 'hvAmount', }, - { - label: vm.$t('message.po_DemandQuantity'), - key: 'amount', - }, + // { + // label: vm.$t('message.po_DemandQuantity'), + // key: 'amount', + // }, { label: vm.$t('message.Pi_CumulativePickingQuantity'), key: 'totalMoAmount', diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue index c9a0036..506af97 100644 --- a/src/pages/raw/handover/aggregating/index.vue +++ b/src/pages/raw/handover/aggregating/index.vue @@ -275,7 +275,8 @@ export default class Aggregating extends BasePage { onQuery() { this.$form.validate(async (valid: boolean) => { if (!valid) return; - this.model.queryProOrder(this.formParams); + await this.model.queryProOrder(this.formParams); + this.model.checkAllProOrderList(true); this.isFormChange = false; this.model.isFormChange = this.formParams; }); diff --git a/src/pages/raw/handover/aggregating/model.ts b/src/pages/raw/handover/aggregating/model.ts index e097f63..476d720 100644 --- a/src/pages/raw/handover/aggregating/model.ts +++ b/src/pages/raw/handover/aggregating/model.ts @@ -157,7 +157,17 @@ export class AggregatingModule extends VuexModule { get isOrderCheckedAll() { return !this.orderList.filter((_: any) => !_.checked).length; } - + /** + * 全选/取消全选查询列表 + * @param checked + */ + @Mutation + checkAllProOrderList(checked: boolean) { + this.proOrderList = this.proOrderList.map((item: any) => ({ + ...item, + checked, + })); + } /** * 全选/取消按单列表 * @param checked @@ -176,9 +186,9 @@ export class AggregatingModule extends VuexModule { */ @MutationAction async queryProOrder(params: any) { - const { values }: any = await http.post(url.sumscan.query.orderno, params); - const proOrderList = values.map((v: string) => ({ prdOrder: v })); - proOrderList.forEach((_: any) => (_.checked = true)); + const { list: proOrderList }: any = await http.post(url.sumscan.query.orderno, params); + //const proOrderList = values.map((v: string) => ({ prdOrder: v })); + //proOrderList.forEach((_: any) => (_.checked = true)); if (!proOrderList.length) { uni.showToast({ icon: 'none',