Skip to content

Commit 7ec3550

Browse files
committed
1、任务管理 新建流程改为发起流程(vue2同步)
2、流程分类 字典回显bug 3、用户分组 编辑时点击空白处弹框消失(vue2同步,不消失) 4、个人中心修改邮箱规范校验 5、任务分配规则 指定角色字段不一定为Number
1 parent 2ec6978 commit 7ec3550

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

src/views/bpm/group/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</XTable>
4444
</ContentWrap>
4545

46-
<XModal v-model="dialogVisible" :title="dialogTitle">
46+
<XModal v-model="dialogVisible" :title="dialogTitle" :mask-closable="false">
4747
<!-- 对话框(添加 / 修改) -->
4848
<Form
4949
v-if="['create', 'update'].includes(actionType)"

src/views/bpm/model/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ const handleUpdate = async (rowId: number) => {
429429
await setDialogTile('edit')
430430
// 设置数据
431431
saveForm.value = await ModelApi.getModelApi(rowId)
432+
saveForm.value.category = Number(saveForm.value.category)
432433
}
433434
434435
// 提交按钮

src/views/bpm/processInstance/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<XButton
88
type="primary"
99
preIcon="ep:zoom-in"
10-
title="新建流程"
10+
title="发起流程"
1111
v-hasPermi="['bpm:process-instance:query']"
1212
@click="handleCreate"
1313
/>

src/views/bpm/taskAssignRule/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
<el-select v-model="formData.roleIds" multiple clearable style="width: 100%">
4646
<el-option
4747
v-for="item in roleOptions"
48-
:key="parseInt(item.id)"
48+
:key="item.id"
4949
:label="item.name"
50-
:value="parseInt(item.id)"
50+
:value="item.id"
5151
/>
5252
</el-select>
5353
</el-form-item>

src/views/system/user/user.data.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@ const { t } = useI18n()
55
export const rules = reactive({
66
username: [required],
77
nickname: [required],
8-
email: [required],
8+
email: [
9+
{ required: true, message: t('profile.rules.mail'), trigger: 'blur' },
10+
{
11+
type: 'email',
12+
message: t('profile.rules.truemail'),
13+
trigger: ['blur', 'change']
14+
}
15+
],
916
status: [required],
1017
mobile: [
1118
{

0 commit comments

Comments
 (0)