From 60fbcaf1c13179f67aa39ea09dbf76b540dc7ff1 Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Fri, 22 Apr 2022 16:32:20 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E5=8E=9F=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E9=80=80=E6=96=99=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue               | 19 ++++++++++++++-----
 src/pages/raw/handover/picking/ByOrder.vue    |  1 -
 .../raw/handover/returning/Time-filter.vue    | 18 +++++++++++-------
 src/pages/raw/handover/returning/index.vue    | 14 +++++++-------
 src/pages/raw/handover/returning/model.ts     |  2 +-
 5 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index 55135b4..86f7469 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -22,7 +22,8 @@
           height: '36rpx',
           margin: '24rpx 20rpx',
         }"
-        ><u-input
+      >
+        <u-input
           v-model="form.username"
           :placeholder="$t('message.PleaseInputUserName')"
           placeholder-style="color: rgba(255, 255, 255, 0.36)"
@@ -31,7 +32,8 @@
             marginRight: '36rpx',
             color: 'rgba(255, 255, 255, 0.67)',
           }"
-      /></u-form-item>
+        />
+      </u-form-item>
 
       <u-form-item
         class="form-item"
@@ -43,7 +45,8 @@
           height: '36rpx',
           margin: '24rpx 20rpx',
         }"
-        ><u-input
+      >
+        <u-input
           v-model="form.password"
           :placeholder="$t('message.PleaseInputPassword')"
           type="password"
@@ -53,7 +56,8 @@
             marginRight: '36rpx',
             color: 'rgba(255, 255, 255, 0.67)',
           }"
-      /></u-form-item>
+        />
+      </u-form-item>
     </u-form>
     <view class="i18n" @click="i18nOptionsShow = true">
       <view class="dropdown-text">{{ $i18n.locale === 'en' ? 'English' : '简体中文' }}</view>
@@ -150,7 +154,7 @@ export default class LoginPage extends BasePage {
     console.log('image', this.image);
     console.log('Version////', this.Version);
   }
