From 70ac623830aa523c72b92802b76b56fcf6389c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=AD=A6=E6=88=90?= <1274337408@qq.com>
Date: Thu, 22 Oct 2026 09:46:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E5=B7=A5=E4=BC=9A=E6=96=87=E5=8C=96?=
=?UTF-8?q?=E6=B4=BB=E5=8A=A8-=E4=BD=93=E8=82=B2=E6=AF=94=E8=B5=9B?=
=?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6=E5=BC=82=E6=AD=A5=E5=8A=A0=E8=BD=BD=E6=97=B6=E6=89=A7?=
=?UTF-8?q?=E8=A1=8C=E9=A1=BA=E5=BA=8F=E5=BC=82=E5=B8=B8=E5=AF=BC=E8=87=B4?=
=?UTF-8?q?=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BC=82=E5=B8=B8=EF=BC=88?=
=?UTF-8?q?=E6=AD=A4=E5=BC=82=E5=B8=B8=E8=A7=A6=E5=8F=91=E5=90=8E=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E4=B8=8D=E4=BC=9A=E5=9B=9E?=
=?UTF-8?q?=E6=98=BE=E6=B4=BB=E5=8A=A8=E4=BF=A1=E6=81=AF=EF=BC=89=EF=BC=9B?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=86=85=E5=AE=B9=E6=9C=AA=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E5=AE=8C=E6=AF=95=E6=97=B6=E7=A6=81=E6=AD=A2=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E4=BF=9D=E5=AD=98=E3=80=81=E6=8F=90=E4=BA=A4=E7=9B=B8=E5=85=B3?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=9B=E6=B5=8F=E8=A7=88=E5=99=A8=E5=BC=BA?=
=?UTF-8?q?=E5=88=B6=E5=88=B7=E6=96=B0=E4=BC=9A=E5=AF=BC=E8=87=B4=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E9=A1=B5=E7=A9=BA=E7=99=BD=E4=B8=80=E5=B0=8F=E6=AE=B5?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E6=89=8D=E6=81=A2=E5=A4=8D=EF=BC=8C=E7=BA=BF?=
=?UTF-8?q?=E4=B8=8A=E6=B5=8B=E8=AF=95=E6=97=B6=E9=A1=BB=E6=B3=A8=E6=84=8F?=
=?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../activity/school/ActivityManage.html | 61 +++++++++++++++----
1 file changed, 49 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/views/platform/activity/school/ActivityManage.html b/src/main/resources/views/platform/activity/school/ActivityManage.html
index de71dff..646d441 100644
--- a/src/main/resources/views/platform/activity/school/ActivityManage.html
+++ b/src/main/resources/views/platform/activity/school/ActivityManage.html
@@ -159,12 +159,13 @@ layout("/layouts/platform.html"){
- 保 存
- 提 交
+ 保 存
+ 提 交
-
+
@@ -203,6 +205,11 @@ layout("/layouts/platform.html"){
is_A06: false,
is_h10: false,
activities: [],
+ showActivity: false,
+ activityReady: false,
+ activityAction: null,
+ showInfo: false,
+ infoId: null,
unitOptions: [],
activityTypeList: [],
planList: [],
@@ -317,27 +324,57 @@ layout("/layouts/platform.html"){
this.url = `点击参与`
this.$refs.sendMsg.openDialog(row.activityGroupId)
},
+ infoMounted() {
+ this.loadInfo()
+ },
+ loadInfo(id) {
+ if (id) {
+ this.infoId = id
+ }
+ if (this.$refs.info && this.infoId) {
+ const infoId = this.infoId
+ this.infoId = null
+ this.$refs.info.getInfo(infoId)
+ }
+ },
openView(row) {
const { id } = row
+ this.infoId = id
+ this.showInfo = true
this.$refs.guava.view()
- setTimeout(() => {
- this.$refs.info.getInfo(id)
- }, 500)
+ this.$nextTick(() => this.loadInfo())
+ },
+ activityMounted() {
+ this.activityReady = true
+ this.handleActivityAction()
+ },
+ handleActivityAction(action) {
+ if (action) {
+ this.activityAction = action
+ }
+ if (!this.$refs.activity || !this.activityAction) {
+ return
+ }
+ const { type, row } = this.activityAction
+ this.activityAction = null
+ if (type === "add") {
+ this.$refs.activity.openAdd()
+ } else if (type === "edit") {
+ this.$refs.activity.openEdit(row, true)
+ }
},
async openAdd() {
+ this.showActivity = true
this.$refs.guava.edit()
- setTimeout(() => {
- this.$refs.activity.openAdd()
- }, 500)
+ this.handleActivityAction({ type: "add" })
},
async openEdit(row) {
const { id, applyStartTime, isSave } = row
this.formData.id = id
const now = moment().valueOf()
+ this.showActivity = true
this.$refs.guava.edit()
- setTimeout(() => {
- this.$refs.activity.openEdit(row, true)
- }, 500)
+ this.handleActivityAction({ type: "edit", row })
},
doDelete(row) {
const { id } = row