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

chenhaozhe

5 天以前 cfd0b53967daca92d98cd304e4d4e0577e2efbd3

 src/router/index.js

@@ -1573,6 +1573,54 @@
  //#endregion
  //#endregion

//#region 财务结算基础资料
//#region 货币列表
 {
    //src\views\basic\gyItemMoney\gyItemMoney.vue
    path: "/basic/gy/gyCurrency",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/basic/gy", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/basic/gy/gyCurrency",
        component: () => import("@/views/basic/gyCurrency/gyCurrency.vue"),
        name: "GyCurrency",
        meta: { title: "货币列表", activeMenu: "basic/gy" },
      },
    ],
  },
//#endregion
//#endregion

//#region 单位基础资料
//#region 计量单位列表
 {
    //src\views\basic\gyUnit\gyUnit.vue
    path: "/basic/gy/gyUnit",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/basic/gy", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/basic/gy/gyUnit",
        component: () => import("@/views/basic/gyUnit/gyUnit.vue"),
        name: "GyCurrency",
        meta: { title: "计量单位列表", activeMenu: "basic/gy" },
      },
    ],
  },
//#endregion
//#endregion

  //#region 辅助属性基础资料
  {
    //src\views\basic\gyItemMoney\gyItemMoney.vue
@@ -1679,6 +1727,39 @@
        meta: { title: "仓库列表", noCache: true, noLoading: true },
      },
      {
        path: "GyCurrency",
        component: () => import("@/views/basic/gyCurrency/gyCurrency"), // 货币列表
        name: "IframeGyCurrency",
        meta: { title: "货币列表", noCache: true, noLoading: true },
      },
      {
        path: "GyCurrencyEdit",
        component: () => import("@/views/basic/gyCurrency/gyCurrencyEdit"), // 货币编辑
        name: "IframeGyCurrencyEdit",
        meta: { title: "货币列表", noCache: true, noLoading: true },
      },
       {
        path: "GyUnit",
        component: () => import("@/views/basic/gyUnit/gyUnit"),
       
        name: "IframeGyUnit",
        meta: { title: "计量单位列表", noCache: true, noLoading: true },
      },
      {
        path: "GyUnitEdit",
        component: () => import("@/views/basic/gyUnit/gyUnitEdit"), // 计量单位编辑
        name: "IframeGyUnitEdit",
        meta: { title: "计量单位编辑", noCache: true, noLoading: true },
        
      },
      {
        path: "GyUnitGroup",
        component: () => import("@/views/basic/gyUnit/gyUnitGroup"), // 计量单位组列表
        name: "IframeGyUnitGroup",
        meta: { title: "计量单位组列表", noCache: true, noLoading: true },
        
      },
      {
        path: "GySupplier",
        component: () => import("@/views/basic/gy/gySupplier"), // 供应商
        name: "IframeGySupplier",
@@ -1702,6 +1783,7 @@
        name: "IframeGyCarEdit",
        meta: { title: "车辆编辑", noCache: true, noLoading: true },
      },
      
      {
        path: "GyProperty",
        component: () => import("@/views/basic/gyProperty/gyPropertyList"), // 辅助属性
@@ -1717,6 +1799,49 @@
    ],
  },
  //#endregion

  //#region 物流管理
  //#region 运输定位
  //#region 运单列表
  {
    path: "logistics/transportGPS/WL_YayBill",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/logistics/transportGPS", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/logistics/transportGPS/WL_YayBill",
        component: () => import("@/views/logistics/transportGPS/WL_YayBill.vue"),
        name: "WL_YayBill",
        meta: { title: "出运单", activeMenu: "logistics/transportGPS" },
      },
    ],
  },
  //#endregion
  //#region 运单编辑
  {
    path: "logistics/transportGPS/Add_Edit_WL_YayBill",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/logistics/transportGPS", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/logistics/transportGPS/Add_Edit_WL_YayBill",
        component: () => import("@/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue"),
        name: "Add_Edit_WL_YayBill",
        meta: { title: "运单编辑", activeMenu: "logistics/transportGPS" },
      },
    ],
  },
  //#endregion
];

// 动态路由，基于用户权限动态去加载