Skip to content

Commit 59c7c49

Browse files
committed
BPM:流程实例的 status 状态实现,使用 Flowable 的 variables 存储,移除 bpm_process_instance_ext
1 parent 33d59c8 commit 59c7c49

File tree

2 files changed

+9
-21
lines changed

2 files changed

+9
-21
lines changed

src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<el-select v-model="loopCharacteristics" @change="changeLoopCharacteristicsType">
1111
<el-option label="并行多重事件" value="ParallelMultiInstance" />
1212
<el-option label="时序多重事件" value="SequentialMultiInstance" />
13-
<!-- <el-option label="循环事件" value="StandardLoop" />-->
1413
<el-option label="" value="Null" />
1514
</el-select>
1615
</el-form-item>

src/views/bpm/processInstance/index.vue

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,13 @@
4343
/>
4444
</el-select>
4545
</el-form-item>
46-
<el-form-item label="状态" prop="status">
47-
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
46+
<el-form-item label="流程状态" prop="status">
47+
<el-select
48+
v-model="queryParams.status"
49+
placeholder="请选择流程状态"
50+
clearable
51+
class="!w-240px"
52+
>
4853
<el-option
4954
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS)"
5055
:key="dict.value"
@@ -53,16 +58,6 @@
5358
/>
5459
</el-select>
5560
</el-form-item>
56-
<el-form-item label="结果" prop="result">
57-
<el-select v-model="queryParams.result" placeholder="请选择结果" clearable class="!w-240px">
58-
<el-option
59-
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT)"
60-
:key="dict.value"
61-
:label="dict.label"
62-
:value="dict.value"
63-
/>
64-
</el-select>
65-
</el-form-item>
6661
<el-form-item label="提交时间" prop="createTime">
6762
<el-date-picker
6863
v-model="queryParams.createTime"
@@ -106,20 +101,15 @@
106101
</el-button>
107102
</template>
108103
</el-table-column>
109-
<el-table-column label="状态" prop="status">
104+
<el-table-column label="流程" prop="status">
110105
<template #default="scope">
111106
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.status" />
112107
</template>
113108
</el-table-column>
114-
<el-table-column label="结果" prop="result">
115-
<template #default="scope">
116-
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result" />
117-
</template>
118-
</el-table-column>
119109
<el-table-column
120110
label="提交时间"
121111
align="center"
122-
prop="createTime"
112+
prop="startTime"
123113
width="180"
124114
:formatter="dateFormatter"
125115
/>
@@ -183,7 +173,6 @@ const queryParams = reactive({
183173
processDefinitionId: undefined,
184174
category: undefined,
185175
status: undefined,
186-
result: undefined,
187176
createTime: []
188177
})
189178
const queryFormRef = ref() // 搜索的表单

0 commit comments

Comments
 (0)