dev #37

Merged
hy merged 2 commits from dev into staging 2025-12-08 11:46:43 +08:00
1 changed files with 15 additions and 7 deletions
Showing only changes of commit 9134466139 - Show all commits

View File

@ -73,9 +73,9 @@
<el-divider />
<el-descriptions title="基础工作" :column="1" border>
<el-descriptions v-if="!isDetail" title="基础工作" :column="1" border>
<el-descriptions-item label="座谈">
<div v-if="!isDetail" class="flexCenterWrap">
<div class="flexCenterWrap">
<el-tag :type="safeDetail.isDiscussion ? 'success' : 'info'">
{{ safeDetail.isDiscussion ? "已开展" : "未开展" }}
</el-tag>
@ -93,12 +93,9 @@
placeholder="请输入座谈情况"
/>
</div>
<div v-else>
{{ safeDetail.isDiscussion ? safeDetail.discussion : "未开展" }}
</div>
</el-descriptions-item>
<el-descriptions-item label="班会">
<div v-if="!isDetail" class="flexCenterWrap">
<div class="flexCenterWrap">
<el-tag :type="safeDetail.isClassMeeting ? 'success' : 'info'">
{{ safeDetail.isClassMeeting ? "已开展" : "未开展" }}
</el-tag>
@ -116,11 +113,22 @@
placeholder="请输入班会情况"
/>
</div>
<div v-else>
</el-descriptions-item>
</el-descriptions>
<el-descriptions v-else title="基础工作" :column="1" border>
<el-descriptions-item label="座谈">
<div>
{{ safeDetail.isDiscussion ? safeDetail.discussion : "未开展" }}
</div>
</el-descriptions-item>
<el-descriptions-item label="班会">
<div>
{{ safeDetail.isClassMeeting ? safeDetail.classMeeting : "未开展" }}
</div>
</el-descriptions-item>
</el-descriptions>
<el-divider />
<el-descriptions title="反馈问题" :column="1" border> </el-descriptions>
<div style="display: flex; gap: 40px; margin-bottom: 5px">