From 91344661391e299ea2cfadb557b17cad40fe3988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Mon, 8 Dec 2025 11:41:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=B5=B4=E6=A0=A1?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=BC=80=E5=B1=95=E4=BC=9A=E8=AE=AE=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E6=9C=89=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/toschoolinfomanage/editModal.vue | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/toschoolinfomanage/editModal.vue b/src/views/toschoolinfomanage/editModal.vue
index 8063628..aaefcb0 100644
--- a/src/views/toschoolinfomanage/editModal.vue
+++ b/src/views/toschoolinfomanage/editModal.vue
@@ -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">