From c958ebb34b91f17e52bcc9ca5de11e8087affda5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 18 十月 2023 11:17:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/system/user.vue |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 39bac5b..2320aff 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -177,7 +177,7 @@
   resetPassword, unlock
 } from "@/api/system/user";
 import {exportBlob} from "@/api/common";
-import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
+import {getDeptTree, getDeptLazyTree, updateUserStatus} from "@/api/system/dept";
 import {getRoleTree} from "@/api/system/role";
 import {getPostList} from "@/api/system/post";
 import {mapGetters} from "vuex";
@@ -552,7 +552,7 @@
                   value: "id"
                 },
                 rules: [{
-                  required: true,
+                  required: false,
                   message: "璇烽�夋嫨鎵�灞炲矖浣�",
                   trigger: "click"
                 }],
@@ -742,6 +742,9 @@
     }
   },
   created() {
+    updateUserStatus({userid:'1702600796324032513',status:true}).then(res=>{
+      console.log(res)
+    })
     this.selecload()
     const arr=JSON.parse(localStorage.getItem("updataid"))
     if(arr.user_id != '0' && arr.tenant_id !== '000000'){

--
Gitblit v1.9.3