From 878c56f443d88bbc112478f373cffb55bfb47a54 Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Fri, 4 Mar 2022 13:15:36 +0800
Subject: [PATCH] =?UTF-8?q?dam-7=20feat=20=E6=88=90=E5=93=81=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue                    |  2 +-
 .../product/inbound/finishProductOffline/index.vue | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index bf0b5c9..045ce6f 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -150,7 +150,7 @@ export default class LoginPage extends BasePage {
     console.log('image', this.image);
     console.log('Version////', this.Version);
   }
-  Version = '1.0.3';
+  Version = '2.0.1';
   async update() {
     try {
       await session.QueryVersion();
diff --git a/src/pages/product/inbound/finishProductOffline/index.vue b/src/pages/product/inbound/finishProductOffline/index.vue
index d9308b8..6946e2c 100644
--- a/src/pages/product/inbound/finishProductOffline/index.vue
+++ b/src/pages/product/inbound/finishProductOffline/index.vue
@@ -10,6 +10,9 @@
     <u-form class="form" ref="form" :model="form" :error-type="['toast']" label-width="120rpx">
       <u-row align="top">
         <u-col :span="12">
+          <u-form-item :label="$t('message.product_barCode')">
+            <u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.barCode" @search="getBarcode" :focus="firstFocus" maxlength="20" :show-action="false"></u-search>
+          </u-form-item>
           <u-form-item :required="true" :label="$t('message.product_Location')" prop="dockName">
             <jPicker sureColor="#ff0000" @bindpicker="bookTypeChange" showKey="value" valKey="value" :val="form.aimWl.value" :options="model.returningTypeList" :focus="true" />
             <!--            <u-input v-model="form.dockName" type="select" @click="returningTypeSelect = true" />-->
@@ -24,9 +27,6 @@
             <!--              "-->
             <!--            ></u-select>-->
           </u-form-item>
-          <u-form-item :label="$t('message.product_barCode')">
-            <u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="form.barCode" @search="getBarcode" :focus="firstFocus" maxlength="20" :show-action="false"></u-search>
-          </u-form-item>
         </u-col>
         <u-col :span="12">
           <view class="table-wrapper">
@@ -247,13 +247,13 @@ export default class finishProductOfflineDom extends BasePage {
       this.customToast(this.$t('message.product_Tip3') as string);
       return;
     }
-    if(this.form.barCode.length < 20){
+    if (this.form.barCode.length < 20) {
       this.customToast(this.$t('message.barCodeLength') as string);
-      return
+      return;
     }
-    if(this.form.barCode.length > 20){
+    if (this.form.barCode.length > 20) {
       this.customToast(this.$t('message.standard') as string);
-      return
+      return;
     }
     console.log('this.form', this.form);
     if (this.materielList.length == 0) {