From 7570f18ad0164dcb9bb71808f68e89053aaa2bbf Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 14 十一月 2025 16:14:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/router/index.js |  101 +++++++++++++++-----------------------------------
 1 files changed, 30 insertions(+), 71 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index e7a28ef..78552fa 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -41,31 +41,26 @@
       },
     ],
   },
-  //鐧诲綍
   {
     path: "/login",
     component: () => import("@/views/login"),
     hidden: true,
   },
-  //娉ㄥ唽
   {
     path: "/register",
     component: () => import("@/views/register"),
     hidden: true,
   },
-  //404
   {
     path: "/404",
     component: () => import("@/views/error/404"),
     hidden: true,
   },
-  //401
   {
     path: "/401",
     component: () => import("@/views/error/401"),
     hidden: true,
   },
-  //棣栭〉
   {
     path: "",
     component: Layout,
@@ -79,7 +74,6 @@
       },
     ],
   },
-  //涓汉涓績
   {
     path: "/user",
     component: Layout,
@@ -94,43 +88,27 @@
       },
     ],
   },
-  // //鐧诲綍璺宠浆椤�
-  // {
-  //   path: "/indexPage",
-  //   component: () => import("@/views/indexPage"),
-  //   hidden: true,
-  // },
   //閿�鍞嚭搴撳崟
-  // {
-  //   path: "/sales/salesOUt/sellOutBill",
-  //   component: () => import("@/views/sellOutBill/index"),
-  //   hidden: true,
-  // },
   {
-    path: "/sales/salesOUt/sellOutBill",
+    path: "/sell/sellOut/sellOutBill",
     component: Layout,
     hidden: true,
     // permissions: ["system:goods:add"],
     redirect: "noredirect",
     meta: {
       breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
-      activeMenu: "/sales/salesOUt", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+      activeMenu: "/sell/sellOut", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
     },
     children: [
       {
-        path: "/sales/salesOUt/sellOutBill",
-        component: () => import("@/views/sell/sellOutBill"),
+        path: "/sell/sellOut/sellOutBill",
+        component: () => import("@/views/sell/sellOut/sellOutBill"),
         name: "SellOutBill",
-        meta: { title: "閿�鍞嚭搴撳崟", activeMenu: "sales/salesOUt" },
+        meta: { title: "閿�鍞嚭搴撳崟", activeMenu: "sell/sellOut" },
       },
     ],
   },
   //閿�鍞嚭搴撳崟缂栬緫椤甸潰
-  // {
-  //   path: "/sellOutBillEdit",
-  //   component: () => import("@/views/sales/salesOUt/sellOutBill/edit/index"),
-  //   hidden: true,
-  // },
   {
     path: "/sell/sellOut/sellOutBillEdit",
     component: Layout,
@@ -168,61 +146,23 @@
       },
     ],
   },
-  //閲囪喘鍏ュ簱鍗�
-  {
-    path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList",
-    component: Layout,
-    hidden: true,
-    // permissions: ["system:goods:add"],
-    redirect: "noredirect",
-    meta: {
-      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
-      activeMenu: "/CaiGouGuanLi/CaiGouRuKu", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
-    },
-    children: [
-      {
-        path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList",
-        component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"),
-        name: "Kf_POStockInBillList",
-        meta: { title: "閲囪喘鍏ュ簱鍗�", activeMenu: "CaiGouGuanLi/CaiGouRuKu" },
-      },
-    ],
-  },
-  //閲囪喘鍏ュ簱鍗曠紪杈戦〉闈�
-  {
-    path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit",
-    component: Layout,
-    hidden: true,
-    redirect: "noredirect",
-    meta: {
-      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
-      activeMenu: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
-    },
-    children: [
-      {
-        path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit",
-        component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),
-        name: "SellOutBillEdit",
-        meta: { title: "閲囪喘鍏ュ簱鍗曠紪杈�", activeMenu: "/CaiGouGuanLi/CaiGouRuKu" },
-      },
-    ],
-  },
+
   //鐢熶骇璧勬簮
   {
-    path: "/basic/gy/gySource",
+    path: "/basic/production/gySource",
     component: Layout,
     hidden: true,
     redirect: "noredirect",
     meta: {
       breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
-      activeMenu: "/basic/gy/gySource", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+      activeMenu: "/basic/production/gySource", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
     },
     children: [
       {
-        path: "/basic/gy/gySource",
-        component: () => import("@/views/basic/gySource"),
+        path: "/basic/production/gySource",
+        component: () => import("@/views/basic/production/gySource.vue"),
         name: "GySource",
-        meta: { title: "鐢熶骇璧勬簮鍒楄〃", activeMenu: "basic/gy" },
+        meta: { title: "鐢熶骇璧勬簮鍒楄〃", activeMenu: "basic/production" },
       },
     ],
   },
@@ -431,6 +371,25 @@
     component: () => import("@/views/ICMO/ScICMOBillList.vue"),
     hidden: true,
   },
+  //渚涘簲鍟嗗垪琛�
+  {
+    path: "/basic/gy/gySupplier",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/basic/gy/gySupplier", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/basic/gy/gySupplier",
+        component: () => import("@/views/basic/gy/gySupplier.vue"),
+        name: "GySupplier",
+        meta: { title: "渚涘簲鍟嗗垪琛�", activeMenu: "basic/gy" },
+      },
+    ],
+  },
 ];
 
 // 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇

--
Gitblit v1.9.1