|
@@ -29,7 +29,6 @@
|
|
|
<div class="flex">
|
|
|
<!-- type: 1[审核人] 2[抄送人] 4[条件路由] 5[子流程] 6[延时处理] 7[触发器] 8[并行路由] 9[包容路由] 10[路由分支]-->
|
|
|
<template v-if="item.type === 1">
|
|
|
-
|
|
|
<div v-if="[2, 5].indexOf(item.setType) > -1">
|
|
|
<el-tag v-if="item.setType === 5" type="primary">{{ setTypeOptions_config[item.setType] }}</el-tag>
|
|
|
<el-tag v-if="item.setType === 2" type="primary">{{
|
|
@@ -109,7 +108,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script setup>
|
|
|
-import {computed, reactive, watch, toRefs, nextTick} from 'vue'
|
|
|
+import { computed, reactive, watch, toRefs, nextTick } from 'vue'
|
|
|
import FileUpload from '@/components/FileUpload.vue'
|
|
|
import FlowNodeAvatar from '@/components/Flow/FlowNodeAvatar.vue'
|
|
|
import { nextNodesApi, processConsentTaskApi, processPreviousNodeNameApi, processRejectionTaskApi } from '@/api/flow/processTask'
|
|
@@ -164,10 +163,9 @@ const datas = reactive({
|
|
|
nodeModelsData: [],
|
|
|
active_selectOpts: {},
|
|
|
useSelectRef: null,
|
|
|
- active_assigneeKey: null,
|
|
|
- nodeTypeData: null
|
|
|
+ active_assigneeKey: null
|
|
|
})
|
|
|
-const { formRef, uploadLoading, rollbackOptions, btnDisabled, nodeModelsData, active_selectOpts, useSelectRef, active_assigneeKey, nodeTypeData } =
|
|
|
+const { formRef, uploadLoading, rollbackOptions, btnDisabled, nodeModelsData, active_selectOpts, useSelectRef, active_assigneeKey } =
|
|
|
toRefs(datas)
|
|
|
const $myEmit = defineEmits(['update:modelValue', 'successCb'])
|
|
|
|
|
@@ -201,9 +199,8 @@ const appendToApprovalComments = label => {
|
|
|
}
|
|
|
|
|
|
const getNextNodesEv = async params => {
|
|
|
- const { nodeModels, nodeType } = await nextNodesApi(params)
|
|
|
+ const { nodeModels } = await nextNodesApi(params)
|
|
|
nodeModelsData.value = nodeModels || []
|
|
|
- nodeTypeData.value = nodeType
|
|
|
/**
|
|
|
* "nodeModels": [
|
|
|
{
|
|
@@ -276,7 +273,7 @@ const submitForm = debounce(() => {
|
|
|
const validNodes = nodeModelsData.value.filter(node => node.selectMode)
|
|
|
if (validNodes.length) {
|
|
|
formData.assigneeMap = validNodes.reduce((acc, node) => {
|
|
|
- acc[node.nodeKey] = { assigneeList: node.nodeAssigneeList, type: nodeTypeData.value }
|
|
|
+ acc[node.nodeKey] = { assigneeList: node.nodeAssigneeList, type: node.nodeCandidate.type }
|
|
|
return acc
|
|
|
}, {}) // 组装成后台需要的格式
|
|
|
} else {
|