From d463b938de5322220fa7cf4849c5f7ad64bd6f6d Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 5 Jan 2022 18:29:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/handover/aggregating/index.vue | 4 ++++
 src/pages/raw/handover/aggregating/model.ts  | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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({