diff --git a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue index 962234d5..2e5bc8a7 100644 --- a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue +++ b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue @@ -3,10 +3,8 @@ - - diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index 20c697d6..bb1ca1a3 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -123,14 +123,37 @@ const setDialogTile = (type: string) => { } // 新增操作 -const handleCreate = () => { +const handleCreate = async () => { // 重置表单 setDialogTile('create') + await nextTick() + console.log(allSchemas.formSchema, 'allSchemas.formSchema') + if (allSchemas.formSchema[4].field !== 'username') { + unref(formRef)?.addSchema( + { + field: 'username', + label: '用户名称', + component: 'Input' + }, + 0 + ) + unref(formRef)?.addSchema( + { + field: 'password', + label: '用户密码', + component: 'InputPassword' + }, + 1 + ) + } } // 修改操作 const handleUpdate = async (rowId: number) => { setDialogTile('update') + await nextTick() + unref(formRef)?.delSchema('username') + unref(formRef)?.delSchema('password') // 设置数据 const res = await TenantApi.getTenantApi(rowId) unref(formRef)?.setValues(res) diff --git a/src/views/system/tenant/tenant.data.ts b/src/views/system/tenant/tenant.data.ts index adda1807..1137b44a 100644 --- a/src/views/system/tenant/tenant.data.ts +++ b/src/views/system/tenant/tenant.data.ts @@ -123,8 +123,7 @@ const crudSchemas = reactive({ title: '用户名称', field: 'username', isTable: false, - isDetail: false, - isForm: false + isDetail: false }, { title: '用户密码', @@ -133,8 +132,7 @@ const crudSchemas = reactive({ isDetail: false, form: { component: 'InputPassword' - }, - isForm: false + } }, { title: '账号额度', diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts index 59a795e7..3a702c04 100644 --- a/src/views/system/user/user.data.ts +++ b/src/views/system/user/user.data.ts @@ -60,6 +60,13 @@ const crudSchemas = reactive({ component: 'InputPassword' } }, + { + title: '用户' + t('profile.user.sex'), + field: 'sex', + dictType: DICT_TYPE.SYSTEM_USER_SEX, + dictClass: 'number', + table: { show: false } + }, { title: '用户昵称', field: 'nickname'