From 39544078e53b1543c1fb45619de51494c701addc Mon Sep 17 00:00:00 2001
From: smallwei <1634566606@qq.com>
Date: Sat, 25 Mar 2023 17:30:04 +0800
Subject: [PATCH] feat:more bug

---
 src/components/third-register/main.vue  |  48 ++++--
 src/main.js                             |   2 +-
 src/page/index/top/top-menu.vue         |   2 +-
 src/router/index.js                     |  11 +-
 src/store/modules/user.js               |   8 +-
 src/views/authority/apiscope.vue        |   8 +-
 src/views/authority/datascope.vue       |   8 +-
 src/views/authority/role.vue            |   8 +-
 src/views/base/region.vue               |   8 +-
 src/views/desk/notice.vue               |  16 +-
 src/views/flow/follow.vue               |   2 +-
 src/views/flow/manager.vue              |   2 +-
 src/views/monitor/log/api.vue           |   2 +-
 src/views/monitor/log/error.vue         |   2 +-
 src/views/monitor/log/usual.vue         |   2 +-
 src/views/resource/attach.vue           |   2 +-
 src/views/resource/oss.vue              |   8 +-
 src/views/resource/sms.vue              |   8 +-
 src/views/system/client.vue             |   8 +-
 src/views/system/dept.vue               |   8 +-
 src/views/system/dict.vue               |   6 +-
 src/views/system/dictbiz.vue            |   6 +-
 src/views/system/menu.vue               |   8 +-
 src/views/system/param.vue              |   8 +-
 src/views/system/post.vue               |   8 +-
 src/views/system/tenant.vue             |  12 +-
 src/views/system/topmenu.vue            |   8 +-
 src/views/system/user.vue               |  14 +-
 src/views/tool/code.vue                 |   8 +-
 src/views/tool/datasource.vue           |   8 +-
 src/views/util/demo/dict-classic.vue    |   8 +-
 src/views/util/demo/dict-horizontal.vue |   8 +-
 src/views/util/demo/dict-vertical.vue   |   8 +-
 src/views/util/demo/dict.vue            |   6 +-
 src/views/util/demo/dictbiz.vue         |   6 +-
 src/views/work/process/leave/form.vue   | 195 ++++++++++++------------
 36 files changed, 254 insertions(+), 226 deletions(-)

diff --git a/src/components/third-register/main.vue b/src/components/third-register/main.vue
index 7481f5e..72fde63 100644
--- a/src/components/third-register/main.vue
+++ b/src/components/third-register/main.vue
@@ -9,7 +9,8 @@
     <el-form :model="form"
              ref="form"
              label-width="80px">
-      <el-form-item label="租户编号">
+      <el-form-item v-if="tenantMode"
+                    label="租户编号">
         <el-input v-model="form.tenantId"
                   placeholder="请输入租户编号"></el-input>
       </el-form-item>
@@ -30,20 +31,22 @@
                   placeholder="请输入确认密码"></el-input>
       </el-form-item>
     </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button type="primary"
-                   :loading="loading"
-                   @click="handleRegister">确 定</el-button>
-      </span>
-    </template>
+    <span slot="footer"
+          class="dialog-footer">
+      <el-button type="primary"
+                 :loading="loading"
+                 @click="handleRegister">确 定</el-button>
+    </span>
   </el-dialog>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
-import { validatenull } from "@/utils/validate";
+import { validatenull } from "utils/validate";
 import { registerGuest } from "@/api/user";
+import { getTopUrl } from "utils/util";
+import { info } from "@/api/system/tenant";
+import { resetRouter } from "@/router/index";
 
 export default {
   name: "thirdRegister",
@@ -57,6 +60,7 @@ export default {
         password2: '',
       },
       loading: false,
+      tenantMode: true,
       accountBox: false,
     };
   },
