Skip to content

Commit f90c9a0

Browse files
committed
1.流程图显示问题
2.任务分配规则列表显示问题(传递id错误) 3.流程分类显示错误
1 parent 666a523 commit f90c9a0

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

src/views/bpm/definition/definition.data.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@ const crudSchemas = reactive<VxeCrudSchema>({
2626
{
2727
title: '流程分类',
2828
field: 'category',
29-
dictType: DICT_TYPE.BPM_MODEL_CATEGORY,
30-
dictClass: 'number'
29+
// dictType: DICT_TYPE.BPM_MODEL_CATEGORY,
30+
// dictClass: 'string'
31+
table: {
32+
slots: {
33+
default: 'category_default'
34+
}
35+
}
3136
},
3237
{
3338
title: '表单信息',

src/views/bpm/definition/index.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<template #name_default="{ row }">
77
<XTextButton :title="row.name" @click="handleBpmnDetail(row.id)" />
88
</template>
9+
<!-- 流程分类 -->
10+
<template #category_default="{ row }">
11+
<DictTag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="Number(row?.category)" />
12+
</template>
913
<!-- 表单信息 -->
1014
<template #formId_default="{ row }">
1115
<XTextButton
@@ -61,6 +65,8 @@ import * as DefinitionApi from '@/api/bpm/definition'
6165
// import * as ModelApi from '@/api/bpm/model'
6266
import { allSchemas } from './definition.data'
6367
import { setConfAndFields2 } from '@/utils/formCreate'
68+
import { DICT_TYPE } from '@/utils/dict'
69+
6470
const bpmnXML = ref(null)
6571
const showBpmnOpen = ref(false)
6672
const bpmnControlForm = ref({
@@ -105,7 +111,7 @@ const handleBpmnDetail = (row) => {
105111
console.log(row)
106112
DefinitionApi.getProcessDefinitionBpmnXMLApi(row).then((response) => {
107113
console.log(response, 'response')
108-
bpmnXML.value = response.bpmnXml
114+
bpmnXML.value = response
109115
// 弹窗打开
110116
showBpmnOpen.value = true
111117
})
@@ -117,7 +123,7 @@ const handleAssignRule = (row) => {
117123
router.push({
118124
name: 'BpmTaskAssignRuleList',
119125
query: {
120-
modelId: row.id
126+
processDefinitionId: row.id
121127
}
122128
})
123129
}

0 commit comments

Comments
 (0)