-  Version = '1.0.22';
+  Version = '1.0.23';
   compareVersion(version1: any, version2: any) {
     //如果version1 大 会返回1  &&&  如果version2 大 会返回 -1
     const newVersion1 = `${version1}`.split('.').length < 3 ? `${version1}`.concat('.0') : `${version1}`;
@@ -347,13 +351,16 @@ export default class LoginPage extends BasePage {
     font-size: 34rpx;
     font-weight: 500;
     text-align: center;
+
     .title {
       flex: 3;
     }
+
     .left,
     .right {
       flex: 1;
     }
+
     .icon {
       display: flex;
       justify-content: center;
@@ -393,9 +400,11 @@ export default class LoginPage extends BasePage {
       padding-right: 12rpx;
       color: rgba(255, 255, 255, 0.66);
     }
+
     .dropdown-icon {
       transition: all 0.3s ease-out;
     }
+
     .dropdown-icon-active {
       transform: rotate(180deg);
       transition: all 0.3s ease-out;
diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue
index e0642db..cda64e6 100644
--- a/src/pages/raw/handover/picking/ByOrder.vue
+++ b/src/pages/raw/handover/picking/ByOrder.vue
@@ -83,7 +83,6 @@
     </view>
   </view>
 </template>
-
 <script lang="ts">
 import { Component, Ref } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
diff --git a/src/pages/raw/handover/returning/Time-filter.vue b/src/pages/raw/handover/returning/Time-filter.vue
index 6d8c548..2bb0159 100644
--- a/src/pages/raw/handover/returning/Time-filter.vue
+++ b/src/pages/raw/handover/returning/Time-filter.vue
@@ -9,7 +9,7 @@
     </view>
     <view>
       <u-form-item :label="$t('message.Warehouse_OrderNo')" prop="prdOrder" style="background: white; border-radius: 5px">
-        <u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="prdOrderFrom" :show-action="false"> </u-search>
+        <u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="prdOrderFuzzy" :show-action="false"> </u-search>
       </u-form-item>
     </view>
     <!-- 开始时间 -->
@@ -57,7 +57,7 @@ export default class returningDom extends BasePage {
   endMobile = '';
   materialList = [];
   OddList: any = [];
-  prdOrderFrom: any = '';
+  prdOrderFuzzy: any = '';
   data: any = {
     label: '',
     value: '',
@@ -118,10 +118,14 @@ export default class returningDom extends BasePage {
   async onReady() {
     this.startMobile = this.getNowFormatDate();
     this.endMobile = this.getNowFormatDate();
-    let proorder = uni.getStorageSync('prdOrderFrom') as any;
-    this.prdOrderFrom = JSON.parse(proorder);
-    uni.removeStorageSync('prdOrderFrom');
-    await this.onSubmit();
+    if (!uni.getStorageSync('prdOrderFuzzy')) {
+      await this.onSubmit();
+    } else {
+      let proorder = uni.getStorageSync('prdOrderFuzzy') as any;
+      this.prdOrderFuzzy = JSON.parse(proorder);
+      uni.removeStorageSync('prdOrderFuzzy');
+      await this.onSubmit();
+    }
   }
   async onSubmit() {
     if (this.startMobile == '' || this.endMobile == '') {
@@ -131,7 +135,7 @@ export default class returningDom extends BasePage {
     let time = {
       requireDateMin: this.startMobile,
       requireDateMax: this.endMobile,
-      prdOrderFrom: this.prdOrderFrom,
+      prdOrderFuzzy: this.prdOrderFuzzy,
     };
     await this.model.queryTimeInInfo(time);
     this.OddList = model.materielList;
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index 4d6f126..2e7160e 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -150,7 +150,7 @@ export default class returningDom extends BasePage {
   };
   screen() {
     if (this.form.prdOrder != null) {
-      uni.setStorageSync('prdOrderFrom', JSON.stringify(this.form.prdOrder));
+      uni.setStorageSync('prdOrderFuzzy', JSON.stringify(this.form.prdOrder));
       this.redirectTo(this.page.raw.handover.returning.filter);
     } else {
       this.redirectTo(this.page.raw.handover.returning.filter);
@@ -189,18 +189,18 @@ export default class returningDom extends BasePage {
     });
     this.wlCode = this.Location[0];
     this.form.sapFactoryCode = await this.model.queryDefaultFactoryCode();
-    let locData = uni.getStorageSync('data') as any;
-    let newlocData = JSON.parse(locData);
-    if (newlocData != null || newlocData != null || newlocData != undefined) {
+    if (!uni.getStorageSync('data')) {
+      return;
+    } else {
+      let locData = uni.getStorageSync('data') as any;
+      let newlocData = JSON.parse(locData);
       this.data = newlocData;
       this.form.prdOrder = this.data.label;
       this.form.materialCode = this.data.value;
       this.form.sendSpot = this.data.sendSpot;
-    }
-    if (this.form.prdOrder != null) {
       await this.query();
+      uni.removeStorageSync('data');
     }
-    uni.removeStorageSync('data');
   }
   back() {
     this.model.orderInInfo.sapFactoryCode = '';
diff --git a/src/pages/raw/handover/returning/model.ts b/src/pages/raw/handover/returning/model.ts
index 068951b..880d00d 100644
--- a/src/pages/raw/handover/returning/model.ts
+++ b/src/pages/raw/handover/returning/model.ts
@@ -86,7 +86,7 @@ export class ReturningModule extends VuexModule {
       page: '1',
       rows: '50',
       loginName: session.loginName,
-      prdOrderFrom: time.prdOrderFrom,
+      prdOrderFuzzy: time.prdOrderFuzzy,
     });
     console.log('qqqqqqqqq', data);
     const materielList = data.map((item: any) => ({