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] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B4=BB=E5=8A=A8=EF=BC=8C?= =?UTF-8?q?=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="请输入关键字"> - - -
- + - @@ -47,6 +43,9 @@ + +
+
查询 @@ -67,10 +66,10 @@
+ style="width: 100%;margin-top:16px"> - + @@ -103,24 +102,24 @@ @@ -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 @@ - + - +