Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dengfei

src/utils/page-tab-util.js

@@ -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');
   }
 }

src/utils/request.js

@@ -65,9 +65,9 @@ service.interceptors.response.use(
     // 登录过期处理
     if (error?.response?.status === 401) {
       const currentPath = router.currentRoute.path;
-      if (currentPath === LAYOUT_PATH) {
-        logout(true);
-      } else {
+      // if (currentPath === LAYOUT_PATH) {
+      //   logout(true);
+      // } else {
         MessageBox.alert('登录状态已过期, 请退出重新登录!', '系统提示', {
           confirmButtonText: '重新登录',
           callback: (action) => {
@@ -79,7 +79,7 @@ service.interceptors.response.use(
             MessageBox.close();
           }
         });
-      }
+      // }
       return Promise.reject(new Error(error.response.data?.message));
     } else if (!error?.response?.status) {
       Message.error('服务器调用失败，请联系管理人员!');

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

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