Merge branch 'dev_test' into dev

zhuo

2025-03-31 2902cd8d2b36f66ea5162ae91d9a5a51912758fa

 src/router/index.js

@@ -46,6 +46,18 @@
    component: () => import("@/views/login"),
    hidden: true,
  },
  // 第三方登录页
  {
    path: "/thirdpartylogin",
    component: () => import("@/views/thirdpartylogin"),
    hidden: true,
  },
  // 第三方登录页中转
  {
    path: "/logindemo",
    component: () => import("@/views/logindemo"),
    hidden: true,
  },
  {
    path: "/register",
    component: () => import("@/views/register"),
@@ -62,7 +74,7 @@
    hidden: true,
  },
  {
    path: "",
    path: "/",
    component: Layout,
    redirect: "index",
    children: [
@@ -100,18 +112,42 @@
    permissions: ["business:order"],
    children: [
      {
        // 原材料下单
        path: 'customsInspection',
        component: () => import('@/views/business/materialOrder/customsInspection'),
        name: 'customsInspection',
        meta: { title: '原材料下单详情', activeMenu: '/business/materialOrder' }
        // 原材料下单-进行下单
        path: "customsInspectionOrder",
        component: () =>
          import("@/views/business/materialOrder/customsInspectionOrder"),
        name: "CustomsInspectionOrder",
        meta: {
          title: "进行原材料下单",
          activeMenu: "/business/materialOrder",
          keepAlive: true
        },
      },
      {
        // 原材料下单-查看详情
        path: "customsInspectionView",
        component: () =>
          import("@/views/business/materialOrder/customsInspectionView"),
        name: "CustomsInspectionView",
        meta: {
          title: "查看原材料下单详情",
          activeMenu: "/business/materialOrder",
          keepAlive: true
        },
      },
      {
        // 铜材料下单
        path: 'copperOrder',
        component: () => import('@/views/business/materialOrder/copperOrder'),
        name: 'copperOrder',
        meta: { title: '铜材料下单', activeMenu: '/business/materialOrder' }
        path: "copperOrder",
        component: () => import("@/views/business/materialOrder/copperOrder"),
        name: "CopperOrder",
        meta: { title: "进行铜材料下单", activeMenu: "/business/materialOrder",keepAlive: true },
      },
      {
        // 铜材料下单-查看详情
        path: "copperView",
        component: () => import("@/views/business/materialOrder/copperView"),
        name: "CopperView",
        meta: { title: "查看铜材料下单详情", activeMenu: "/business/materialOrder",keepAlive: true },
      },
    ],
  },
@@ -120,15 +156,23 @@
    path: "/productOrder",
    component: Layout,
    hidden: true,
    permissions: ["productOrder:order"],
    permissions: ["business:productOrder"],
    children: [
      {
        // 成品下单详情
        path: "add",
        // 查看成品下单详情
        path: "addView",
        component: () =>
          import("@/views/business/productOrder/components/add.vue"),
        name: "add",
        meta: { title: "成品下单详情", activeMenu: "/business/materialOrder" },
          import("@/views/business/productOrder/components/addView.vue"),
        name: "AddView",
        meta: { title: "查看成品下单详情", activeMenu: "/business/productOrder",keepAlive: true },
      },
      {
        // 进行下单-成品下单
        path: "addOrder",
        component: () =>
          import("@/views/business/productOrder/components/addOrder.vue"),
        name: "AddOrder",
        meta: { title: "进行成品下单", activeMenu: "/business/productOrder",keepAlive: true },
      },
    ],
  },
@@ -144,7 +188,7 @@
        path: "inspection",
        component: () => import("@/views/business/inspectionTask/inspection"),
        name: "inspection",
        meta: { title: "检验单详情", activeMenu: "/business/inspectionTask" },
        meta: { title: "检验单详情", activeMenu: "/business/inspectionTask", keepAlive: false },
      },
    ],
  },
@@ -199,34 +243,6 @@
    component: Layout,
    hidden: true,
    permissions: ["customer:edit"],
  },
  {
    path: "/monitor/job-log",
    component: Layout,
    hidden: true,
    permissions: ["monitor:job:list"],
    children: [
      {
        path: "index/:jobId(\\d+)",
        component: () => import("@/views/monitor/job/log"),
        name: "JobLog",
        meta: { title: "调度日志", activeMenu: "/monitor/job" },
      },
    ],
  },
  {
    path: "/tool/gen-edit",
    component: Layout,
    hidden: true,
    permissions: ["tool:gen:edit"],
    children: [
      {
        path: "index/:tableId(\\d+)",
        component: () => import("@/views/tool/gen/editTable"),
        name: "GenEdit",
        meta: { title: "修改生成配置", activeMenu: "/tool/gen" },
      },
    ],
  },
];