From 033d6c2ae40e723d09ce4451f3c649e8dc04c04d Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Mon, 31 Oct 2022 17:09:06 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=8A=A5=E5=BA=9F=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=8E=9F=E5=9B=A0=E8=B4=A3=E4=BB=BB=E4=BA=BA&&?=
 =?UTF-8?q?=E9=97=A8=E4=BD=93=E5=94=AE=E5=90=8E=E6=95=B0=E9=87=8F=E5=8F=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Semi-finished/Semi-finished-SO/index.vue  | 21 ++++++++++++-------
 .../raw/warehouse/RUS-rowScrap/index.vue      | 20 +++++++++---------
 2 files changed, 23 insertions(+), 18 deletions(-)

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 696b93d..b0b24f9 100644
--- a/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
+++ b/src/pages/raw/Semi-finished/Semi-finished-SO/index.vue
@@ -3,7 +3,7 @@
     <!-- 头部 -->
     <view class="header" :style="{ backgroundColor: `rgba(23, 83, 234, ${scrollTop / 100})` }">
       <view class="left">
-        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack()" />
+        <u-icon class="icon" name="arrow-left" @click="uni.navigateBack({})" />
       </view>
       <view class="title">{{ $t('message.SemiFinished_SO') }}</view>
       <view class="right"></view>
@@ -47,7 +47,7 @@
       <view class="single">
         <view class="single-left">
           <view>{{ $t('message.product_barCode') }}:</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>
@@ -61,7 +61,7 @@
         </view>
         <view class="library-right">
           <view class="library-right-title">{{ $t('message.CommissionedThisNumber') }}</view>
-          <u-input :placeholder="$t('message.po_PleaseInput')" v-model="nowAmount" type="number" :disabled="disabled" :border="border" class="input" />
+          <u-input :placeholder="$t('message.po_PleaseInput')" v-model="nowAmount" type="number" :border="border" class="input" />
         </view>
       </view>
       <!-- 添加 -->
@@ -81,7 +81,7 @@
           <u-button type="primary" @click="onSubmit">{{ $t('message.product_Upload') }}</u-button>
         </u-col>
         <u-col :span="4">
-          <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>
@@ -103,6 +103,7 @@ export default class SemiFinishedSO extends BasePage {
   model = model;
   detailHeader = detailHeader;
   disabled = false;
+  isfocus = true;
   form: any = {
     documentNo: '',
   };
@@ -197,7 +198,7 @@ export default class SemiFinishedSO extends BasePage {
     this.Loc = [];
     this.Container = '';
     this.nowAmount = '';
-    this.disabled = false;
+    //this.disabled = false;
     let params = {
       productCode: this.every.materialCode,
       barcode: this.Barcode,
@@ -212,14 +213,18 @@ export default class SemiFinishedSO extends BasePage {
     // this.nowAmount = 1;
     if (this.Container.cpRef4 == null) {
       this.nowAmount = parseFloat(this.Container.qty);
-      this.disabled = true;
+      //this.disabled = true;
     } else {
       this.nowAmount = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4);
-      this.disabled = true;
+      //this.disabled = true;
     }
   }
   //点击添加
   Add() {
+    this.isfocus = false;
+    this.$nextTick(() => {
+      this.isfocus = true;
+    });
     if (this.Container == '') {
       this.customToast(this.$t('message.scanningContainer') as any);
       return;
@@ -285,7 +290,7 @@ export default class SemiFinishedSO extends BasePage {
       this.nowAmount = '';
       this.Barcode = '';
       this.Container = '';
-      this.disabled = false;
+      //this.disabled = false;
     }
   }
   deleteItem(e: any) {
diff --git a/src/pages/raw/warehouse/RUS-rowScrap/index.vue b/src/pages/raw/warehouse/RUS-rowScrap/index.vue
index d58f525..15653c4 100644
--- a/src/pages/raw/warehouse/RUS-rowScrap/index.vue
+++ b/src/pages/raw/warehouse/RUS-rowScrap/index.vue
@@ -73,13 +73,13 @@
         <u-input v-model="qty" placeholder="" :border="border" type="number" />
       </u-form-item>
       <!-- 责任人 -->
-      <u-form-item :label="$t('message.personLiable')">
+      <!-- <u-form-item :label="$t('message.personLiable')">
         <u-input v-model="dockCode" :placeholder="$t('message.PleaseOne')" :border="border" />
-      </u-form-item>
+      </u-form-item> -->
       <!-- 不良原因 -->
-      <u-form-item :label="$t('message.CausesOfDefects')">
+      <!-- <u-form-item :label="$t('message.CausesOfDefects')">
         <u-input v-model="dockName" :placeholder="$t('message.PleaseTwo')" :border="border" />
-      </u-form-item>
+      </u-form-item> -->
       <wyb-table class="table" ref="table" width="100%" show-left-and-right-border :headers="RUSdetailHeader" :contents="SubmitOrderlist" :show-vert-border="false" @onCellClick="deleteItem($event)"></wyb-table>
       <u-row class="button-bar">
         <u-col :span="6">
@@ -251,16 +251,16 @@ export default class KanDanHandOver extends BasePage {
     this.SubmitOrderlist[this.SubmitOrderlist.length - 1].type = '1';
     this.SubmitOrderlist[this.SubmitOrderlist.length - 1].keepBy = session.loginName;
     this.SubmitOrderlist[this.SubmitOrderlist.length - 1].orderType = '1';
-    this.SubmitOrderlist[this.SubmitOrderlist.length - 1].dockCode = this.dockCode;
-    this.SubmitOrderlist[this.SubmitOrderlist.length - 1].dockName = this.dockName;
+    //this.SubmitOrderlist[this.SubmitOrderlist.length - 1].dockCode = this.dockCode;
+    //this.SubmitOrderlist[this.SubmitOrderlist.length - 1].dockName = this.dockName;
     this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = this.qty;
     this.SubmitOrderlist[this.SubmitOrderlist.length - 1].barCode = this.Container.barcode;
     this.model.orderInInfoList[this.SomeIndex].totalqty += parseFloat(this.qty);
     this.Container = '';
     this.qty = 0;
     this.Barcode = '';
-    this.dockCode = '';
-    this.dockName = '';
+    //this.dockCode = '';
+    //this.dockName = '';
   }
   deleteItem(e: any) {
     uni.showModal({
@@ -313,8 +313,8 @@ export default class KanDanHandOver extends BasePage {
       this.Container = '';
       this.SubmitOrderlist = [];
       this.Barcode = '';
-      this.dockCode = '';
-      this.dockName = '';
+      // this.dockCode = '';
+      //this.dockName = '';
       this.query();
     }
   }