diff --git a/src/api/emis/emisWaybill.js b/src/api/emis/emisWaybill.js index 515125c3..ed07ac07 100644 --- a/src/api/emis/emisWaybill.js +++ b/src/api/emis/emisWaybill.js @@ -70,6 +70,15 @@ export function calcSetteldWeight(data) { }) } +// 体积重量计算 +export function calcVolumeWeight(data) { + return request({ + url: '/emis/emisWaybill/calcVolumeWeight', + method: 'post', + data: data + }) +} + // 修改运单列表 diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 55752c88..b38e0507 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -43,14 +43,18 @@ const permission = { const rdata = JSON.parse(JSON.stringify(res.data)) const sidebarRoutes = filterAsyncRouter(sdata) const rewriteRoutes = filterAsyncRouter(rdata, false, true) + const indexUrl=getFirstUrl(res.data) const asyncRoutes = filterDynamicRoutes(dynamicRoutes); + if(asyncRoutes.length>0){ rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true }) - }else{ - // 无路由，则退出登录 + } + + if(sidebarRoutes.length==0){ + // 无左侧菜单路由，则退出登录 dispatch('FedLogOut', { }, { root: true }) - rewriteRoutes.push({ path: '*', redirect: '/401', hidden: true }) + // rewriteRoutes.push({ path: '*', redirect: '/401', hidden: true }) } router.addRoutes(asyncRoutes); diff --git a/src/views/emis/EmisBaseTools/CountryPicker.vue b/src/views/emis/EmisBaseTools/CountryPicker.vue index 08f501c9..8496c8b2 100644 --- a/src/views/emis/EmisBaseTools/CountryPicker.vue +++ b/src/views/emis/EmisBaseTools/CountryPicker.vue @@ -1,6 +1,6 @@