yusheng 4 месяцев назад
Родитель
Сommit
309ba091f3
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      src/utils/page-tab-util.js
  2. 1 1
      src/views/saleOrder/components/create-order.vue

+ 2 - 2
src/utils/page-tab-util.js

@@ -246,10 +246,10 @@ export function logout (route, from) {
   if (route) {
   if (route) {
     router.push({
     router.push({
       path: '/login',
       path: '/login',
-      query: from ? { from } : void 0
+      // query: from ? { from } : void 0
     });
     });
   } else {
   } else {
     // 这样跳转避免再次登录重复注册动态路由
     // 这样跳转避免再次登录重复注册动态路由
-    location.replace(BASE_URL + 'login' + (from ? '?from=' + from : ''));
+     location.replace(window.location.origin + '/login');
   }
   }
 }
 }

+ 1 - 1
src/views/saleOrder/components/create-order.vue

@@ -1161,7 +1161,7 @@
 
 
           //contractNum
           //contractNum
 
 
-          if (!v.produceRoutingId) {
+          if (!v.produceRoutingId&&this.clientEnvironmentId!=4) {
             flag = false;
             flag = false;
             this.$message.warning('请选择工艺路线');
             this.$message.warning('请选择工艺路线');
             break;
             break;