From 5d2f2ef4f4be04f750ffb526526b7681030f3ac6 Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Thu, 18 Nov 2021 14:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=B5=B7=E5=A4=96DN?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierignore                 |  16 +-
 src/pages.json                  | 689 ++------------------------------
 src/pages/raw/ingoods/index.vue |   8 +-
 src/utils/page.ts               |  11 +-
 4 files changed, 58 insertions(+), 666 deletions(-)

diff --git a/.prettierignore b/.prettierignore
index 3fa83cd..115cde8 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,10 +1,10 @@
-/dist/*
-/src/*
-.local
-.output.js
-/node_modules/**
+# /dist/*
+# /src/*
+# .local
+# .output.js
+# /node_modules/**
 
-**/*.svg
-**/*.sh
+# **/*.svg
+# **/*.sh
 
-/public/*
+# /public/*
diff --git a/src/pages.json b/src/pages.json
index f16aea8..aaa626c 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -241,6 +241,14 @@
                 "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
             }
         },
+        {
+          "path": "pages/raw/ingoods/poReceipt/poReceiving",
+          "style": {
+              "navigationBarTitleText": "PO单收货",
+              "navigationStyle": "custom", // 隐藏系统导航栏
+              "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
+          }
+      },
         {
             "path": "pages/raw/ingoods/poReceipt/idetailed",
             "style": {
@@ -265,6 +273,22 @@
                 "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
             }
         },
+        {
+          "path": "pages/raw/ingoods/dnReceipt/ImportDN",
+          "style": {
+              "navigationBarTitleText": "海外DN收货",
+              "navigationStyle": "custom", // 隐藏系统导航栏
+              "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
+          }
+      },
+        {
+          "path": "pages/raw/ingoods/dnReceipt/dnReceiving",
+          "style": {
+              "navigationBarTitleText": "DN单收货",
+              "navigationStyle": "custom", // 隐藏系统导航栏
+              "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
+          }
+      },
         {
             "path": "pages/raw/ingoods/dnReceipt/idetailed",
             "style": {
@@ -321,6 +345,22 @@
                 "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
             }
         },
+        {
+          "path": "pages/raw/handover/picking/ByOrder",
+          "style": {
+              "navigationBarTitleText": "拣配查询",
+              "navigationStyle": "custom", // 隐藏系统导航栏
+              "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
+          }
+      },
+      {
+        "path": "pages/raw/handover/picking/BySummary",
+        "style": {
+            "navigationBarTitleText": "拣配查询",
+            "navigationStyle": "custom", // 隐藏系统导航栏
+            "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
+        }
+    },
         {
             "path": "pages/raw/handover/picking/idetailed",
             "style": {
@@ -648,660 +688,11 @@
                 "navigationBarTitleText": "演示"
             }
         }
-<<<<<<< HEAD
-      },
-    {
-      "path": "pages/product/index",
-      "style": {
-        "navigationBarTitleText": "成品主菜单",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/product/inbound/index3",
-      "style": {
-        "navigationBarTitleText": "成品入库",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/product/outbound/index",
-      "style": {
-        "navigationBarTitleText": "出库",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/product/outbound/internal/index",
-      "style": {
-        "navigationBarTitleText": "内销出库",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/product/outbound/foreign/index",
-      "style": {
-        "navigationBarTitleText": "外销出库",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/product/warehouse/index",
-      "style": {
-        "navigationBarTitleText": "库内",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/product/warehouse/wholeTransfer/index",
-      "style": {
-        "navigationBarTitleText": "成品移库",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/product/warehouse/wholeScrap/index",
-      "style": {
-        "navigationBarTitleText": "成品报废",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/product/warehouse/wholeCollect/index",
-      "style": {
-        "navigationBarTitleText": "成品领用",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/product/warehouse/wholeLnventory/index",
-      "style": {
-        "navigationBarTitleText": "成品盘点",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/product/outbound/stoOutbound/index",
-      "style": {
-        "navigationBarTitleText": "STO出库",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/product/outbound/stoOutbound/detail",
-      "style": {
-        "navigationBarTitleText": "STO出库明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/index",
-      "style": {
-        "navigationBarTitleText": "原材料主菜单",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/appointment/index",
-      "style": {
-        "navigationBarTitleText": "预约",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/appointment/checkin/index",
-      "style": {
-        "navigationBarTitleText": "预约登记",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/appointment/checkout/index",
-      "style": {
-        "navigationBarTitleText": "预约离开",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/index",
-      "style": {
-        "navigationBarTitleText": "收货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/receipt/index",
-      "style": {
-        "navigationBarTitleText": "看单收货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/receipt/detail",
-      "style": {
-        "navigationBarTitleText": "看单明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/receipt/detail-ex",
-      "style": {
-        "navigationBarTitleText": "看单明细未通过明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/index",
-      "style": {
-        "navigationBarTitleText": "交接",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/warehouse/index",
-      "style": {
-        "navigationBarTitleText": "库内",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/warehouse/rowTransfer/index",
-      "style": {
-        "navigationBarTitleText": "移库",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/warehouse/rowTransfer/details",
-      "style": {
-        "navigationBarTitleText": "移库明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/warehouse/rowScrap/index",
-      "style": {
-        "navigationBarTitleText": "报废",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/warehouse/rowScrap/details",
-      "style": {
-        "navigationBarTitleText": "报废明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/warehouse/rowCollect/index",
-      "style": {
-        "navigationBarTitleText": "成本中心",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/warehouse/rowCollect/details",
-      "style": {
-        "navigationBarTitleText": "成本中心明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/poReceipt/index",
-      "style": {
-        "navigationBarTitleText": "PO单收货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/poReceipt/idetailed",
-      "style": {
-        "navigationBarTitleText": "PO退货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/poReceipt/detail",
-      "style": {
-        "navigationBarTitleText": "PO单收货明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/dnReceipt/index",
-      "style": {
-        "navigationBarTitleText": "DN单收货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/dnReceipt/bill",
-      "style": {
-        "navigationBarTitleText": "收货明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/dnReceipt/dnReceiving",
-      "style": {
-        "navigationBarTitleText": "DN单收货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/poReceipt/poReceiving",
-      "style": {
-        "navigationBarTitleText": "PO单收货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/dnReceipt/idetailed",
-      "style": {
-        "navigationBarTitleText": "DN单收货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/dnReceipt/detail",
-      "style": {
-        "navigationBarTitleText": "DN单收货明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/dnReturnGoods/index",
-      "style": {
-        "navigationBarTitleText": "DN退货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/dnReturnGoods/idetailed",
-      "style": {
-        "navigationBarTitleText": "DN退货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/dnReturnGoods/Location",
-      "style": {
-        "navigationBarTitleText": "DN退货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/ingoods/dnReturnGoods/detail",
-      "style": {
-        "navigationBarTitleText": "DN单退货明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/picking/index",
-      "style": {
-        "navigationBarTitleText": "拣配查询",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/picking/ByOrder",
-      "style": {
-        "navigationBarTitleText": "按单拣配",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/picking/query",
-      "style": {
-        "navigationBarTitleText": "拣配查询",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/picking/idetailed",
-      "style": {
-        "navigationBarTitleText": "DN退货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/picking/result",
-      "style": {
-        "navigationBarTitleText": "拣配查询结果",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/picking/BySummary",
-      "style": {
-        "navigationBarTitleText": "汇总拣配",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/picking/summary",
-      "style": {
-        "navigationBarTitleText": "汇总拣配",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/picking/total",
-      "style": {
-        "navigationBarTitleText": "汇总拣配",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/picking/order",
-      "style": {
-        "navigationBarTitleText": "按单拣配",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/feeding/index",
-      "style": {
-        "navigationBarTitleText": "补料",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/feeding/Location",
-      "style": {
-        "navigationBarTitleText": "补料",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/feeding/detail",
-      "style": {
-        "navigationBarTitleText": "补料明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/returning/index",
-      "style": {
-        "navigationBarTitleText": "退料",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/appointment/checkin/list",
-      "style": {
-        "navigationBarTitleText": "登记清单",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/kan-dan/index",
-      "style": {
-        "navigationBarTitleText": "看单交接",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/kan-dan/details",
-      "style": {
-        "navigationBarTitleText": "看单交接",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/aggregating/index",
-      "style": {
-        "navigationBarTitleText": "汇总查询",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/aggregating/result",
-      "style": {
-        "navigationBarTitleText": "汇总交接",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/aggregating/summary",
-      "style": {
-        "navigationBarTitleText": "汇总交接",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/aggregating/order",
-      "style": {
-        "navigationBarTitleText": "按单交接",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/raw/handover/aggregating/accessory",
-      "style": {
-        "navigationBarTitleText": "辅料交接",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-      {
-        "path": "pages/raw/handover/virtual/index",
-        "style": {
-          "navigationBarTitleText": "虚拟单交接",
-          "navigationStyle": "custom",// 隐藏系统导航栏
-          "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-        }
-      },
-      {
-        "path": "pages/raw/handover/virtual/result",
-        "style": {
-          "navigationBarTitleText": "虚拟单明细",
-          "navigationStyle": "custom",// 隐藏系统导航栏
-          "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-        }
-      },
-      {
-        "path": "pages/raw/handover/virtual/summary",
-        "style": {
-          "navigationBarTitleText": "虚拟单交接-确认",
-          "navigationStyle": "custom",// 隐藏系统导航栏
-          "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-        }
-      },
-    {
-      "path": "pages/login/login/index",
-      "style": {
-        "navigationBarTitleText": "登录",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/login/server/index",
-      "style": {
-        "navigationBarTitleText": "服务器设置",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/login/area/index",
-      "style": {
-        "navigationBarTitleText": "登录区选择",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-      {
-        "path": "pages/product/inbound/offline-in/index",
-        "style": {
-          "navigatpaionBarTitleText": "成品下线入库",
-          "navigationStyle": "custom",// 隐藏系统导航栏
-          "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-        }
-      },
-    {
-      "path": "pages/product/inbound/finishProductOffline/index",
-      "style": {
-        "navigatpaionBarTitleText": "成品下线",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/product/inbound/semiFinishProductOffline2/index",
-      "style": {
-        "navigatpaionBarTitleText": "半成品下线-其他",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/SemiProduct/index",
-      "style": {
-        "navigationBarTitleText": "半成品主菜单",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/SemiProduct/inbound/index",
-      "style": {
-        "navigationBarTitleText": "半成品入库",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/SemiProduct/DumpList/index",
-      "style": {
-        "navigationBarTitleText": "转储单",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/SemiProduct/DumpList/DumpListFH/index",
-      "style": {
-        "navigationBarTitleText": "转储单发货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/SemiProduct/DumpList/DumpListFH/detail",
-      "style": {
-        "navigationBarTitleText": "转储单发货明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/SemiProduct/DumpList/DumpListSH/index",
-      "style": {
-        "navigationBarTitleText": "转储单收货",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/SemiProduct/DumpList/DumpListSH/detail",
-      "style": {
-        "navigationBarTitleText": "转储单收货明细",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/SemiProduct/outbound/index",
-      "style": {
-        "navigatpaionBarTitleText": "半成品出库",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/SemiProduct/inbound/index",
-      "style": {
-        "navigatpaionBarTitleText": "半成品入库",
-        "navigationStyle": "custom",// 隐藏系统导航栏
-        "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一
-      }
-    },
-    {
-      "path": "pages/demo/index",
-      "style": {
-        "navigationBarTitleText": "演示"
-      }
-=======
     ],
     "globalStyle": {
         "navigationBarTextStyle": "black",
         "navigationBarTitleText": "uni-app",
         "navigationBarBackgroundColor": "#F8F8F8",
         "backgroundColor": "#F8F8F8"
->>>>>>> 57fbc39721f016bc5ee6b99c82721d1cb9433b00
     }
 }
\ No newline at end of file
diff --git a/src/pages/raw/ingoods/index.vue b/src/pages/raw/ingoods/index.vue
index 19305b6..aff6aec 100644
--- a/src/pages/raw/ingoods/index.vue
+++ b/src/pages/raw/ingoods/index.vue
@@ -27,12 +27,9 @@
             >
           </u-button>
         </u-col>
-<<<<<<< HEAD
         <u-button @click="DNReceiving">DN收货</u-button>
         <u-button @click="POReceiving">PO收货</u-button>
-=======
-        
->>>>>>> 57fbc39721f016bc5ee6b99c82721d1cb9433b00
+        <u-button @click="importDN">海外DN</u-button>
         <!-- <u-col :span="12">
           <u-button @click="toPage(page.raw.ingoods.poReceipt.index)">
             <u-icon size="80" name="/static/icons/icon-14.png"></u-icon>
@@ -65,6 +62,9 @@ export default class RawAppointment extends BasePage {
   POReceiving() {
     this.toPage(this.page.raw.ingoods.poReceipt.poReceiving);
   }
+  importDN() {
+    this.toPage(this.page.raw.ingoods.dnReceipt.importDN);
+  }
 }
 </script>
 
diff --git a/src/utils/page.ts b/src/utils/page.ts
index 2da4dd3..b32184d 100644
--- a/src/utils/page.ts
+++ b/src/utils/page.ts
@@ -115,6 +115,7 @@ export const page = {
         detailEx: "/pages/raw/ingoods/dnReceipt/detail-ex",
         idetailed: "/pages/raw/ingoods/dnReceipt/idetailed",
         dnReceiving: "/pages/raw/ingoods/dnReceipt/dnReceiving",
+        importDN: "/pages/raw/ingoods/dnReceipt/ImportDN",
         bill: "/pages/raw/ingoods/dnReceipt/bill",
       },
       dnReturnGoods: {
@@ -143,17 +144,17 @@ export const page = {
         index: "/pages/raw/warehouse/rowInventory/index",
       },
     },
-    commission:{
+    commission: {
       index: "/pages/raw/commission/index",
-      entrant:{
+      entrant: {
         index: "/pages/raw/commission/entrant/index",
         detail: "/pages/raw/commission/entrant/detail",
       },
-      goOut:{
+      goOut: {
         index: "/pages/raw/commission/goOut/index",
         detail: "/pages/raw/commission/goOut/detail",
-      }
-    }
+      },
+    },
   },
   SemiProduct: {
     index: "/pages/SemiProduct/index",