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

廖井涛

8 天以前 ceb1dea2b24d5c3216816f42fd0e514613656416

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

@@ -83,6 +83,23 @@
            }
          ]
        },
        {
          path:'userLog',
          name: 'userLog',
          component: () => import('../views/system/userLog/UserLog.vue'),
          children:[
            {
              path: 'userListLog',
              name: 'userListLog',
              component: () => import('../views/system/userLog/UserListLog.vue'),
            },
            {
              name:'userLog',
              path: '',
              redirect:'/main/userLog/userListLog'
            }
          ]
        },

        {
          path:'glassPrice',
@@ -155,6 +172,11 @@
              path: 'searchGlassType',
              name: 'searchGlassType',
              component: () => import('../views/sd/basicData/SearchGlassType.vue')
            },
            {
              path: 'searchProcessAttributeConfig',
              name: 'searchProcessAttributeConfig',
              component: () => import('../views/sd/basicData/SearchProcessAttributeConfig.vue')
            },
            {
              name: 'OrderBasicData',
@@ -561,6 +583,11 @@
              component: () => import('../components/pp/TagStyleDesigner.vue'),
            },
            {
              path: 'printProjectDetailSmallPiece',
              name: 'printProjectDetailSmallPiece',
              component: () => import('../views/pp/processCard/PrintProjectDetailSmallPiece.vue'),
            },
            {
              path: '',
              redirect:'/main/processCard/selectProcessCard'
            }
@@ -745,11 +772,7 @@
              name: 'selectMachine',
              component: () => import('../views/pp/machine/SelectMachine.vue'),
            },
            {
              path: 'addMachine',
              name: 'addMachine',
              component: () => import('../views/pp/machine/AddMachine.vue'),
            },

            {
              path: 'maintenanceAndRepair',
              name: 'maintenanceAndRepair',
@@ -801,6 +824,12 @@
              path: 'processToBeCompleted',
              name: 'processToBeCompleted',
              component: () => import('../views/pp/report/ProcessToBeCompleted.vue'),
            },
            {
              //工序待完成汇总
              path: 'processCompletedSummarize',
              name: 'processCompletedSummarize',
              component: () => import('../views/pp/report/ProcessCompletedSummarize.vue'),
            },
            {
              //生产进度
@@ -875,13 +904,19 @@
              component: () => import('../views/pp/report/DamageReport.vue'),
            },
            {
              //非跨工序次破报表
              path: 'notCrossProcessBreaking',
              name: 'notCrossProcessBreaking',
              component: () => import('../views/pp/report/NotCrossProcessBreaking.vue'),
            },
            {
              //订单排产计划
              path: 'scheduleProductionSchedule',
              name: 'scheduleProductionSchedule',
              component: () => import('../views/pp/report/ScheduleProductionSchedule.vue'),
            },
            {
              //排产计划
              //跨工序次破
              path: 'crossProcessBreaking',
              name: 'crossProcessBreaking',
              component: () => import('../views/pp/report/crossProcessBreaking.vue'),
@@ -917,6 +952,11 @@
              path: 'addTeamGroup',
              name: 'addTeamGroup',
              component: () => import('../views/pp/productionBasicData/AddTeamGroup.vue'),
            },
            {
              path: 'addMachine',
              name: 'addMachine',
              component: () => import('../views/pp/productionBasicData/AddMachine.vue'),
            },
            {
              path: '',
@@ -1179,6 +1219,15 @@
              path: 'materialReturnReport',
              name: 'materialReturnReport',
              component: () => import('../views/mm/stockReport/MaterialReturnReport.vue'),
            },{
              path: 'finishedGlassShelfEmitReport',
              name: 'finishedGlassShelfEmitReport',
              component: () => import('../views/mm/stockReport/FinishedGlassShelfEmitReport.vue'),
            },
            {
              path: 'finishedGlassShelfWithdrawReport',
              name: 'finishedGlassShelfWithdrawReport',
              component: () => import('../views/mm/stockReport/FinishedGlassShelfWithdrawReport.vue'),
            }, {
              path: '',
              redirect: '/main/stockReport/finishedProductInventoryReport'