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

guoyuji

2024-07-10 15e254a574f0c8bc2f7054d9d09c89f95afdd6bb

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

@@ -72,12 +72,18 @@
              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模块
        {
@@ -370,7 +376,7 @@
            {
              path: 'printCustomLabel',
              name: 'printCustomLabel',
              component: () => import('../views/pp/processCard/PrintCustomLabel1.vue'),
              component: () => import('../views/pp/processCard/PrintCustomLabel.vue'),
            },
            {
              path: 'printCustomLabelSemi',
@@ -380,7 +386,7 @@
            {
              path: 'printCustomLabelSemi2',
              name: 'printCustomLabelSemi2',
              component: () => import('../views/pp/processCard/PrintCustomLabelSemi.vue'),
              component: () => import('../views/pp/processCard/PrintCustomLabelSemi2.vue'),
            },
            {
              path: 'printLabel1',