Merge branch 'dev_test' into dev_20230829_change

# Conflicts:
#	src/components/hzwlComponents/ReceiptDescription.vue
#	src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
#	src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
#	src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
#	src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
#	src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
This commit is contained in:
wxyclub
2023-11-28 15:34:45 +08:00
312 changed files with 8247 additions and 789 deletions
+12
View File
@@ -105,14 +105,26 @@ const routes = [
{
path: '/standDynamics',
name: 'standDynamics',
component: () => import('@/pages/phone/standDynamics/index'),
meta: {
keepAlive: true
}
/*
component: () =>
import('@/pages/phone/standDynamics')
*/
},
{
path: '/domesticStand',
name: 'domesticStand',
component: () => import('@/pages/phone/domesticStand/index'),
meta: {
keepAlive: true
}
/*
component: () =>
import('@/pages/phone/domesticStand')
*/
},
{
path: '/domesticDetails',