From 20d993c40d47f6d9d0e3f49129354b276517bb55 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Thu, 30 Mar 2023 10:58:19 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E4=BF=84=E7=BD=97=E6=96=AF?=
 =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E7=9B=98=E7=82=B9=E5=85=89=E6=A0=87?=
 =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E4=BF=AE=E5=A4=8D?=
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/LineSide/LineSide-inventory/index.vue        | 7 +++++--
 .../raw/Semi-finished/Semi-finished-inventory/index.vue    | 7 +++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 5ce8d22..433831e 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -171,7 +171,7 @@ export default class LoginPage extends BasePage {
     console.log('......', server.serverAddress);
     if (server.serverAddress.includes('https://eurmom.haier.net')) {
       //修改俄罗斯版本号
-      this.Version = '1.1.35';
+      this.Version = '1.1.36';
     } else {
       this.Version = '1.0.50';
     }
diff --git a/src/pages/raw/LineSide/LineSide-inventory/index.vue b/src/pages/raw/LineSide/LineSide-inventory/index.vue
index 8a4d12d..213e03f 100644
--- a/src/pages/raw/LineSide/LineSide-inventory/index.vue
+++ b/src/pages/raw/LineSide/LineSide-inventory/index.vue
@@ -126,9 +126,12 @@ export default class rawMaterialInventory extends BasePage {
       // this.wl = this.model.InventoryItemList[0];
     }
     this.isfocus = false;
-    setTimeout(() => {
+    this.$nextTick(() => {
       this.isfocus = true;
-    }, 0);
+    });
+    // setTimeout(() => {
+    //   this.isfocus = true;
+    // }, 0);
   }
   //选择其中一条物料
   // onchange(e: any) {
diff --git a/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue b/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue
index e5188a0..b692557 100644
--- a/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue
+++ b/src/pages/raw/Semi-finished/Semi-finished-inventory/index.vue
@@ -126,9 +126,12 @@ export default class rawMaterialInventory extends BasePage {
       // this.wl = this.model.InventoryItemList[0];
     }
     this.isfocus = false;
-    setTimeout(() => {
+    this.$nextTick(() => {
       this.isfocus = true;
-    }, 0);
+    });
+    // setTimeout(() => {
+    //   this.isfocus = true;
+    // }, 0);
   }
   //选择其中一条物料
   // onchange(e: any) {