2
0

fix:账号管理删除dept字段

This commit is contained in:
zhongzm
2025-02-17 11:40:36 +08:00
parent f9ecdfcb71
commit 631fd1d5ad
3 changed files with 20 additions and 28 deletions

View File

@@ -70,19 +70,12 @@ const { columns, columnChecks, data, loading, getData, mobilePagination, searchP
return <Tag color={tagMap[record.status]}>{label}</Tag>; return <Tag color={tagMap[record.status]}>{label}</Tag>;
} }
}, },
{ // {
key: 'dept', // key: 'createTime',
dataIndex: 'dept', // dataIndex: 'createTime',
title: $t('page.manage.user.dept'), // align: 'center',
align: 'center', // title: $t('page.manage.user.createtime'),
customRender: ({ record }) => record.dept?.deptName || '' // },
},
{
key: 'createTime',
dataIndex: 'createTime',
align: 'center',
title: $t('page.manage.user.createtime'),
},
{ {
key: 'operate', key: 'operate',
title: $t('common.operate'), title: $t('common.operate'),

View File

@@ -41,7 +41,7 @@ const title = computed(() => {
}); });
type Model = Partial< type Model = Partial<
Pick<Api.Auth.User, 'userName' | 'nickName' | 'email' | 'phonenumber' | 'status' | 'deptId' | 'remark'> & { Pick<Api.Auth.User, 'userName' | 'nickName' | 'email' | 'phonenumber' | 'status' | 'remark'> & {
postIds: number[]; postIds: number[];
roleIds: number[]; roleIds: number[];
password?: string; password?: string;
@@ -60,7 +60,6 @@ function createDefaultModel(): Model {
email: '', email: '',
phonenumber: '', phonenumber: '',
status: '0', status: '0',
deptId: undefined,
remark: '', remark: '',
postIds: [], postIds: [],
roleIds: [], roleIds: [],
@@ -194,9 +193,9 @@ watch(
</ARadio> </ARadio>
</ARadioGroup> </ARadioGroup>
</AFormItem> </AFormItem>
<AFormItem :label="$t('page.manage.user.dept')" name="deptId"> <!-- <AFormItem :label="$t('page.manage.user.dept')" name="deptId">-->
<ATreeSelect v-model:value="model.deptId" :field-names="{ value: 'id' }" :tree-data="deptTreeData" /> <!-- <ATreeSelect v-model:value="model.deptId" :field-names="{ value: 'id' }" :tree-data="deptTreeData" />-->
</AFormItem> <!-- </AFormItem>-->
<AFormItem :label="$t('page.manage.user.remark')" name="remark"> <AFormItem :label="$t('page.manage.user.remark')" name="remark">
<ATextarea v-model:value="model.remark" :placeholder="$t('page.manage.user.form.remark')" /> <ATextarea v-model:value="model.remark" :placeholder="$t('page.manage.user.form.remark')" />
</AFormItem> </AFormItem>

View File

@@ -61,16 +61,16 @@ function search() {
</ACol> </ACol>
<ACol :span="24" :md="12" :lg="4"> <ACol :span="24" :md="12" :lg="4">
<!-- 部门 --> <!-- 部门 -->
<AFormItem :label="$t('page.manage.user.dept')" name="deptId" class="m-0"> <!-- <AFormItem :label="$t('page.manage.user.dept')" name="deptId" class="m-0">-->
<ATreeSelect <!-- <ATreeSelect-->
v-model:value="formModel.deptId" <!-- v-model:value="formModel.deptId"-->
:field-names="{ value: 'id' }" <!-- :field-names="{ value: 'id' }"-->
:placeholder="$t('page.manage.user.form.dept')" <!-- :placeholder="$t('page.manage.user.form.dept')"-->
:tree-data="deptTreeData" <!-- :tree-data="deptTreeData"-->
:tree-default-expand-all="true" <!-- :tree-default-expand-all="true"-->
:allow-clear="true" <!-- :allow-clear="true"-->
/> <!-- />-->
</AFormItem> <!-- </AFormItem>-->
</ACol> </ACol>
<ACol :span="24" :md="12" :lg="8"> <ACol :span="24" :md="12" :lg="8">
<AFormItem class="m-0"> <AFormItem class="m-0">