@@ -64,14 +68,13 @@ export default {
     ...mapGetters(["userInfo"]),
   },
   created () {
-
+    this.getTenant();
   },
   mounted () {
-    console.log(this.userInfo)
     // 若未登录则弹出框进行绑定
-    if (validatenull(this.userInfo.userId) || this.userInfo.userId < 0) {
-      this.form.name = this.userInfo.account;
-      this.form.account = this.userInfo.account;
+    if (validatenull(this.userInfo.user_id) || this.userInfo.user_id < 0) {
+      this.form.name = this.userInfo.user_name;
+      this.form.account = this.userInfo.user_name;
       this.accountBox = true;
     }
   },
@@ -94,13 +97,14 @@ export default {
         return;
       }
       this.loading = true;
-      registerGuest(this.form, this.userInfo.oauthId).then(res => {
+      registerGuest(this.form, this.userInfo.oauth_id).then(res => {
         this.loading = false;
         const data = res.data;
         if (data.success) {
           this.accountBox = false;
           this.$alert("注册申请已提交,请耐心等待管理员通过!", '注册提示').then(() => {
             this.$store.dispatch("LogOut").then(() => {
+              resetRouter();
               this.$router.push({ path: "/login" });
             });
           })
@@ -112,6 +116,18 @@ export default {
         this.loading = false;
       });
     },
+    getTenant () {
+      let domain = getTopUrl();
+      // 临时指定域名，方便测试
+      //domain = "https://bladex.vip";
+      info(domain).then(res => {
+        const data = res.data;
+        if (data.success && data.data.tenantId) {
+          this.form.tenantId = data.data.tenantId;
+          this.tenantMode = false;
+        }
+      })
+    },
   },
 };
-</script>
+</script>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 4bc5949..d4d1be9 100755
--- a/src/main.js
+++ b/src/main.js
@@ -48,7 +48,7 @@ app.use(ElementPlus, {
 })
 app.use(Avue, {
   axios,
-  calcHeight: -165,
+  calcHeight: 10,
   locale: messages[language]
 })
 app.mount('#app')
diff --git a/src/page/index/top/top-menu.vue b/src/page/index/top/top-menu.vue
index b42b259..60f4a99 100755
--- a/src/page/index/top/top-menu.vue
+++ b/src/page/index/top/top-menu.vue
@@ -28,7 +28,7 @@ export default {
   },
   inject: ["index"],
   created () {
-    // this.getMenu();
+    this.getMenu();
   },
   computed: {
     ...mapGetters(["tagCurrent", "menu"])
diff --git a/src/router/index.js b/src/router/index.js
index a6ff403..b686cec 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -17,5 +17,14 @@ AvueRouter.install({
 });
 
 Router.$avueRouter.formatRoutes(Store.getters.menuAll, true);
-
+export function resetRouter () {  // 重置路由 比如用于身份验证失败，需要重新登录时 先清空当前的路有权限
+  const newRouter = createRouter()
+  Router.matcher = newRouter.matcher // reset router
+  AvueRouter.install(Vue, {
+    router: Router,
+    store: Store,
+    i18n: i18n,
+    keepAlive: false,
+  });
+}
 export default Router
\ No newline at end of file
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 17a872e..6704fbe 100755
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,9 +1,9 @@
 import { setToken, removeToken } from 'utils/auth'
 import { setStore, getStore } from 'utils/store'
-import { isURL, validatenull } from 'utils/validate'
+import { validatenull } from 'utils/validate'
 import { deepClone } from 'utils/util'
 import { loginByUsername, getUserInfo, logout, refreshToken, getButtons } from '@/api/user'
-import { getMenu, getTopMenu } from '@/api/system/menu'
+import { getRoutes, getTopMenu } from '@/api/system/menu'
 import { formatPath } from '@/router/avue-router'
 import { ElMessage } from 'element-plus'
 import md5 from 'js-md5'
@@ -154,9 +154,9 @@ const user = {
         })
       })
     },
