1、任务管理 新建流程改为发起流程(vue2同步)
2、流程分类 字典回显bug 3、用户分组 编辑时点击空白处弹框消失(vue2同步,不消失) 4、个人中心修改邮箱规范校验 5、任务分配规则 指定角色字段不一定为Number
This commit is contained in:
parent
2ec6978400
commit
7ec3550157
@ -43,7 +43,7 @@
|
|||||||
</XTable>
|
</XTable>
|
||||||
</ContentWrap>
|
</ContentWrap>
|
||||||
|
|
||||||
<XModal v-model="dialogVisible" :title="dialogTitle">
|
<XModal v-model="dialogVisible" :title="dialogTitle" :mask-closable="false">
|
||||||
<!-- 对话框(添加 / 修改) -->
|
<!-- 对话框(添加 / 修改) -->
|
||||||
<Form
|
<Form
|
||||||
v-if="['create', 'update'].includes(actionType)"
|
v-if="['create', 'update'].includes(actionType)"
|
||||||
|
@ -429,6 +429,7 @@ const handleUpdate = async (rowId: number) => {
|
|||||||
await setDialogTile('edit')
|
await setDialogTile('edit')
|
||||||
// 设置数据
|
// 设置数据
|
||||||
saveForm.value = await ModelApi.getModelApi(rowId)
|
saveForm.value = await ModelApi.getModelApi(rowId)
|
||||||
|
saveForm.value.category = Number(saveForm.value.category)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 提交按钮
|
// 提交按钮
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<XButton
|
<XButton
|
||||||
type="primary"
|
type="primary"
|
||||||
preIcon="ep:zoom-in"
|
preIcon="ep:zoom-in"
|
||||||
title="新建流程"
|
title="发起流程"
|
||||||
v-hasPermi="['bpm:process-instance:query']"
|
v-hasPermi="['bpm:process-instance:query']"
|
||||||
@click="handleCreate"
|
@click="handleCreate"
|
||||||
/>
|
/>
|
||||||
|
@ -45,9 +45,9 @@
|
|||||||
<el-select v-model="formData.roleIds" multiple clearable style="width: 100%">
|
<el-select v-model="formData.roleIds" multiple clearable style="width: 100%">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in roleOptions"
|
v-for="item in roleOptions"
|
||||||
:key="parseInt(item.id)"
|
:key="item.id"
|
||||||
:label="item.name"
|
:label="item.name"
|
||||||
:value="parseInt(item.id)"
|
:value="item.id"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -5,7 +5,14 @@ const { t } = useI18n()
|
|||||||
export const rules = reactive({
|
export const rules = reactive({
|
||||||
username: [required],
|
username: [required],
|
||||||
nickname: [required],
|
nickname: [required],
|
||||||
email: [required],
|
email: [
|
||||||
|
{ required: true, message: t('profile.rules.mail'), trigger: 'blur' },
|
||||||
|
{
|
||||||
|
type: 'email',
|
||||||
|
message: t('profile.rules.truemail'),
|
||||||
|
trigger: ['blur', 'change']
|
||||||
|
}
|
||||||
|
],
|
||||||
status: [required],
|
status: [required],
|
||||||
mobile: [
|
mobile: [
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user