From 7c8d2cdb2f6f0013f15f1291c879fec389839b90 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 13:51:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro

---
 src/router/index.js |   98 ++++++++++++++++++++++++++-----------------------
 1 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index c9b163c..61568ce 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -47,20 +47,6 @@
     component: () => import("@/views/register"),
     hidden: true,
   },
-  // 绯荤粺鏋舵瀯鍥�
-  {
-    path: "/system-architecture",
-    component: Layout,
-    redirect: "/system-architecture/index",
-    children: [
-      {
-        path: "index",
-        component: () => import("@/views/systemArchitecture/index.vue"),
-        name: "SystemArchitecture",
-        meta: { title: "绯荤粺鏋舵瀯鍥�", icon: "tree" },
-      },
-    ],
-  },
   {
     path: "/:pathMatch(.*)*",
     component: () => import("@/views/error/404"),
@@ -85,6 +71,32 @@
       },
     ],
   },
+  // 绯荤粺鏋舵瀯鍥�
+  {
+    path: "/system-architecture",
+    component: Layout,
+    redirect: "/system-architecture/index",
+    children: [
+      {
+        path: "index",
+        component: () => import("@/views/systemArchitecture/index.vue"),
+        name: "SystemArchitecture",
+        meta: { title: "绯荤粺鏋舵瀯鍥�", icon: "tree" },
+      },
+    ],
+  },
+  {
+    path: "/ai-industrial-brain",
+    component: Layout,
+    children: [
+      {
+        path: "index",
+        component: () => import("@/views/aiIndustrialBrain/index.vue"),
+        name: "AiIndustrialBrain",
+        meta: { title: "AI宸ヤ笟澶ц剳", icon: "skill" },
+      },
+    ],
+  },
   {
     path: "/user",
     component: Layout,
@@ -106,20 +118,6 @@
     name: "DeviceInfo",
     meta: { title: "璁惧淇℃伅", icon: "monitor" },
   },
-  // 娣诲姞椤圭洰璇︽儏椤甸潰璺敱閰嶇疆
-  {
-    path: "/oaSystem/projectManagement/projectDetail",
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: ":projectId",
-        component: () => import("@/views/oaSystem/projectManagement/projectDetail.vue"),
-        name: "ProjectDetail",
-        meta: { title: "椤圭洰璇︽儏", activeMenu: "/oaSystem/projectManagement" },
-      },
-    ],
-  },
   {
     path: "/projectManagement/Management/detail",
     component: Layout,
@@ -134,7 +132,7 @@
     ],
   },
   // 璐㈠姟绠＄悊妯″潡璺敱
-  {
+  /*{
     path: "/financial",
     component: Layout,
     hidden: false,
@@ -142,12 +140,6 @@
     alwaysShow: true,
     meta: { title: "璐㈠姟绠＄悊", icon: "money" },
     children: [
-      {
-        path: "general-ledger",
-        component: () => import("@/views/financialManagement/generalLedger/index.vue"),
-        name: "GeneralLedger",
-        meta: { title: "鎬诲笎绉戠洰" },
-      },
       {
         path: "sales-out",
         component: () => import("@/views/financialManagement/receivable/salesOut.vue"),
@@ -160,12 +152,7 @@
         name: "SalesReturn",
         meta: { title: "閿�鍞��璐�" },
       },
-      {
-        path: "receivable-reconciliation",
-        component: () => import("@/views/financialManagement/receivable/reconciliation.vue"),
-        name: "ReceivableReconciliation",
-        meta: { title: "搴旀敹瀵硅处" },
-      },
+
       {
         path: "invoice-apply",
         component: () => import("@/views/financialManagement/receivable/invoiceApply.vue"),
@@ -185,16 +172,22 @@
         meta: { title: "鏀舵鍗�" },
       },
       {
+        path: "receivable-reconciliation",
+        component: () => import("@/views/financialManagement/receivable/reconciliation.vue"),
+        name: "ReceivableReconciliation",
+        meta: { title: "搴旀敹瀵硅处" },
+      },
+      {
         path: "purchase-in",
         component: () => import("@/views/financialManagement/payable/purchaseIn.vue"),
         name: "PurchaseIn",
         meta: { title: "閲囪喘鍏ュ簱" },
       },
       {
-        path: "payable-reconciliation",
-        component: () => import("@/views/financialManagement/payable/reconciliation.vue"),
-        name: "PayableReconciliation",
-        meta: { title: "搴斾粯瀵硅处" },
+        path: "purchase-return",
+        component: () => import("@/views/financialManagement/payable/purchaseReturn.vue"),
+        name: "PurchaseReturn",
+        meta: { title: "閲囪喘閫�璐�" },
       },
       {
         path: "input-invoice",
@@ -208,11 +201,18 @@
         name: "PaymentApply",
         meta: { title: "浠樻鐢宠" },
       },
+
       {
         path: "payment",
         component: () => import("@/views/financialManagement/payable/payment.vue"),
         name: "Payment",
         meta: { title: "浠樻鍗�" },
+      },
+      {
+        path: "payable-reconciliation",
+        component: () => import("@/views/financialManagement/payable/reconciliation.vue"),
+        name: "PayableReconciliation",
+        meta: { title: "搴斾粯瀵硅处" },
       },
       {
         path: "fixed-assets",
@@ -225,6 +225,12 @@
         component: () => import("@/views/financialManagement/assets/intangibleAssets.vue"),
         name: "IntangibleAssets",
         meta: { title: "鏃犲舰璧勪骇" },
+      },
+      {
+        path: "general-ledger",
+        component: () => import("@/views/financialManagement/generalLedger/index.vue"),
+        name: "GeneralLedger",
+        meta: { title: "鎬诲笎绉戠洰" },
       },
       {
         path: "voucher",
@@ -245,7 +251,7 @@
         meta: { title: "绉戠洰鏄庣粏甯�" },
       },
     ],
-  },
+  },*/
 ];
 
 // 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇

--
Gitblit v1.9.3