From b73e4bf7c2c75eaaa89f52b0ef3ef17bd1836adf Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Sat, 25 Dec 2021 14:55:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8E=A5=20=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/handover/aggregating/config.ts  | 16 ++++++++--------
 .../raw/handover/returning/Time-filter.vue    | 19 -------------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/pages/raw/handover/aggregating/config.ts b/src/pages/raw/handover/aggregating/config.ts
index 64d21b8..d16f381 100644
--- a/src/pages/raw/handover/aggregating/config.ts
+++ b/src/pages/raw/handover/aggregating/config.ts
@@ -76,10 +76,6 @@ export const summaryHeaders = [
     label: vm.$t("message.Summary_QuantityOfThisHandover"),
     key: "hvAmount",
   },
-  {
-    label: vm.$t("message.po_DemandQuantity"),
-    key: "amount",
-  },
   {
     label: vm.$t("message.Pi_CumulativePickingQuantity"),
     key: "totalMoAmount",
@@ -89,6 +85,10 @@ export const summaryHeaders = [
     label: vm.$t("message.Pi_HandoverQuantity"),
     key: "totalHvAmount",
   },
+  {
+    label: vm.$t("message.po_DemandQuantity"),
+    key: "amount",
+  },
   {
     label: vm.$t("message.Pi_Station"),
     key: "sendSpot",
@@ -125,10 +125,6 @@ export const orderHeaders = [
     label: vm.$t("message.Summary_QuantityOfThisHandover"),
     key: "hvAmount",
   },
-  {
-    label: vm.$t("message.po_DemandQuantity"),
-    key: "amount",
-  },
   {
     label: vm.$t("message.Pi_CumulativePickingQuantity"),
     key: "totalMoAmount",
@@ -138,6 +134,10 @@ export const orderHeaders = [
     label: vm.$t("message.Pi_HandoverQuantity"),
     key: "totalHvAmount",
   },
+  {
+    label: vm.$t("message.po_DemandQuantity"),
+    key: "amount",
+  },
   {
     label: vm.$t("message.Pi_Station"),
     key: "sendSpot",
diff --git a/src/pages/raw/handover/returning/Time-filter.vue b/src/pages/raw/handover/returning/Time-filter.vue
index 579ccb6..bfd1bae 100644
--- a/src/pages/raw/handover/returning/Time-filter.vue
+++ b/src/pages/raw/handover/returning/Time-filter.vue
@@ -52,7 +52,6 @@ export default class returningDom extends BasePage {
   endMobile = '';
   materialList = [];
   OddList: any = [];
-<<<<<<< HEAD
   data: any = {
     label: '',
     value: '',
@@ -60,15 +59,6 @@ export default class returningDom extends BasePage {
     sendSpot: '',
   };
 
-=======
-
-  data: any = {
-    label: '',
-    value: '',
-    amount: '',
-    sendSpot: '',
-  };
->>>>>>> 9bcbb18... 退料 筛选后选择一条数据带回上一页面并初始化赋值
   startParams = {
     year: true,
     month: true,
@@ -93,17 +83,8 @@ 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) {