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

廖井涛

2024-04-12 e3cc5fb859a4e3c56c1dfa4d7892b233a30874fa

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

@@ -1,8 +1,9 @@
import { createRouter, createWebHistory } from 'vue-router'
import {createRouter, createWebHashHistory, createWebHistory} from 'vue-router'
import HomeView from '../views/HomeView.vue'

const router = createRouter({
  history: createWebHistory(import.meta.env.BASE_URL),
  history: createWebHashHistory(),
  //history: createWebHistory(import.meta.env.BASE_URL),
  routes: [
    {
      path: '/',
@@ -21,6 +22,23 @@
      component: () => import('../layout/MainErpView.vue'),
      children:[
          //sd模块
        {
          path:'orderBasicData',
          name: 'orderBasicData',
          component: () => import('../views/sd/basicData/BasicData.vue'),
          children:[
            {
              path: 'searchBasicData',
              name: 'searchBasicData',
              component: () => import('../views/sd/basicData/SearchBasicData.vue')
            },
            {
              name: 'OrderBasicData',
              path: '',
              redirect:'/main/orderBasicData/searchBasicData'
            }
          ]
        },
        {
          path: 'product',//产品
          name: 'product',
@@ -47,6 +65,12 @@
              component: () => import('../views/sd/product/Test11.vue')
            },
            {
              path: 'testSort',
              name: 'testSort',
              component: () => import('../views/sd/product/testSort.vue')
            },
            {
              name: 'product',
              path: '',
              redirect:'/main/product/selectProduct'
            }
@@ -255,9 +279,14 @@
              component: () => import('../views/pp/processCard/PrintProcess.vue'),
            },
            {
              path: 'reShelving',
              name: 'reShelving',
              component: () => import('../views/pp/processCard/ReShelving.vue'),
              path: 'productionScheduling',
              name: 'productionScheduling',
              component: () => import('../views/pp/processCard/ProductionScheduling.vue'),
            },
            {
              path: 'selectDetailProcessCard',
              name: 'selectDetailProcessCard',
              component: () => import('../views/pp/processCard/SelectDetailProcessCard.vue'),
            },
            {
              path: '',
@@ -336,18 +365,18 @@
          //返工管理
          path: 'rework',
          name: 'rework',
          component: () => import('../views/pp/Rework/Rework.vue'),
          component: () => import('../views/pp/rework/Rework.vue'),
          children:[

            {
              path: 'addRework',
              name: 'addRework',
              component: () => import('../views/pp/Rework/AddRework.vue'),
              component: () => import('../views/pp/rework/AddRework.vue'),
            },
            {
              path: 'selectRework',
              name: 'selectRework',
              component: () => import('../views/pp/Rework/SelectRework.vue'),
              component: () => import('../views/pp/rework/SelectRework.vue'),
            },
            {
              path: '',
@@ -466,6 +495,12 @@
              component: () => import('../views/pp/report/ProductionSchedule.vue'),
            },
            {
              //流程卡进度
              path: 'processCardProgress',
              name: 'processCardProgress',
              component: () => import('../views/pp/report/ProcessCardProgress.vue'),
            },
            {
              //品质报表
              path: 'qualityReport',
              name: 'qualityReport',
@@ -513,13 +548,50 @@
              name: 'damageReport',
              component: () => import('../views/pp/report/DamageReport.vue'),
            },
            {
              //跨工序次破报表
              path: 'crossProcessBreaking',
              name: 'crossProcessBreaking',
              component: () => import('../views/pp/report/crossProcessBreaking.vue'),
            },
            // {
            //   path: '',
            //   redirect:'/main/report/ProductionSchedule'
            // }
          ]
        },

        {
          //基础数据管理
          path: 'productionBasicData',
          name: 'productionBasicData',
          component: () => import('../views/pp/productionBasicData/ProductionBasicData.vue'),
          children:[
            {
              path: 'selectProductionBasicData',
              name: 'selectProductionBasicData',
              component: () => import('../views/pp/productionBasicData/SelectProductionBasicData.vue'),
            },
            {
              path: 'addBreakageReason',
              name: 'addBreakageReason',
              component: () => import('../views/pp/productionBasicData/AddBreakageReason.vue'),
            },
            {
              path: 'addBreakageType',
              name: 'addBreakageType',
              component: () => import('../views/pp/productionBasicData/AddBreakageType.vue'),
            },
            {
              path: 'addTeamGroup',
              name: 'addTeamGroup',
              component: () => import('../views/pp/productionBasicData/AddTeamGroup.vue'),
            },
            {
              path: '',
              redirect:'/main/productionBasicData/SelectProductionBasicData'
            }
          ]
        },



@@ -570,6 +642,30 @@
              path: 'finishedProductRework',
              name: 'finishedProductRework',
              component:()=>import('../views/mm/mainProductStock/FinishedProductRework.vue'),
            },
            {
              // 调拨记录
              path: 'transferRecord',
              name: 'transferRecord',
              component:()=>import('../views/mm/mainProductStock/TransferRecord.vue'),
            },
            {
              // 领出记录
              path: 'takeOutRecord',
              name: 'takeOutRecord',
              component:()=>import('../views/mm/mainProductStock/TakeOutRecord.vue'),
            },
            {
              // 返工记录
              path: 'reworkRecord',
              name: 'reworkRecord',
              component:()=>import('../views/mm/mainProductStock/ReworkRecord.vue'),
            },
            {
              // 出入库记录
              path: 'storageRecord',
              name: 'storageRecord',
              component:()=>import('../views/mm/mainProductStock/StorageRecord.vue'),
            },

            {
@@ -637,10 +733,24 @@
              name: 'materialOutbound',
              component:()=>import('../views/mm/mainIngredientStock/MaterialOutbound.vue')
            },
              //出库新增
            {
              path:'createOutBound',
              name:'createOutBound',
              component:()=>import('../views/mm/mainIngredientStock/CreateOutBound.vue')
            },
            //返库
            {
              path:'returnToStorage',
              name:'returnToStorage',
              component:()=>import('../views/mm/mainIngredientStock/ReturnToStorage.vue')
            },

            //返库新增
            {
              path:'returnToStorageCreate',
              name:'returnToStorageCreate',
              component:()=>import('../views/mm/mainIngredientStock/ReturnToStorageCreate.vue')
            },
            {
              path: '',
@@ -680,7 +790,7 @@
          /*----------- 仓储报表 ----------------*/
          path: 'stockReport',
          name: 'stockReport',
          component: () => import('../views/mm/stockReport/stockReport.vue'),
          component: () => import('../views/mm/stockReport/StockReport.vue'),
          children:[
            {
              path: 'WarehouseReport',
@@ -781,7 +891,7 @@
        },
        {
          path: '',
          redirect:'/main/Product'
          redirect:'/main/order'
        }
      ]
    },