Procházet zdrojové kódy

优化角色部门选择展示

hubin před 1 rokem
rodič
revize
56dc74d7ee
1 změnil soubory, kde provedl 9 přidání a 20 odebrání
  1. 9 20
      src/views/approve/launch/ItemDrawer.vue

+ 9 - 20
src/views/approve/launch/ItemDrawer.vue

@@ -15,10 +15,9 @@
 					</template>
 					<template v-else>
 						<div style="padding-bottom: 6px">{{ v.name }}</div>
-						<!-- {{ v.local_name }} -->
 						<div v-if="v.type !== 0" style="display: flex; align-items: center; gap: 6px">
 							<el-button :icon="Plus" style="width: 32px" @click="selectHandler(v.name)" />
-							<FlowNodeAvatar v-for="(item, index) in userMap.get(v.name)" :key="index" :name="item.name" style="margin-top: 5px" />
+							<FlowNodeAvatar v-for="(item, index) in userMap.get(v.name).assignees" :key="index" :name="item.name" style="margin-top: 5px" />
 						</div>
 					</template>
 				</el-timeline-item>
@@ -54,9 +53,9 @@ const userMap = ref(new Map())
 const useSelectRef = ref()
 const selectHandler = (name: string) => {
 	if (!userMap.value.get(name)) {
-		userMap.value.set(name, [])
+		userMap.value.set(name, { assignees: [], type: 1 })
 	}
-	useSelectRef.value.open(1, userMap.value.get(name))
+	useSelectRef.value.open(1, userMap.value.get(name).assignees)
 }
 const FormCreate = viewForm.$form()
 const formOption = ref({
@@ -69,18 +68,11 @@ const formOption = ref({
 			// 填写的数据存储(local_: 本地数据处理标识)
 			v.local_value = formData[v.field]
 		})
-		const assigneeMap = {}
-		userMap.value.forEach((v, k) => {
-			assigneeMap[k] = {
-				assigneeList: v,
-				type: 1
-			}
-		})
 		model
 			.processLaunchApi({
 				processId, // 流程ID
 				processForm: JSON.stringify(processForm), // 流程表单JSON内容 & local_value 保存
-				assigneeMap: assigneeMap // 流程节点审批人
+				assigneeMap: userMap.value // 流程节点审批人
 			})
 			.then(res => {
 				ElMessage.success('提交成功')
@@ -106,18 +98,15 @@ const packageProcess = (data, list = []) => {
 	return data.reduce((_list, config) => {
 		if (config.conditionNode === 0) {
 			// console.log(config.name, 'name 普通节点名称', config)
-			if (!config.local_name) {
-				// 普通节点 展示 控制
-				config.local_name = (config.nodeUserList || []).map(x => x.name).join(',') || config.name
-			}
-
 			// 默认用户
-			let assigneeList = config.nodeUserList
+			let type = 1
+			let assignees = config.nodeUserList
 			if (config.nodeRoleList) {
 				// 存在设置角色
-				assigneeList = config.nodeRoleList
+				type = 2
+				assignees = config.nodeRoleList
 			}
-			userMap.value.set(config.name, assigneeList)
+			userMap.value.set(config.name, { assignees: assignees, type: type })
 			_list.push(config)
 		} else if (config.conditionNode === 1) {
 			// 自定义标识key