diff --git a/src/components/common/treeCaseTable/loadCaseTable.vue b/src/components/common/treeCaseTable/loadCaseTable.vue index 715978b2..a51a28b0 100644 --- a/src/components/common/treeCaseTable/loadCaseTable.vue +++ b/src/components/common/treeCaseTable/loadCaseTable.vue @@ -18,12 +18,12 @@ - @@ -264,7 +270,7 @@ const addRowFun = (nodeType?: any) => { const editRowFun = (row: any) => { operationType.value = OPERATION_TYPE.EDIT; modalNodeType.value = row.nodeType; - modalDetail.value = { ...row, planTime: [row.beginTime, row.endTime] }; + modalDetail.value = { ...row, planTime: [row.beginTime, row.endTime], eMemberListArr: row.eMemberList, pMemberListArr: row.pMemberList }; modalVisible.value = true; }; diff --git a/src/components/common/treeCaseTable/nodeDetailDialog.vue b/src/components/common/treeCaseTable/nodeDetailDialog.vue index 057c2e31..cdf802a2 100644 --- a/src/components/common/treeCaseTable/nodeDetailDialog.vue +++ b/src/components/common/treeCaseTable/nodeDetailDialog.vue @@ -43,7 +43,7 @@ import { ref, computed, nextTick, watch } from 'vue'; import Dialog from '@/components/common/dialog/index.vue'; import TableForm from '@/components/common/table/tableForm.vue'; import { getTagKeyMap, NODE_TYPE } from '@/utils/enum/node'; -import { getMemberListStr } from '@/utils/task'; +import { getMemberListIds } from '@/utils/task'; import { disposeTagKey } from '@/views/task/projectDetail/components/project'; import { isCategoryType, isCategoryNodeType } from '@/utils/node'; import flowTemplateSelect from './flowTemplateSelect.vue'; @@ -89,7 +89,7 @@ const onShowFun = () => { resetFun(); nextTick(() => { if (localDetail.value) { - tableFormRef.value?.setFormDataFun({ ...localDetail.value, eMemberList: getMemberListStr(localDetail.value.eMemberList), pMemberList: getMemberListStr(localDetail.value.pMemberList) }); + tableFormRef.value?.setFormDataFun({ ...localDetail.value, eMemberList: getMemberListIds(localDetail.value.eMemberList), pMemberList: getMemberListIds(localDetail.value.pMemberList) }); standard.value = localDetail.value.standard; if (localDetail.value.flowTemplate) { selectedFlowTemplate.value = localDetail.value.flowTemplate; @@ -131,6 +131,14 @@ const onConfirmFun = async () => { formData.beginTime = formData.planTime[0]; formData.endTime = formData.planTime[1]; } + formData.pMemberIds = ''; + if (formData.pMemberList?.length > 0) { + formData.pMemberIds = formData.pMemberList.map((i:any) => i.id).join(','); + } + formData.eMemberIds = ''; + if (formData.eMemberList?.length > 0) { + formData.eMemberIds = formData.eMemberList.map((i:any) => i.id).join(','); + } emits('confirm', formData); } }; diff --git a/src/components/common/treeCaseTable/treeTable.vue b/src/components/common/treeCaseTable/treeTable.vue index fa47e57f..4ce78c6b 100644 --- a/src/components/common/treeCaseTable/treeTable.vue +++ b/src/components/common/treeCaseTable/treeTable.vue @@ -44,6 +44,18 @@ + + + +