提交
This commit is contained in:
1 parent
135dd550b6
commit
2a4767a014
76 files changed
+25160
-2306
No files matched your search
@@ -179,6 +179,11 @@
|
||||
<el-option label="停用" value="0" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="角色" style="grid-column: 1 / -1">
|
||||
<el-select v-model="formData.roleIds" multiple placeholder="请选择角色" style="width: 100%">
|
||||
<el-option v-for="item in roleOptions" :key="item.value" :label="item.label" :value="item.value" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" style="grid-column: 1 / -1">
|
||||
<el-input v-model="formData.remark" type="textarea" :rows="2" placeholder="可选" />
|
||||
</el-form-item>
|
||||
@@ -218,9 +223,20 @@
|
||||
fetchUpdateUser,
|
||||
fetchDeleteUser,
|
||||
fetchResetPassword,
|
||||
fetchDeptTree
|
||||
fetchDeptTree,
|
||||
fetchRoleOptions
|
||||
} from '@/api/admin'
|
||||
|
||||
const roleOptions = ref<Array<{ label: string; value: string }>>([])
|
||||
|
||||
async function loadRoleOptions() {
|
||||
try {
|
||||
roleOptions.value = (await fetchRoleOptions()) || []
|
||||
} catch {
|
||||
roleOptions.value = []
|
||||
}
|
||||
}
|
||||
|
||||
defineOptions({ name: 'SystemUser' })
|
||||
|
||||
const deptKeyword = ref('')
|
||||
@@ -251,7 +267,8 @@
|
||||
avatar: '',
|
||||
status: '1',
|
||||
orderNum: 0,
|
||||
remark: ''
|
||||
remark: '',
|
||||
roleIds: [] as string[]
|
||||
})
|
||||
|
||||
const formRules = {
|
||||
@@ -327,6 +344,7 @@
|
||||
formData.status = '1'
|
||||
formData.orderNum = 0
|
||||
formData.remark = ''
|
||||
formData.roleIds = []
|
||||
editingId.value = null
|
||||
}
|
||||
|
||||
@@ -356,6 +374,7 @@
|
||||
formData.status = row.status || '1'
|
||||
formData.orderNum = row.orderNum ?? 0
|
||||
formData.remark = row.remark || ''
|
||||
formData.roleIds = (row as any).roleIds || []
|
||||
dialogVisible.value = true
|
||||
formRef.value?.clearValidate?.()
|
||||
}
|
||||
@@ -373,7 +392,8 @@
|
||||
sex: formData.sex,
|
||||
status: formData.status,
|
||||
orderNum: formData.orderNum,
|
||||
remark: formData.remark?.trim() || undefined
|
||||
remark: formData.remark?.trim() || undefined,
|
||||
roleIds: formData.roleIds.length ? formData.roleIds : undefined
|
||||
})
|
||||
} else {
|
||||
await fetchCreateUser({
|
||||
@@ -386,7 +406,8 @@
|
||||
sex: formData.sex,
|
||||
status: formData.status,
|
||||
orderNum: formData.orderNum,
|
||||
remark: formData.remark?.trim() || undefined
|
||||
remark: formData.remark?.trim() || undefined,
|
||||
roleIds: formData.roleIds.length ? formData.roleIds : undefined
|
||||
})
|
||||
}
|
||||
dialogVisible.value = false
|
||||
@@ -445,6 +466,7 @@
|
||||
onMounted(() => {
|
||||
loadDeptTree()
|
||||
loadData()
|
||||
loadRoleOptions()
|
||||
})
|
||||
</script>
|
||||
|
||||
|
||||
Reference in new issue
Block a user