diff --git a/src/views/admin/system/user/face-manage.vue b/src/views/admin/system/user/face-manage.vue index 8cfe4e8..3200677 100644 --- a/src/views/admin/system/user/face-manage.vue +++ b/src/views/admin/system/user/face-manage.vue @@ -1,9 +1,7 @@ - + @@ -38,13 +29,7 @@ 取 消 - + @@ -128,7 +113,7 @@ const editFace = (row: any) => { const delFace = async (row: any) => { try { await useMessage().delConfirm("是否删除人脸?") - userFaceApi.delObjs([row.id]) + await userFaceApi.delObjs([row.id]) useMessage().success("删除成功") getDataList() } catch (error) { diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue index 8c48c59..d0fe65f 100644 --- a/src/views/admin/system/user/index.vue +++ b/src/views/admin/system/user/index.vue @@ -17,25 +17,23 @@ - - + + - - + + - {{ $t("common.queryBtn") }} - {{ $t("common.resetBtn") }} + 查询 + 重置
- - {{ $t("common.addBtn") }} - + 新增 - {{ $t("common.importBtn") }} + 导入 - {{ $t("common.delBtn") }} + 删除 - +
+ + + + + +
- - - - + + + + - - + - + - + - + @@ -191,6 +193,8 @@ import { BasicTableProps, useTable } from "/@/hooks/table" import { useMessage, useMessageBox } from "/@/hooks/message" import { useI18n } from "vue-i18n" import { auth } from "/@/utils/authFunction" +import { getDicts } from "/@/api/admin/dict" +import ProcessDrawer from "/@/components/processDrawer/index.vue" const UserForm = defineAsyncComponent(() => import("./form.vue")) const FaceManage = defineAsyncComponent(() => import("./face-manage.vue")) @@ -205,6 +209,9 @@ const queryRef = ref() const showSearch = ref(true) const inputPassword = ref() const draggableDepTreeRef = ref() // 树组件ref引用 +const activeName = ref(null) +const tabItems = ref([{}]) +const processDrawerRef = ref() // 多选rows const selectObjs = ref([]) as any @@ -240,6 +247,29 @@ const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepT getDataList() } +onMounted(async () => { + const { data } = await getDicts("check_status") + data.unshift({ label: "全部", value: null }) + tabItems.value = data +}) + +// tab点击切换 +const handleClickTabItem = (e: any) => { + state.queryForm.processStatus = tabItems.value[e.index].value + getDataList() +} + +// 点击开始处理 +const deal = (row: any) => { + if (!row.processId) return useMessage().warning("流程id不存在") + processDrawerRef.value.openProcessDrawer(row) +} + +// 审批提交事件 +const taskSubmitEvent = () => { + getDataList() +} + // 导出excel const exportExcel = () => { postDownBlobFile("/admin/user/export", Object.assign(state.queryForm, { ids: selectObjs }), "用户管理.xlsx") diff --git a/src/views/admin/system/userFaceApprove/index.vue b/src/views/admin/system/userFaceApprove/index.vue index bfb98ed..17f53fa 100644 --- a/src/views/admin/system/userFaceApprove/index.vue +++ b/src/views/admin/system/userFaceApprove/index.vue @@ -28,6 +28,10 @@ 重置 + + + + @@ -74,12 +78,15 @@ import ProcessDrawer from "/@/components/processDrawer/index.vue" import { getUserFaceList } from "/@/api/admin/userFaceApprove" import { useMessage } from "/@/hooks/message" import { useDict } from "/@/hooks/dict" +import { getDicts } from "/@/api/admin/dict" const { check_status } = useDict("check_status") -const processDrawerRef = ref() const queryRef = ref() const showSearch = ref(true) const draggableDepTreeRef = ref() // 树组件ref引用 +const activeName = ref(null) +const tabItems = ref([{}]) +const processDrawerRef = ref() // 定义表格查询、后台调用的API const state: BasicTableProps = reactive({ @@ -110,8 +117,21 @@ const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepT getDataList() } +onMounted(async () => { + const { data } = await getDicts("check_status") + data.unshift({ label: "全部", value: null }) + tabItems.value = data +}) + +// tab点击切换 +const handleClickTabItem = (e: any) => { + state.queryForm.processStatus = tabItems.value[e.index].value + getDataList() +} + +// 点击开始处理 const deal = (row: any) => { - if (!row.processId) return useMessage().info("流程id不存在") + if (!row.processId) return useMessage().warning("流程id不存在") processDrawerRef.value.openProcessDrawer(row) }