From 72b4c8df39edffc149ae51376499ac28b9bde0c1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 08 五月 2026 09:18:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

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

diff --git a/src/router/index.js b/src/router/index.js
index 2bb5586..e08b668 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -134,118 +134,118 @@
     ],
   },
   // 璐㈠姟绠$悊妯″潡璺敱
-  // {
-  //   path: "/financial",
-  //   component: Layout,
-  //   hidden: false,
-  //   redirect: "/financial/general-ledger",
-  //   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"),
-  //       name: "SalesOut",
-  //       meta: { title: "閿�鍞嚭搴�" },
-  //     },
-  //     {
-  //       path: "sales-return",
-  //       component: () => import("@/views/financialManagement/receivable/salesReturn.vue"),
-  //       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"),
-  //       name: "InvoiceApply",
-  //       meta: { title: "寮�绁ㄧ敵璇�" },
-  //     },
-  //     {
-  //       path: "output-invoice",
-  //       component: () => import("@/views/financialManagement/receivable/outputInvoice.vue"),
-  //       name: "OutputInvoice",
-  //       meta: { title: "閿�椤瑰彂绁�" },
-  //     },
-  //     {
-  //       path: "receipt",
-  //       component: () => import("@/views/financialManagement/receivable/receipt.vue"),
-  //       name: "Receipt",
-  //       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: "input-invoice",
-  //       component: () => import("@/views/financialManagement/payable/input-invoice.vue"),
-  //       name: "InputInvoice",
-  //       meta: { title: "杩涢」鍙戠エ" },
-  //     },
-  //     {
-  //       path: "payment-apply",
-  //       component: () => import("@/views/financialManagement/payable/paymentApply.vue"),
-  //       name: "PaymentApply",
-  //       meta: { title: "浠樻鐢宠" },
-  //     },
-  //     {
-  //       path: "payment",
-  //       component: () => import("@/views/financialManagement/payable/payment.vue"),
-  //       name: "Payment",
-  //       meta: { title: "浠樻鍗�" },
-  //     },
-  //     {
-  //       path: "fixed-assets",
-  //       component: () => import("@/views/financialManagement/assets/fixedAssets.vue"),
-  //       name: "FixedAssets",
-  //       meta: { title: "鍥哄畾璧勪骇" },
-  //     },
-  //     {
-  //       path: "intangible-assets",
-  //       component: () => import("@/views/financialManagement/assets/intangibleAssets.vue"),
-  //       name: "IntangibleAssets",
-  //       meta: { title: "鏃犲舰璧勪骇" },
-  //     },
-  //     {
-  //       path: "voucher",
-  //       component: () => import("@/views/financialManagement/voucher/index.vue"),
-  //       name: "Voucher",
-  //       meta: { title: "鍑瘉" },
-  //     },
-  //     {
-  //       path: "voucher-general-ledger",
-  //       component: () => import("@/views/financialManagement/voucher/generalLedger.vue"),
-  //       name: "VoucherGeneralLedger",
-  //       meta: { title: "绉戠洰鎬诲笎" },
-  //     },
-  //     {
-  //       path: "voucher-detail-ledger",
-  //       component: () => import("@/views/financialManagement/voucher/detailLedger.vue"),
-  //       name: "VoucherDetailLedger",
-  //       meta: { title: "绉戠洰鏄庣粏甯�" },
-  //     },
-  //   ],
-  // },
+  {
+    path: "/financial",
+    component: Layout,
+    hidden: false,
+    redirect: "/financial/general-ledger",
+    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"),
+        name: "SalesOut",
+        meta: { title: "閿�鍞嚭搴�" },
+      },
+      {
+        path: "sales-return",
+        component: () => import("@/views/financialManagement/receivable/salesReturn.vue"),
+        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"),
+        name: "InvoiceApply",
+        meta: { title: "寮�绁ㄧ敵璇�" },
+      },
+      {
+        path: "output-invoice",
+        component: () => import("@/views/financialManagement/receivable/outputInvoice.vue"),
+        name: "OutputInvoice",
+        meta: { title: "閿�椤瑰彂绁�" },
+      },
+      {
+        path: "receipt",
+        component: () => import("@/views/financialManagement/receivable/receipt.vue"),
+        name: "Receipt",
+        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: "input-invoice",
+        component: () => import("@/views/financialManagement/payable/input-invoice.vue"),
+        name: "InputInvoice",
+        meta: { title: "杩涢」鍙戠エ" },
+      },
+      {
+        path: "payment-apply",
+        component: () => import("@/views/financialManagement/payable/paymentApply.vue"),
+        name: "PaymentApply",
+        meta: { title: "浠樻鐢宠" },
+      },
+      {
+        path: "payment",
+        component: () => import("@/views/financialManagement/payable/payment.vue"),
+        name: "Payment",
+        meta: { title: "浠樻鍗�" },
+      },
+      {
+        path: "fixed-assets",
+        component: () => import("@/views/financialManagement/assets/fixedAssets.vue"),
+        name: "FixedAssets",
+        meta: { title: "鍥哄畾璧勪骇" },
+      },
+      {
+        path: "intangible-assets",
+        component: () => import("@/views/financialManagement/assets/intangibleAssets.vue"),
+        name: "IntangibleAssets",
+        meta: { title: "鏃犲舰璧勪骇" },
+      },
+      {
+        path: "voucher",
+        component: () => import("@/views/financialManagement/voucher/index.vue"),
+        name: "Voucher",
+        meta: { title: "鍑瘉" },
+      },
+      {
+        path: "voucher-general-ledger",
+        component: () => import("@/views/financialManagement/voucher/generalLedger.vue"),
+        name: "VoucherGeneralLedger",
+        meta: { title: "绉戠洰鎬诲笎" },
+      },
+      {
+        path: "voucher-detail-ledger",
+        component: () => import("@/views/financialManagement/voucher/detailLedger.vue"),
+        name: "VoucherDetailLedger",
+        meta: { title: "绉戠洰鏄庣粏甯�" },
+      },
+    ],
+  },
 ];
 
 // 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇

--
Gitblit v1.9.3