From acc373cd0760ec0773b64c6bc6be96c40c1d7280 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Fri, 14 Apr 2023 14:19:20 +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=E5=88=A4=E5=BA=9F=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue               |  2 +-
 .../semifinished-wasteJudgment/index.vue      | 27 +++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index bb6fb4a..1e33f08 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.37';
+      this.Version = '1.1.38';
     } else {
       this.Version = '1.0.51';
     }
diff --git a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue
index c269a4a..93a79f2 100644
--- a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue
+++ b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue
@@ -100,7 +100,7 @@ export default class KanDanHandOver extends BasePage {
   form = {
     aimWl: {} as OptionType,
   };
-  ScrapLocation = [
+  ScrapLocationOld = [
     {
       label: 'CA',
       value: 'CA',
@@ -114,11 +114,34 @@ export default class KanDanHandOver extends BasePage {
       value: 'FA',
     },
   ];
+  ScrapLocationNew = [
+    {
+      label: 'CA',
+      value: 'CA',
+    },
+    {
+      label: 'DA',
+      value: 'DA',
+    },
+    {
+      label: 'FA',
+      value: 'FA',
+    },
+    {
+      label: 'COMBI',
+      value: 'COMBI',
+    },
+  ];
+  ScrapLocation: any = [];
   bookTypeChange(e: any) {
     this.form.aimWl = e.pickerName;
   }
   async onReady() {
-    //
+    if (session.user.factoryCode === '6681') {
+      this.ScrapLocation = this.ScrapLocationOld;
+    } else {
+      this.ScrapLocation = this.ScrapLocationNew;
+    }
     this.form.aimWl = this.ScrapLocation[0];
   }
   async query() {