-    GetMenu ({ commit, dispatch }, parentId) {
+    GetMenu ({ commit, dispatch }, tenantId) {
       return new Promise(resolve => {
-        getMenu(parentId).then((res) => {
+        getRoutes(tenantId).then((res) => {
           const data = res.data.data
           let menu = deepClone(data);
           menu.forEach(ele => formatPath(ele, true));
diff --git a/src/views/authority/apiscope.vue b/src/views/authority/apiscope.vue
index 16013c6..cf1add0 100644
--- a/src/views/authority/apiscope.vue
+++ b/src/views/authority/apiscope.vue
@@ -382,10 +382,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.menu_add, false),
-        viewBtn: this.vaildData(this.permission.menu_view, false),
-        delBtn: this.vaildData(this.permission.menu_delete, false),
-        editBtn: this.vaildData(this.permission.menu_edit, false)
+        addBtn: this.validData(this.permission.menu_add, false),
+        viewBtn: this.validData(this.permission.menu_view, false),
+        delBtn: this.validData(this.permission.menu_delete, false),
+        editBtn: this.validData(this.permission.menu_edit, false)
       };
     },
     ids () {
diff --git a/src/views/authority/datascope.vue b/src/views/authority/datascope.vue
index 19a9a8e..8f48064 100644
--- a/src/views/authority/datascope.vue
+++ b/src/views/authority/datascope.vue
@@ -423,10 +423,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.menu_add, false),
-        viewBtn: this.vaildData(this.permission.menu_view, false),
-        delBtn: this.vaildData(this.permission.menu_delete, false),
-        editBtn: this.vaildData(this.permission.menu_edit, false)
+        addBtn: this.validData(this.permission.menu_add, false),
+        viewBtn: this.validData(this.permission.menu_view, false),
+        delBtn: this.validData(this.permission.menu_delete, false),
+        editBtn: this.validData(this.permission.menu_edit, false)
       };
     },
     ids () {
diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index 82fc832..6844ee1 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -206,10 +206,10 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.role_add, false),
-        viewBtn: this.vaildData(this.permission.role_view, false),
-        delBtn: this.vaildData(this.permission.role_delete, false),
-        editBtn: this.vaildData(this.permission.role_edit, false)
+        addBtn: this.validData(this.permission.role_add, false),
+        viewBtn: this.validData(this.permission.role_view, false),
+        delBtn: this.validData(this.permission.role_delete, false),
+        editBtn: this.validData(this.permission.role_edit, false)
       };
     },
     ids () {
diff --git a/src/views/base/region.vue b/src/views/base/region.vue
index 42ae08b..9b1840c 100644
--- a/src/views/base/region.vue
+++ b/src/views/base/region.vue
@@ -321,10 +321,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.region_add, false),
-        viewBtn: this.vaildData(this.permission.region_view, false),
-        delBtn: this.vaildData(this.permission.region_delete, false),
-        editBtn: this.vaildData(this.permission.region_edit, false)
+        addBtn: this.validData(this.permission.region_add, false),
+        viewBtn: this.validData(this.permission.region_view, false),
+        delBtn: this.validData(this.permission.region_delete, false),
+        editBtn: this.validData(this.permission.region_edit, false)
       };
     },
     ids () {
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index 9f99682..ef26296 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -98,8 +98,8 @@ export default {
             label: "通知时间",
             prop: "releaseTimeRange",
             type: "datetime",
-            format: "yyyy-MM-dd hh:mm:ss",
-            valueFormat: "yyyy-MM-dd hh:mm:ss",
+            format: "YYYY-MM-DD HH:mm:ss",
+            valueFormat: "YYYY-MM-DD HH:mm:ss",
             searchRange: true,
             hide: true,
             addDisplay: false,
@@ -116,8 +116,8 @@ export default {
             label: "通知日期",
             prop: "releaseTime",
             type: "date",
-            format: "yyyy-MM-dd hh:mm:ss",
-            valueFormat: "yyyy-MM-dd hh:mm:ss",
+            format: "YYYY-MM-DD HH:mm:ss",
+            valueFormat: "YYYY-MM-DD HH:mm:ss",
             rules: [{
               required: true,
               message: "请输入通知日期",
@@ -148,10 +148,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.notice_add, false),
-        viewBtn: this.vaildData(this.permission.notice_view, false),
-        delBtn: this.vaildData(this.permission.notice_delete, false),
-        editBtn: this.vaildData(this.permission.notice_edit, false)
+        addBtn: this.validData(this.permission.notice_add, false),
+        viewBtn: this.validData(this.permission.notice_view, false),
+        delBtn: this.validData(this.permission.notice_delete, false),
+        editBtn: this.validData(this.permission.notice_edit, false)
       };
     },
     ids () {
diff --git a/src/views/flow/follow.vue b/src/views/flow/follow.vue
index c04d752..882d2ad 100644
--- a/src/views/flow/follow.vue
+++ b/src/views/flow/follow.vue
@@ -120,7 +120,7 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        delBtn: this.vaildData(this.permission.flow_follow_delete, false),
+        delBtn: this.validData(this.permission.flow_follow_delete, false),
       };
     },
     ids () {
diff --git a/src/views/flow/manager.vue b/src/views/flow/manager.vue
index 5b406e1..e06ccee 100644
--- a/src/views/flow/manager.vue
+++ b/src/views/flow/manager.vue
@@ -201,7 +201,7 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        delBtn: this.vaildData(this.permission.flow_manager_remove, false),
+        delBtn: this.validData(this.permission.flow_manager_remove, false),
       };
     },
     ids () {
diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue
index e28c4ac..dedacb3 100644
--- a/src/views/monitor/log/api.vue
+++ b/src/views/monitor/log/api.vue
@@ -112,7 +112,7 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        viewBtn: this.vaildData(this.permission.log_api_view, false)
+        viewBtn: this.validData(this.permission.log_api_view, false)
       };
     }
   },
