From 50821e65e82430f92cecc4003ba52088c35ede46 Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 1 Nov 2022 11:34:20 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=89=AB=E7=A0=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=90=8E=E5=85=89=E6=A0=87=E5=86=8D=E6=AC=A1=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/STO/STO-Outbound/index.vue      |  4 +++
 src/pages/raw/STO/STO-Storage/index.vue       |  4 +++
 .../Semi-finished/Semi-finished-SO/index.vue  | 10 +++---
 src/pages/raw/commission/RUS-Out/index.vue    |  7 ++++-
 .../raw/commission/RUS-entrant/index.vue      |  7 ++++-
 .../raw/handover/RUS-picking/ByOrder.vue      | 13 +++++++-
 .../raw/handover/RUS-picking/BySummary.vue    | 13 +++++++-
 .../raw/handover/RUS-returning/index.vue      |  7 ++++-
 .../raw/handover/feeding/RUS-Location.vue     |  8 ++++-
 .../ingoods/RUS-dnReturnGoods/Location.vue    |  7 ++++-
 .../Container-consolidation/index.vue         | 31 +++++++++++++------
 .../raw/warehouse/RUS-rowCollect/index.vue    |  7 ++++-
 .../raw/warehouse/RUS-rowScrap/index.vue      |  7 ++++-
 .../raw/warehouse/RUS-rowTransfer/index.vue   |  7 ++++-
 14 files changed, 108 insertions(+), 24 deletions(-)

