From 414190deffd5bcfb6878bd2d631737bbb1dab01d Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期三, 14 一月 2026 08:45:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/router/index.js | 226 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 195 insertions(+), 31 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 345c7b7..7cdaf7a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -139,6 +139,39 @@
},
//#endregion
+ //#region 鏉＄爜鐢熸垚_閿﹂殕
+ {
+ path: "/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong",
+ component: () =>
+ import("@/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue"),
+ name: "Gy_BarCodeBill_JinLong",
+ meta: {
+ title: "鏉＄爜鐢熸垚_閿﹂殕",
+ activeMenu: "warehouse/barcodeMaster",
+ },
+ },
+ ],
+ },
+ //#endregion
+
+ //#region 鏉＄爜鐢熸垚_閿﹂殕_鑷姩鐧诲綍
+ {
+ path: "/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin",
+ component: () => import("@/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue"),
+ hidden: true,
+ },
+ //#endregion
+
//#region 鏉＄爜涓绘尅
{
path: "/warehouse/barcodeMaster/Gy_BarCodeBillList",
@@ -815,9 +848,9 @@
//#endregion
//#endregion
- //#region 鍣ㄥ叿绠＄悊
- //#region 鍣ㄥ叿鍩虹璧勬枡
- //#region 鍣ㄥ叿涓绘。缁存姢
+ //#region 瀹瑰櫒绠＄悊
+ //#region 瀹瑰櫒鍩虹璧勬枡
+ //#region 瀹瑰櫒涓绘。缁存姢
{
path: "/scMould/basicModeling/Gy_MouldFileList",
component: Layout,
@@ -833,13 +866,13 @@
component: () =>
import("@/views/scMould/basicModeling/Gy_MouldFileList.vue"),
name: "Gy_MouldFileList",
- meta: { title: "鍣ㄥ叿涓绘。缁存姢", activeMenu: "scMould/basicModeling" },
+ meta: { title: "瀹瑰櫒涓绘。缁存姢", activeMenu: "scMould/basicModeling" },
},
],
},
//#endregion
- //#region 鍣ㄥ叿涓绘。
+ //#region 瀹瑰櫒涓绘。
{
path: "/scMould/basicModeling/Gy_MouldFile",
component: Layout,
@@ -855,7 +888,7 @@
component: () =>
import("@/views/scMould/basicModeling/Gy_MouldFile.vue"),
name: "Gy_MouldFile",
- meta: { title: "鍣ㄥ叿涓绘。", activeMenu: "scMould/basicModeling" },
+ meta: { title: "瀹瑰櫒涓绘。", activeMenu: "scMould/basicModeling" },
},
],
},
@@ -889,8 +922,8 @@
//#endregion
//#endregion
- //#region 鍣ㄥ叿浠撳瓨绠＄悊
- //#region 鍣ㄥ叿棰嗙敤鐢宠鍗曞垪琛�
+ //#region 瀹瑰櫒浠撳瓨绠＄悊
+ //#region 瀹瑰櫒棰嗙敤鐢宠鍗曞垪琛�
{
path: "/scMould/warehouse/Sc_MouldOutRequestBillList",
component: Layout,
@@ -907,13 +940,13 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldOutRequestBillList"),
name: "Sc_MouldOutRequestBillList",
- meta: { title: "鍣ㄥ叿棰嗙敤鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒棰嗙敤鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
],
},
//#endregion
- //#region 鍣ㄥ叿棰嗙敤鐢宠鍗�
+ //#region 瀹瑰櫒棰嗙敤鐢宠鍗�
{
path: "/scMould/warehouse/Sc_MouldOutRequestBillEdit",
component: Layout,
@@ -929,13 +962,13 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldOutRequestBillEdit"),
name: "Sc_MouldOutRequestBillEdit",
- meta: { title: "鍣ㄥ叿棰嗙敤鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒棰嗙敤鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
],
},
//#endregion
- //#region 鍣ㄥ叿棰嗙敤鍑哄簱鍗曞垪琛�
+ //#region 瀹瑰櫒棰嗙敤鍑哄簱鍗曞垪琛�
{
path: "/scMould/warehouse/Sc_MouldProdOutBillList",
component: Layout,
@@ -951,13 +984,13 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldProdOutBillList"),
name: "Sc_MouldProdOutBillList",
- meta: { title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒棰嗙敤鍑哄簱鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
],
},
//#endregion
- //#region 鍣ㄥ叿棰嗙敤鍑哄簱鍗�
+ //#region 瀹瑰櫒棰嗙敤鍑哄簱鍗�
{
path: "/scMould/warehouse/Sc_MouldProdOutBillEdit",
component: Layout,
@@ -973,13 +1006,13 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"),
name: "Sc_MouldProdOutBillEdit",
- meta: { title: "鍣ㄥ叿棰嗙敤鍑哄簱鍗曠紪杈�", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒棰嗙敤鍑哄簱鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
],
},
//#endregion
- //#region 鍣ㄥ叿鍏ュ簱鐢宠鍗曞垪琛�
+ //#region 瀹瑰櫒鍏ュ簱鐢宠鍗曞垪琛�
{
path: "/scMould/warehouse/Sc_MouldInRequestBillList",
component: Layout,
@@ -996,13 +1029,13 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldInRequestBillList"),
name: "Sc_MouldInRequestBillList",
- meta: { title: "鍣ㄥ叿鍏ュ簱鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒鍏ュ簱鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
],
},
//#endregion
- //#region 鍣ㄥ叿鍏ュ簱鐢宠鍗�
+ //#region 瀹瑰櫒鍏ュ簱鐢宠鍗�
{
path: "/scMould/warehouse/Sc_MouldInRequestBillEdit",
component: Layout,
@@ -1018,13 +1051,13 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldInRequestBillEdit"),
name: "Sc_MouldInRequestBillEdit",
- meta: { title: "鍣ㄥ叿鍏ュ簱鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒鍏ュ簱鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
],
},
//#endregion
- //#region 鍣ㄥ叿棰嗙敤閫�搴撳崟鍒楄〃
+ //#region 瀹瑰櫒棰嗙敤閫�搴撳崟鍒楄〃
{
path: "/scMould/warehouse/Sc_MouldProdBackBillList",
component: Layout,
@@ -1041,13 +1074,13 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldProdBackBillList"),
name: "Sc_MouldProdBackBillList",
- meta: { title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缁存姢", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒棰嗙敤閫�搴撳崟缁存姢", activeMenu: "scMould/warehouse" },
},
],
},
//#endregion
- //#region 鍣ㄥ叿棰嗙敤閫�搴撳崟
+ //#region 瀹瑰櫒棰嗙敤閫�搴撳崟
{
path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
component: Layout,
@@ -1063,13 +1096,13 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"),
name: "Sc_MouldProdBackBillEdit",
- meta: { title: "鍣ㄥ叿棰嗙敤閫�搴撳崟缂栬緫", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒棰嗙敤閫�搴撳崟缂栬緫", activeMenu: "scMould/warehouse" },
},
],
},
//#endregion
- //#region 鍣ㄥ叿璋冩嫧鐢宠鍗曞垪琛�
+ //#region 瀹瑰櫒璋冩嫧鐢宠鍗曞垪琛�
{
path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillList",
component: Layout,
@@ -1086,13 +1119,13 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList"),
name: "Sc_MouldMoveStockRequestBillList",
- meta: { title: "鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒璋冩嫧鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
],
},
//#endregion
- //#region 鍣ㄥ叿璋冩嫧鐢宠鍗�
+ //#region 瀹瑰櫒璋冩嫧鐢宠鍗�
{
path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit",
component: Layout,
@@ -1108,13 +1141,13 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit"),
name: "Sc_MouldMoveStockRequestBillEdit",
- meta: { title: "鍣ㄥ叿璋冩嫧鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒璋冩嫧鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
],
},
//#endregion
- //#region 鍣ㄥ叿鐩存帴璋冩嫧鍗曞垪琛�
+ //#region 瀹瑰櫒鐩存帴璋冩嫧鍗曞垪琛�
{
path: "/scMould/warehouse/Sc_MouldProdMoveBillList",
component: Layout,
@@ -1131,13 +1164,13 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldProdMoveBillList"),
name: "Sc_MouldProdMoveBillList",
- meta: { title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒鐩存帴璋冩嫧鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
},
],
},
//#endregion
- //#region 鍣ㄥ叿鐩存帴璋冩嫧鍗�
+ //#region 瀹瑰櫒鐩存帴璋冩嫧鍗�
{
path: "/scMould/warehouse/Sc_MouldProdMoveBillEdit",
component: Layout,
@@ -1153,7 +1186,7 @@
component: () =>
import("@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"),
name: "Sc_MouldProdMoveBillEdit",
- meta: { title: "鍣ㄥ叿鐩存帴璋冩嫧鍗曠紪杈�", activeMenu: "scMould/warehouse" },
+ meta: { title: "瀹瑰櫒鐩存帴璋冩嫧鍗曠紪杈�", activeMenu: "scMould/warehouse" },
},
],
},
@@ -1540,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
@@ -1646,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",
@@ -1669,12 +1783,62 @@
name: "IframeGyCarEdit",
meta: { title: "杞﹁締缂栬緫", noCache: true, noLoading: true },
},
+
{
path: "GyProperty",
component: () => import("@/views/basic/gyProperty/gyPropertyList"), // 杈呭姪灞炴��
name: "IframeGyProperty",
meta: { title: "杈呭姪灞炴��", noCache: true, noLoading: true },
},
+ {
+ path: "BarCode_JinLong",
+ component: () => import("@/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong"), // 鏉＄爜鐢熸垚_閿﹂殕
+ name: "IframeBarCode_JinLong",
+ meta: { title: "鏉＄爜鐢熸垚_閿﹂殕", noCache: true, noLoading: true },
+ },
+ ],
+ },
+ //#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