From 01b8e18f2e8503e9a1f82ffd35c37e6ab5cf21b5 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Thu, 6 Apr 2023 17:29:31 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=B3=B0=E5=9B=BD=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E8=BD=AC=E6=8D=A2=EF=BC=8CBOM=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=94=B9=E4=B8=BA=E4=B8=8D=E5=8F=AF=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/cn.ts                                  | 1 +
 src/i18n/lang/en.ts                                  | 1 +
 src/i18n/lang/ru.ts                                  | 1 +
 src/pages/login/login/index.vue                      | 2 +-
 src/pages/raw/ingoods/dnReturnGoods/Location.vue     | 2 +-
 src/pages/raw/warehouse/MaterialConversion/index.vue | 6 +++---
 src/pages/raw/warehouse/Relationship/index.vue       | 4 ++--
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 45aa4c2..220404a 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -565,5 +565,6 @@ export default {
     reqQty: '计划数量',
     finQty: '扫描数量',
     confirm: '确认',
+    HeaderText: '备注',
   },
 };
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 352f903..002c27c 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -564,5 +564,6 @@ export default {
     reqQty: 'Req Qty',
     finQty: 'Scan Qty',
     confirm: 'Confirm',
+    HeaderText: 'Header Text',
   },
 };
diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts
index d2a3f5f..be805dd 100644
--- a/src/i18n/lang/ru.ts
+++ b/src/i18n/lang/ru.ts
@@ -564,5 +564,6 @@ export default {
     reqQty: 'Запланированная численность',
     finQty: 'Количество сканирования',
     confirm: 'Подтверждениe',
+    HeaderText: 'Примечания',
   },
 };
diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 433831e..e805074 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.36';
     } else {
-      this.Version = '1.0.50';
+      this.Version = '1.0.51';
     }
     console.log('////', this.Version);
   }
diff --git a/src/pages/raw/ingoods/dnReturnGoods/Location.vue b/src/pages/raw/ingoods/dnReturnGoods/Location.vue
index c59de00..bf09a96 100644
--- a/src/pages/raw/ingoods/dnReturnGoods/Location.vue
+++ b/src/pages/raw/ingoods/dnReturnGoods/Location.vue
@@ -82,7 +82,7 @@
       <!-- 备注 -->
       <view class="material">
         <view class="material-right">
-          <view class="material-right-title">{{ $t('message.Note') }}:</view>
+          <view class="material-right-title">{{ $t('message.HeaderText') }}:</view>
           <u-input class="material-right-code" style="overflow: hidden; border: 2rpx solid; border-color: rgb(220, 223, 230); border-radius: 10rpx" v-model="userDefined10" placeholder="" />
         </view>
       </view>
diff --git a/src/pages/raw/warehouse/MaterialConversion/index.vue b/src/pages/raw/warehouse/MaterialConversion/index.vue
index 87069ed..4df2c8b 100644
--- a/src/pages/raw/warehouse/MaterialConversion/index.vue
+++ b/src/pages/raw/warehouse/MaterialConversion/index.vue
@@ -44,10 +44,10 @@
       </u-form-item>
       <!-- 数量 -->
       <u-form-item :label="$t('message.dn_Number')">
-        <u-input v-model="actualQty" type="number" placeholder="" />
+        <u-input v-model="Some.qty" type="number" placeholder="" :disabled="true" />
       </u-form-item>
       <!-- 备注 -->
-      <u-form-item :label="$t('message.Note')">
+      <u-form-item :label="$t('message.HeaderText')">
         <u-input v-model="userDefined3" placeholder="" />
       </u-form-item>
       <u-row class="button-bar">
@@ -151,7 +151,7 @@ export default class KanDanHandOver extends BasePage {
       productDescZh: this.Some.productDescZh,
       productCodeTarget: this.Some.productCodeTarget,
       productDescZhTarget: this.Some.productDescZhTarget,
-      actualQty: this.actualQty,
+      actualQty: this.Some.qty,
       userDefined3: this.userDefined3,
       originWl: this.Some.originWl,
       type: '1',
diff --git a/src/pages/raw/warehouse/Relationship/index.vue b/src/pages/raw/warehouse/Relationship/index.vue
index d00f6c6..002aab9 100644
--- a/src/pages/raw/warehouse/Relationship/index.vue
+++ b/src/pages/raw/warehouse/Relationship/index.vue
@@ -44,7 +44,7 @@
       </u-form-item>
       <!-- 数量 -->
       <u-form-item :label="$t('message.dn_Number')">
-        <u-input v-model="actualQty" type="number" placeholder="" />
+        <u-input v-model="Some.qty" type="number" placeholder="" :disabled="true" />
       </u-form-item>
       <u-row class="button-bar">
         <u-col :span="6">
@@ -133,7 +133,7 @@ export default class KanDanHandOver extends BasePage {
       factoryCode: this.Some.factoryCode,
       productCode: this.Some.productCode,
       productDescZh: this.Some.productDescZh,
-      actualQty: this.actualQty,
+      actualQty: this.Some.qty,
       originWl: this.Some.originWl,
       type: '1',
       loginName: session.loginName,