diff --git a/src/views/OKR/Meeting/MeetingInfo.vue b/src/views/OKR/Meeting/MeetingInfo.vue index 410a255..cb6a49d 100644 --- a/src/views/OKR/Meeting/MeetingInfo.vue +++ b/src/views/OKR/Meeting/MeetingInfo.vue @@ -124,12 +124,7 @@ :name="item.userId + ''" /> - +
@@ -147,13 +142,13 @@
- + import { listToTree } from '@/utils/tree' import { getAllNodeTree } from '@/api/okr/okr' +import { getWaitPage } from '@/api/okr/wait' import * as MeetingApi from '@/api/okr/meeting' import { formatDate } from '@/utils/formatTime' import { getEmployeeSimpleList } from '@/api/pers/employee' @@ -275,6 +271,7 @@ onMounted(async () => { } ] currentContentId.value = 0 + searchUserWait([userStore.getUser.id]) } }) @@ -431,6 +428,7 @@ function meetingSummaryEdit(targetName, action) { } } +const checkedUsers = ref([]) function handleUserChange(val) { // 当预约参会人员变化时,更新实际参会人员选项 expectUserOptions.value = userOptions.value.filter((user) => @@ -457,6 +455,39 @@ function handleUserChange(val) { }) } }) + if (!form.value.meetingId) { + searchUserWait(val) + } +} + +function searchUserWait(val) { + val.map((item) => { + if (!checkedUsers.value.includes(item)) { + checkedUsers.value.push(item) + // 新增会议时,根据参会人员拉取代办事项 + getWaitPage({ + pageNo: 1, + pageSize: -1, + workUserId: item, + creator: userStore.getUser.id, + completeStatus: 1 + }).then((resp) => { + joinContent(resp.list) + }) + } + }) +} + +function joinContent(arr) { + arr.map((wait) => { + let text = '

未完成事项:' + wait.title + '

' + text += wait.content + text += `

执行人:${wait.userNameStr}

` + text += `

截止日期:${formatDate(wait.endDate, 'YYYY-MM-DD')}

` + text += '


' + form.value.meetingContentList[0].userMeetingContentList[0].content = + text + form.value.meetingContentList[0].userMeetingContentList[0].content + }) } const router = useRouter() diff --git a/src/views/OKR/Wait/Components/DialogWait.vue b/src/views/OKR/Wait/Components/DialogWait.vue index 25c1697..cd3510a 100644 --- a/src/views/OKR/Wait/Components/DialogWait.vue +++ b/src/views/OKR/Wait/Components/DialogWait.vue @@ -4,7 +4,7 @@ 修改 + + 详情 + { deleteWait(row.workId).then(() => {