【代码优化】工作流:去除多余的 :startUserSelectAssignees 传参

This commit is contained in:
YunaiV 2024-11-10 11:46:45 +08:00
parent 8f32dce2d6
commit 52a8c46a0a
2 changed files with 22 additions and 19 deletions

View File

@ -24,12 +24,10 @@
<el-col :span="6" :offset="1">
<!-- 流程时间线 -->
<!-- TODO @芋艿selectUserConfirm 调整一下改成 activityNodes 里面的东西 -->
<ProcessInstanceTimeline
ref="timelineRef"
:activity-nodes="activityNodes"
:show-status-icon="false"
:startUserSelectAssignees="startUserSelectAssignees"
@select-user-confirm="selectUserConfirm"
/>
</el-col>
@ -85,6 +83,7 @@ import type { ApiAttrs } from '@form-create/element-ui/types/config'
import { useTagsViewStore } from '@/store/modules/tagsView'
import * as ProcessInstanceApi from '@/api/bpm/processInstance'
import * as DefinitionApi from '@/api/bpm/definition'
import { ApprovalNodeInfo } from '@/api/bpm/processInstance'
defineOptions({ name: 'ProcessDefinitionDetail' })
const props = defineProps<{
@ -153,20 +152,20 @@ const initProcessInfo = async (row: any, formVariables?: any) => {
/** 获取审批详情 */
const getApprovalDetail = async (row: any) => {
try {
const param = {
processDefinitionId: row.id
}
const data = await ProcessInstanceApi.getApprovalDetail(param)
const data = await ProcessInstanceApi.getApprovalDetail({ processDefinitionId: row.id })
if (!data) {
message.error('查询不到审批详情信息!')
return
}
//
startUserSelectTasks.value = data.activityNodes?.filter(node => CandidateStrategy.START_USER_SELECT === node.candidateStrategy )
startUserSelectTasks.value = data.activityNodes?.filter(
(node: ApprovalNodeInfo) => CandidateStrategy.START_USER_SELECT === node.candidateStrategy
)
for (const node of startUserSelectTasks.value) {
//
startUserSelectAssignees.value[node.id] = []
}
// Timeline
activityNodes.value = data.activityNodes
} finally {
@ -209,12 +208,14 @@ const submitForm = async () => {
}
}
/** 取消发起审批 */
const handleCancel = () => {
emit('cancel')
}
const selectUserConfirm = (id, userList) => {
startUserSelectAssignees.value[id] = userList?.map((item) => item.id)
/** 选择发起人 */
const selectUserConfirm = (id: string, userList: any[]) => {
startUserSelectAssignees.value[id] = userList?.map((item: any) => item.id)
}
defineExpose({ initProcessInfo })

View File

@ -39,17 +39,21 @@
<!-- 需要自定义选择审批人 -->
<div
class="flex flex-wrap gap2 items-center"
v-if="isEmpty(activity.tasks) && isEmpty(activity.candidateUsers) && CandidateStrategy.START_USER_SELECT === activity.candidateStrategy"
v-if="
isEmpty(activity.tasks) &&
isEmpty(activity.candidateUsers) &&
CandidateStrategy.START_USER_SELECT === activity.candidateStrategy
"
>
<!-- && activity.nodeType === NodeType.USER_TASK_NODE -->
<el-button
class="!px-8px"
@click="handleSelectUser(activity.id, customApprover[activity.id])"
@click="handleSelectUser(activity.id, customApproveUsers[activity.id])"
>
<Icon icon="fa:user-plus" />
</el-button>
<div
v-for="(user, idx1) in customApprover[activity.id]"
v-for="(user, idx1) in customApproveUsers[activity.id]"
:key="idx1"
class="bg-gray-100 h-35px rounded-3xl flex items-center p-8px gap-2 dark:color-gray-600 position-relative"
>
@ -169,11 +173,9 @@ withDefaults(
defineProps<{
activityNodes: ProcessInstanceApi.ApprovalNodeInfo[] //
showStatusIcon?: boolean //
startUserSelectAssignees?: any //
}>(),
{
showStatusIcon: true, // true
startUserSelectAssignees: () => {}
showStatusIcon: true // true
}
)
@ -280,10 +282,10 @@ const handleSelectUser = (activityId, selectedList) => {
const emit = defineEmits<{
selectUserConfirm: [id: any, userList: any[]]
}>()
const customApprover: any = ref({}) // keyactivityIdvalue TODO
const customApproveUsers: any = ref({}) // keyactivityIdvalue
//
const handleUserSelectConfirm = (activityId, userList) => {
customApprover.value[activityId] = userList || []
const handleUserSelectConfirm = (activityId: string, userList: any[]) => {
customApproveUsers.value[activityId] = userList || []
emit('selectUserConfirm', activityId, userList)
}
</script>