diff --git a/src/views/monitor/log/error.vue b/src/views/monitor/log/error.vue
index e255992..2477c3d 100644
--- a/src/views/monitor/log/error.vue
+++ b/src/views/monitor/log/error.vue
@@ -116,7 +116,7 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        viewBtn: this.vaildData(this.permission.log_error_view, false)
+        viewBtn: this.validData(this.permission.log_error_view, false)
       };
     }
   },
diff --git a/src/views/monitor/log/usual.vue b/src/views/monitor/log/usual.vue
index 0e3372d..3967e39 100644
--- a/src/views/monitor/log/usual.vue
+++ b/src/views/monitor/log/usual.vue
@@ -116,7 +116,7 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        viewBtn: this.vaildData(this.permission.log_usual_view, false)
+        viewBtn: this.validData(this.permission.log_usual_view, false)
       };
     }
   },
diff --git a/src/views/resource/attach.vue b/src/views/resource/attach.vue
index c9201df..92a6bf8 100644
--- a/src/views/resource/attach.vue
+++ b/src/views/resource/attach.vue
@@ -175,7 +175,7 @@ export default {
         addBtn: false,
         editBtn: false,
         viewBtn: false,
-        delBtn: this.vaildData(this.permission.attach_delete, false)
+        delBtn: this.validData(this.permission.attach_delete, false)
       };
     },
     ids () {
diff --git a/src/views/resource/oss.vue b/src/views/resource/oss.vue
index d754876..35f5c01 100644
--- a/src/views/resource/oss.vue
+++ b/src/views/resource/oss.vue
@@ -258,10 +258,10 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.oss_add),
-        viewBtn: this.vaildData(this.permission.oss_view),
-        delBtn: this.vaildData(this.permission.oss_delete),
-        editBtn: this.vaildData(this.permission.oss_edit)
+        addBtn: this.validData(this.permission.oss_add),
+        viewBtn: this.validData(this.permission.oss_view),
+        delBtn: this.validData(this.permission.oss_delete),
+        editBtn: this.validData(this.permission.oss_edit)
       };
     },
     ids () {
diff --git a/src/views/resource/sms.vue b/src/views/resource/sms.vue
index 78ca02e..4fe617b 100644
--- a/src/views/resource/sms.vue
+++ b/src/views/resource/sms.vue
@@ -272,10 +272,10 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.sms_add, false),
-        viewBtn: this.vaildData(this.permission.sms_view, false),
-        delBtn: this.vaildData(this.permission.sms_delete, false),
-        editBtn: this.vaildData(this.permission.sms_edit, false)
+        addBtn: this.validData(this.permission.sms_add, false),
+        viewBtn: this.validData(this.permission.sms_view, false),
+        delBtn: this.validData(this.permission.sms_delete, false),
+        editBtn: this.validData(this.permission.sms_edit, false)
       };
     },
     ids () {
diff --git a/src/views/system/client.vue b/src/views/system/client.vue
index 200fa28..867040d 100644
--- a/src/views/system/client.vue
+++ b/src/views/system/client.vue
@@ -201,10 +201,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.client_add),
-        viewBtn: this.vaildData(this.permission.client_view),
-        delBtn: this.vaildData(this.permission.client_delete),
-        editBtn: this.vaildData(this.permission.client_edit)
+        addBtn: this.validData(this.permission.client_add),
+        viewBtn: this.validData(this.permission.client_view),
+        delBtn: this.validData(this.permission.client_delete),
+        editBtn: this.validData(this.permission.client_edit)
       };
     },
     ids () {
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 00e7c9d..c915a61 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -188,10 +188,10 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.dept_add, false),
-        viewBtn: this.vaildData(this.permission.dept_view, false),
-        delBtn: this.vaildData(this.permission.dept_delete, false),
-        editBtn: this.vaildData(this.permission.dept_edit, false)
+        addBtn: this.validData(this.permission.dept_add, false),
+        viewBtn: this.validData(this.permission.dept_view, false),
+        delBtn: this.validData(this.permission.dept_delete, false),
+        editBtn: this.validData(this.permission.dept_edit, false)
       };
     },
     ids () {
diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue
index 2ecd690..4cd839c 100644
--- a/src/views/system/dict.vue
+++ b/src/views/system/dict.vue
@@ -138,9 +138,9 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.dict_add, false),
-        delBtn: this.vaildData(this.permission.dict_delete, false),
-        editBtn: this.vaildData(this.permission.dict_edit, false),
+        addBtn: this.validData(this.permission.dict_add, false),
+        delBtn: this.validData(this.permission.dict_delete, false),
+        editBtn: this.validData(this.permission.dict_edit, false),
         viewBtn: false,
       };
     },
