From d346b99928587082305ab3f6e5d7b15e8ed9db76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Thu, 27 Jun 2024 09:49:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/activity/index.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index f848a804e..690e12526 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -762,8 +762,9 @@
   .m-search {
     background: #ffffff;
     border-radius: 4px;
-    padding: 30px 20px 5px;
+    padding: 24px 10px 10px;
     box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+    margin: 20px 7px 7px;
   }
 
   .item_width_1 {
@@ -779,11 +780,12 @@
     box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
     border-radius: 4px;
     margin-top: 15px;
-    padding: 23px 30px 10px;
+    padding: 24px 16px 10px;
+    margin: 16px 7px 7px;
 
-    .table {
-      margin-top: 20px;
-    }
+    // .table {
+    //   margin-top: 20px;
+    // }
   }
 
   .div_btn {

From 580e1bb61174cd58e17ca2b43573a11871081430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Thu, 27 Jun 2024 13:34:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=B4=BB=E5=8A=A8=E6=A0=87=E7=AD=BE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/activity/index.vue | 47 +++++++++++--------
 .../modules/workSys/typeActivity/index.vue    | 10 ++--
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index 690e12526..80a3d1a7a 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -23,17 +23,13 @@
               placeholder="请输入关键字">
             </el-input>
           </el-form-item>
-
-        </div>
-        <div>
-
+          
           <el-form-item label="活动时间" prop="timeRange">
             <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
               value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至" start-placeholder="开始时间"
               end-placeholder="结束时间">
             </el-date-picker>
           </el-form-item>
-
           <el-form-item label="活动地点" prop="address">
             <el-input v-model.trim="formData.address" size="small" class="item_width_1" clearable placeholder="请输入内容">
             </el-input>
@@ -47,6 +43,9 @@
             </el-select>
           </el-form-item>
 
+
+        </div>
+        <div>
           <div style="display: flex; justify-content: flex-end;">
             <el-button style="margin-left:10px" class="diy-button--blue" size="small"
               @click="handleSearch">查询</el-button>
@@ -67,10 +66,10 @@
       </div>
 
       <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
-        style="width: 100%">
+        style="width: 100%;margin-top:16px">
 
         <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
-        <el-table-column prop="typeId" header-align="center" align="center" label="活动类型" width="180">
+        <el-table-column prop="typeName" header-align="center" align="center" label="活动类型" width="180">
         </el-table-column>
         <el-table-column prop="activityName" header-align="center" align="center" label="活动名称" width="180">
         </el-table-column>
@@ -103,24 +102,24 @@
         <el-table-column label="操作" fixed="right" width="230" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
 
-            <el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small"
+            <el-button type="text" style="color:#1C6AFD;" size="small"
               @click="handleDetail(scope.row)">查看</el-button>
 
-            <el-button type="text" v-if="scope.row.status == 0" style="color:#1C6AFD;text-decoration: underline;"
+            <el-button type="text" v-if="scope.row.status == 0" style="color:#1C6AFD;"
               size="small" @click="handleEdit(scope.row)">编辑</el-button>
 
-            <!-- <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs === '' && scope.row.sumUp === ''" style="color:#1C6AFD;text-decoration: underline;"
+            <!-- <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs === '' && scope.row.sumUp === ''" style="color:#1C6AFD;"
               size="small" @click="handleSumm(scope.row)">活动总结</el-button> -->
 
-              <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs == null && scope.row.sumUp == ''" style="color:#1C6AFD;text-decoration: underline;"
+              <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs == null && scope.row.sumUp == ''" style="color:#1C6AFD;"
               size="small" @click="handleSumm(scope.row)">活动总结</el-button>
 
             <el-button v-if="scope.row.status == 2 || scope.row.status == 3" type="text"
-              style="color:#D51010;text-decoration: underline;" size="small"
+              style="color:rgb(28, 106, 253);" size="small"
               @click="handleDelete(scope.row)">删除</el-button>
 
             <el-button v-if="scope.row.status == 0" type="text"
-              style="color:#D51010;text-decoration: underline;" size="small"
+              style="color:#D51010;" size="small"
               @click="handleCancel(scope.row)">取消</el-button>
 
           </template>
@@ -298,6 +297,14 @@
           this.tableData = data.list
 
           this.tableData.forEach((item) => {
+            this.typeList.forEach((itemuse)=>{
+              if(item.typeId==itemuse.id)
+              {
+                item.typeName=itemuse.typeName
+              }
+             
+            })
+          
             const currentTime = new Date();
             if (item.startTime > currentTime) {
               if( item.status === 0 ){
@@ -324,12 +331,14 @@
                 this.updatetow()
               }            
             }
+          
           });
           
 
         } else {
           this.$message.error(msg)
         }
+        console.log(this.tableData);
       },
       async getDemandOptions() {
         this.$http
@@ -767,13 +776,13 @@
     margin: 20px 7px 7px;
   }
 
-  .item_width_1 {
-    width: 260px;
-  }
+  // .item_width_1 {
+  //   width: 260px;
+  // }
 
-  .item_width_2 {
-    width: 495px;
-  }
+  // .item_width_2 {
+  //   width: 495px;
+  // }
 
   .m-table {
     background: #ffffff;
diff --git a/src/views/modules/workSys/typeActivity/index.vue b/src/views/modules/workSys/typeActivity/index.vue
index 78dbc0e24..9c840a3b7 100644
--- a/src/views/modules/workSys/typeActivity/index.vue
+++ b/src/views/modules/workSys/typeActivity/index.vue
@@ -41,25 +41,25 @@
 
                 <el-table-column label="序号" header-align="center" align="center" type="index"
                     width="80"></el-table-column>
-                <el-table-column prop="typeName" header-align="center" align="center" label="类型名称" width="380">
+                <el-table-column prop="typeName" header-align="center" align="center" label="类型名称" >
                 </el-table-column>
                 
-                <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" width="380">
+                <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" >
                 </el-table-column>
 
                 <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center"
                     class="operate">
                     <template slot-scope="scope">
 
-                        <el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small"
+                        <el-button type="text" style="color:#1C6AFD;" size="small"
                             @click="handleDetail(scope.row)">查看</el-button>
                         <el-button type="text"
-                            style="color:#00A7A9;text-decoration: underline;" size="small"
+                            style="color:#1C6AFD;" size="small"
                             @click="handleEdit(scope.row)">修改</el-button>
                             
 
                         <el-button type="text"
-                            style="color:#D51010;text-decoration: underline;" size="small"
+                            style="color:#1C6AFD;" size="small"
                             @click="handleDelete(scope.row)">删除</el-button>
 
                     </template>