076b0cd531
- 新后台新增「公司管理」页(列/新建/改名/启停,不提供删除),路由 menuKey 与 columns 表的 admin_companies 逐字一致,由用例钉住;操作指引补该菜单一条。 - 建号弹窗对超管必须显式选一家(后端对"不传"仍落操作者自己公司,是给旧后台兜底); admin 只能落自己公司,越权直接 403。账号列表显示 company_name,可按公司筛。 - 客户端登录后把 companyId/companyName 落到 localStorage 并在顶栏显示; 两个登出出口(handleKicked 与切号/登出)连公司名一起清 —— 残留会把上一个账号 的归属显示给下一个账号。 - 契约分层:列表端点用 snake_case(company_id/company_name),current-user 与登录 回包用 camelCase;解析器读到另一套写法必须忽略,防止前后端各猜一套。 admin-frontend-vue 1678/1678、frontend-vue 672/672,两边 build(含 vue-tsc --noEmit)干净。
160 lines
5.4 KiB
Vue
160 lines
5.4 KiB
Vue
<script setup lang="ts">
|
||
import { computed, reactive, ref, watch } from 'vue'
|
||
import { submitCreateUser } from './user-create-adapter'
|
||
import {
|
||
createEmptyCreateUserForm,
|
||
initialCompanyId,
|
||
selectableCompanies,
|
||
type CreateOperatorScope,
|
||
type CreateUserForm,
|
||
type CreateUserFormErrors,
|
||
validateCreateUserForm,
|
||
} from './user-create-model'
|
||
import type { CompanyItem } from '@/api/companies-dto'
|
||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||
import { actionableErrorText } from '@/components/admin-feedback'
|
||
import UserMenuAuthTree from './UserMenuAuthTree.vue'
|
||
|
||
const props = defineProps<{
|
||
modelValue: boolean
|
||
operatorSuper?: boolean
|
||
/** 所属管理员候选(列表响应 admins;仅超管创建普通账号时展示)。 */
|
||
adminOptions?: Array<{ id: number; username: string }>
|
||
/** 整份公司目录(GET /api/admin/companies,后端已按操作者收窄)。 */
|
||
companies?: CompanyItem[]
|
||
/** 操作者角色与归属:决定公司下拉是否必选。 */
|
||
operator?: CreateOperatorScope
|
||
}>()
|
||
const emit = defineEmits<{ (e: 'update:modelValue', v: boolean): void; (e: 'created'): void }>()
|
||
|
||
const form = reactive<CreateUserForm>(createEmptyCreateUserForm())
|
||
const errors = reactive<CreateUserFormErrors>({})
|
||
const busy = ref(false)
|
||
|
||
/** 可选项收窄规则与后端 resolveTargetCompanyId 同源,写在这里而不是父页模板里。 */
|
||
const companyOptions = computed(() => selectableCompanies(props.companies || [], props.operator || {}))
|
||
|
||
/** 角色下拉(对齐 admin.html:普通账号/管理员;超管才显示可改)。 */
|
||
const ROLE_CHOICES: Array<{ value: 'admin' | 'normal'; label: string }> = [
|
||
{ value: 'normal', label: '普通账号' },
|
||
{ value: 'admin', label: '管理员' },
|
||
]
|
||
|
||
watch(
|
||
() => props.modelValue,
|
||
(open) => {
|
||
if (!open) return
|
||
form.username = ''
|
||
form.password = ''
|
||
form.role = 'normal'
|
||
form.columnIds = []
|
||
form.createdBy = null
|
||
form.companyId = initialCompanyId(props.operator || {}, props.companies || [])
|
||
errors.username = undefined
|
||
errors.password = undefined
|
||
errors.company = undefined
|
||
},
|
||
)
|
||
|
||
function close(): void {
|
||
emit('update:modelValue', false)
|
||
}
|
||
|
||
async function create(): Promise<void> {
|
||
const { valid, errors: errs } = validateCreateUserForm(form, props.operator)
|
||
Object.assign(errors, errs)
|
||
if (!valid) return
|
||
busy.value = true
|
||
try {
|
||
await submitCreateUser(form)
|
||
showAdminFeedback('创建成功', 'success')
|
||
// 对齐 admin:成功后弹窗不关,仅清空用户名/密码并刷新列表。
|
||
form.username = ''
|
||
form.password = ''
|
||
errors.username = undefined
|
||
errors.password = undefined
|
||
emit('created')
|
||
} catch (error) {
|
||
showAdminFeedback(actionableErrorText(error), 'error')
|
||
} finally {
|
||
busy.value = false
|
||
}
|
||
}
|
||
</script>
|
||
|
||
<template>
|
||
<el-dialog
|
||
:model-value="modelValue"
|
||
title="创建用户"
|
||
width="640px"
|
||
:close-on-click-modal="false"
|
||
destroy-on-close
|
||
@update:model-value="(v: boolean) => emit('update:modelValue', v)"
|
||
>
|
||
<el-form label-position="top" @submit.prevent>
|
||
<el-form-item label="用户名" :error="errors.username">
|
||
<el-input v-model="form.username" autocomplete="username" placeholder="用户名(至少 2 个字符)" @input="errors.username = undefined" />
|
||
</el-form-item>
|
||
<el-form-item label="密码" :error="errors.password">
|
||
<el-input
|
||
v-model="form.password"
|
||
type="password"
|
||
show-password
|
||
autocomplete="new-password"
|
||
placeholder="密码(至少 6 个字符)"
|
||
@input="errors.password = undefined"
|
||
/>
|
||
</el-form-item>
|
||
<el-form-item v-if="operatorSuper" label="角色">
|
||
<el-select filterable v-model="form.role" style="width: 200px">
|
||
<el-option v-for="opt in ROLE_CHOICES" :key="opt.value" :label="opt.label" :value="opt.value" />
|
||
</el-select>
|
||
</el-form-item>
|
||
<el-form-item v-if="operatorSuper && form.role === 'normal'" label="所属管理员">
|
||
<el-select v-model="form.createdBy" clearable filterable placeholder="请选择管理员" style="width: 200px">
|
||
<el-option
|
||
v-for="admin in props.adminOptions || []"
|
||
:key="admin.id"
|
||
:label="admin.username"
|
||
:value="admin.id"
|
||
/>
|
||
</el-select>
|
||
</el-form-item>
|
||
<el-form-item v-if="companyOptions.length" label="所属公司" :error="errors.company">
|
||
<el-select
|
||
v-model="form.companyId"
|
||
filterable
|
||
:placeholder="operatorSuper ? '请选择所属公司' : '所属公司'"
|
||
style="width: 200px"
|
||
@change="errors.company = undefined"
|
||
>
|
||
<el-option
|
||
v-for="company in companyOptions"
|
||
:key="company.id"
|
||
:label="company.companyName"
|
||
:value="company.id"
|
||
/>
|
||
</el-select>
|
||
</el-form-item>
|
||
<el-form-item label="菜单权限(勾选上级菜单会继承全部子菜单)">
|
||
<div class="auth-tree-box">
|
||
<UserMenuAuthTree v-model:checked="form.columnIds" />
|
||
</div>
|
||
</el-form-item>
|
||
</el-form>
|
||
<template #footer>
|
||
<el-button @click="close">取消</el-button>
|
||
<el-button type="primary" :loading="busy" @click="create">创建用户</el-button>
|
||
</template>
|
||
</el-dialog>
|
||
</template>
|
||
|
||
<style scoped>
|
||
.auth-tree-box {
|
||
width: 100%;
|
||
border: 1px solid var(--el-border-color);
|
||
border-radius: 9px;
|
||
padding: 8px;
|
||
}
|
||
</style>
|