diff --git a/src/views/progress/plan/component/createDailyRate.vue b/src/views/progress/plan/component/createDailyRate.vue index 6546c08..bbbd05d 100644 --- a/src/views/progress/plan/component/createDailyRate.vue +++ b/src/views/progress/plan/component/createDailyRate.vue @@ -161,7 +161,7 @@ :total="detailTotalWork" v-model:page="detailQueryParamsWork.pageNum" v-model:limit="detailQueryParamsWork.pageSize" - @pagination="getPvModuleList" + @pagination="getDailyBookList" layout="total, sizes, prev, pager, next" :isSmall="5" /> @@ -436,10 +436,10 @@ const handleView = (row: any, obj: any) => { // 获取已填日报 const getDailyBookList = (doneTime: string) => { - detialWordList.value = []; + // detialWordList.value = []; getDailyBook({ id: formDetail.value.id, - ...detailQueryParams.value + ...detailQueryParamsWork.value }).then((res: any) => { if (res.code === 200) { detialWordList.value = res.rows || []; diff --git a/src/views/system/user/comm/roleInfo.vue b/src/views/system/user/comm/roleInfo.vue index 8cb28d4..207f2eb 100644 --- a/src/views/system/user/comm/roleInfo.vue +++ b/src/views/system/user/comm/roleInfo.vue @@ -219,6 +219,10 @@ const removeProject = (projectId: number | string) => { // 提交表单 const submitForm = async () => { // 整理项目角色数据 + if (form.value.projectRoles.length == 0) { + proxy?.$modal.msgWarning('请选择项目角色'); + return; + } form.value.projectRoles = selectedProjects.value.map((project) => ({ projectId: project.id, roleIds: [...new Set(project.webRoles), ...new Set(project.appRoles)]