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

View File

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