fix(meeting-new): 落实 manager/meetings/new 审查报告 13 项修复
P0 数据正确性: - BizMeetingMapper.xml INSERT 扩 20 列 (原只插 meeting_id) - BizMeetingServiceImpl businessId 兜底生成 (DDL NOT NULL, 前端无字段) - MeetingNew.vue onMounted 回填 projectId/projectName (原只 projectNo) P1 核心功能: - 删 会议ID 输入框 (PK 让用户填错) - 加 6 个项目只读快照 (el-descriptions, 跟原型对齐) - 会议名称默认 = 项目名称, 不可修改 (加红字提示 + disabled) - meetingId String → Long (6 文件: BizMeeting/Mapper/ServiceImpl/Controller/IBizMeetingService/Mapper.xml) - supervisionTime String → Date + @JsonFormat P2 体验: - 面包屑改 项目列表 / 新建会议 - page-sub 显示项目名而非 ID 13 - 当前阶段 el-select 4 → 10 选项 - resultMap/selectFields 补 9 个漏字段 (projectId/projectName/orgName/supervision*/invitation*/schedule*/labor*) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -1,17 +1,33 @@
|
||||
<template>
|
||||
<div class="page-card manager-meeting-new">
|
||||
<div class="breadcrumb">首页 / 会议管理 / 新建会议</div>
|
||||
<p class="page-sub" v-if="preselectProjectId">已选择项目: {{ preselectProjectId }}</p>
|
||||
<div class="breadcrumb">项目列表 / 新建会议</div>
|
||||
<p class="page-sub" v-if="preselectProjectId">已选择项目: {{ projectSnap.projectName || '加载中...' }} ({{ projectSnap.projectNo || preselectProjectId }})</p>
|
||||
|
||||
<!-- 6 个项目只读快照 (跟原型 §#4 一致) -->
|
||||
<el-descriptions
|
||||
v-if="preselectProjectId"
|
||||
class="project-snapshot"
|
||||
:column="3"
|
||||
border
|
||||
size="small"
|
||||
title="项目信息"
|
||||
>
|
||||
<el-descriptions-item label="项目编号">{{ projectSnap.projectNo }}</el-descriptions-item>
|
||||
<el-descriptions-item label="项目名称">{{ projectSnap.projectName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="项目形式">{{ projectSnap.projectForm }}</el-descriptions-item>
|
||||
<el-descriptions-item label="项目开始时间">{{ projectSnap.startTime }}</el-descriptions-item>
|
||||
<el-descriptions-item label="创建人">{{ projectSnap.createBy }}</el-descriptions-item>
|
||||
<el-descriptions-item label="创建时间">{{ projectSnap.createTime }}</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
|
||||
<el-form :model="form" :rules="rules" ref="formRef" label-width="120px" class="meeting-form">
|
||||
<el-form-item label="项目编号" prop="projectNo">
|
||||
<el-input v-model="form.projectNo" :disabled="!!preselectProjectId" placeholder="项目编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="会议名称" prop="meetingName">
|
||||
<el-input v-model="form.meetingName" placeholder="会议名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="会议ID" prop="meetingId">
|
||||
<el-input v-model="form.meetingId" placeholder="会议ID" />
|
||||
<!-- 跟原型 §#3 一致: 默认 = 项目名称, 不可修改 -->
|
||||
<el-input v-model="form.meetingName" :disabled="!!preselectProjectId" placeholder="会议名称" />
|
||||
<span v-if="preselectProjectId" class="field-tip">*会议名称默认为项目名称,不可修改</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目形式" prop="projectForm">
|
||||
<el-select v-model="form.projectForm" placeholder="请选择" style="width:100%">
|
||||
@@ -39,6 +55,12 @@
|
||||
<el-option label="执行中" value="执行中" />
|
||||
<el-option label="已执行" value="已执行" />
|
||||
<el-option label="已完结" value="已完结" />
|
||||
<el-option label="待监管" value="待监管" />
|
||||
<el-option label="监管通过" value="监管通过" />
|
||||
<el-option label="待整改" value="待整改" />
|
||||
<el-option label="待结算" value="待结算" />
|
||||
<el-option label="已结算" value="已结算" />
|
||||
<el-option label="已结题" value="已结题" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注">
|
||||
@@ -61,12 +83,13 @@ import { ElMessage } from 'element-plus'
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const preselectProjectId = route.query.projectId || ''
|
||||
const preselectProjectNo = route.query.projectNo || ''
|
||||
const formRef = ref()
|
||||
const form = reactive({
|
||||
projectNo: preselectProjectNo || '',
|
||||
// meetingId 删了 (PK 是 AUTO_INCREMENT, 不让用户填)
|
||||
projectId: preselectProjectId ? Number(preselectProjectId) : null, // P0#3: 补 projectId
|
||||
projectNo: '',
|
||||
projectName: '',
|
||||
meetingName: '',
|
||||
meetingId: '',
|
||||
projectForm: '',
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
@@ -75,10 +98,18 @@ const form = reactive({
|
||||
currentStage: '未执行',
|
||||
remark: ''
|
||||
})
|
||||
// 项目只读快照 (P1#5)
|
||||
const projectSnap = reactive({
|
||||
projectNo: '',
|
||||
projectName: '',
|
||||
projectForm: '',
|
||||
startTime: '',
|
||||
createBy: '',
|
||||
createTime: ''
|
||||
})
|
||||
const rules = {
|
||||
projectNo: [{ required: true, message: '请输入项目编号', trigger: 'blur' }],
|
||||
meetingName: [{ required: true, message: '请输入会议名称', trigger: 'blur' }],
|
||||
meetingId: [{ required: true, message: '请输入会议ID', trigger: 'blur' }],
|
||||
startTime: [{ required: true, message: '请选择会议开始时间', trigger: 'change' }],
|
||||
endTime: [{ required: true, message: '请选择会议结束时间', trigger: 'change' }]
|
||||
}
|
||||
@@ -97,12 +128,23 @@ async function onSave() {
|
||||
function onCancel() { router.back() }
|
||||
|
||||
onMounted(async () => {
|
||||
if (preselectProjectId) {
|
||||
try {
|
||||
const r = await bizGet('project', preselectProjectId)
|
||||
form.projectNo = (r.data && r.data.projectNo) || ''
|
||||
} catch (e) {}
|
||||
}
|
||||
if (!preselectProjectId) return
|
||||
try {
|
||||
const r = await bizGet('project', preselectProjectId)
|
||||
const d = (r && r.data) || {}
|
||||
// P0#3: 回填 projectId / projectNo / projectName / meetingName (默认 = 项目名)
|
||||
form.projectId = d.projectId ?? Number(preselectProjectId)
|
||||
form.projectNo = d.projectNo || ''
|
||||
form.projectName = d.projectName || ''
|
||||
form.meetingName = d.projectName || '' // P1#6: 会议名称默认 = 项目名称
|
||||
// P1#5: 项目只读快照
|
||||
projectSnap.projectNo = d.projectNo || ''
|
||||
projectSnap.projectName = d.projectName || ''
|
||||
projectSnap.projectForm = d.projectForm || ''
|
||||
projectSnap.startTime = d.startTime || ''
|
||||
projectSnap.createBy = d.createBy || ''
|
||||
projectSnap.createTime = d.createTime || ''
|
||||
} catch (e) {}
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -111,5 +153,7 @@ onMounted(async () => {
|
||||
.manager-meeting-new { padding: 16px; }
|
||||
.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 12px; }
|
||||
.page-sub { color: #909399; font-size: 13px; margin-bottom: 16px; }
|
||||
.project-snapshot { margin-bottom: 16px; }
|
||||
.field-tip { color: #f56c6c; font-size: 12px; margin-left: 8px; }
|
||||
.meeting-form { max-width: 700px; }
|
||||
</style>
|
||||
Reference in New Issue
Block a user