From e3712fa74b9d8c637472f985107f4f6243b3c3be Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Thu, 23 Dec 2021 18:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=20=E5=B0=86=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E7=9A=84=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=E5=88=B0=E9=80=80=E6=96=99=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../raw/handover/returning/Time-filter.vue    | 20 ++++++++++++++-----
 src/pages/raw/handover/returning/index.vue    |  8 ++++++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/pages/raw/handover/returning/Time-filter.vue b/src/pages/raw/handover/returning/Time-filter.vue
index c57a2d6..c0f5f2b 100644
--- a/src/pages/raw/handover/returning/Time-filter.vue
+++ b/src/pages/raw/handover/returning/Time-filter.vue
@@ -52,7 +52,13 @@ export default class returningDom extends BasePage {
   endMobile = '';
   materialList = [];
   OddList: any = [];
-  label: any = '';
+  data: any = {
+    label: '',
+    value: '',
+    amount: 0,
+    sendSpot: '',
+  };
+
   startParams = {
     year: true,
     month: true,
@@ -77,14 +83,18 @@ export default class returningDom extends BasePage {
     this.endMobile = endParams.year + '-' + endParams.month + '-' + endParams.day;
   }
   onCheck(e: any) {
-    console.log('eeeee', e.data[0].lineData.label);
-    this.label = e.data[0].lineData.label;
+   // 修改退料 筛选后选择一条可以将相关信息赋值到退料页面
+    console.log('eeeee', e.data[0].lineData);
+    this.data.label = e.data[0].lineData.label;
+    this.data.value = e.data[0].lineData.value;
+    this.data.sendSpot = e.data[0].lineData.sendSpot;
+    this.data.amount = e.data[0].lineData.amount;
   }
   back() {
-    if (this.label == '' || this.label == null) {
+    if (this.data.label == '' || this.data.label == null) {
       this.redirectTo(this.page.raw.handover.returning.index);
     } else {
-      sessionStorage.setItem('labelCode', JSON.stringify(this.label));
+      sessionStorage.setItem('data', JSON.stringify(this.data));
       this.redirectTo(this.page.raw.handover.returning.index);
     }
   }
diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue
index a492d37..e01eef6 100644
--- a/src/pages/raw/handover/returning/index.vue
+++ b/src/pages/raw/handover/returning/index.vue
@@ -159,11 +159,15 @@ export default class returningDom extends BasePage {
     //页面初始化 获取可选库位
     let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
     let sendSpot = JSON.parse(localStorage.getItem('sendSpot') as any);
-    this.form.prdOrder = JSON.parse(sessionStorage.getItem('labelCode') as any);
+    //guoshuang  修改退料 筛选后选择一条可以将相关信息赋值到退料页面
+    this.form.wlName = JSON.parse(sessionStorage.getItem('data') as any).value;
+    this.form.prdOrder = JSON.parse(sessionStorage.getItem('data') as any).label;
+    this.form.sendSpot = JSON.parse(sessionStorage.getItem('data') as any).sendSpot;
+    this.form.amount = JSON.parse(sessionStorage.getItem('data') as any).amount;
     if (this.form.prdOrder != null) {
       model.queryOrderInInfo(this.form.prdOrder);
     }
-    sessionStorage.removeItem('labelCode');
+    sessionStorage.removeItem('data');
     let content = {
       loginName: means.session.user.loginName,
       sendSpot: sendSpot,