fix: 选择人员 & 角色 调整同步

src/components/scWorkflow/nodes/approver.vue

@@ -86,7 +86,7 @@
 							</el-form-item>
 
 							<el-form-item v-if="form.setType === 3" label="选择角色">
-								<el-button type="primary" icon="plus" round @click="selectHandle(2, form.nodeAssigneeList)">选择角色</el-button>
+								<el-button type="primary" icon="plus" round @click="selectHandle(3, form.nodeAssigneeList)">选择角色</el-button>
 								<div class="tags-list">
 									<el-tag v-for="(role, index) in form.nodeAssigneeList" :key="role.id" type="info" closable @close="delRole(index)">{{
 										role.name
@@ -324,6 +324,7 @@ export default {
 			this.form.nodeAssigneeList.splice(index, 1)
 		},
 		selectHandle(type, data) {
+			// type: 1人员, 3角色
 			this.select(type, data)
 		},
 		toText(nodeConfig) {

src/components/scWorkflow/select.vue

@@ -2,13 +2,13 @@
 	<el-dialog
 		v-model="dialogVisible"
 		class="le-dialog"
-		:title="titleMap[type - 1]"
-		:width="type == 1 ? 680 : 460"
+		:title="curTitle"
+		:width="type === 1 ? 680 : 460"
 		destroy-on-close
 		append-to-body
 		@closed="$emit('closed')"
 	>
-		<template v-if="type == 1">
+		<template v-if="type === 1">
 			<div class="sc-user-select">
 				<div class="sc-user-select__left">
 					<div class="sc-user-select__search">
@@ -86,7 +86,7 @@
 			</div>
 		</template>
 
-		<template v-if="type == 2">
+		<template v-if="type === 3">
 			<div class="sc-user-select sc-user-select-role">
 				<div class="sc-user-select__left">
 					<div class="sc-user-select__select">
@@ -164,8 +164,6 @@ export default {
 				label: 'name',
 				children: 'children'
 			},
-
-			titleMap: ['人员选择', '角色选择'],
 			dialogVisible: false,
 			showGrouploading: false,
 			showUserloading: false,
@@ -177,7 +175,7 @@ export default {
 			group: [],
 			user: [],
 			role: [],
-			type: 1,
+			type: 1, // 1: 用户 3: 角色
 			selected: [],
 			value: []
 		}
@@ -185,21 +183,28 @@ export default {
 	computed: {
 		selectedIds() {
 			return this.selected.map(t => t.id)
+		},
+		curTitle() {
+			return {
+				1: '人员选择',
+				3: '角色选择'
+			}[this.type]
 		}
 	},
 	mounted() {},
 	methods: {
 		//打开赋值
 		open(type, data) {
+			// 1: 用户 3: 角色
 			this.type = type
 			this.value = JSON.parse(JSON.stringify(data || []))
 			this.selected = JSON.parse(JSON.stringify(data || []))
 			this.dialogVisible = true
 
-			if (this.type == 1) {
+			if (this.type === 1) {
 				this.getGroup()
 				this.getUser()
-			} else if (this.type == 2) {
+			} else if (this.type === 3) {
 				this.getRole()
 			}
 		},
@@ -268,9 +273,9 @@ export default {
 		//删除已选
 		deleteSelected(index) {
 			this.selected.splice(index, 1)
-			if (this.type == 1) {
+			if (this.type === 1) {
 				this.$refs.userTree.setCheckedKeys(this.selectedIds)
-			} else if (this.type == 2) {
+			} else if (this.type === 3) {
 				this.$refs.groupTree.setCheckedKeys(this.selectedIds)
 			}
 		},

src/views/approve/launch/ItemDrawer.vue

@@ -225,7 +225,7 @@ const packageProcess = (data, list = [], levelIdx = 0) => {
 						let disabled = false
 						let selectOpts = {}
 						const user_fn = () => {
-							assigneeMap.value[config.local_name] = { assignees: config.nodeUserList, type: 1, disabled, selectOpts }
+							assigneeMap.value[config.local_name] = { assignees: config.nodeAssigneeList, type: 1, disabled, selectOpts }
 						}
 						switch (config.setType) {
 							case 1:
@@ -239,7 +239,7 @@ const packageProcess = (data, list = [], levelIdx = 0) => {
 								break
 							case 3:
 								// 角色 选择角色 (允许重新选择)
-								assigneeMap.value[config.local_name] = { assignees: config.nodeRoleList, type: 3 }
+								assigneeMap.value[config.local_name] = { assignees: config.nodeAssigneeList, type: 3 }
 								break
 							case 4:
 								// 发起人自选 (1: 选择一个人, 2: 选择多个人)
@@ -263,7 +263,7 @@ const packageProcess = (data, list = [], levelIdx = 0) => {
 				case 2: {
 					// 抄送人
 					// 选择人员 & allowSelection 控制 true 允许选择 否则  隐藏
-					assigneeMap.value[config.local_name] = { assignees: config.nodeUserList, type: 1, disabled: !config.allowSelection }
+					assigneeMap.value[config.local_name] = { assignees: config.nodeAssigneeList, type: 1, disabled: !config.allowSelection }
 					break
 				}
 				/*case 3: {