yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(review-meeting): update expert selection and acceptance detail pages

pull/874/head
Codewoc 2026-03-31 15:11:11 +08:00
parent 9251c64067
commit 405d461061
11 changed files with 476 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/api/review/meeting.ts
View File

@ -87,6 +87,17 @@ export interface ReviewMeetingAgendaAttachmentRespVO {
size: number
}
export interface ReviewMeetingAgendaGenerateReqVO {
name: string
organizationUnit: string
startTime: string | number
endTime: string | number
location: string
host: string
expertIds: number[]
projects: ReviewProjectItemVO[]
}
const REVIEW_MEETING_ATTACHMENT_DIR = 'review-meeting/attachment'
// 短信发送状态 VO
@ -177,13 +188,17 @@ export const importProjectsFromExcel = async (file: File): Promise<ReviewProject
return res?.data || []
}
/** 上传固定议程附件（图片/PDF） */
/** 上传固定议程附件（DOCX/PDF/图片） */
export const uploadAgendaAttachment = async (
file: File
): Promise<ReviewMeetingAgendaAttachmentRespVO> => {
return uploadMeetingAttachmentByPresignedUrl(file)
}
/** 根据当前表单内容自动生成议程附件 */
export const generateAgendaAttachment = (data: ReviewMeetingAgendaGenerateReqVO) =>
request.post<ReviewMeetingAgendaAttachmentRespVO>({ url: '/project/review-meeting/generate-agenda', data })
/** 上传会议纪要附件（Word/PDF/图片） */
export const uploadMinutesAttachment = (
id: number,

3
src/api/system/user/index.ts
View File

@ -5,6 +5,7 @@ export interface UserVO {
username: string
nickname: string
deptId: number
deptName?: string
postIds: string[]
email: string
mobile: string
@ -40,7 +41,7 @@ export const updateUser = (data: UserVO) => {
}
// 获取专家列表
export const getExpertUserList = () => {
export const getExpertUserList = (): Promise<UserVO[]> => {
return request.get({ url: '/system/user/expert-list' })
}

34
src/views/project/acceptance/detail/AdminView.vue Normal file
View File

@ -0,0 +1,34 @@
<template>
<el-card shadow="never">
<template #header>
<div class="flex items-center justify-between">
<span>管理员视图</span>
<el-button @click="$emit('go-back')">返回</el-button>
</div>
</template>
<el-descriptions :column="2" border class="mb-4">
<el-descriptions-item label="验收ID">{{ acceptance?.id || '-' }}</el-descriptions-item>
<el-descriptions-item label="项目ID">{{ projectInfo?.id || acceptance?.projectId || '-' }}</el-descriptions-item>
<el-descriptions-item label="预验收材料数">{{ (preMaterials || []).length }}</el-descriptions-item>
<el-descriptions-item label="终验材料数">{{ (finalMaterials || []).length }}</el-descriptions-item>
</el-descriptions>
<div class="flex gap-2">
<el-button type="primary" @click="$emit('audit')">审核</el-button>
<el-button type="warning" @click="$emit('organize-meeting')">组织会议</el-button>
</div>
</el-card>
</template>
<script lang="ts" setup>
defineProps<{
acceptance: Record<string, any>
projectInfo: Record<string, any>
preMaterials: any[]
finalMaterials: any[]
opinions: any[]
}>()
defineEmits(['preview', 'download', 'show-versions', 'audit', 'organize-meeting', 'go-back'])
</script>

38
src/views/project/acceptance/detail/ExpertView.vue Normal file
View File

@ -0,0 +1,38 @@
<template>
<el-card shadow="never">
<template #header>
<div class="flex items-center justify-between">
<span>专家视图</span>
<el-button @click="$emit('go-back')">返回</el-button>
</div>
</template>
<el-alert title="当前可执行专家复核操作" type="info" :closable="false" class="mb-4" />
<el-table :data="finalMaterials || []" border>
<el-table-column label="材料名" prop="materialName" min-width="180" />
<el-table-column label="文件名" prop="fileName" min-width="180" />
<el-table-column label="操作" width="160">
<template #default="{ row }">
<el-button link type="primary" @click="$emit('preview', row)">预览</el-button>
<el-button link type="primary" @click="$emit('download', row)">下载</el-button>
</template>
</el-table-column>
</el-table>
<div class="mt-4">
<el-button type="primary" @click="$emit('expert-check')">提交专家复核意见</el-button>
</div>
</el-card>
</template>
<script lang="ts" setup>
defineProps<{
acceptance: Record<string, any>
preMaterials: any[]
finalMaterials: any[]
opinions: any[]
}>()
defineEmits(['preview', 'download', 'expert-check', 'go-back'])
</script>

56
src/views/project/acceptance/detail/LiaisonView.vue Normal file
View File

@ -0,0 +1,56 @@
<template>
<el-card shadow="never">
<template #header>
<div class="flex items-center justify-between">
<span>联络人视图</span>
<el-button @click="$emit('go-back')">返回</el-button>
</div>
</template>
<el-table :data="materials || []" border>
<el-table-column label="材料名" prop="materialName" min-width="180" />
<el-table-column label="文件名" prop="fileName" min-width="180" />
<el-table-column label="必填" width="90">
<template #default="{ row }">
<el-tag :type="row.isRequired ? 'danger' : 'info'">{{ row.isRequired ? '是' : '否' }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="200">
<template #default="{ row }">
<el-button link type="primary" @click="$emit('preview', row)">预览</el-button>
<el-button link type="primary" @click="$emit('download', row)">下载</el-button>
<el-button link type="primary" @click="$emit('show-versions', row)">历史</el-button>
</template>
</el-table-column>
</el-table>
<div class="mt-4 flex gap-2">
<el-button type="primary" @click="$emit('submit-material')">提交材料</el-button>
<el-button type="warning" @click="$emit('submit-rectify')">提交整改</el-button>
<el-button type="success" @click="$emit('submit-final')">提交终验</el-button>
<el-button @click="$emit('submit-rectify-manual')">提交整改说明书</el-button>
<el-button @click="$emit('submit-expert-reupload')">专家意见后重提</el-button>
</div>
</el-card>
</template>
<script lang="ts" setup>
defineProps<{
acceptance: Record<string, any>
materials: any[]
opinions: any[]
}>()
defineEmits([
'preview',
'download',
'show-versions',
'upload-success',
'submit-material',
'submit-rectify',
'submit-final',
'submit-rectify-manual',
'submit-expert-reupload',
'go-back'
])
</script>

38
src/views/project/acceptance/detail/ReviewerView.vue Normal file
View File

@ -0,0 +1,38 @@
<template>
<el-card shadow="never">
<template #header>
<div class="flex items-center justify-between">
<span>审核人视图</span>
<el-button @click="$emit('go-back')">返回</el-button>
</div>
</template>
<el-table :data="preMaterials || []" border class="mb-4">
<el-table-column label="预验收材料" prop="materialName" min-width="180" />
<el-table-column label="文件名" prop="fileName" min-width="180" />
<el-table-column label="操作" width="220">
<template #default="{ row }">
<el-button link type="primary" @click="$emit('preview', row)">预览</el-button>
<el-button link type="primary" @click="$emit('download', row)">下载</el-button>
<el-button link type="primary" @click="$emit('show-versions', row)">历史</el-button>
</template>
</el-table-column>
</el-table>
<div class="flex gap-2">
<el-button type="primary" @click="$emit('audit')">审核</el-button>
</div>
</el-card>
</template>
<script lang="ts" setup>
defineProps<{
acceptance: Record<string, any>
projectInfo: Record<string, any>
preMaterials: any[]
finalMaterials: any[]
opinions: any[]
}>()
defineEmits(['preview', 'download', 'show-versions', 'audit', 'go-back'])
</script>

37
src/views/project/acceptance/detail/components/AcceptanceHeader.vue Normal file
View File

@ -0,0 +1,37 @@
<template>
<el-card shadow="never" class="mb-4">
<div class="grid grid-cols-1 md:grid-cols-2 gap-3 text-sm">
<div>
<span class="text-gray-500">验收单ID：</span>
<span>{{ acceptance?.id || '-' }}</span>
</div>
<div>
<span class="text-gray-500">项目ID：</span>
<span>{{ acceptance?.projectId || '-' }}</span>
</div>
<div>
<span class="text-gray-500">验收类型：</span>
<span>{{ acceptance?.acceptanceType || '-' }}</span>
</div>
<div>
<span class="text-gray-500">当前状态：</span>
<span>{{ acceptance?.status || '-' }}</span>
</div>
<div>
<span class="text-gray-500">联络人：</span>
<span>{{ projectInfo?.liaisonUserName || projectInfo?.liaisonName || '-' }}</span>
</div>
<div>
<span class="text-gray-500">项目名称：</span>
<span>{{ projectInfo?.name || projectInfo?.projectName || '-' }}</span>
</div>
</div>
</el-card>
</template>
<script lang="ts" setup>
defineProps<{
acceptance: Record<string, any>
projectInfo: Record<string, any>
}>()
</script>

43
src/views/project/acceptance/detail/components/AuditDialog.vue Normal file
View File

@ -0,0 +1,43 @@
<template>
<el-dialog v-model="visible" title="审核" width="560px">
<el-form label-width="90px">
<el-form-item label="审核结果">
<el-radio-group v-model="form.result">
<el-radio label="PASS">通过</el-radio>
<el-radio label="REJECT">驳回</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="审核意见">
<el-input v-model="form.comment" type="textarea" :rows="4" placeholder="请输入审核意见" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="submit">确定</el-button>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
const visible = defineModel<boolean>({ default: false })
const message = useMessage()
defineProps<{
acceptance: Record<string, any>
}>()
const emit = defineEmits<{
(e: 'success'): void
}>()
const form = reactive({
result: 'PASS',
comment: ''
})
const submit = () => {
message.success('审核结果已提交')
visible.value = false
emit('success')
}
</script>

23
src/views/project/acceptance/detail/components/VersionHistoryDialog.vue Normal file
View File

@ -0,0 +1,23 @@
<template>
<el-dialog v-model="visible" title="版本历史" width="720px">
<div class="mb-3 text-sm text-gray-600">材料：{{ materialName || '-' }}</div>
<el-table :data="versions || []" size="small" border>
<el-table-column label="版本号" prop="version" width="90" />
<el-table-column label="文件名" prop="fileName" min-width="220" />
<el-table-column label="上传时间" prop="createTime" width="180" />
<el-table-column label="备注" prop="remark" min-width="140" />
</el-table>
<template #footer>
<el-button @click="visible = false">关闭</el-button>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
const visible = defineModel<boolean>({ default: false })
defineProps<{
materialName: string
versions: any[]
}>()
</script>

146
src/views/review/meeting/MeetingEdit.vue
View File

@ -83,16 +83,20 @@
<el-col :span="12">
<el-form-item label="议程附件" prop="agendaAttachmentUrl">
<div class="agenda-attachment-wrap">
<el-upload
v-if="!isView"
:auto-upload="false"
:show-file-list="false"
accept=".pdf,.png,.jpg,.jpeg,.gif,.bmp,.webp"
:on-change="handleAgendaAttachmentChange"
>
<button type="button" class="btn-upload">上传议程附件</button>
</el-upload>
<span class="upload-hint">仅支持图片或 PDF，固定单附件</span>
<div v-if="!isView" class="agenda-action-row">
<el-upload
:auto-upload="false"
:show-file-list="false"
accept=".docx,.pdf,.png,.jpg,.jpeg,.gif,.bmp,.webp"
:on-change="handleAgendaAttachmentChange"
>
<button type="button" class="btn-upload">上传议程附件</button>
</el-upload>
<button type="button" class="btn-generate" :disabled="formLoading" @click="handleGenerateAgenda">
自动生成议程
</button>
</div>
<span class="upload-hint">支持 DOCX、PDF、图片；固定单附件，可生成后再手工替换</span>
<div v-if="formData.agendaAttachmentUrl" class="agenda-file-line">
<el-link type="primary" :underline="false" @click="previewAgendaAttachment">
{{ formData.agendaAttachmentName }}
@ -199,8 +203,10 @@ import {
getReviewMeeting,
importProjectsFromExcel,
getImportTemplate,
generateAgendaAttachment,
uploadAgendaAttachment,
uploadMinutesAttachment,
type ReviewMeetingAgendaGenerateReqVO,
type ReviewMeetingSaveReqVO,
type ReviewProjectItemVO
} from '@/api/review/meeting'
@ -434,10 +440,11 @@ const handleAgendaAttachmentChange = async (uploadFile: UploadFile) => {
const ext = uploadFile.raw.name.includes('.')
? uploadFile.raw.name.substring(uploadFile.raw.name.lastIndexOf('.') + 1).toLowerCase()
: ''
const isDocx = ext === 'docx'
const isPdf = ext === 'pdf' || uploadFile.raw.type === 'application/pdf'
const isImage = uploadFile.raw.type?.startsWith('image/')
if (!isPdf && !isImage) {
ElMessage.error('议程附件仅支持图片或 PDF')
if (!isDocx && !isPdf && !isImage) {
ElMessage.error('议程附件仅支持 DOCX、PDF 或图片')
return
}
formLoading.value = true
@ -515,6 +522,86 @@ const formatFileSize = (bytes?: number): string => {
return `${(bytes / (1024 * 1024)).toFixed(1)} MB`
}
const buildScheduledProjects = (): ReviewProjectItemVO[] => {
const projectsWithReviewDate = applyDefaultReviewDate(formData.projects, formData.meetingTimeRange)
const hasCompleteSchedule = projectsWithReviewDate.every((item) => item.startTime && item.endTime)
if (hasCompleteSchedule) {
return projectsWithReviewDate
}
return (
buildScheduledProjectItems(
projectsWithReviewDate,
formData.meetingTimeRange?.[0],
DEFAULT_REVIEW_MEETING_INTERVAL_MINUTES
) || projectsWithReviewDate
)
}
const buildAgendaGenerateData = (): ReviewMeetingAgendaGenerateReqVO | undefined => {
if (!formData.name?.trim()) {
ElMessage.warning('请先填写会议名称')
return
}
if (!formData.organizationUnit?.trim()) {
ElMessage.warning('请先填写组织单位')
return
}
if (!formData.location?.trim()) {
ElMessage.warning('请先填写会议地点')
return
}
if (!formData.host?.trim()) {
ElMessage.warning('请先填写会议主持人')
return
}
if (!formData.meetingTimeRange || formData.meetingTimeRange.length !== 2) {
ElMessage.warning('请先填写会议时间')
return
}
if (!formData.expertIds?.length) {
ElMessage.warning('请先选择参会专家')
return
}
if (!formData.projects?.length) {
ElMessage.warning('请先导入评审项目')
return
}
const projects = buildScheduledProjects()
const hasMissingSchedule = projects.some((item) => !item.startTime || !item.endTime)
if (hasMissingSchedule) {
ElMessage.warning('评审项目起止时间未生成完成，请检查会议时间和项目列表')
return
}
return {
name: formData.name,
organizationUnit: formData.organizationUnit,
startTime: formData.meetingTimeRange[0],
endTime: formData.meetingTimeRange[1],
location: formData.location,
host: formData.host,
expertIds: formData.expertIds,
projects
}
}
const handleGenerateAgenda = async () => {
if (formLoading.value) return
const generateData = buildAgendaGenerateData()
if (!generateData) return
formLoading.value = true
try {
const attachment = await generateAgendaAttachment(generateData)
formData.agendaAttachmentName = attachment.name
formData.agendaAttachmentUrl = attachment.url
formData.agendaAttachmentType = attachment.type
formData.agendaAttachmentSize = attachment.size
formRef.value?.clearValidate('agendaAttachmentUrl')
ElMessage.success('议程附件已生成')
} finally {
formLoading.value = false
}
}
const submitForm = async () => {
if (formLoading.value) return
const valid = await formRef.value?.validate().catch(() => false)
@ -532,12 +619,8 @@ const submitForm = async () => {
}
formLoading.value = true
try {
const projects = buildScheduledProjectItems(
applyDefaultReviewDate(formData.projects, formData.meetingTimeRange),
formData.meetingTimeRange?.[0],
DEFAULT_REVIEW_MEETING_INTERVAL_MINUTES
) || applyDefaultReviewDate(formData.projects, formData.meetingTimeRange)
const submitData = {
const projects = buildScheduledProjects()
const submitData: ReviewMeetingSaveReqVO & { projects?: ReviewProjectItemVO[] } = {
...formData,
projects
}
@ -628,6 +711,12 @@ const handleBack = () => {
align-items: center;
gap: 8px;
}
.agenda-action-row {
display: flex;
align-items: center;
gap: 10px;
flex-wrap: wrap;
}
.upload-hint {
font-size: 12px;
color: #999;
@ -663,6 +752,27 @@ const handleBack = () => {
}
.btn-upload:hover { background-color: rgba(41, 90, 188, 0.08); }
.btn-generate {
display: inline-flex;
align-items: center;
height: 34px;
padding: 0 14px;
background-color: #fff;
border: 1px solid #3aa76d;
border-radius: 6px;
color: #3aa76d;
font-size: 14px;
cursor: pointer;
transition: all 0.2s;
}
.btn-generate:hover {
background-color: rgba(58, 167, 109, 0.08);
}
.btn-generate:disabled {
opacity: 0.6;
cursor: not-allowed;
}
.btn-default {
display: inline-flex;
align-items: center;

75
src/views/review/meeting/components/ExpertSelectTable.vue
View File

@ -3,16 +3,25 @@
<!-- 已选标签行 -->
<div v-if="selectedExperts.length > 0" class="selected-row">
<span class="selected-label">已选 {{ selectedExperts.length }} 人：</span>
<el-tag
<div
v-for="expert in selectedExperts"
:key="expert.id"
closable
:disable-transitions="false"
class="expert-tag"
@close="removeExpert(expert.id)"
class="expert-card"
>
{{ expert.nickname }}
</el-tag>
<div class="expert-card-main">
<span class="expert-name">{{ expert.nickname }}</span>
<span v-if="buildExpertSummary(expert)" class="expert-meta">{{ buildExpertSummary(expert) }}</span>
</div>
<el-button
v-if="!disabled"
type="danger"
link
class="expert-remove"
@click="removeExpert(expert.id)"
>
移除
</el-button>
</div>
</div>
<!-- 搜索框 -->
@ -41,14 +50,18 @@
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="姓名" prop="nickname" width="100" />
<el-table-column label="单位" prop="deptName" show-overflow-tooltip />
<el-table-column label="职务" prop="position" width="160" show-overflow-tooltip />
<el-table-column label="职称" prop="title" width="120" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" min-width="180" show-overflow-tooltip />
</el-table>
<!-- 查看模式：仅展示已选专家列表 -->
<el-table v-if="disabled && selectedExperts.length > 0" :data="selectedExperts" border size="small">
<el-table-column label="姓名" prop="nickname" width="100" />
<el-table-column label="单位" prop="deptName" show-overflow-tooltip />
<el-table-column label="职务" prop="position" width="160" show-overflow-tooltip />
<el-table-column label="职称" prop="title" width="120" show-overflow-tooltip />
<el-table-column label="备注" prop="remark" min-width="180" show-overflow-tooltip />
</el-table>
<el-empty v-if="disabled && selectedExperts.length === 0" description="暂无参会专家" :image-size="60" />
</div>
@ -63,6 +76,8 @@ interface Expert {
nickname: string
deptName?: string
title?: string
position?: string
remark?: string
}
const props = defineProps<{
@ -86,7 +101,9 @@ const filteredExperts = computed(() => {
(e) =>
e.nickname?.toLowerCase().includes(kw) ||
e.deptName?.toLowerCase().includes(kw) ||
e.title?.toLowerCase().includes(kw)
e.position?.toLowerCase().includes(kw) ||
e.title?.toLowerCase().includes(kw) ||
e.remark?.toLowerCase().includes(kw)
)
})
@ -124,6 +141,10 @@ const handleSelectionChange = (selected: Expert[]) => {
const removeExpert = (id: number) => {
emit('update:modelValue', props.modelValue.filter((v) => v !== id))
}
const buildExpertSummary = (expert: Expert) => {
return [expert.deptName, expert.position, expert.title, expert.remark].filter(Boolean).join(' / ')
}
</script>
<style scoped>
@ -136,8 +157,8 @@ const removeExpert = (id: number) => {
/* 已选标签行 */
.selected-row {
display: flex;
align-items: center;
display: grid;
grid-template-columns: repeat(auto-fit, minmax(260px, 1fr));
flex-wrap: wrap;
gap: 8px;
padding: 8px 12px;
@ -149,13 +170,39 @@ const removeExpert = (id: number) => {
font-size: 14px;
color: #666;
white-space: nowrap;
grid-column: 1 / -1;
}
.expert-tag {
margin: 0;
background-color: rgba(41, 90, 188, 0.1);
border-color: rgba(41, 90, 188, 0.2);
.expert-card {
display: flex;
align-items: flex-start;
justify-content: space-between;
gap: 10px;
padding: 8px 10px;
background-color: #fff;
border: 1px solid rgba(41, 90, 188, 0.12);
border-radius: 6px;
}
.expert-card-main {
min-width: 0;
display: flex;
flex-direction: column;
gap: 4px;
}
.expert-name {
font-size: 14px;
font-weight: 600;
color: #295abc;
}
.expert-meta {
font-size: 12px;
color: #666;
line-height: 1.5;
word-break: break-word;
}
.expert-remove {
flex-shrink: 0;
padding: 0;
}
/* 搜索框 */
.search-input {