diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue index c9a0036..72076f1 100644 --- a/src/pages/raw/handover/aggregating/index.vue +++ b/src/pages/raw/handover/aggregating/index.vue @@ -247,11 +247,14 @@ export default class Aggregating extends BasePage { this.$form.validate(async (valid: boolean) => { if (!valid) return; let orderNoList = []; + let materialList = []; if (this.isFormChange || this.model.proOrderList.length === 0) { await model.queryProOrder(this.formParams); orderNoList = model.proOrderList.map((_: any) => _.prdOrder); + materialList = model.proOrderList.map((_: any) => _.materialCode); } else { orderNoList = this.model.checkedProOrderList.map((_: any) => _.prdOrder); + materialList = this.model.checkedProOrderList.map((_: any) => _.materialCode); } if (orderNoList.length === 0 && this.model.proOrderList.length > 0) { uni.showToast({ icon: 'none', title: this.$t('message.Pi_OrderNoNotSelected') as string }); @@ -263,6 +266,7 @@ export default class Aggregating extends BasePage { const params = { ...this.formParams, orderNoList: orderNoList, + materialCodeList: materialList, }; await this.model.queryProOrderResult(params); this.model.param = params; diff --git a/src/pages/raw/handover/aggregating/model.ts b/src/pages/raw/handover/aggregating/model.ts index 6e6148a..0b4831b 100644 --- a/src/pages/raw/handover/aggregating/model.ts +++ b/src/pages/raw/handover/aggregating/model.ts @@ -186,8 +186,10 @@ 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 })); + const { list: proOrderList }: any = await http.post(url.sumscan.query.orderno, params); + //const proOrderList = values.map((v: string) => ({ prdOrder, amount: v, materialCode: v, materialDesc: v })); + //const proOrderList = values; + //console.log(">>>>>?????proOrderList",proOrderList); proOrderList.forEach((_: any) => (_.checked = true)); if (!proOrderList.length) { uni.showToast({