diff --git a/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue b/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue index 8412328..e92d1de 100644 --- a/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue +++ b/PC/InterFace.Dash/src/components/commonTabel-drawer/index.vue @@ -9,7 +9,7 @@ :modal="false" size="100%" > -
+
{ const toNextHandle = async (to, from, next) => { let isFresh = false + // 如果有登录特殊配置,重新获取token + let isAutoLogin = JSON.parse(localStorage.getItem('isConfigLogin')) || to.query.loginName + if(isAutoLogin){ + let _username = localStorage.getItem("isConfigLogin") && localStorage.getItem("isConfigLogin") != 'false' ? localStorage.getItem("configLoginName") : to.query.loginName + await store.dispatch('user/login', { + username:_username, + password:localStorage.getItem("configLoginPass") + }).catch(()=>{ + getErrHandle(to, from, next) + }) + } + // 获取表头转义 if(!store.getters.columZHList){ await store.dispatch('definition/getColumZHList').catch(()=>{ diff --git a/PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue b/PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue index 8412328..e92d1de 100644 --- a/PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue +++ b/PC/UI.WinIn.FasterZ.Job/src/components/commonTabel-drawer/index.vue @@ -9,7 +9,7 @@ :modal="false" size="100%" > -
+
{ const toNextHandle = async (to, from, next) => { let isFresh = false + // 如果有登录特殊配置,重新获取token + let isAutoLogin = JSON.parse(localStorage.getItem('isConfigLogin')) || to.query.loginName + if(isAutoLogin){ + let _username = localStorage.getItem("isConfigLogin") && localStorage.getItem("isConfigLogin") != 'false' ? localStorage.getItem("configLoginName") : to.query.loginName + await store.dispatch('user/login', { + username:_username, + password:localStorage.getItem("configLoginPass") + }).catch(()=>{ + getErrHandle(to, from, next) + }) + } + // 获取表头转义 if(!store.getters.columZHList){ await store.dispatch('definition/getColumZHList').catch(()=>{ diff --git a/PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue b/PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue index 8412328..e92d1de 100644 --- a/PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue +++ b/PC/UI.WinIn.FasterZ.Store/src/components/commonTabel-drawer/index.vue @@ -9,7 +9,7 @@ :modal="false" size="100%" > -
+
{ const toNextHandle = async (to, from, next) => { let isFresh = false + // 如果有登录特殊配置,重新获取token + let isAutoLogin = JSON.parse(localStorage.getItem('isConfigLogin')) || to.query.loginName + if(isAutoLogin){ + let _username = localStorage.getItem("isConfigLogin") && localStorage.getItem("isConfigLogin") != 'false' ? localStorage.getItem("configLoginName") : to.query.loginName + await store.dispatch('user/login', { + username:_username, + password:localStorage.getItem("configLoginPass") + }).catch(()=>{ + getErrHandle(to, from, next) + }) + } + // 获取表头转义 if(!store.getters.columZHList){ await store.dispatch('definition/getColumZHList').catch(()=>{ diff --git a/PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js b/PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js index 0aa52bc..b8245ca 100644 --- a/PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js +++ b/PC/UI.WinIn.FasterZ.Store/src/utils/baseData/urlOption.js @@ -111,7 +111,7 @@ export const DeliverNote = { } export const DeliverNoteDetail = { - baseURL:'DeliverNote/base',//主表-列表 + baseURL:'DeliverNoteDetail/base',//主表-列表 detailURL:'app/deliver-note-detail',//主表-明细 + 明细-查看主表 } @@ -123,7 +123,7 @@ export const DeliverPlan = { } export const DeliverPlanDetail = { - baseURL:'DeliverPlan/base',//主表-列表 + baseURL:'DeliverPlanDetail/base',//主表-列表 detailURL:'app/deliver-plan-detail',//主表-明细 + 明细-查看主表 } @@ -152,7 +152,7 @@ export const InspectAbnormalNote = { } export const InspectAbnormalNoteDetail = { - baseURL:'InspectAbnormalNote/base',//主表-列表 + baseURL:'InspectAbnormalNoteDetail/base',//主表-列表 detailURL:'app/inspect-abnormal-note-detail',//主表-明细 + 明细-查看主表 }