diff --git a/src/views/system/dictbiz.vue b/src/views/system/dictbiz.vue
index 33ec33b..399f993 100644
--- a/src/views/system/dictbiz.vue
+++ b/src/views/system/dictbiz.vue
@@ -138,9 +138,9 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.dictbiz_add, false),
-        delBtn: this.vaildData(this.permission.dictbiz_delete, false),
-        editBtn: this.vaildData(this.permission.dictbiz_edit, false),
+        addBtn: this.validData(this.permission.dictbiz_add, false),
+        delBtn: this.validData(this.permission.dictbiz_delete, false),
+        editBtn: this.validData(this.permission.dictbiz_edit, false),
         viewBtn: false,
       };
     },
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index a080d7b..ae0244b 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -249,10 +249,10 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.menu_add, false),
-        viewBtn: this.vaildData(this.permission.menu_view, false),
-        delBtn: this.vaildData(this.permission.menu_delete, false),
-        editBtn: this.vaildData(this.permission.menu_edit, false)
+        addBtn: this.validData(this.permission.menu_add, false),
+        viewBtn: this.validData(this.permission.menu_view, false),
+        delBtn: this.validData(this.permission.menu_delete, false),
+        editBtn: this.validData(this.permission.menu_edit, false)
       };
     },
     ids () {
diff --git a/src/views/system/param.vue b/src/views/system/param.vue
index a656e68..66d8d1c 100644
--- a/src/views/system/param.vue
+++ b/src/views/system/param.vue
@@ -27,10 +27,10 @@ export default window.$crudCommon({
   computed: {
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.param_add, false),
-        viewBtn: this.vaildData(this.permission.param_view, false),
-        delBtn: this.vaildData(this.permission.param_delete, false),
-        editBtn: this.vaildData(this.permission.param_edit, false)
+        addBtn: this.validData(this.permission.param_add, false),
+        viewBtn: this.validData(this.permission.param_view, false),
+        delBtn: this.validData(this.permission.param_delete, false),
+        editBtn: this.validData(this.permission.param_edit, false)
       };
     }
   },
diff --git a/src/views/system/post.vue b/src/views/system/post.vue
index 97710b4..0782925 100644
--- a/src/views/system/post.vue
+++ b/src/views/system/post.vue
@@ -148,10 +148,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.post_add, false),
-        viewBtn: this.vaildData(this.permission.post_view, false),
-        delBtn: this.vaildData(this.permission.post_delete, false),
-        editBtn: this.vaildData(this.permission.post_edit, false)
+        addBtn: this.validData(this.permission.post_add, false),
+        viewBtn: this.validData(this.permission.post_view, false),
+        delBtn: this.validData(this.permission.post_delete, false),
+        editBtn: this.validData(this.permission.post_edit, false)
       };
     },
     ids () {
diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue
index cdab318..fc410be 100644
--- a/src/views/system/tenant.vue
+++ b/src/views/system/tenant.vue
@@ -249,8 +249,8 @@ export default {
             label: "过期时间",
             prop: "expireTime",
             type: "date",
-            format: "yyyy-MM-dd hh:mm:ss",
-            valueFormat: "yyyy-MM-dd hh:mm:ss",
+            format: "YYYY-MM-DD HH:mm:ss",
+            valueFormat: "YYYY-MM-DD HH:mm:ss",
             span: 24,
           },
         ]
