From 3228ef10857ab1c7766ce9034395509bf3634934 Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Tue, 7 Dec 2021 10:09:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=87=8D=E5=A4=8D=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/handover/picking/ByOrder.vue       |  2 +-
 src/pages/raw/handover/picking/BySummary.vue     |  2 +-
 src/pages/raw/handover/returning/Time-filter.vue |  2 ++
 src/pages/raw/handover/returning/config.ts       | 16 +++-------------
 src/pages/raw/ingoods/dnReceipt/ImportDN.vue     |  2 +-
 src/pages/raw/ingoods/dnReceipt/dnReceiving.vue  |  2 +-
 src/pages/raw/ingoods/dnReceipt/model.ts         |  6 +++---
 7 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue
index 71e3448..aeec991 100644
--- a/src/pages/raw/handover/picking/ByOrder.vue
+++ b/src/pages/raw/handover/picking/ByOrder.vue
@@ -295,7 +295,7 @@ export default class RawReceiptDetail extends BasePage {
     });
     this.model.proOrderResultList[this.someIndex].currentAmount = num;
   }
-  async onShow() {
+  async onReady() {
     //页面初始化 获取可选库位
     let means: any = JSON.parse(
       localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
diff --git a/src/pages/raw/handover/picking/BySummary.vue b/src/pages/raw/handover/picking/BySummary.vue
index 1b3d4cc..63dceb2 100644
--- a/src/pages/raw/handover/picking/BySummary.vue
+++ b/src/pages/raw/handover/picking/BySummary.vue
@@ -301,7 +301,7 @@ export default class RawReceiptDetail extends BasePage {
     this.model.aggregateList[this.someIndex].currentAmount = num;
   }
   //页面每次显示 获取可选库位
-  async onShow() {
+  async onReady() {
     let means: any = JSON.parse(
       localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
     );
diff --git a/src/pages/raw/handover/returning/Time-filter.vue b/src/pages/raw/handover/returning/Time-filter.vue
index 6964898..9392396 100644
--- a/src/pages/raw/handover/returning/Time-filter.vue
+++ b/src/pages/raw/handover/returning/Time-filter.vue
@@ -87,6 +87,7 @@ export default class returningDom extends BasePage {
   startMobile = "";
   endMobile = "";
   materialList = [];
+  OddList: any;
   startParams = {
     year: true,
     month: true,
@@ -132,6 +133,7 @@ export default class returningDom extends BasePage {
       requireDateMax: this.endMobile,
     };
     await this.model.queryTimeInInfo(time);
+    this.OddList = model.materielList;
   }
 }
 </script>
diff --git a/src/pages/raw/handover/returning/config.ts b/src/pages/raw/handover/returning/config.ts
index 1d45ca0..d791cda 100644
--- a/src/pages/raw/handover/returning/config.ts
+++ b/src/pages/raw/handover/returning/config.ts
@@ -1,21 +1,11 @@
 /**
  * 看单明细表格列
  */
-import vm from '@/main';
+import vm from "@/main";
 export const headers = [
   {
-    label: vm.$t('message.product_barCode'),
-    key: 'barcode',
-    width: 300,
-  },
-  {
-    label: vm.$t('message.product_FGCode'),
-    key: 'materialCode',
-    width: 300,
-  },
-  {
-    label: vm.$t('message.product_FGDes'),
-    key: 'materialDesc',
+    label: vm.$t("message.InventoryOrderNo"),
+    key: "label",
     width: 300,
   },
 ];
diff --git a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
index 3930b1a..86a057e 100644
--- a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
+++ b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue
@@ -205,7 +205,7 @@ export default class dnReceiptDom extends BasePage {
   //上传
   upload: any = [];
   //页面初始化
-  async onShow() {
+  async onReady() {
     //页面初始化 获取可选库位
     let means: any = JSON.parse(
       localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
index 402f7be..9737131 100644
--- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
+++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue
@@ -205,7 +205,7 @@ export default class dnReceiptDom extends BasePage {
   //上传
   upload: any = [];
   //页面初始化
-  async onShow() {
+  async onReady() {
     //页面初始化 获取可选库位
     let means: any = JSON.parse(
       localStorage.getItem("__GWMS_APP_STATE_DATA__") as any
diff --git a/src/pages/raw/ingoods/dnReceipt/model.ts b/src/pages/raw/ingoods/dnReceipt/model.ts
index b176bbc..242f0eb 100644
--- a/src/pages/raw/ingoods/dnReceipt/model.ts
+++ b/src/pages/raw/ingoods/dnReceipt/model.ts
@@ -237,7 +237,7 @@ export class ReceiptModule extends VuexModule {
    */
   @Action({ commit: "updateCheckedOrderInInfoListKw" })
   async changeOrderInLocation(kw: string) {
-    await http.post("/material/orderin/enter", {
+    await http.post("/wmspda/material/orderin/enter", {
       warehouseCode: session.warehouseCode,
       factoryCode: session.factoryCode,
       loginName: session.loginName,
@@ -248,7 +248,7 @@ export class ReceiptModule extends VuexModule {
   @Action({ commit: "updateCheckedOrderInInfoListKw" })
   async queryByFactoryCodeAndWorkAreaCode(content: any) {
     let res = await http.post(
-      "/wmspda/fg/queryByFactoryCodeAndWorkAreaCode",
+      "wmspda/fg/queryByFactoryCodeAndWorkAreaCode",
       content
     );
     return res;
@@ -256,7 +256,7 @@ export class ReceiptModule extends VuexModule {
   //查询DN/海外DN收货明细
   @Action({ commit: "updateCheckedOrderInInfoListKw" })
   async querydetaildlist(content: any) {
-    let res: any = await http.post("/material/getDnRecSn", content);
+    let res: any = await http.post("/wmspda/material/getDnRecSn", content);
     console.log("明细》》》》》》》》》", res.list);
     this.DNdetailedList = res.list;
     return res;