From 4261cc3d6695e0b63227cdab2cf5b772c051c9cb Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Thu, 17 Feb 2022 14:32:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BB=A5=E5=8F=8A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=B0=8F=E4=BF=AE=E6=94=B9?=
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/pages/product/warehouse/wholeCollect/index.vue | 2 +-
 src/pages/product/warehouse/wholeScrap/index.vue   | 2 +-
 src/pages/raw/handover/returning/index.vue         | 4 ++--
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 66c44fc..9445da1 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -322,6 +322,7 @@ export default {
     Scrap_ScrapDetails: '报废明细',
     operatingTime: '操作时间',
     finishedProductReport: '报废明细',
+    product_Tip10: '数量已达上限，请勿扫描',
 
     //领用借用
     borrow_OrderNo: '单号',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 5d55925..fe72cee 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -324,6 +324,7 @@ export default {
     Scrap_ScrapDetails: 'Scrap detail',
     operatingTime: 'OperatingTime',
     finishedProductReport: 'Scrap details',
+    product_Tip10: 'The number has reached the upper limit. Do not scan',
 
     //领用借用
     borrow_OrderNo: 'Order No',
diff --git a/src/pages/product/warehouse/wholeCollect/index.vue b/src/pages/product/warehouse/wholeCollect/index.vue
index 96d55a7..8122ec1 100644
--- a/src/pages/product/warehouse/wholeCollect/index.vue
+++ b/src/pages/product/warehouse/wholeCollect/index.vue
@@ -146,7 +146,7 @@ export default class ProductCheckReceipt extends BasePage {
       return;
     }
     if (this.Some.actualQty >= this.Some.qty) {
-      this.customToast(this.$t('message.barcode') as string);
+      this.customToast(this.$t('message.product_Tip10') as string);
       return;
     }
     let params = {
diff --git a/src/pages/product/warehouse/wholeScrap/index.vue b/src/pages/product/warehouse/wholeScrap/index.vue
index 8513226..87127de 100644
--- a/src/pages/product/warehouse/wholeScrap/index.vue
+++ b/src/pages/product/warehouse/wholeScrap/index.vue
@@ -126,7 +126,7 @@ export default class productCheckReceipt extends BasePage {
       return;
     }
     if (this.Some.actualQty >= this.Some.qty) {
-      this.customToast(this.$t('message.barcode') as string);
+      this.customToast(this.$t('message.product_Tip10') as string);
       return;
     }
     let params = {
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index c8305d0..8a7ebd1 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -35,7 +35,7 @@
       <!-- 库存 -->
       <view class="newly">
         <u-form-item :label="$t('message.Pi_factory')" style="width: 50%">
-          <u-input v-model="model.orderInInfo.sapFactoryCode" placeholder=" " :disabled="true" />
+          <u-input style="flex: 0.9" v-model="model.orderInInfo.sapFactoryCode" placeholder=" " :disabled="true" />
         </u-form-item>
         <u-form-item :label="$t('message.product_Location')" style="width: 50%; margin-top: 16rpx">
           <!-- <u-input
@@ -49,7 +49,7 @@
       <u-row gutter="0">
         <u-col :span="6">
           <u-form-item :label="$t('message.QuantityReturned')" prop="sapFactoryCode">
-            <u-input :disabled="true" v-model="form.totalBackAmount" placeholder="" />
+            <u-input style="flex: 0.9" :disabled="true" v-model="form.totalBackAmount" placeholder="" />
           </u-form-item>
         </u-col>
         <u-col :span="6">