@@ -322,10 +322,10 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.tenant_add, false),
-        viewBtn: this.vaildData(this.permission.tenant_view, false),
-        delBtn: this.vaildData(this.permission.tenant_delete, false),
-        editBtn: this.vaildData(this.permission.tenant_edit, false)
+        addBtn: this.validData(this.permission.tenant_add, false),
+        viewBtn: this.validData(this.permission.tenant_view, false),
+        delBtn: this.validData(this.permission.tenant_delete, false),
+        editBtn: this.validData(this.permission.tenant_edit, false)
       };
     },
     ids () {
diff --git a/src/views/system/topmenu.vue b/src/views/system/topmenu.vue
index 3c0baa3..988be96 100644
--- a/src/views/system/topmenu.vue
+++ b/src/views/system/topmenu.vue
@@ -159,10 +159,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.topmenu_add, false),
-        viewBtn: this.vaildData(this.permission.topmenu_view, false),
-        delBtn: this.vaildData(this.permission.topmenu_delete, false),
-        editBtn: this.vaildData(this.permission.topmenu_edit, false)
+        addBtn: this.validData(this.permission.topmenu_add, false),
+        viewBtn: this.validData(this.permission.topmenu_view, false),
+        delBtn: this.validData(this.permission.topmenu_delete, false),
+        editBtn: this.validData(this.permission.topmenu_edit, false)
       };
     },
     ids () {
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index b75c7bc..d454059 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -466,8 +466,8 @@ export default {
                 label: "用户生日",
                 type: "date",
                 prop: "birthday",
-                format: "yyyy-MM-dd hh:mm:ss",
-                valueFormat: "yyyy-MM-dd hh:mm:ss",
+                format: "YYYY-MM-DD HH:mm:ss",
+                valueFormat: "YYYY-MM-DD HH:mm:ss",
                 hide: true
               },
               {
@@ -684,10 +684,10 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.user_add, false),
-        viewBtn: this.vaildData(this.permission.user_view, false),
-        delBtn: this.vaildData(this.permission.user_delete, false),
-        editBtn: this.vaildData(this.permission.user_edit, false)
+        addBtn: this.validData(this.permission.user_add, false),
+        viewBtn: this.validData(this.permission.user_view, false),
+        delBtn: this.validData(this.permission.user_delete, false),
+        editBtn: this.validData(this.permission.user_edit, false)
       };
     },
     platformPermissionList () {
@@ -695,7 +695,7 @@ export default {
         addBtn: false,
         viewBtn: false,
         delBtn: false,
-        editBtn: this.vaildData(this.permission.user_edit, false)
+        editBtn: this.validData(this.permission.user_edit, false)
       };
     },
     ids () {
diff --git a/src/views/tool/code.vue b/src/views/tool/code.vue
index be5113e..9d5f923 100644
--- a/src/views/tool/code.vue
+++ b/src/views/tool/code.vue
@@ -463,10 +463,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.code_add, false),
-        viewBtn: this.vaildData(this.permission.code_view, false),
-        delBtn: this.vaildData(this.permission.code_delete, false),
-        editBtn: this.vaildData(this.permission.code_edit, false)
+        addBtn: this.validData(this.permission.code_add, false),
+        viewBtn: this.validData(this.permission.code_view, false),
+        delBtn: this.validData(this.permission.code_delete, false),
+        editBtn: this.validData(this.permission.code_edit, false)
       };
     },
     ids () {
diff --git a/src/views/tool/datasource.vue b/src/views/tool/datasource.vue
index f60578f..cedf8e8 100644
--- a/src/views/tool/datasource.vue
+++ b/src/views/tool/datasource.vue
@@ -146,10 +146,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.datasource_add, false),
-        viewBtn: this.vaildData(this.permission.datasource_view, false),
-        delBtn: this.vaildData(this.permission.datasource_delete, false),
-        editBtn: this.vaildData(this.permission.datasource_edit, false)
+        addBtn: this.validData(this.permission.datasource_add, false),
+        viewBtn: this.validData(this.permission.datasource_view, false),
+        delBtn: this.validData(this.permission.datasource_delete, false),
+        editBtn: this.validData(this.permission.datasource_edit, false)
       };
     },
     ids () {
diff --git a/src/views/util/demo/dict-classic.vue b/src/views/util/demo/dict-classic.vue
index fd0ad09..fad9544 100644
--- a/src/views/util/demo/dict-classic.vue
+++ b/src/views/util/demo/dict-classic.vue
@@ -181,10 +181,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.dict_add, false),
-        viewBtn: this.vaildData(this.permission.dict_view, false),
-        delBtn: this.vaildData(this.permission.dict_delete, false),
-        editBtn: this.vaildData(this.permission.dict_edit, false)
+        addBtn: this.validData(this.permission.dict_add, false),
+        viewBtn: this.validData(this.permission.dict_view, false),
+        delBtn: this.validData(this.permission.dict_delete, false),
+        editBtn: this.validData(this.permission.dict_edit, false)
       };
     },
     ids () {
diff --git a/src/views/util/demo/dict-horizontal.vue b/src/views/util/demo/dict-horizontal.vue
index ee6a04f..c15fe1b 100644
--- a/src/views/util/demo/dict-horizontal.vue
+++ b/src/views/util/demo/dict-horizontal.vue
@@ -207,10 +207,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.dict_add, false),
-        viewBtn: this.vaildData(this.permission.dict_view, false),
-        delBtn: this.vaildData(this.permission.dict_delete, false),
-        editBtn: this.vaildData(this.permission.dict_edit, false)
+        addBtn: this.validData(this.permission.dict_add, false),
+        viewBtn: this.validData(this.permission.dict_view, false),
+        delBtn: this.validData(this.permission.dict_delete, false),
+        editBtn: this.validData(this.permission.dict_edit, false)
       };
     },
     ids () {
diff --git a/src/views/util/demo/dict-vertical.vue b/src/views/util/demo/dict-vertical.vue
index abf6d1f..cb76154 100644
--- a/src/views/util/demo/dict-vertical.vue
+++ b/src/views/util/demo/dict-vertical.vue
@@ -212,10 +212,10 @@ export default {
     ...mapGetters(["permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.dict_add, false),
-        viewBtn: this.vaildData(this.permission.dict_view, false),
-        delBtn: this.vaildData(this.permission.dict_delete, false),
-        editBtn: this.vaildData(this.permission.dict_edit, false)
+        addBtn: this.validData(this.permission.dict_add, false),
+        viewBtn: this.validData(this.permission.dict_view, false),
+        delBtn: this.validData(this.permission.dict_delete, false),
+        editBtn: this.validData(this.permission.dict_edit, false)
       };
     },
     ids () {
diff --git a/src/views/util/demo/dict.vue b/src/views/util/demo/dict.vue
index b140a6c..35a2d70 100644
--- a/src/views/util/demo/dict.vue
+++ b/src/views/util/demo/dict.vue
@@ -146,9 +146,9 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.dict_add, false),
-        delBtn: this.vaildData(this.permission.dict_delete, false),
-        editBtn: this.vaildData(this.permission.dict_edit, false),
+        addBtn: this.validData(this.permission.dict_add, false),
+        delBtn: this.validData(this.permission.dict_delete, false),
+        editBtn: this.validData(this.permission.dict_edit, false),
         viewBtn: false,
       };
     },
