root/ludu-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!444 oa请假，修复列表展示的状态字段取值错误

Browse Source 
Merge pull request !444 from syubun/master
This commit is contained in:
芋道源码 2024-05-10 00:40:49 +00:00 committed by Gitee
commit f5474840b3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
View File

@ -79,13 +79,13 @@ const resetFlowCondition = () => {
bpmnElement.value = bpmnInstances().bpmnElement bpmnElement.value = bpmnInstances().bpmnElement
bpmnElementSource.value = bpmnElement.value.source bpmnElementSource.value = bpmnElement.value.source
bpmnElementSourceRef.value = bpmnElement.value.businessObject.sourceRef bpmnElementSourceRef.value = bpmnElement.value.businessObject.sourceRef
// 初始化默认type为default
flowConditionForm.value = { type: 'default' }
if ( if (
bpmnElementSourceRef.value && bpmnElementSourceRef.value &&
bpmnElementSourceRef.value.default && bpmnElementSourceRef.value.default &&
bpmnElementSourceRef.value.default.id === bpmnElement.value.id && bpmnElementSourceRef.value.default.id === bpmnElement.value.id
flowConditionForm.value.type == 'default'
) { ) {
// 默认
flowConditionForm.value = { type: 'default' } flowConditionForm.value = { type: 'default' }
} else if (!bpmnElement.value.businessObject.conditionExpression) { } else if (!bpmnElement.value.businessObject.conditionExpression) {
// 普通 // 普通

2
src/views/bpm/oa/leave/index.vue
View File

@ -83,7 +83,7 @@
<el-table-column align="center" label="申请编号" prop="id" /> <el-table-column align="center" label="申请编号" prop="id" />
<el-table-column align="center" label="状态" prop="result"> <el-table-column align="center" label="状态" prop="result">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.result" /> <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column