From 7918fbaf3bc0c8a04dc343f5323b575d40d6a2cc Mon Sep 17 00:00:00 2001
From: suiwei <136693118@qq.com>
Date: Fri, 13 Jan 2023 11:28:47 +0800
Subject: [PATCH] =?UTF-8?q?overseamom-61=20feat=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=B7=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/cn.ts                              | 1 +
 src/i18n/lang/en.ts                              | 1 +
 src/i18n/lang/ru.ts                              | 1 +
 src/pages/raw/handover/returning/Time-filter.vue | 8 +++++++-
 src/pages/raw/handover/returning/model.ts        | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts
index 2826d1b..5e7ae52 100644
--- a/src/i18n/lang/cn.ts
+++ b/src/i18n/lang/cn.ts
@@ -304,6 +304,7 @@ export default {
     Warehouse_TransferDetails: '移库明细',
     Warehouse_OrderNo: '单号',
     Warehouse_No: '单号',
+    Material_No: '物料号',
     Warehouse_OriginalLocation: '原库位',
     Warehouse_TargetLocation: '目标库位',
     Warehouse_Tip: '请输入移库单号',
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index c38a38a..3b3676a 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -304,6 +304,7 @@ export default {
     Warehouse_TransferDetails: 'Transfer detail',
     Warehouse_OrderNo: 'Order No',
     Warehouse_No: 'Order',
+    Material_No: 'Mat Code',
     Warehouse_OriginalLocation: 'Original Loc',
     Warehouse_TargetLocation: 'Target Loc',
     Warehouse_Tip: 'Please input the transfer order No',
diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts
index 8536dd4..ddf9abd 100644
--- a/src/i18n/lang/ru.ts
+++ b/src/i18n/lang/ru.ts
@@ -304,6 +304,7 @@ export default {
     Warehouse_TransferDetails: 'Детали перемещения',
     Warehouse_OrderNo: 'Номер заказа',
     Warehouse_No: 'номер',
+    Material_No: 'Номер материалы',
     Warehouse_OriginalLocation: 'Исходное местоположение',
     Warehouse_TargetLocation: 'Целевое местоположение',
     Warehouse_Tip: 'Пожалуйста, введите номер накладной на перемещение',
diff --git a/src/pages/raw/handover/returning/Time-filter.vue b/src/pages/raw/handover/returning/Time-filter.vue
index 51d893e..6dbd34e 100644
--- a/src/pages/raw/handover/returning/Time-filter.vue
+++ b/src/pages/raw/handover/returning/Time-filter.vue
@@ -11,9 +11,12 @@
       <u-form-item :label="$t('message.Warehouse_No')" prop="prdOrder" style="background: white; border-radius: 5px">
         <u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="prdOrderFuzzy" :show-action="false"> </u-search>
       </u-form-item>
+      <u-form-item :label="$t('message.Material_No')" style="background: white; border-radius: 5px; margin-top: 10rpx">
+        <u-search :placeholder="$t('message.po_PleaseInput')" v-model.trim="matCodeFuzzy" :show-action="false"> </u-search>
+      </u-form-item>
     </view>
     <!-- 开始时间 -->
-    <view style="display: flex; padding-top: 3px">
+    <view style="display: flex; padding-top: 3px; margin-top: 10rpx">
       <u-field style="background: white; border-radius: 10rpx" v-model="startMobile" :placeholder="$t('message.starttime')" :label="$t('message.start')"> </u-field>
       <u-picker :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="startShow" :params="startParams" mode="time" @confirm="startConfirm"></u-picker>
       <u-button @click="startShow = true" type="primary">{{ $t('message.workArea_Selelct') }}</u-button>
@@ -58,6 +61,7 @@ export default class returningDom extends BasePage {
   materialList = [];
   OddList: any = [];
   prdOrderFuzzy: any = '';
+  matCodeFuzzy: any = '';
   data: any = {
     label: '',
     value: '',
@@ -115,6 +119,7 @@ export default class returningDom extends BasePage {
     var currentdate = year + seperator1 + month + seperator1 + strDate;
     return currentdate;
   }
+  //进入该页面后执行
   async onReady() {
     this.startMobile = this.getNowFormatDate();
     this.endMobile = this.getNowFormatDate();
@@ -136,6 +141,7 @@ export default class returningDom extends BasePage {
       requireDateMin: this.startMobile,
       requireDateMax: this.endMobile,
       prdOrderFuzzy: this.prdOrderFuzzy,
+      matCodeFuzzy: this.matCodeFuzzy,
     };
     await this.model.queryTimeInInfo(time);
     this.OddList = model.materielList;
diff --git a/src/pages/raw/handover/returning/model.ts b/src/pages/raw/handover/returning/model.ts
index 6d3db7a..78eb0dd 100644
--- a/src/pages/raw/handover/returning/model.ts
+++ b/src/pages/raw/handover/returning/model.ts
@@ -84,6 +84,7 @@ export class ReturningModule extends VuexModule {
       rows: '50',
       loginName: session.loginName,
       prdOrderFuzzy: time.prdOrderFuzzy,
+      matCodeFuzzy: time.matCodeFuzzy,
     });
     console.log('qqqqqqqqq', data);
     const materielList = data.map((item: any) => ({