diff --git a/src/pages/raw/STO/STO-Outbound/index.vue b/src/pages/raw/STO/STO-Outbound/index.vue
index cd5a0ec..1f25e38 100644
--- a/src/pages/raw/STO/STO-Outbound/index.vue
+++ b/src/pages/raw/STO/STO-Outbound/index.vue
@@ -273,6 +273,10 @@ export default class dnReceiptDom extends BasePage {
     this.barCode = '';
     this.num = '';
     this.locCode = '';
+    this.firstFocus = false;
+    this.$nextTick(() => {
+      this.firstFocus = true;
+    });
     console.log('this.model.dnNoList', this.model.dnNoList);
   }
   deleteItem(e: any) {
diff --git a/src/pages/raw/STO/STO-Storage/index.vue b/src/pages/raw/STO/STO-Storage/index.vue
index e98aa7b..1fc8430 100644
--- a/src/pages/raw/STO/STO-Storage/index.vue
+++ b/src/pages/raw/STO/STO-Storage/index.vue
@@ -277,6 +277,10 @@ export default class dnReceiptDom extends BasePage {
     this.SunmitList.push(obj);
     this.num = '';
     this.barCode = '';
+    this.firstFocus = false;
+    this.$nextTick(() => {
+      this.firstFocus = true;
+    });
     //this.locCode = '';
     console.log('this.model.dnNoList', this.model.dnNoList);
   }
diff --git a/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue b/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
index b0b24f9..672e0ab 100644
--- a/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
+++ b/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
@@ -103,7 +103,7 @@ export default class SemiFinishedSO extends BasePage {
   model = model;
   detailHeader = detailHeader;
   disabled = false;
-  isfocus = true;
+  isfocus = false;
   form: any = {
     documentNo: '',
   };
@@ -221,10 +221,6 @@ export default class SemiFinishedSO extends BasePage {
   }
   //点击添加
   Add() {
-    this.isfocus = false;
-    this.$nextTick(() => {
-      this.isfocus = true;
-    });
     if (this.Container == '') {
       this.customToast(this.$t('message.scanningContainer') as any);
       return;
@@ -290,6 +286,10 @@ export default class SemiFinishedSO extends BasePage {
       this.nowAmount = '';
       this.Barcode = '';
       this.Container = '';
+      this.isfocus = false;
+      this.$nextTick(() => {
+        this.isfocus = true;
+      });
       //this.disabled = false;
     }
   }
diff --git a/src/pages/raw/commission/RUS-Out/index.vue b/src/pages/raw/commission/RUS-Out/index.vue
index d425557..31705c2 100644
--- a/src/pages/raw/commission/RUS-Out/index.vue
+++ b/src/pages/raw/commission/RUS-Out/index.vue
@@ -47,7 +47,7 @@
       <view class="single">
         <view class="single-left">
           <view>{{ $t('message.Container') }}:</view>
-          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
+          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" :focus="isfocus" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
         </view>
         <view class="single-right">
           <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@@ -122,6 +122,7 @@ export default class dnReceiptDom extends BasePage {
   wlCode: any = '';
   materialIndex: any = null;
   Barcode: any = '';
+  isfocus = false;
   Container: any = '';
   async QueryLoc() {
     await this.model.queryItemLoc({
@@ -315,6 +316,10 @@ export default class dnReceiptDom extends BasePage {
             this.Container = '';
             this.Loc = [];
             this.Barcode = '';
+            this.isfocus = false;
+            this.$nextTick(() => {
+              this.isfocus = true;
+            });
           } else if (res.cancel) {
             return;
           }
diff --git a/src/pages/raw/commission/RUS-entrant/index.vue b/src/pages/raw/commission/RUS-entrant/index.vue
index cf5440e..d58b8e6 100644
--- a/src/pages/raw/commission/RUS-entrant/index.vue
+++ b/src/pages/raw/commission/RUS-entrant/index.vue
@@ -55,7 +55,7 @@
       <view class="single">
         <view class="single-left">
           <view>{{ $t('message.Container') }}:</view>
-          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
+          <u-search :placeholder="$t('message.PleaseScan')" :focus="isfocus" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
         </view>
         <view class="single-right">
           <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@@ -143,6 +143,7 @@ export default class dnReceiptDom extends BasePage {
   requestAmount: number = null;
   //容器码
   Barcode: any = '';
+  isfocus = false;
   Container: any = '';
   // 页面初始化
   async onShow() {
@@ -389,6 +390,10 @@ export default class dnReceiptDom extends BasePage {
       this.Barcode = '';
       this.every = this.DNReceivingList[this.everyIndex];
       this.disabled = false;
+      this.isfocus = false;
+      this.$nextTick(() => {
+        this.isfocus = true;
+      });
     }
   }
   deleteItem(e: any) {
diff --git a/src/pages/raw/handover/RUS-picking/ByOrder.vue b/src/pages/raw/handover/RUS-picking/ByOrder.vue
index 645bde7..ef1e0d0 100644
--- a/src/pages/raw/handover/RUS-picking/ByOrder.vue
+++ b/src/pages/raw/handover/RUS-picking/ByOrder.vue
@@ -25,7 +25,7 @@
     <view class="library">
       <view class="single-left">
         <view>{{ $t('message.Container') }}</view>
-        <u-search :placeholder="$t('message.PleaseScan')" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
+        <u-search :placeholder="$t('message.PleaseScan')" :focus="isfocus" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
       </view>
       <view class="library-left">
         <view>{{ $t('message.CommissionedLocation') }}:</view>
@@ -129,6 +129,7 @@ export default class RawReceiptDetail extends BasePage {
   some: any = {};
   Container: any = {};
   Barcode: any = '';
+  isfocus = false;
   qty: any = '';
   /**
    * 表单数据
@@ -319,6 +320,11 @@ export default class RawReceiptDetail extends BasePage {
               this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
               this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
               this.qty = '';
+              this.Barcode = '';
+              this.isfocus = false;
+              this.$nextTick(() => {
+                this.isfocus = true;
+              });
             }
           },
         });
@@ -339,6 +345,11 @@ export default class RawReceiptDetail extends BasePage {
         this.model.proOrderResultList[this.someIndex].wlList.push(TEM);
         this.model.proOrderResultList[this.someIndex].currentAmount += parseFloat(this.qty);
         this.qty = '';
+        this.Barcode = '';
+        this.isfocus = false;
+        this.$nextTick(() => {
+          this.isfocus = true;
+        });
       }
     }
   }
diff --git a/src/pages/raw/handover/RUS-picking/BySummary.vue b/src/pages/raw/handover/RUS-picking/BySummary.vue
index f0bb1fd..d833ef6 100644
--- a/src/pages/raw/handover/RUS-picking/BySummary.vue
+++ b/src/pages/raw/handover/RUS-picking/BySummary.vue
@@ -27,7 +27,7 @@
       <!-- 容器编码 -->
       <view class="single-left">
         <view>{{ $t('message.Container') }}</view>
-        <u-search :placeholder="$t('message.PleaseScan')" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
+        <u-search :placeholder="$t('message.PleaseScan')" :focus="isfocus" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
       </view>
       <view class="library-left">
         <view>{{ $t('message.CommissionedLocation') }}:</view>
@@ -122,6 +122,7 @@ export default class RawReceiptDetail extends BasePage {
   some: any = {};
   Container: any = {};
   Barcode: any = '';
+  isfocus = false;
   qty: any = '';
   //表单数据
   form: any = {
@@ -309,6 +310,11 @@ export default class RawReceiptDetail extends BasePage {
               this.model.aggregateList[this.someIndex].wlList.push(TEM);
               this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
               this.qty = '';
+              this.Barcode = '';
+              this.isfocus = false;
+              this.$nextTick(() => {
+                this.isfocus = true;
+              });
             }
           },
         });
@@ -329,6 +335,11 @@ export default class RawReceiptDetail extends BasePage {
         this.model.aggregateList[this.someIndex].wlList.push(TEM);
         this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
         this.qty = '';
+        this.Barcode = '';
+        this.isfocus = false;
+        this.$nextTick(() => {
+          this.isfocus = true;
+        });
       }
     }
   }
diff --git a/src/pages/raw/handover/RUS-returning/index.vue b/src/pages/raw/handover/RUS-returning/index.vue
index eda5cad..1f504a0 100644
--- a/src/pages/raw/handover/RUS-returning/index.vue
+++ b/src/pages/raw/handover/RUS-returning/index.vue
@@ -36,7 +36,7 @@
       <view class="single">
         <view class="single-left">
           <view>{{ $t('message.Container') }}:</view>
-          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
+          <u-search :placeholder="$t('message.PleaseScan')" :focus="isfocus" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
         </view>
         <view class="single-right">
           <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@@ -111,6 +111,7 @@ export default class returningDom extends BasePage {
   operator: any = '';
   form: any = {};
   Barcode: any = '';
+  isfocus = false;
   qty: any = '';
   prdOrder: any = [];
   wlCode: any = '';
@@ -228,6 +229,10 @@ export default class returningDom extends BasePage {
     this.Container = '';
     this.Barcode = '';
     this.qty = '';
+    this.isfocus = false;
+    this.$nextTick(() => {
+      this.isfocus = true;
+    });
   }
   deleteItem(e: any) {
     uni.showModal({
diff --git a/src/pages/raw/handover/feeding/RUS-Location.vue b/src/pages/raw/handover/feeding/RUS-Location.vue
index c453c74..db04bad 100644
--- a/src/pages/raw/handover/feeding/RUS-Location.vue
+++ b/src/pages/raw/handover/feeding/RUS-Location.vue
@@ -59,7 +59,7 @@
       <view class="single">
         <view class="single-left">
           <view>{{ $t('message.Container') }}:</view>
-          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
+          <u-search :placeholder="$t('message.PleaseScan')" :focus="isfocus" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
         </view>
         <view class="single-right">
           <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@@ -164,6 +164,7 @@ export default class RawReceiptDetail extends BasePage {
   some: any = {};
   Container: any = {};
   qty: any = '';
+  isfocus = false;
   form: any = {
     documentNo: '',
     amount: null,
@@ -405,6 +406,11 @@ export default class RawReceiptDetail extends BasePage {
       this.business();
       this.qty = '';
       this.Container = '';
+      this.Barcode = '';
+      this.isfocus = false;
+      this.$nextTick(() => {
+        this.isfocus = true;
+      });
     }
   }
   deleteItem(e: any): void {
diff --git a/src/pages/raw/ingoods/RUS-dnReturnGoods/Location.vue b/src/pages/raw/ingoods/RUS-dnReturnGoods/Location.vue
index 7425957..aa92a87 100644
--- a/src/pages/raw/ingoods/RUS-dnReturnGoods/Location.vue
+++ b/src/pages/raw/ingoods/RUS-dnReturnGoods/Location.vue
@@ -70,7 +70,7 @@
       <view class="single">
         <view class="single-left">
           <view>{{ $t('message.Container') }}:</view>
-          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
+          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" :focus="isfocus" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
         </view>
         <view class="single-right">
           <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@@ -150,6 +150,7 @@ export default class RawReceiptDetail extends BasePage {
     password: '',
   };
   Barcode: any = '';
+  isfocus = false;
   model = model;
   materialList: any = [];
   type = 'text';
@@ -310,6 +311,10 @@ export default class RawReceiptDetail extends BasePage {
     this.qty = '';
     this.Container = '';
     this.Barcode = '';
+    this.isfocus = false;
+    this.$nextTick(() => {
+      this.isfocus = true;
+    });
   }
   //删除某一项 触发事件
   deleteItem(e: any) {
diff --git a/src/pages/raw/warehouse/Container-consolidation/index.vue b/src/pages/raw/warehouse/Container-consolidation/index.vue
index 3bbe6c8..bd4adf3 100644
--- a/src/pages/raw/warehouse/Container-consolidation/index.vue
+++ b/src/pages/raw/warehouse/Container-consolidation/index.vue
@@ -35,7 +35,7 @@
       <view class="single">
         <view class="single-left">
           <view>{{ $t('message.source') }}:</view>
-          <u-search :placeholder="$t('message.barcodeSource')" style="z-index: 10000" v-model="NextCode" @search="searchSource" :show-action="false"></u-search>
+          <u-search :placeholder="$t('message.barcodeSource')" :focus="isfocus" style="z-index: 10000" v-model="NextCode" @search="searchSource" :show-action="false"></u-search>
         </view>
         <view class="single-right">
           <u-button type="primary" @click="searchSource">{{ $t('message.Query') }}</u-button>
@@ -67,7 +67,7 @@
         </u-col>
         <!-- 返回 -->
         <u-col :span="6">
-          <u-button type="error" @click="uni.navigateBack()">{{ $t('message.po_Return') }}</u-button>
+          <u-button type="error" @click="uni.navigateBack({})">{{ $t('message.po_Return') }}</u-button>
         </u-col>
       </u-row>
     </view>
@@ -90,6 +90,7 @@ export default class KanDanHandOver extends BasePage {
   model = model;
   barcode = '';
   every: any = {};
+  isfocus = false;
   async query() {
     if (this.barcode == '' || this.barcode.length == 0) {
       this.customToast(this.$t('message.Commission_tips1') as string);
@@ -131,6 +132,12 @@ export default class KanDanHandOver extends BasePage {
   NewQty: any = '';
   Submitlist: any = [];
   Add() {
+    let sum = 0;
+    this.Submitlist.forEach((item) => {
+      sum += parseFloat(item.qty);
+    });
+    // this.allnumber = sum;
+    console.log('/////////', this.model.SourceDetail.qty);
     if (this.NewQty == '') {
       this.customToast(this.$t('message.Summary_PleaseInputNumber') as string);
       return;
@@ -139,11 +146,11 @@ export default class KanDanHandOver extends BasePage {
       this.customToast(this.$t('message.Commission_tips3') as string);
       return;
     }
-    if (parseFloat(this.NewQty) > parseFloat(this.every.qty)) {
-      this.customToast(this.$t('message.Commission_tips4') as string);
-      return;
-    }
-    if (parseFloat(this.NewQty) > parseFloat(this.model.SourceDetail.qty)) {
+    // if (parseFloat(this.NewQty) > parseFloat(this.every.qty)) {
+    //   this.customToast(this.$t('message.Commission_tips4') as string);
+    //   return;
+    // }
+    if (parseFloat(this.NewQty) + sum > parseFloat(this.model.SourceDetail.qty)) {
       this.customToast(this.$t('message.Commission_tips4') as string);
       return;
     }
@@ -156,7 +163,13 @@ export default class KanDanHandOver extends BasePage {
     };
     this.Submitlist.push(arr);
     this.every.qty += parseFloat(this.NewQty);
-    this.model.SourceDetail.qty -= parseFloat(this.NewQty);
+
+    // this.model.SourceDetail.qty -= parseFloat(this.NewQty);
+    this.NextCode = '';
+    this.isfocus = false;
+    this.$nextTick(() => {
+      this.isfocus = true;
+    });
   }
   deleteItem(e: any) {
     uni.showModal({
@@ -167,7 +180,7 @@ export default class KanDanHandOver extends BasePage {
         if (res.confirm) {
           this.Submitlist.splice(e.contentIndex, 1);
           this.every.qty -= parseFloat(e.lineData.qty);
-          this.model.SourceDetail.qty += parseFloat(e.lineData.qty);
+          //this.model.SourceDetail.qty += parseFloat(e.lineData.qty);
         } else if (res.cancel) {
           return;
         }
diff --git a/src/pages/raw/warehouse/RUS-rowCollect/index.vue b/src/pages/raw/warehouse/RUS-rowCollect/index.vue
index e2c7409..be166c5 100644
--- a/src/pages/raw/warehouse/RUS-rowCollect/index.vue
+++ b/src/pages/raw/warehouse/RUS-rowCollect/index.vue
@@ -50,7 +50,7 @@
       <view class="single">
         <view class="single-left">
           <view>{{ $t('message.Container') }}:</view>
-          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
+          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" :focus="isfocus" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
         </view>
         <view class="single-right">
           <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@@ -97,6 +97,7 @@ export default class KanDanHandOver extends BasePage {
   Some: any = {};
   MaterialList: any = [];
   Barcode: any = '';
+  isfocus = false;
   qty: any = 0;
   SubmitOrderlist: any = [];
   Container: any = '';
@@ -218,6 +219,10 @@ export default class KanDanHandOver extends BasePage {
     this.qty = 0;
     this.Container = '';
     this.Barcode = '';
+    this.isfocus = false;
+    this.$nextTick(() => {
+      this.isfocus = true;
+    });
   }
   deleteItem(e: any) {
     uni.showModal({
diff --git a/src/pages/raw/warehouse/RUS-rowScrap/index.vue b/src/pages/raw/warehouse/RUS-rowScrap/index.vue
index 15653c4..764f502 100644
--- a/src/pages/raw/warehouse/RUS-rowScrap/index.vue
+++ b/src/pages/raw/warehouse/RUS-rowScrap/index.vue
@@ -58,7 +58,7 @@
       <view class="single">
         <view class="single-left">
           <view>{{ $t('message.Container') }}:</view>
-          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
+          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" :focus="isfocus" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
         </view>
         <view class="single-right">
           <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@@ -118,6 +118,7 @@ export default class KanDanHandOver extends BasePage {
   Container: any = '';
   qty: any = 0;
   Barcode: any = '';
+  isfocus = false;
   SomeIndex = 0;
   async query() {
     if (this.order3 === '') {
@@ -259,6 +260,10 @@ export default class KanDanHandOver extends BasePage {
     this.Container = '';
     this.qty = 0;
     this.Barcode = '';
+    this.isfocus = false;
+    this.$nextTick(() => {
+      this.isfocus = true;
+    });
     //this.dockCode = '';
     //this.dockName = '';
   }
diff --git a/src/pages/raw/warehouse/RUS-rowTransfer/index.vue b/src/pages/raw/warehouse/RUS-rowTransfer/index.vue
index 15ba985..b6a6b8f 100644
--- a/src/pages/raw/warehouse/RUS-rowTransfer/index.vue
+++ b/src/pages/raw/warehouse/RUS-rowTransfer/index.vue
@@ -47,7 +47,7 @@
       <view class="single">
         <view class="single-left">
           <view>{{ $t('message.Container') }}:</view>
-          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
+          <u-search :placeholder="$t('message.PleaseScan')" style="z-index: 10000" :focus="isfocus" v-model="Barcode" @search="searchBarcode" :show-action="false"></u-search>
         </view>
         <view class="single-right">
           <u-button type="primary" @click="Add">{{ $t('message.product_add') }}</u-button>
@@ -97,6 +97,7 @@ export default class KanDanHandOver extends BasePage {
   orderlist: any = [];
   orderlistIndex = 0;
   Barcode: any = '';
+  isfocus = false;
   SubmitOrderlist: any = [];
   Container: any = '';
   async query() {
@@ -175,6 +176,10 @@ export default class KanDanHandOver extends BasePage {
     this.Barcode = '';
     this.Container = '';
     this.total = 0;
+    this.isfocus = false;
+    this.$nextTick(() => {
+      this.isfocus = true;
+    });
   }
   deleteItem(e: any) {
     uni.showModal({