Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUE_New

llj

2025-11-11 6108e3d49712b6ded5cf3c3e735ec40f13e35971

 src/router/index.js

@@ -41,26 +41,31 @@
      },
    ],
  },
  {
    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: "/login",
    component: () => import("@/views/login"),
    hidden: true,
  },
  //注册
  {
    path: "/register",
    component: () => import("@/views/register"),
    hidden: true,
  },
  //首页
  {
    path: "",
    component: Layout,
@@ -74,6 +79,7 @@
      },
    ],
  },
  //个人中心
  {
    path: "/user",
    component: Layout,
@@ -88,83 +94,62 @@
      },
    ],
  },
  // //登录跳转页
  // {
  //   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, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/sales/salesOUt", // 当路由设置了该属性，则会高亮相对应的侧边栏。
      activeMenu: "/sell/sellOut/sellOutBill", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/sales/salesOUt/sellOutBill",
        component: () => import("@/views/sell/sellOutBill"),
        path: "/sell/sellOut/sellOutBill",
        component: () => import("@/views/sell/sellOut/sellOutBill.vue"),
        name: "SellOutBill",
        meta: { title: "销售出库单", activeMenu: "sales/salesOUt" },
        meta: { title: "销售出库单", activeMenu: "sell/sellOUt/sellOutBill" },
      },
    ],
  },
  //销售出库单编辑页面
  // {
  //   path: "/sellOutBillEdit",
  //   component: () => import("@/views/sales/salesOUt/sellOutBill/edit/index"),
  //   hidden: true,
  // },
  //销售出库单编辑
  {
    path: "/sales/salesOUt/sellOutBillEdit",
    path: "/sell/sellOut/sellOutBillEdit",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/sales/salesOUt/sellOutBillEdit", // 当路由设置了该属性，则会高亮相对应的侧边栏。
      activeMenu: "/sell/sellOut/sellOutBillEdit", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/sales/salesOUt/sellOutBillEdit",
        component: () => import("@/views/sell/sellOutBill/edit"),
        path: "/sell/sellOut/sellOutBillEdit",
        component: () => import("@/views/sell/sellOut/sellOutBillEdit.vue"),
        name: "SellOutBillEdit",
        meta: { title: "销售出库单编辑", activeMenu: "sales/salesOUt" },
        meta: { title: "销售出库单编辑", activeMenu: "/sell/sellOut/sellOutBillEdit" },
      },
    ],
  },
  //销售单
  // {
  //   path: "/sellBill",
  //   component: () => import("@/views/sellBill/index"),
  //   hidden: true,
  // },
  //生产资源
  //采购入库单
  {
    path: "/basic/gy/gySource",
    path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList",
    component: Layout,
    hidden: true,
    // permissions: ["system:goods:add"],
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/basic/gy/gySource", // 当路由设置了该属性，则会高亮相对应的侧边栏。
      activeMenu: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/basic/gy/gySource",
        component: () => import("@/views/basic/gySource"),
        name: "GySource",
        meta: { title: "生产资源列表", activeMenu: "basic/gy" },
        path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList",
        component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList"),
        name: "Kf_POStockInBillList",
        meta: { title: "采购入库单", activeMenu: "/CaiGouGuanLi/CaiGouRuKu" },
      },
    ],
  },
@@ -179,6 +164,25 @@
    component: () => import("@/views/component/printList/hBarPlanPrint"),
    hidden: true,
  },
  //生产资源
  {
    path: "/basic/production/gySource",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/basic/production/gySource", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/basic/production/gySource",
        component: () => import("@/views/basic/production/gySource.vue"),
        name: "GySource",
        meta: { title: "生产资源列表", activeMenu: "basic/production" },
      },
    ],
  },
  // 仓库
  {
    path: "/gyWarehouse",