From cfd0b53967daca92d98cd304e4d4e0577e2efbd3 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 13 一月 2026 13:27:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/router/index.js |  125 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 125 insertions(+), 0 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 9be7e6f..7cdaf7a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1573,6 +1573,54 @@
   //#endregion
   //#endregion
 
+//#region 璐㈠姟缁撶畻鍩虹璧勬枡
+//#region 璐у竵鍒楄〃
+ {
+    //src\views\basic\gyItemMoney\gyItemMoney.vue
+    path: "/basic/gy/gyCurrency",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/basic/gy", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/basic/gy/gyCurrency",
+        component: () => import("@/views/basic/gyCurrency/gyCurrency.vue"),
+        name: "GyCurrency",
+        meta: { title: "璐у竵鍒楄〃", activeMenu: "basic/gy" },
+      },
+    ],
+  },
+//#endregion
+//#endregion
+
+//#region 鍗曚綅鍩虹璧勬枡
+//#region 璁¢噺鍗曚綅鍒楄〃
+ {
+    //src\views\basic\gyUnit\gyUnit.vue
+    path: "/basic/gy/gyUnit",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/basic/gy", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/basic/gy/gyUnit",
+        component: () => import("@/views/basic/gyUnit/gyUnit.vue"),
+        name: "GyCurrency",
+        meta: { title: "璁¢噺鍗曚綅鍒楄〃", activeMenu: "basic/gy" },
+      },
+    ],
+  },
+//#endregion
+//#endregion
+
   //#region 杈呭姪灞炴�у熀纭�璧勬枡
   {
     //src\views\basic\gyItemMoney\gyItemMoney.vue
@@ -1679,6 +1727,39 @@
         meta: { title: "浠撳簱鍒楄〃", noCache: true, noLoading: true },
       },
       {
+        path: "GyCurrency",
+        component: () => import("@/views/basic/gyCurrency/gyCurrency"), // 璐у竵鍒楄〃
+        name: "IframeGyCurrency",
+        meta: { title: "璐у竵鍒楄〃", noCache: true, noLoading: true },
+      },
+      {
+        path: "GyCurrencyEdit",
+        component: () => import("@/views/basic/gyCurrency/gyCurrencyEdit"), // 璐у竵缂栬緫
+        name: "IframeGyCurrencyEdit",
+        meta: { title: "璐у竵鍒楄〃", noCache: true, noLoading: true },
+      },
+       {
+        path: "GyUnit",
+        component: () => import("@/views/basic/gyUnit/gyUnit"),
+       
+        name: "IframeGyUnit",
+        meta: { title: "璁¢噺鍗曚綅鍒楄〃", noCache: true, noLoading: true },
+      },
+      {
+        path: "GyUnitEdit",
+        component: () => import("@/views/basic/gyUnit/gyUnitEdit"), // 璁¢噺鍗曚綅缂栬緫
+        name: "IframeGyUnitEdit",
+        meta: { title: "璁¢噺鍗曚綅缂栬緫", noCache: true, noLoading: true },
+        
+      },
+      {
+        path: "GyUnitGroup",
+        component: () => import("@/views/basic/gyUnit/gyUnitGroup"), // 璁¢噺鍗曚綅缁勫垪琛�
+        name: "IframeGyUnitGroup",
+        meta: { title: "璁¢噺鍗曚綅缁勫垪琛�", noCache: true, noLoading: true },
+        
+      },
+      {
         path: "GySupplier",
         component: () => import("@/views/basic/gy/gySupplier"), // 渚涘簲鍟�
         name: "IframeGySupplier",
@@ -1702,6 +1783,7 @@
         name: "IframeGyCarEdit",
         meta: { title: "杞﹁締缂栬緫", noCache: true, noLoading: true },
       },
+      
       {
         path: "GyProperty",
         component: () => import("@/views/basic/gyProperty/gyPropertyList"), // 杈呭姪灞炴��
@@ -1717,6 +1799,49 @@
     ],
   },
   //#endregion
+
+  //#region 鐗╂祦绠$悊
+  //#region 杩愯緭瀹氫綅
+  //#region 杩愬崟鍒楄〃
+  {
+    path: "logistics/transportGPS/WL_YayBill",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/logistics/transportGPS", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/logistics/transportGPS/WL_YayBill",
+        component: () => import("@/views/logistics/transportGPS/WL_YayBill.vue"),
+        name: "WL_YayBill",
+        meta: { title: "鍑鸿繍鍗�", activeMenu: "logistics/transportGPS" },
+      },
+    ],
+  },
+  //#endregion
+  //#region 杩愬崟缂栬緫
+  {
+    path: "logistics/transportGPS/Add_Edit_WL_YayBill",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/logistics/transportGPS", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/logistics/transportGPS/Add_Edit_WL_YayBill",
+        component: () => import("@/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue"),
+        name: "Add_Edit_WL_YayBill",
+        meta: { title: "杩愬崟缂栬緫", activeMenu: "logistics/transportGPS" },
+      },
+    ],
+  },
+  //#endregion
 ];
 
 // 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇

--
Gitblit v1.9.1