From 65646241e6a4a60231875a0610cc7fa1d4315394 Mon Sep 17 00:00:00 2001
From: mabaoyan <mabaoyan0405@163.com>
Date: Mon, 26 Jun 2023 09:38:33 +0800
Subject: [PATCH] =?UTF-8?q?overseamom-483=20feat=20pickup-=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit dee28106f6c73d935695da3f1dd4596121410998)
---
 src/pages/raw/handover/picking-vn/ByOrder.vue   | 2 +-
 src/pages/raw/handover/picking-vn/BySummary.vue | 2 +-
 src/pages/raw/handover/picking-vn/index.vue     | 2 +-
 src/pages/raw/handover/picking-vn/model.ts      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/raw/handover/picking-vn/ByOrder.vue b/src/pages/raw/handover/picking-vn/ByOrder.vue
index cda64e6..9df53e0 100644
--- a/src/pages/raw/handover/picking-vn/ByOrder.vue
+++ b/src/pages/raw/handover/picking-vn/ByOrder.vue
@@ -317,7 +317,7 @@ export default class RawReceiptDetail extends BasePage {
     }
   }
   async onAggregate() {
-    await this.model.queryProOrder(this.model.formParams);
+    await this.model.queryProOrderPickUp(this.model.formParams);
     await this.model.queryProOrderResult(this.model.NEWparams);
     if (this.model.proOrderResultList.length == 0) {
       this.some = {};
diff --git a/src/pages/raw/handover/picking-vn/BySummary.vue b/src/pages/raw/handover/picking-vn/BySummary.vue
index cb9e879..03f7bca 100644
--- a/src/pages/raw/handover/picking-vn/BySummary.vue
+++ b/src/pages/raw/handover/picking-vn/BySummary.vue
@@ -302,7 +302,7 @@ export default class RawReceiptDetail extends BasePage {
     }
   }
   async onAggregate() {
-    await this.model.queryProOrder(this.model.formParams);
+    await this.model.queryProOrderPickUp(this.model.formParams);
     await this.model.queryProOrderResult(this.model.NEWparams);
     const orderOutIdList = this.model.proOrderResultList.map((_: any) => _.orderOutId);
     const params = {
diff --git a/src/pages/raw/handover/picking-vn/index.vue b/src/pages/raw/handover/picking-vn/index.vue
index 07e3e89..081553a 100644
--- a/src/pages/raw/handover/picking-vn/index.vue
+++ b/src/pages/raw/handover/picking-vn/index.vue
@@ -362,7 +362,7 @@ export default class pickingDom extends BasePage {
     this.selectIndex = [];
     this.$form.validate(async (valid: boolean) => {
       if (!valid) return;
-      await this.model.queryProOrder(this.formParams);
+      await this.model.queryProOrderPickUp(this.formParams);
       this.model.checkAllProOrderList(true);
       this.isFormChange = false;
       model.mrpCodeRegion = this.form.mrpCodeRegion as any;
diff --git a/src/pages/raw/handover/picking-vn/model.ts b/src/pages/raw/handover/picking-vn/model.ts
index bcf0258..36399fb 100644
--- a/src/pages/raw/handover/picking-vn/model.ts
+++ b/src/pages/raw/handover/picking-vn/model.ts
@@ -235,7 +235,7 @@ export class PickingModule extends VuexModule {
    * @param params
    */
   @MutationAction
-  async queryProOrder(params: any) {
+  async queryProOrderPickUp(params: any) {
     const { list: proOrderList }: any = await http.post(url.sortscan.query.prdorder, params);
     if (!proOrderList.length) {
       // uni.showToast({