From a6a51bb745d62d7514826b4a80c5446da0769ff9 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, 11 Jul 2024 18:27:29 +0800
Subject: [PATCH] 1111

---
 .../communityParty/activity/eventDetails.vue  |  2 +-
 .../communityParty/comPromotion/add.vue       |  4 ++--
 .../modules/shequzhili/eventOld/eventList.vue | 19 ++++++++++++++-----
 .../modules/workSys/promotionTab/index.vue    |  7 +------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue
index d2337b8da..8a4608523 100644
--- a/src/views/modules/communityParty/activity/eventDetails.vue
+++ b/src/views/modules/communityParty/activity/eventDetails.vue
@@ -92,7 +92,7 @@
                         </div>
                     </div>
                        <!-- 报名名单 -->
-                    <div v-if="formData.status!==0||formData.online == 1" style="margin-top: 20px;">
+                    <div v-if="formData.status!==0 && formData.online == 1" style="margin-top: 20px;">
                         <div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
                             报名名单
                         </div>
diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue
index 6c7c0a82b..f174a2f67 100644
--- a/src/views/modules/communityParty/comPromotion/add.vue
+++ b/src/views/modules/communityParty/comPromotion/add.vue
@@ -171,6 +171,7 @@ export default {
              
             }
             this.formType=typeid
+           
             console.log(this.formData,"5164");
             this.endLoading();
             this.setDefaultReleaseTime()
@@ -258,7 +259,7 @@ export default {
           this.$refs['ref_form'].validate((valid, messageObj) => {
             this.formData.agencyName= this.agencyName
             this.formData.agencyId= this.agencyId
-            this.formData.status= 0
+            this.formData.status= 1
             console.log("this.formData看看里面村的什么",this.formData)
             if (!valid) {
               app.util.validateRule(messageObj)
@@ -274,7 +275,6 @@ export default {
               let url = '/actual/base/communityPublicity/update'
               this.formData.sendMsg= this.formData.sendMsg? 1:0
               this.formData.top= this.formData.top? 1:0
-                console.log(this.formData.top);
               console.log(this.formData,"formData");
               const { data, code, msg } = await requestPost(url, this.formData)
               if (code === 0) {
diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue
index ad7e86dad..8789de5ea 100644
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@@ -220,7 +220,9 @@
                                 " @click="handleWatch(scope.row)" type="text" size="small" class="">去评价</el-button>
                             <el-button v-else @click="handleWatch(scope.row)" type="text" size="small">查看</el-button>
                             <el-button @click="handleDel(scope.row)" type="text" size="small" class="">删除</el-button>
-                            <el-button @click="handleVote(scope.row)" type="text" size="small" class="">开启表决</el-button>
+                            <el-button @click="handleVote(scope.row)" type="text" size="small" class="">{{scope.row.openFlag === 0 ? '开启表决' : '关闭表决'}}</el-button>
+                            
+                     
                             
                         </template>
                     </el-table-column>
@@ -641,16 +643,23 @@ export default {
             this.getTableData();
         },
         async handleVote(row){
-          const url = "/governance/icEventOld/reply";
+          const url = "/governance/icEventOld/updateSpecialColumn";
             let params = {
-                conten:row.eventContent,
+
                 icEventId:row.icEventId,
                 openFlag:row.openFlag==1?0:1,
-                operationType:"operationType"
+
             }
     
             const { data, code, msg } = await requestPost(url, params);
-            console.log(data);
+            
+            if (code === 0) {
+                this.$message.success("操作成功！");
+                this.getTableData();
+            } else {
+                this.$message.error("操作失败！");
+            }
+     
         },
         async handleDel(rowData) {
             let message = "确认删除?";
diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue
index 0188cdba4..53b534aa2 100644
--- a/src/views/modules/workSys/promotionTab/index.vue
+++ b/src/views/modules/workSys/promotionTab/index.vue
@@ -29,12 +29,7 @@
         <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
         <el-table-column prop="tagName" header-align="center" align="center" label="标签名称" >
         </el-table-column>
-        <el-table-column prop="enabled" header-align="center" align="center" label="首页显示" >
-          <template slot-scope="scope">
-            <span>{{ scope.row.status === 1 ? '显示' : '关闭' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" >
+        <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" width="380">
         </el-table-column>
 
         <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">