From 252752e5d43a7c81d5e0536c7ea1a886db8d6b2a Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 18 Jan 2022 11:34:35 +0800
Subject: [PATCH] 26303

---
 .../AppMeetingChinaunion.vue                  | 19 ++++++++++---------
 .../components/meetingDetail.vue              |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
index 2ae875e7..daf52dbc 100644
--- a/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/AppMeetingChinaunion.vue
@@ -61,7 +61,7 @@
         </ai-search-bar>
         <el-table ref="multipleTable" :data="tableData" style="margin-top:16px;"
                   header-cell-class-name="table-header"
-                  tooltip-effect="light" row-class-name="table-row" cell-class-name="table-cell">
+                  tooltip-effect="dark" row-class-name="table-row" cell-class-name="table-cell">
           <el-table-column prop="meetingAgenda" label="会议名称" show-overflow-tooltip align="center">
             <div slot-scope="{row}">
               {{ row.meetingAgenda || "-" }}
@@ -105,13 +105,14 @@
               {{ dict.getLabel('postStatus', row.postStatus) || '-' }}
             </div>
           </el-table-column>
-          <el-table-column prop="operate" label="操作" align="center">
-            <div slot-scope="{row}">
-              <el-button type="text" icon="iconfont iconjdq_led_edit" title="编辑" @click="gotoDetail(row)"
-                         v-if="row.postStatus=='0'"/>
-              <el-button type="text" icon="iconfont iconShow" title="详情" @click="gotoDetail(row)" v-else/>
-              <el-button type="text" icon="iconfont iconDelete" title="删除" @click="delMeeting(row)"/>
-            </div>
+          <el-table-column prop="operate" label="操作" align="center" width="160px" fixed="right">
+            <template slot-scope="{ row }">
+              <div class="table-options">
+                <el-button type="text" title="编辑" @click="gotoDetail(row)" v-if="row.postStatus=='0'">编辑</el-button>
+                <el-button type="text" title="详情" @click="gotoDetail(row)" v-else>详情</el-button>
+                <el-button type="text" title="删除" @click="delMeeting(row)">删除</el-button>
+              </div>
+            </template>
           </el-table-column>
           <div slot="empty" class="no-data" style="height:160px;"/>
         </el-table>
@@ -227,7 +228,7 @@ export default {
       showSet: false,   //设置
       showMeetingUser: false,   //统计
       showSupplement: false, //补录
-      showDetail: true,  //详情
+      showDetail: false,  //详情
       showAdd: false,    //添加
       showList: true,    //列表
       meetingId: "",//会议id
diff --git a/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue b/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
index ffdcb043..da1a1a9f 100644
--- a/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
+++ b/packages/3.0.0/AppMeetingChinaunion/components/meetingDetail.vue
@@ -131,7 +131,7 @@
               </ai-title>
               <div class="detail-info">
                 <div class="detail-left detail-info-p84">
-                  <ai-wrapper style="margin-top: 10px;">
+                  <ai-wrapper style="margin-top: 20px;">
                     <ai-info-item label="签到负责人" isLine>
                       <span class="value" v-if="obj.chargeOfSignInList && obj.chargeOfSignInList.length">
                           <span v-for="(item,index) in obj.chargeOfSignInList" :key="item+index">{{ item.userName }}