合并代码rabase

src/pages/raw/handover/returning/Time-filter.vue

@@ -52,6 +52,7 @@ export default class returningDom extends BasePage {
   endMobile = '';
   materialList = [];
   OddList: any = [];
+<<<<<<< HEAD
   data: any = {
     label: '',
     value: '',
@@ -59,6 +60,15 @@ export default class returningDom extends BasePage {
     sendSpot: '',
   };
 
+=======
+
+  data: any = {
+    label: '',
+    value: '',
+    amount: '',
+    sendSpot: '',
+  };
+>>>>>>> 9bcbb18... 退料 筛选后选择一条数据带回上一页面并初始化赋值
   startParams = {
     year: true,
     month: true,
@@ -83,12 +93,17 @@ export default class returningDom extends BasePage {
     this.endMobile = endParams.year + '-' + endParams.month + '-' + endParams.day;
   }
   onCheck(e: any) {
+<<<<<<< HEAD
    // 修改退料 筛选后选择一条可以将相关信息赋值到退料页面
     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;
+=======
+    console.log('eeeee', e.data[0].lineData);
+    this.data = e.data[0].lineData;
+>>>>>>> 9bcbb18... 退料 筛选后选择一条数据带回上一页面并初始化赋值
   }
   back() {
     if (this.data.label == '' || this.data.label == null) {

src/pages/raw/handover/returning/index.vue

@@ -128,6 +128,8 @@ export default class returningDom extends BasePage {
    * 工位退料人名称
    */
   operatorName = '';
+  // 筛选带回数据
+  data: any = {};
   /**
    * 退料类型选择
    */
@@ -159,11 +161,14 @@ 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);
-    //guoshuang  修改退料 筛选后选择一条可以将相关信息赋值到退料页面
+    if (JSON.parse(sessionStorage.getItem('data') as any)) {
-    this.form.wlName = JSON.parse(sessionStorage.getItem('data') as any).value;
+      this.data = JSON.parse(sessionStorage.getItem('data') as any)
-    this.form.prdOrder = JSON.parse(sessionStorage.getItem('data') as any).label;
+      this.form.prdOrder = this.data.label;
-    this.form.sendSpot = JSON.parse(sessionStorage.getItem('data') as any).sendSpot;
+      this.form.wlName = this.data.value;
-    this.form.amount = JSON.parse(sessionStorage.getItem('data') as any).amount;
+      this.form.sendSpot = this.data.sendSpot;
+      this.form.amount = this.data.amount;
+    }
+
     if (this.form.prdOrder != null) {
       model.queryOrderInInfo(this.form.prdOrder);
     }