Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-08-15 8b7d4b9527b9e196df4b9ac7cf113f06798f7941

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

@@ -28,6 +28,11 @@
          component: () => import('../views/system/user/User.vue'),
          children:[
            {
              path: 'notPermission',
              name: 'notPermission',
              component: () => import('../views/system/user/NotPermission.vue'),
            },
            {
              path: 'userList',
              name: 'userList',
              component: () => import('../views/system/user/UserList.vue')
@@ -39,6 +44,46 @@
            }
          ]
        },
        {
          path:'role',
          name: 'role',
          component: () => import('../views/system/role/Role.vue'),
          children:[
            {
              path: 'roleList',
              name: 'roleList',
              component: () => import('../views/system/role/RoleList.vue')
            },
            {
              name:'role',
              path: '',
              redirect:'/main/role/roleList'
            }
          ]
        },
        {
          path:'userPassWord',
          name: 'userPassWord',
          component: () => import('../views/system/userPassWord/userPassWord.vue'),
          children:[
            {
              path: 'updateUserPassWord',
              name: 'updateUserPassWord',
              component: () => import('../views/system/userPassWord/UpdateUserPassWord.vue')
            },
            {
              path: 'updateUserName',
              name: 'updateUserName',
              component: () => import('../views/system/userPassWord/UpdateUserName.vue')
            },
            {
              name:'userPassWord',
              path: '',
              redirect:'/main/userPassWord/updateUserPassWord'
            }
          ]
        },


          //sd模块
        {
@@ -50,6 +95,11 @@
              path: 'searchBasicData',
              name: 'searchBasicData',
              component: () => import('../views/sd/basicData/SearchBasicData.vue')
            },
            {
              path: 'searchGlassType',
              name: 'searchGlassType',
              component: () => import('../views/sd/basicData/SearchGlassType.vue')
            },
            {
              name: 'OrderBasicData',
@@ -100,11 +150,7 @@
          name: 'order',
          component: () => import('../views/sd/order/Order.vue'),
          children:[
            {
              path: 'notPermission',
              name: 'notPermission',
              component: () => import('../views/sd/order/NotPermission.vue'),
            },

            {
              path: 'selectOrder',
              name: 'selectOrder',
@@ -121,9 +167,19 @@
              component: () => import('../views/sd/order/UpdateOrderCraft.vue'),
            },
            {
              path: 'orderSummaryReport',
              name: 'orderSummaryReport',
              component: () => import('../views/sd/order/OrderSummaryReport.vue'),
            },
            {
              path: 'orderReport',
              name: 'orderReport',
              component: () => import('../views/sd/order/OrderReport.vue'),
            },
            {
              path: 'orderProductSummaryReport',
              name: 'orderProductSummaryReport',
              component: () => import('../views/sd/order/OrderProductSummaryReport.vue'),
            },
            {
              path: '',
@@ -150,6 +206,11 @@
              path: 'deliveryReport',
              name: 'deliveryReport',
              component: () => import('../views/sd/delivery/DeliveryReport.vue'),
            },
            {
              path: 'deliveryProductReport',
              name: 'deliveryProductReport',
              component: () => import('../views/sd/delivery/DeliveryProductReport.vue'),
            },
            {
              path: 'createDelivery',
@@ -310,7 +371,32 @@
            {
              path: 'printProcess',
              name: 'printProcess',
              component: () => import('../views/pp/processCard/PrintProcess.vue'),
              component: () => import('../components/pp/PrintProcess.vue'),
            },
            {
              path: 'printLabel',
              name: 'printLabel',
              component: () => import('../views/pp/processCard/PrintLabel.vue'),
            },
            {
              path: 'printCustomLabel',
              name: 'printCustomLabel',
              component: () => import('../components/pp/PrintCustomLabel.vue'),
            },
            {
              path: 'printCustomLabelSemi',
              name: 'printCustomLabelSemi',
              component: () => import('../components/pp/PrintCustomLabelSemi.vue'),
            },
            {
              path: 'printCustomLabelSemi2',
              name: 'printCustomLabelSemi2',
              component: () => import('../views/pp/processCard/PrintCustomLabelSemi2.vue'),
            },
            {
              path: 'printLabel1',
              name: 'printLabel1',
              component: () => import('../views/pp/processCard/PrintLabel1.vue'),
            },
            {
              path: 'productionScheduling',
@@ -321,6 +407,26 @@
              path: 'selectDetailProcessCard',
              name: 'selectDetailProcessCard',
              component: () => import('../views/pp/processCard/SelectDetailProcessCard.vue'),
            },
            {
              path: 'selectPrintProject',
              name: 'selectPrintProject',
              component: () => import('../views/pp/processCard/SelectPrintProject.vue'),
            },
            {
              path: 'selectSortDetailProcessCard',
              name: 'selectSortDetailProcessCard',
              component: () => import('../components/pp/SelectSortDetailProcessCard.vue'),
            },
            {
              path: 'printFlowCardDetails',
              name: 'printFlowCardDetails',
              component: () => import('../views/pp/processCard/PrintFlowCardDetails.vue'),
            },
            {
              path: 'printCustomLabelDetails',
              name: 'printCustomLabelDetails',
              component: () => import('../components/pp/PrintCustomLabelDetails.vue'),
            },
            {
              path: '',
@@ -336,15 +442,16 @@
          component: () => import('../views/pp/reportingWorks/ReportingWorks.vue'),
          children:[

            {
              path: 'selectReportingWorks',
              name: 'selectReportingWorks',
              component: () => import('../views/pp/reportingWorks/SelectReportingWorks.vue'),
            },

            {
              path: 'addReportingWork',
              name: 'addReportingWork',
              component: () => import('../views/pp/reportingWorks/AddReportingWork.vue'),
            },
            {
              path: 'selectReportingWorks',
              name: 'selectReportingWorks',
              component: () => import('../views/pp/reportingWorks/SelectReportingWorks.vue'),
            },
            {
              path: 'qualityInspectionReview',
@@ -363,7 +470,7 @@
            },
            {
              path: '',
              redirect:'/main/reportingWorks/SelectReportingWorks'
              redirect:'/main/reportingWorks/AddReportingWork'
            }
          ]
        },
@@ -390,6 +497,26 @@
              component: () => import('../views/pp/Replenish/SelectReplenish.vue'),
            },
            {
              path: 'printRepairProcess',
              name: 'printRepairProcess',
              component: () => import('../views/pp/Replenish/PrintRepairProcess.vue'),
            },
            {
              path: 'printReplenishFlowCard',
              name: 'printReplenishFlowCard',
              component: () => import('../views/pp/Replenish/PrintReplenishFlowCard.vue'),
            },
            {
              path: 'printRepairCustomLabelSemi',
              name: 'printRepairCustomLabelSemi',
              component: () => import('../components/pp/PrintRepairCustomLabelSemi.vue'),
            },
            {
              path: 'printRepairCustomLabel',
              name: 'printRepairCustomLabel',
              component: () => import('../components/pp/PrintRepairCustomLabel.vue'),
            },
            {
              path: '',
              redirect:'/main/Replenish/SelectReplenish'
            }
@@ -411,6 +538,21 @@
              path: 'selectRework',
              name: 'selectRework',
              component: () => import('../views/pp/rework/SelectRework.vue'),
            },
            {
              path: 'printReworkFlowCard',
              name: 'printReworkFlowCard',
              component: () => import('../views/pp/rework/PrintReworkFlowCard.vue'),
            },
            {
              path: 'printReworkCustomLabelSemi',
              name: 'printReworkCustomLabelSemi',
              component: () => import('../views/pp/rework/PrintReworkCustomLabelSemi.vue'),
            },
            {
              path: 'printReworkCustomLabel',
              name: 'printReworkCustomLabel',
              component: () => import('../views/pp/rework/PrintReworkCustomLabel.vue'),
            },
            {
              path: '',
@@ -583,7 +725,13 @@
              component: () => import('../views/pp/report/DamageReport.vue'),
            },
            {
              //跨工序次破报表
              //订单排产计划
              path: 'scheduleProductionSchedule',
              name: 'scheduleProductionSchedule',
              component: () => import('../views/pp/report/ScheduleProductionSchedule.vue'),
            },
            {
              //排产计划
              path: 'crossProcessBreaking',
              name: 'crossProcessBreaking',
              component: () => import('../views/pp/report/crossProcessBreaking.vue'),
@@ -750,7 +898,11 @@
              name: 'selectIngredientsStock',
              component:()=>import('../views/mm/mainIngredientStock/SelectIngredientsStock.vue')
            },

            {
              path: 'selectSurplusMaterials',
              name: 'selectSurplusMaterials',
              component:()=>import('../views/mm/mainIngredientStock/SelectSurplusMaterials.vue')
            },
            {
              path: 'accessoriesMonthlySettlement',
              name: 'accessoriesMonthlySettlement',