From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001 From: 刘磊 <1161824510@qq.com> Date: 星期二, 17 十二月 2024 19:53:14 +0800 Subject: [PATCH] 解决冲突 --- Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js b/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js index dd63472..c6dde69 100644 --- a/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js +++ b/Code Management/WMS/WIDESEA_WMSClient/src/router/tables.js @@ -12,13 +12,16 @@ name: 'Dt_BillGroupStock', component: () => import('@/views/widesea_wms/stock/Dt_BillGroupStock.vue'), meta: { - keepAlive: false + keepAlive: true } }, // { // path: '/Dt_BillGroupStockDetail', // name: 'Dt_BillGroupStockDetail', - // component: () => import('@/views/widesea_wms/stock/Dt_BillGroupStockDetail.vue') + // component: () => import('@/views/widesea_wms/stock/Dt_BillGroupStockDetail.vue'), + // meta: { + // keepAlive: true + // } // }, { path: '/Dt_InboundOrder', @@ -139,15 +142,22 @@ meta: { keepAlive: false } - }, - { - path: '/Dt_TaskOut', - name: 'Dt_TaskOut', - component: () => import('@/views/widesea_wms/taskinfo/Dt_TaskOut.vue'), + },{ + path: '/Dt_Task_Hty', + name: 'Dt_Task_Hty', + component: () => import('@/views/widesea_wms/taskinfo/Dt_Task_Hty.vue'), meta: { keepAlive: false } }, + // { + // path: '/Dt_TaskOut', + // name: 'Dt_TaskOut', + // component: () => import('@/views/widesea_wms/taskinfo/Dt_TaskOut.vue'), + // meta: { + // keepAlive: false + // } + // }, // { // path: '/Dt_TaskExecuteDetail', // name: 'Dt_TaskExecuteDetail', @@ -216,6 +226,14 @@ meta: { keepAlive: false } + }, + { + path: '/ProductionModel', + name: 'ProductionModel', + component: () => import('@/views/widesea_wms/MOM/ProductionModel.vue'), + meta: { + keepAlive: false + } } ] export default tables -- Gitblit v1.9.3