From 65ed34b002810ae406f1e17810af4638ae7e55b0 Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期二, 27 八月 2024 14:23:38 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/views/authority/users/index.vue | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/views/authority/users/index.vue b/src/views/authority/users/index.vue
index 6c51b2e..55d397e 100644
--- a/src/views/authority/users/index.vue
+++ b/src/views/authority/users/index.vue
@@ -123,7 +123,7 @@
@ok="editHandleOk"
width="48%"
>
- <a-form ref="formRefPaw" :model="editform" auto-label-width>
+ <a-form ref="formRef" :model="editform" auto-label-width>
<a-row :gutter="20">
<a-col :span="10">
<a-form-item
@@ -327,7 +327,7 @@
let checkStrictlyDialog = ref([]);
let checkStrictlyAgent = ref([]);
let formRef = ref();
- const formRefPaw = ref();
+
let menuTips = ref(['鏉冮檺绠＄悊', '璐﹀彿']);
type SizeProps = 'mini' | 'small' | 'medium' | 'large';
@@ -447,7 +447,16 @@
]);
const statusChange = async (value, record) => {
- await Userstatus(record.userId, value).then((res) => {});
+ if (record?.dept) {
+ await Userstatus(record.userId, value).then((res) => {
+ });
+ } else {
+ record.status = "0";
+ Modal.warning({
+ title: '鎻愮ず',
+ content: '濡傛兂鍚敤鐢ㄦ埛锛岄渶杩涜閮ㄩ棬閰嶇疆.'
+ });
+ }
};
const handleCancel = (type) => {
@@ -475,19 +484,27 @@
if (err) {
visible.value = true;
} else {
+ let uuu;
if (editform.value.userId.length > 0) {
await UserEdit({
...editform.value,
} as unknown as User).then((res) => {
fetchData();
+ uuu=res.data;
});
} else {
await UserAdd({
...editform.value,
} as unknown as User).then((res) => {
fetchData();
+ uuu=res.data;
});
}
+ deptvisible.value = true;
+ checkedKeys.value = [];
+ expandKdys.value = [];
+ checkStrictly.value = [];
+ selectUser.value = uuu;
}
};
const editHandleOk = () => {
@@ -524,7 +541,7 @@
//缂栬緫
if (t == 2) {
visible.value = true;
- formRefPaw.value?.resetFields();
+ formRef.value?.resetFields();
save.value = '缂栬緫';
editform.value.userId = record.userId;
editform.value.userName = record.userName;
@@ -612,7 +629,7 @@
checkStrictly.value = [];
selectUser.value = record;
expandKdys.value.push('0');
- if (record.dept) {
+ if (record?.dept) {
record.dept.forEach((val) => {
checkStrictly.value.push({
deptId: val.deptId,
--
Gitblit v1.8.0