From 11150f2eea0c895106653f59f66cc9ca6211ecfd Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 24 Dec 2021 20:11:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E4=BC=9A=E4=B8=80=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppMeetingChinaunion.vue                  |   1 +
 .../components/meetingSet.vue                 | 138 +++++++++---------
 2 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
index 41284752..67752838 100644
--- a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
@@ -395,6 +395,7 @@ export default {
         return this.$message.error("所属组织不是支部党组织");
       }
       this.showList = false;
+      this.showDetail = false
       this.showSet = true;
     },
   },
diff --git a/packages/3.0.0/AppMeetingChinaunion/components/meetingSet.vue b/packages/3.0.0/AppMeetingChinaunion/components/meetingSet.vue
index 1539daa1..f65f075b 100644
--- a/packages/3.0.0/AppMeetingChinaunion/components/meetingSet.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/components/meetingSet.vue
@@ -1,75 +1,73 @@
 <template>
-  <section class="meetingSet">
-    <ai-detail>
-      <ai-title slot="title" title="三会一课设置" isShowBack @onBackClick="$parent.goBack()" isShowBottomBorder/>
-      <template #content>
-        <div class="tab-tips">
-          <span class="el-icon-warning"/>
-          <span class="text">未按照“会议要求”开展三会一课的情况下，支部负责人主要用于接收上级领导的催办消息。</span>
-        </div>
-        <ai-card title="基本信息">
-          <template #content>
-            <ai-wrapper>
-              <ai-info-item label="党组织" :value="partyName"/>
-            </ai-wrapper>
+  <ai-detail>
+    <ai-title slot="title" title="三会一课设置" isShowBack @onBackClick="$parent.goBack()" isShowBottomBorder/>
+    <template #content>
+      <div class="tab-tips">
+        <span class="el-icon-warning"/>
+        <span class="text">未按照“会议要求”开展三会一课的情况下，支部负责人主要用于接收上级领导的催办消息。</span>
+      </div>
+      <ai-card title="基本信息">
+        <template #content>
+          <ai-wrapper>
+            <ai-info-item label="党组织" :value="partyName"/>
+          </ai-wrapper>
 
-          </template>
-        </ai-card>
-        <ai-card title="支部负责人">
-          <template #right>
-            <ai-party-member :instance="instance" v-model="peopleList"
-                             :action="'/app/appparty/list?partyOrgId='+partyId" @change="confirmAddUser"
-                             dialogTitle="添加支部负责人" customCliker>
-              <el-button type="text" icon="iconfont iconAdd">添加人员</el-button>
-            </ai-party-member>
-          </template>
-          <template #content>
-            <el-table
-                :key='0'
-                :data="tableDataUser"
-                style="width: 100%"
-                border
-                header-cell-class-name="table-header"
-                empty-text="支部负责人信息为空，点击标题右侧添加按钮进行添加"
-            >
-              <el-table-column type="index" label="序号" align="center" width="240"></el-table-column>
-              <el-table-column prop="partyName" label="姓名" align="center"></el-table-column>
-              <el-table-column label="操作" align="center">
-                <div slot-scope="{row}">
-                  <span @click="deleteUser(row)"
-                        class="iconfont iconDelete icon-color89B"
-                        title="删除"
-                        style="cursor: pointer;"
-                  />
-                </div>
-              </el-table-column>
-            </el-table>
-          </template>
-        </ai-card>
-        <ai-card title="三会一课要求">
-          <template #content>
-            <el-table
-                :key='1'
-                :data="tableDataRequirement"
-                style="width: 100%"
-                border
-                header-cell-class-name="table-header"
-                align="center"
-                empty-text="三会一课要求为空"
-            >
-              <el-table-column prop="meetingClassification" label="类型">
-                <div slot-scope="{row}">{{ dict.getLabel('meetingClassification', row.meetingClassification) || '-' }}
-                </div>
-              </el-table-column>
-              <el-table-column prop="type" label="要求">
-                <div slot-scope="{row}">{{ dict.getLabel('appThreeMeetingCTCType', row.type) || '-' }}</div>
-              </el-table-column>
-            </el-table>
-          </template>
-        </ai-card>
-      </template>
-    </ai-detail>
-  </section>
+        </template>
+      </ai-card>
+      <ai-card title="支部负责人">
+        <template #right>
+          <ai-party-member :instance="instance" v-model="peopleList"
+                            :action="'/app/appparty/list?partyOrgId='+partyId" @change="confirmAddUser"
+                            dialogTitle="添加支部负责人" customCliker>
+            <el-button type="text" icon="iconfont iconAdd">添加人员</el-button>
+          </ai-party-member>
+        </template>
+        <template #content>
+          <el-table
+              :key='0'
+              :data="tableDataUser"
+              style="width: 100%"
+              border
+              header-cell-class-name="table-header"
+              empty-text="支部负责人信息为空，点击标题右侧添加按钮进行添加"
+          >
+            <el-table-column type="index" label="序号" align="center" width="240"></el-table-column>
+            <el-table-column prop="partyName" label="姓名" align="center"></el-table-column>
+            <el-table-column label="操作" align="center">
+              <div slot-scope="{row}">
+                <span @click="deleteUser(row)"
+                      class="iconfont iconDelete icon-color89B"
+                      title="删除"
+                      style="cursor: pointer;"
+                />
+              </div>
+            </el-table-column>
+          </el-table>
+        </template>
+      </ai-card>
+      <ai-card title="三会一课要求">
+        <template #content>
+          <el-table
+              :key='1'
+              :data="tableDataRequirement"
+              style="width: 100%"
+              border
+              header-cell-class-name="table-header"
+              align="center"
+              empty-text="三会一课要求为空"
+          >
+            <el-table-column prop="meetingClassification" label="类型">
+              <div slot-scope="{row}">{{ dict.getLabel('meetingClassification', row.meetingClassification) || '-' }}
+              </div>
+            </el-table-column>
+            <el-table-column prop="type" label="要求">
+              <div slot-scope="{row}">{{ dict.getLabel('appThreeMeetingCTCType', row.type) || '-' }}</div>
+            </el-table-column>
+          </el-table>
+        </template>
+      </ai-card>
+    </template>
+  </ai-detail>
 </template>
 
 <script>