From e6ce5001710205f45bacb0061e07e6566e49585b 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: Fri, 5 Jul 2024 13:53:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=90=8D=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E5=AE=9E=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/activity/eventDetails.vue  | 66 +++++++++++++------
 .../communityParty/comPromotion/add.vue       |  1 -
 .../communityParty/comPromotion/event.vue     |  4 +-
 3 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue
index 25825e9d8..fae8220b7 100644
--- a/src/views/modules/communityParty/activity/eventDetails.vue
+++ b/src/views/modules/communityParty/activity/eventDetails.vue
@@ -87,24 +87,24 @@
                         <div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
                             报名名单
                         </div>
-                        <el-table class="table" border style="width: 100%">
+                        <el-table class="table" border style="width: 100%" :data="NameList">
                             <el-table-column label="序号" header-align="center" align="center" type="index"
                                 width="50"></el-table-column>
 
-                            <el-table-column prop="unitName" header-align="center" align="center" label="姓名"
+                            <el-table-column prop="name" header-align="center" align="center" label="姓名"
                                 min-width="80">
                             </el-table-column>
-                            <el-table-column prop="agencyName" header-align="center" align="center" label="联系电话"
+                            <el-table-column prop="mobile" header-align="center" align="center" label="联系电话"
                                 min-width="100">
                             </el-table-column>
-                            <el-table-column prop="type" header-align="center" align="center" label="报名时间"
+                            <el-table-column prop="createdTime" header-align="center" align="center" label="报名时间"
                                 min-width="80">
                             </el-table-column>
-                            <el-table-column prop="serviceMatterListShow" header-align="center" align="center"
+                            <el-table-column prop="remark" header-align="center" align="center"
                                 label="备注说明" show-overflow-tooltip min-width="120">
 
                             </el-table-column>
-                            <el-table-column prop="contact" header-align="center" align="center" label="签到" width="80">
+                            <el-table-column prop="signFlag" header-align="center" align="center" label="签到" width="80">
                             </el-table-column>
                             <el-table-column prop="contactMobile" header-align="center" align="center" label="签到地点"
                                 width="120">
@@ -117,23 +117,23 @@
                         <div style="font-size: 15px; color: black; margin-left: -30px; margin-bottom: 10px;">
                             活动实况
                         </div>
-                        <el-table class="table" border style="width: 100%">
+                        <el-table class="table" border style="width: 100%" :data="actList">
                             <el-table-column label="序号" header-align="center" align="center" type="index"
                                 width="50"></el-table-column>
 
-                            <el-table-column prop="unitName" header-align="center" align="center" label="姓名"
+                            <el-table-column prop="nickname" header-align="center" align="center" label="姓名"
                                 min-width="100">
                             </el-table-column>
                             <el-table-column prop="agencyName" header-align="center" align="center" label="联系电话"
                                 min-width="80">
                             </el-table-column>
-                            <el-table-column prop="type" header-align="center" align="center" label="实况内容"
+                            <el-table-column prop="desc" header-align="center" align="center" label="实况内容"
                                 min-width="280">
                             </el-table-column>
-                            <el-table-column prop="serviceMatterListShow" header-align="center" align="center"
+                            <el-table-column prop="images" header-align="center" align="center"
                                 label="活动照片" show-overflow-tooltip min-width="120">
                                 <template slot-scope="scope">
-                                    <div v-for="(item, index) in scope.row.serviceMatterListShow" :key="index"
+                                    <div v-for="(item, index) in scope.row.images" :key="index"
                                         style="display: flex;">
                                         <img :src="item.url"
                                             style="max-width: 20px; max-height: 20px; margin-right: 10px;" />
@@ -156,6 +156,7 @@
 import { Loading } from "element-ui"; // 引入Loading服务
 import nextTick from "dai-js/tools/nextTick";
 import daiMap from "@/utils/dai-map";
+import { requestPost,requestGet } from "@/js/dai/request";
 
 var map;
 var search;
@@ -169,27 +170,49 @@ export default {
         return {
             formData: {},
             initLoading: false,
+            NameList:[],
+            actList:[],
+            activityId:""
         };
     },
     components: {},
-    created() { },
+    created() { 
+
+    },
 
     mounted () {
+   
     },
 
     methods: {
-        async activityType () {
-        const url = "/actual/base/activityType/page"
+        async communityActivityApplicationRecord () {
+        const url = "/actual/base/communityActivityApplicationRecord/page"
         let params = {
-          // agencyId: this.agencyId
           pageSize: 20,
           pageNo: 1,
-          typeName: "",
-          enabled: 0
+          activityId:this.activityId
+        }
+        console.log("df ");
+        const { data, code, msg } = await requestGet(url, params)
+        if (code === 0) {
+     
+          this.NameList=data.list
+          console.log( this.NameList);
+        } else {
+          this.$message.error(msg)
+        }
+      },
+      async livereclist () {
+        const url = "/heart/resi/act/livereclist"
+        let params = {
+          pageSize: 20,
+          pageNo: 1,
+          actId:this.formData.id
         }
         const { data, code, msg } = await requestPost(url, params)
         if (code === 0) {
-          this.typeList = data.list
+          this.actList=data.actLives
+          console.log(data);
         } else {
           this.$message.error(msg)
         }
@@ -206,9 +229,12 @@ export default {
         },
 
         async initForm(row) {
-            console.log("df ");
+
             this.startLoading();
             this.formData = JSON.parse(JSON.stringify(row));
+            console.log(this.formData,"this.formData");
+            this.activityId=this.formData.id
+            console.log(    this.activityId,"this.activ");
             this.initLoading = true;
             // console.log('this.formData,',this.formData);
 
@@ -223,6 +249,8 @@ export default {
                 longitude = 116.39743841556731;
             }
             this.endLoading();
+            this.communityActivityApplicationRecord()
+            this.livereclist()
         },
 
         // 开启加载动画
diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue
index 214225974..3172d800a 100644
--- a/src/views/modules/communityParty/comPromotion/add.vue
+++ b/src/views/modules/communityParty/comPromotion/add.vue
@@ -296,7 +296,6 @@ export default {
               let url = '/actual/base/communityPublicity/save'
               console.log(this.formData,"formData");
               this.formData.sendMsg= this.formData.sendMsg? 1:0
-              console.log(this.formData);
               const { data, code, msg } = await requestPost(url, this.formData)
               if (code === 0) {
                   this.$message({
diff --git a/src/views/modules/communityParty/comPromotion/event.vue b/src/views/modules/communityParty/comPromotion/event.vue
index 7cc5d2512..d481e8585 100644
--- a/src/views/modules/communityParty/comPromotion/event.vue
+++ b/src/views/modules/communityParty/comPromotion/event.vue
@@ -13,7 +13,7 @@
                         <div class="m-info-prop" style="flex: 0 0 50%;">
                             <span class="u-info-title-2">标签: </span>
                             <span style="margin-right: 10px;">&nbsp;</span>
-                            <span>{{ formData.tagId || "--" }}</span>
+                            <span>{{ formData.tagName || "--" }}</span>
                         </div>
                     </div>
 
@@ -130,7 +130,7 @@ export default {
             this.startLoading();
             this.formData = JSON.parse(JSON.stringify(row));
             this.initLoading = true;
-
+            console.log(this.formData,"sdf ");
             this.endLoading();
         },