Merge branch 'master' of http://106.12.13.113:3000/haier_cosmo/wms_haiwai_app

src/i18n/lang/cn.ts

@@ -322,6 +322,7 @@ export default {
     Scrap_ScrapDetails: '报废明细',
     operatingTime: '操作时间',
     finishedProductReport: '报废明细',
+    product_Tip10: '数量已达上限，请勿扫描',
 
     //领用借用
     borrow_OrderNo: '单号',

src/i18n/lang/en.ts

@@ -326,6 +326,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',

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 = {

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 = {

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">