From 2b5ee6f1fb34e0d2bdc7dfd398229a0753491af0 Mon Sep 17 00:00:00 2001 From: hongqiwei <1143662660@qq.com> Date: Sat, 10 Oct 2026 08:41:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=85=B0=E9=97=AE=E9=98=85=E8=A7=88=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AF=BC=E5=87=BA=EF=BC=9B=E6=96=87=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E7=9B=B4=E6=8E=A5=E8=AF=BB=E5=8F=96=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E7=94=B5=E8=AF=9D=EF=BC=9B=E6=A0=A1=E5=B7=A5=E4=BC=9A?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=BB=98=E8=AE=A4=E4=B8=BB=E5=8A=9E=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=92=8C=E6=89=BF=E5=8A=9E=E5=8D=95=E4=BD=8D=E4=B8=BA?= =?UTF-8?q?=E5=B7=A5=E4=BC=9A=EF=BC=8C=E5=90=8C=E6=97=B6=E4=B9=9F=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=80=89=E6=8B=A9=E5=85=B6=E4=BB=96=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=EF=BC=9B=E6=B4=BB=E5=8A=A8=E5=8D=95=E4=BD=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=8F=AA=E6=98=BE=E7=A4=BA=E4=BA=8C=E7=BA=A7=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=B8=89=E7=BA=A7=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/TrainSignUpManageController.java | 1 + .../activity/culture/common/applyActivity.js | 22 ++++++++++++++++--- .../activity/sports/infoManage/addActivity.js | 3 ++- .../activity/trainSignUp/manage/basicForm.js | 3 ++- .../staffbenefit/condolence/read/index.html | 7 +++++- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpManageController.java b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpManageController.java index 21fc469..acd1945 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpManageController.java +++ b/src/main/java/com/budwk/app/zhgh/activity/trainSignUp/controller/manage/TrainSignUpManageController.java @@ -215,6 +215,7 @@ public class TrainSignUpManageController { map.put("id", unit.getId()); map.put("name", unit.getName()); map.put("type", "unit"); + map.put("unitLevel", unit.getUnitLevel()); result.add(map); } List clubList = dao.query(SysClub.class, Cnd.NEW().asc(SysClub::getClubCode)); diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js index a38b883..f489702 100644 --- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js @@ -925,8 +925,9 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { this.$set(this.formData, "time", val) }, userChang(id) { - const userList = this.$refs.userData.options - this.$set(this.formData, "mobile", id ? userList.find((v) => v.id === id).mobile : null) + const user = this.userList.find((item) => item.userId === id) + // 联系人来自远程查询结果；清空选择或未找到联系人时同步清空联系方式。 + this.$set(this.formData, "mobile", user ? (user.mobile || "") : "") }, async getActivityTwoLevelType(code) { const {data} = await this.$axios.post("/platform/activity/basic/settings/getActivityTwoLevelType", {code: code}) @@ -961,6 +962,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { otherFiles: [], tissuePersonList: [], unionUserNumberLimit: [], + hostUnitIds: [], + undertakeUnitIds: [], signUpMethod: null, rangerMeter: 100, isEnrollSystem: true, @@ -979,7 +982,20 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = { v.name = v.clubName }) const units = await this.$businessTool.listUnit() - this.unitOptions = this.clubOptions.concat(units) + if (this.activity_type === 40001) { + // 校工会活动只选二级单位；新建时为主办和承办单位预选默认单位，仍可添加其他单位。 + this.unitOptions = units.filter((unit) => unit.unitLevel === 2) + if (!id) { + const defaultUnit = this.unitOptions.find((unit) => unit.name === "工会、离退休工作处") + if (defaultUnit) { + this.$set(this.formData, "hostUnitIds", [defaultUnit.id]) + this.$set(this.formData, "undertakeUnitIds", [defaultUnit.id]) + } + } + } else { + // 分工会和协会申报保留协会选项，仅排除三级单位。 + this.unitOptions = this.clubOptions.concat(units.filter((unit) => unit.unitLevel !== 3)) + } }, async queryUserByIds(ids) { const {data} = await this.$axios.post("/platform/activity/culture/applyActivity/queryUserByIds", {ids: JSON.stringify(ids)}) diff --git a/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js b/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js index 46bd47d..1acf5a6 100644 --- a/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js +++ b/src/main/resources/views/platform/zhgh/activity/sports/infoManage/addActivity.js @@ -1203,6 +1203,7 @@ let ACTIVITY_SPORTS_ADD_ACTIVITY = { v.name = v.clubName }) const units = await this.$businessTool.listUnit() - this.unitOptions = this.clubOptions.concat(units) + // 保留协会选项，主办、承办和协办单位均不提供三级单位。 + this.unitOptions = this.clubOptions.concat(units.filter((unit) => unit.unitLevel !== 3)) } } diff --git a/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js b/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js index efcc890..499c449 100644 --- a/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js +++ b/src/main/resources/views/platform/zhgh/activity/trainSignUp/manage/basicForm.js @@ -596,7 +596,8 @@ const basicForm = { }, async selectUnitAndClub() { const resp = await this.$axios.post("/platform/trainSignUp/manage/selectUnitAndClub") - this.undertakeOptions = resp.data + // 接口中的协会没有单位层级，保留协会并过滤三级单位。 + this.undertakeOptions = resp.data.filter((item) => item.type !== "unit" || item.unitLevel !== 3) }, }, watch: { diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/read/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/read/index.html index 809bac5..aac7390 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/read/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/read/index.html @@ -74,9 +74,10 @@ layout("/layouts/platform.html"){ - +