diff --git a/src/views/util/demo/dictbiz.vue b/src/views/util/demo/dictbiz.vue
index 87258fd..351d9a3 100644
--- a/src/views/util/demo/dictbiz.vue
+++ b/src/views/util/demo/dictbiz.vue
@@ -146,9 +146,9 @@ export default {
     ...mapGetters(["userInfo", "permission"]),
     permissionList () {
       return {
-        addBtn: this.vaildData(this.permission.dictbiz_add, false),
-        delBtn: this.vaildData(this.permission.dictbiz_delete, false),
-        editBtn: this.vaildData(this.permission.dictbiz_edit, false),
+        addBtn: this.validData(this.permission.dictbiz_add, false),
+        delBtn: this.validData(this.permission.dictbiz_delete, false),
+        editBtn: this.validData(this.permission.dictbiz_edit, false),
         viewBtn: false,
       };
     },
diff --git a/src/views/work/process/leave/form.vue b/src/views/work/process/leave/form.vue
index 6f20bb3..dd09fe2 100644
--- a/src/views/work/process/leave/form.vue
+++ b/src/views/work/process/leave/form.vue
@@ -1,112 +1,115 @@
 <template>
   <div>
     <basic-container>
-      <avue-form :option="option" v-model="form" @submit="handleSubmit"/>
+      <avue-form :option="option"
+                 v-model="form"
+                 @submit="handleSubmit" />
     </basic-container>
     <basic-container>
-      <flow-design :is-display="true" :process-definition-id="processDefinitionId"></flow-design>
+      <flow-design :is-display="true"
+                   :process-definition-id="processDefinitionId"></flow-design>
     </basic-container>
   </div>
 </template>
 
 <script>
-  import {leaveProcess} from "@/api/work/process";
+import { leaveProcess } from "@/api/work/process";
 
-  export default {
-    data() {
-      return {
-        processDefinitionId: '',
-        form: {},
-        option: {
-          group: [
-            {
-              icon: 'el-icon-info',
-              label: '请假基础信息',
-              prop: 'group1',
-              column: [
-                {
-                  label: '审批人员',
-                  prop: 'taskUser',
-                  type: 'select',
-                  dicUrl: `/api/blade-user/user-list`,
-                  props: {
-                    label: "account",
-                    value: "id"
-                  },
-                  span: 24,
-                  rules: [
-                    {
-                      required: true,
-                      message: '请选择审批人员',
-                      trigger: 'blur'
-                    }
-                  ]
+export default {
+  data () {
+    return {
+      processDefinitionId: '',
+      form: {},
+      option: {
+        group: [
+          {
+            icon: 'el-icon-info',
+            label: '请假基础信息',
+            prop: 'group1',
+            column: [
+              {
+                label: '审批人员',
+                prop: 'taskUser',
+                type: 'select',
+                dicUrl: `/api/blade-user/user-list`,
+                props: {
+                  label: "account",
+                  value: "id"
                 },
-                {
-                  label: '开始时间',
-                  prop: 'startTime',
-                  type: 'datetime',
-                  valueFormat: 'yyyy-MM-dd HH:mm:ss',
-                  rules: [
-                    {
-                      required: true,
-                      message: '请选择开始时间',
-                      trigger: 'blur'
-                    }
-                  ]
-                },
-                {
-                  label: '结束时间',
-                  prop: 'endTime',
-                  type: 'datetime',
-                  valueFormat: 'yyyy-MM-dd HH:mm:ss',
-                  rules: [
-                    {
-                      required: true,
-                      message: '请选择结束时间',
-                      trigger: 'blur'
-                    }
-                  ]
-                },
-                {
-                  label: '请假理由',
-                  prop: 'reason',
-                  type: 'textarea',
-                  span: 24,
-                  rules: [
-                    {
-                      required: true,
-                      message: '请输入请假理由',
-                      trigger: 'blur'
-                    }
-                  ]
-                },
-              ]
-            },
-          ],
-        }
-      }
-    },
-    created() {
-      this.processDefinitionId = this.$route.params.processDefinitionId;
-    },
-    methods: {
-      handleSubmit() {
-        const params = {
-          processDefinitionId: this.$route.params.processDefinitionId,
-          ...this.form,
-        };
-        leaveProcess(params).then(resp => {
-          const data = resp.data;
-          if (data.success) {
-            this.$message.success(data.msg);
-            this.$router.$avueRouter.closeTag();
-            this.$router.push({path: `/work/start`});
-          } else {
-            this.$message.error(data.msg || '提交失败');
-          }
-        });
+                span: 24,
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择审批人员',
+                    trigger: 'blur'
+                  }
+                ]
+              },
+              {
+                label: '开始时间',
+                prop: 'startTime',
+                type: 'datetime',
+                valueFormat: 'YYYY-MM-DD HH:mm:ss',
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择开始时间',
+                    trigger: 'blur'
+                  }
+                ]
+              },
+              {
+                label: '结束时间',
+                prop: 'endTime',
+                type: 'datetime',
+                valueFormat: 'YYYY-MM-DD HH:mm:ss',
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择结束时间',
+                    trigger: 'blur'
+                  }
+                ]
+              },
+              {
+                label: '请假理由',
+                prop: 'reason',
+                type: 'textarea',
+                span: 24,
+                rules: [
+                  {
+                    required: true,
+                    message: '请输入请假理由',
+                    trigger: 'blur'
+                  }
+                ]
+              },
+            ]
+          },
+        ],
       }
     }
+  },
+  created () {
+    this.processDefinitionId = this.$route.params.processDefinitionId;
+  },
+  methods: {
+    handleSubmit () {
+      const params = {
+        processDefinitionId: this.$route.params.processDefinitionId,
+        ...this.form,
+      };
+      leaveProcess(params).then(resp => {
+        const data = resp.data;
+        if (data.success) {
+          this.$message.success(data.msg);
+          this.$router.$avueRouter.closeTag();
+          this.$router.push({ path: `/work/start` });
+        } else {
+          this.$message.error(data.msg || '提交失败');
+        }
+      });
+    }
   }
+}
 </script>