@@ -246,10 +246,10 @@ export function logout (route, from) {
if (route) {
router.push({
path: '/login',
- query: from ? { from } : void 0
+ // query: from ? { from } : void 0
});
} else {
// 这样跳转避免再次登录重复注册动态路由
- location.replace(BASE_URL + 'login' + (from ? '?from=' + from : ''));
+ location.replace(window.location.origin + '/login');
}
@@ -1161,7 +1161,7 @@
//contractNum
- if (!v.produceRoutingId) {
+ if (!v.produceRoutingId&&this.clientEnvironmentId!=4) {
flag = false;
this.$message.warning('请选择工艺路线');
break;