From e40973680e8842a0797ca2e1cd45ec5e6bf0f3d8 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 18 十月 2023 13:47:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/user.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 0f92d14..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";
@@ -278,6 +278,7 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
+ columnBtn:false,
border: true,
index: true,
selection: true,
@@ -345,7 +346,7 @@
required: true,
message: "璇烽�夋嫨鐢ㄦ埛骞冲彴",
trigger: "blur"
- }]
+ }],
},
],
group: [
@@ -392,6 +393,7 @@
label: "dictValue",
value: "dictKey"
},
+ value:'1',
dataType: "number",
slot: true,
prop: "userType",
@@ -550,7 +552,7 @@
value: "id"
},
rules: [{
- required: true,
+ required: false,
message: "璇烽�夋嫨鎵�灞炲矖浣�",
trigger: "click"
}],
@@ -740,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