From 27dd95c139fa9bdf5dc4b6687792bcc638ec59b1 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Mon, 16 Jan 2023 18:11:08 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E4=BF=84=E7=BD=97=E6=96=AF?=
 =?UTF-8?q?=E6=B5=B7=E5=A4=96dn=E6=94=B6=E8=B4=A7=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue               |  2 +-
 .../raw/ingoods/RUS-dnReceipt/ImportDN.vue    | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 539507c..2f4f6b1 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.24';
+      this.Version = '1.1.25';
     } else {
       this.Version = '1.0.49';
     }
diff --git a/src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue
index bdf8d65..0b5dd1a 100644
--- a/src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue
+++ b/src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue
@@ -270,16 +270,16 @@ export default class dnReceiptDom extends BasePage {
     this.every = { ...e.pickerName };
     //清空库位列表 避免库位重复添加
     console.log('this.every', this.every);
-    this.Location = [];
+    //this.Location = [];
     // 查询时初始化仓库
-    this.Location = await this.initLocation(this.every);
-    if (this.Location.length == 0) {
-      await this.queryLoction();
-    }
+    // this.Location = await this.initLocation(this.every);
+    // if (this.Location.length == 0) {
+    //   await this.queryLoction();
+    // }
     // 自动化流程改造测试
-    this.LocationChoice({
-      pickerName: this.Location.find(() => true),
-    });
+    // this.LocationChoice({
+    //   pickerName: this.Location.find(() => true),
+    // });
     this.DNReceivingList.forEach((item: any, index: any) => {
       if (item.poNo == this.every.poNo && item.materialCode == this.every.materialCode && item.poLine == this.every.poLine) {
         this.everyIndex = index;
@@ -371,13 +371,13 @@ export default class dnReceiptDom extends BasePage {
     // 清空 add table
     this.LocationList = [];
     // 仓库
-    this.Location = [];
+    // this.Location = [];
     this.poNo = '';
     this.poList = [];
     // 清空 当前选择的库位对象
-    this.wl = {
-      value: null,
-    };
+    // this.wl = {
+    //   value: null,
+    // };
     // 清空 物料对象
     this.every = {};
     // 清空 原始物料列表
@@ -391,12 +391,12 @@ export default class dnReceiptDom extends BasePage {
   }
   empty() {
     this.LocationList = [];
-    this.Location = [];
+    //this.Location = [];
     this.poNo = '';
     this.poList = [];
-    this.wl = {
-      value: null,
-    };
+    // this.wl = {
+    //   value: null,
+    // };
     this.every = {};
     this.materialList = [];
     this.receiptAmount = null;