From 8aae5826be2b9ab3b34f9ee235aeec11708928a3 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Mon, 16 Jan 2023 11:07:40 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=B3=B0=E5=9B=BD=E6=8B=A3?=
 =?UTF-8?q?=E9=85=8D=E4=BA=A4=E6=8E=A5=E6=B3=A8=E9=87=8A=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?mrp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue              |  2 +-
 src/pages/raw/handover/aggregating/index.vue | 14 +++++++-------
 src/pages/raw/handover/picking/index.vue     | 20 ++++++++++----------
 src/pages/raw/handover/virtual/index.vue     | 12 ++++++------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 5d93e36..88fef18 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -173,7 +173,7 @@ export default class LoginPage extends BasePage {
       //修改俄罗斯版本号
       this.Version = '1.1.23';
     } else {
-      this.Version = '1.0.48';
+      this.Version = '1.0.49';
     }
     console.log('////', this.Version);
   }
diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue
index ff55a9e..c8b9d30 100644
--- a/src/pages/raw/handover/aggregating/index.vue
+++ b/src/pages/raw/handover/aggregating/index.vue
@@ -213,7 +213,7 @@ export default class Aggregating extends BasePage {
     this.getLoc();
   }
   async onShow() {
-    await this.getMRP();
+    //await this.getMRP();
   }
   async getMRP() {
     let params = {
@@ -304,12 +304,12 @@ export default class Aggregating extends BasePage {
   async onQuery() {
     this.$form.validate(async (valid: boolean) => {
       if (!valid) return;
-      await this.model.checkUserAndMrp({ mrpCodeRegion: this.form.mrpScope, loginName: session.loginName, factoryCode: session.factoryCode });
-      if (this.model.mrpcode == 1) {
-        await this.model.queryProOrder(Object.assign(this.formParams, { sendSpot: this.formone.aimWl.value }));
-        this.isFormChange = false;
-        this.model.isFormChange = this.formParams;
-      }
+      // await this.model.checkUserAndMrp({ mrpCodeRegion: this.form.mrpScope, loginName: session.loginName, factoryCode: session.factoryCode });
+      // if (this.model.mrpcode == 1) {
+      await this.model.queryProOrder(Object.assign(this.formParams, { sendSpot: this.formone.aimWl.value }));
+      this.isFormChange = false;
+      this.model.isFormChange = this.formParams;
+      //}
     });
   }
 }
diff --git a/src/pages/raw/handover/picking/index.vue b/src/pages/raw/handover/picking/index.vue
index 7f02c08..4758cc5 100644
--- a/src/pages/raw/handover/picking/index.vue
+++ b/src/pages/raw/handover/picking/index.vue
@@ -173,7 +173,7 @@ export default class pickingDom extends BasePage {
     return params;
   }
   async onShow() {
-    await this.getMRP();
+    //await this.getMRP();
   }
   async getMRP() {
     let params = {
@@ -244,15 +244,15 @@ export default class pickingDom extends BasePage {
   onQuery() {
     this.$form.validate(async (valid: boolean) => {
       if (!valid) return;
-      await this.model.checkUserAndMrp({ mrpCodeRegion: this.form.mrpCodeRegion, loginName: session.loginName, factoryCode: session.factoryCode });
-      if (this.model.mrpcode == 1) {
-        await this.model.queryProOrder(this.formParams);
-        this.model.checkAllProOrderList(true);
-        this.isFormChange = false;
-        model.mrpCodeRegion = this.form.mrpCodeRegion as any;
-        model.sapFactoryCode = this.form.sapFactoryCode as any;
-        model.formParams = this.formParams;
-      }
+      // await this.model.checkUserAndMrp({ mrpCodeRegion: this.form.mrpCodeRegion, loginName: session.loginName, factoryCode: session.factoryCode });
+      // if (this.model.mrpcode == 1) {
+      await this.model.queryProOrder(this.formParams);
+      this.model.checkAllProOrderList(true);
+      this.isFormChange = false;
+      model.mrpCodeRegion = this.form.mrpCodeRegion as any;
+      model.sapFactoryCode = this.form.sapFactoryCode as any;
+      model.formParams = this.formParams;
+      // }
     });
   }
 }
diff --git a/src/pages/raw/handover/virtual/index.vue b/src/pages/raw/handover/virtual/index.vue
index 3c44f18..e1aecbb 100644
--- a/src/pages/raw/handover/virtual/index.vue
+++ b/src/pages/raw/handover/virtual/index.vue
@@ -196,7 +196,7 @@ export default class Virtual extends BasePage {
     this.getLoc();
   }
   async onShow() {
-    await this.getMRP();
+    //await this.getMRP();
   }
   async getMRP() {
     let params = {
@@ -261,11 +261,11 @@ export default class Virtual extends BasePage {
   onQuery() {
     this.$form.validate(async (valid: boolean) => {
       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.isFormChange = false;
-      }
+      // 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.isFormChange = false;
+      // }
     });
   }
   ondelete() {