Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

1 天以前 a597d9c7d1975ab9fe0f01d1a3608497288eafe0

 north-glass-erp/northglass-erp/src/router/index.js

@@ -111,7 +111,34 @@
            }
          ]
        },

          //bom模块
        {
          path:'bom',
          name: 'bom',
          component: () => import('../views/sd/bom/BOM.vue'),
          children:[
            {
              path: 'materialBOM',
              name: 'materialBOM',
              component: () => import('../views/sd/bom/MaterialBOM.vue')
            },
            {
              path: 'productBOM',
              name: 'productBOM',
              component: () => import('../views/sd/bom/ProductBOM.vue')
            },
            {
              path: 'orderBOM',
              name: 'orderBOM',
              component: () => import('../views/sd/bom/OrderBOM.vue')
            },
            {
              name: 'bom1',
              path: '',
              redirect:'/main/bom/orderBOM'
            }
          ]
        },

          //sd模块
        {
@@ -655,7 +682,7 @@
            }
          ]
        },
        {
        /*{
          //BOM管理
          path: 'BOM',
          name: 'BOM',
@@ -696,7 +723,7 @@
              redirect:'/main/BOM/SelectBOM'
            }
          ]
        },
        },*/
        {
          //设备管理
          path: 'machine',