diff --git a/src/views/admin/system/user/form.vue b/src/views/admin/system/user/form.vue
index 76e45ae..e860b02 100644
--- a/src/views/admin/system/user/form.vue
+++ b/src/views/admin/system/user/form.vue
@@ -28,14 +28,14 @@
-
+
-
+
@@ -171,10 +171,7 @@ const dataRules = ref({
{ validator: rule.chinese, trigger: "blur" },
],
deptId: [{ required: true, message: "部门不能为空", trigger: "blur" }],
- role:
- roleCodes.includes("DEPT_ADMIN") || roleCodes.includes("ROLE_ADMIN")
- ? []
- : [{ required: true, message: "角色不能为空", trigger: "blur" }],
+ role: roleCodes.includes("DEPT_ADMIN") ? [] : [{ required: true, message: "角色不能为空", trigger: "blur" }],
// post: [{ required: true, message: '岗位不能为空', trigger: 'blur' }],
// 手机号校验，不能为空、新增的时不能重复校验
phone: [
@@ -288,7 +285,7 @@ const getPostData = () => {
postList().then((res) => {
postData.value = res.data
// 默认选择第一个
- if (!roleCodes.includes("DEPT_ADMIN") && !roleCodes.includes("ROLE_ADMIN") && !dataForm.userId) {
+ if (!roleCodes.includes("DEPT_ADMIN") && !dataForm.userId) {
dataForm.post = [res.data[0].postId]
}
})
@@ -298,7 +295,7 @@ const getRoleData = () => {
roleList().then((res) => {
roleData.value = res.data
// 默认选择第一个
- if (!roleCodes.includes("DEPT_ADMIN") && !roleCodes.includes("ROLE_ADMIN") && !dataForm.userId) {
+ if (!roleCodes.includes("DEPT_ADMIN") && !dataForm.userId) {
dataForm.role = [res.data[0].roleId]
}
})
diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index bbe8a2c..67a2e69 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -75,16 +75,16 @@
>
-
-
-
-
-
+
+
+
+
+
{{ item.roleName }}
-
+
-
+
diff --git a/src/views/admin/system/userFaceApprove/index.vue b/src/views/admin/system/userFaceApprove/index.vue
index 29d14e8..5f8d683 100644
--- a/src/views/admin/system/userFaceApprove/index.vue
+++ b/src/views/admin/system/userFaceApprove/index.vue
@@ -28,11 +28,10 @@
重置
-
-
-
-
+
+
+
-
-
+
+
@@ -60,7 +59,7 @@
开始处理
- 删除
+ 删除
@@ -82,6 +81,7 @@ import { useMessage } from "/@/hooks/message"
import { useDict } from "/@/hooks/dict"
import { getDicts } from "/@/api/admin/dict"
import * as userFaceApi from "/@/api/admin/userFace"
+import { ElLoading } from "element-plus"
const { check_status } = useDict("check_status")
const queryRef = ref()
@@ -90,6 +90,7 @@ const draggableDepTreeRef = ref() // 树组件ref引用
const activeName = ref(null)
const tabItems = ref([{}])
const processDrawerRef = ref()
+const loading = ref()
// 定义表格查询、后台调用的API
const state: BasicTableProps = reactive({
@@ -143,15 +144,27 @@ const taskSubmitEvent = () => {
getDataList()
}
+// 全屏loading
+const loadingStart = () => {
+ loading.value = ElLoading.service({
+ lock: true,
+ text: "删除中...",
+ background: "rgba(0, 0, 0, 0.7)",
+ })
+}
+
// 删除人脸
const delFace = async (row: any) => {
try {
await useMessage().delConfirm("是否删除人脸?")
- await userFaceApi.delObjs([row.id])
+ loadingStart()
+ await userFaceApi.delObjs([row.id]).finally(() => loading.value.close())
useMessage().success("删除成功")
getDataList()
} catch (error) {
console.log(error)
+ } finally {
+ loading.value.close()
}
}