From fc7725ae672b4e8f7bd3bbf3f96315f351020abc Mon Sep 17 00:00:00 2001
From: mabaoyan <mabaoyan0405@163.com>
Date: Tue, 18 Jul 2023 18:13:40 +0800
Subject: [PATCH] =?UTF-8?q?Overseamom-518=20feat=20=E8=99=9A=E6=8B=9F?=
 =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E9=87=8D=E5=A4=8D=E8=B0=83=E7=94=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/handover/virtual-Vn/index.vue   | 10 +++++-----
 src/pages/raw/handover/virtual-Vn/model.ts    |  4 ++--
 src/pages/raw/handover/virtual-Vn/summary.vue |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/raw/handover/virtual-Vn/index.vue b/src/pages/raw/handover/virtual-Vn/index.vue
index e75ec74..1e8c311 100644
--- a/src/pages/raw/handover/virtual-Vn/index.vue
+++ b/src/pages/raw/handover/virtual-Vn/index.vue
@@ -58,7 +58,7 @@
           <u-button type="primary" @click="onQuery">{{ $t('message.Pi_order') }}</u-button>
         </u-col>
         <u-col :span="3">
-          <u-button type="success" @click="onOk">{{ $t('message.dn_Confirm') }}</u-button>
+          <u-button type="success" @click="onConfirm">{{ $t('message.dn_Confirm') }}</u-button>
         </u-col>
         <u-col :span="3">
           <u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
@@ -223,13 +223,13 @@ export default class Virtual extends BasePage {
   /**
    * 确认
    */
-  onOk() {
+  onConfirm() {
     this.$form.validate(async (valid: boolean) => {
       if (!valid) return;
       let orderNoList = [];
       let materialCodeList = [];
       if (this.isFormChange || this.model.proOrderList.length === 0) {
-        await model.queryProOrder(this.formParams);
+        await model.queryProOrderInfo(this.formParams);
         orderNoList = model.proOrderList.map((_: any) => _.prdOrder);
         materialCodeList = model.proOrderList.map((_: any) => _.materialCode);
       } else {
@@ -249,7 +249,7 @@ export default class Virtual extends BasePage {
         materialCodeList: materialCodeList,
       };
       this.model.QueryParams(params);
-      await this.model.queryProOrderResult(params);
+      await this.model.queryProOrderResultList(params);
       this.model.setSapFactoryCode({ sapFactoryCode: this.form.sapFactoryCode });
       this.toPage(this.page.raw.handover.virtual.result);
     });
@@ -263,7 +263,7 @@ export default class Virtual extends BasePage {
       if (!valid) return;
       // await this.model.checkUserAndMrp({ mrpCodeRegion: this.form.mrpScope, loginName: session.loginName, factoryCode: session.factoryCode });
       // if (this.model.mrpcode == 1) {
-      this.model.queryProOrder(Object.assign(this.formParams, { sendSpot: this.formone.aimWl.value }));
+      this.model.queryProOrderInfo(Object.assign(this.formParams, { sendSpot: this.formone.aimWl.value }));
       this.isFormChange = false;
       // }
     });
diff --git a/src/pages/raw/handover/virtual-Vn/model.ts b/src/pages/raw/handover/virtual-Vn/model.ts
index 0e9451e..449fd46 100644
--- a/src/pages/raw/handover/virtual-Vn/model.ts
+++ b/src/pages/raw/handover/virtual-Vn/model.ts
@@ -116,7 +116,7 @@ export class VirtualModule extends VuexModule {
    * @param params
    */
   @MutationAction
-  async queryProOrder(params: any) {
+  async queryProOrderInfo(params: any) {
     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));
@@ -131,7 +131,7 @@ export class VirtualModule extends VuexModule {
    * @param params
    */
   @MutationAction
-  async queryProOrderResult(params: any) {
+  async queryProOrderResultList(params: any) {
     const { list: proOrderResultList }: any = await http.post(url.virtual.query.ordoutlist, params);
     proOrderResultList.forEach((item: any) => {
       item.hvAmount = 0;
diff --git a/src/pages/raw/handover/virtual-Vn/summary.vue b/src/pages/raw/handover/virtual-Vn/summary.vue
index 2ff1dc1..c284c38 100644
--- a/src/pages/raw/handover/virtual-Vn/summary.vue
+++ b/src/pages/raw/handover/virtual-Vn/summary.vue
@@ -272,7 +272,7 @@ export default class VirtualSummary extends BasePage {
           dataList: list,
           includeOrderOutIdList: model.proOrderResultList.map((item: any) => item.orderOutId),
         });
-        await this.model.queryProOrderResult(this.model.nextQueryParams);
+        await this.model.queryProOrderResultList(this.model.nextQueryParams);
         if (this.model.proOrderResultList.length == 0) {
           uni.showToast({
             title: this.$t('message.Pi_NoDataFound') as string,