zhangjie il y a 3 ans
Parent
commit
150904ec9c

+ 13 - 4
src/features/system/OrgManagement/OrgManagementDialog.vue

@@ -2,7 +2,7 @@
   <el-dialog
     ref="dialog"
     :title="(isEdit ? '编辑' : '新增') + '机构'"
-    width="480px"
+    width="560px"
     :visible.sync="visible"
     @close="closeDialog"
   >
@@ -11,7 +11,7 @@
       ref="form"
       :rules="rules"
       label-position="right"
-      label-width="140px"
+      label-width="130px"
     >
       <el-row>
         <el-form-item label="机构名称" prop="name">
@@ -119,8 +119,17 @@ export default {
       visible: false,
       form: {},
       rules: {
-        name: { required: true, message: "必填" },
-        code: { required: true, message: "必填" },
+        name: {
+          required: true,
+          max: 100,
+          message: "机构名称不能超过100个字符",
+          trigger: "change",
+        },
+        code: {
+          required: true,
+          pattern: new RegExp(`^[a-zA-Z0-9_]{3,100}$`),
+          message: `机构编码只能由数字、字母和下划线组成,长度3-100个字符`,
+        },
       },
       loading: false,
     };

+ 21 - 2
src/plugins/axiosApp.js

@@ -7,8 +7,9 @@ import { notifyInvalidTokenThrottled } from "./axiosNotice";
 import { getToken, removeToken, getSessionId } from "../auth/auth";
 import axiosRetry from "axios-retry";
 import { PLATFORM, DEVICE_ID } from "@/constant/constants";
-import { Notification } from "element-ui";
+import { Notification, MessageBox } from "element-ui";
 import CryptoJS from "crypto-js";
+import router from "@/router";
 
 // console.log(btoa(CryptoJS.SHA1("pWWQ0qyaXL8QHni4ig9YiWYTKr8UVQd4")));
 // console.log(
@@ -78,7 +79,7 @@ _axiosApp.interceptors.request.use(
     return Promise.reject(error);
   }
 );
-
+let unauthMsgBoxIsShow = false;
 // Add a response interceptor
 _axiosApp.interceptors.response.use(
   (response) => {
@@ -127,6 +128,24 @@ _axiosApp.interceptors.response.use(
 
     if (status != 200) {
       const data = error.response.data;
+
+      if (status === 500 && data && data.code === 500012) {
+        if (unauthMsgBoxIsShow) return error;
+        unauthMsgBoxIsShow = true;
+        MessageBox.confirm("身份验证失效,请重新登录!", "错误提示", {
+          type: "warning",
+          closeOnClickModal: false,
+          closeOnPressEscape: false,
+          showClose: false,
+          callback: (action) => {
+            unauthMsgBoxIsShow = false;
+            if (action !== "confirm") return;
+            router.push({ name: "Login" });
+          },
+        });
+        return Promise.reject(error);
+      }
+
       if (data && data.message) {
         if (showErrorMessage) {
           Notification({