From 65f340e3b06709d3fb6c77616f3e3384c936aec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B=E8=AF=9A?= <1009578407@qq.com> Date: Fri, 30 Oct 2026 13:33:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix=EF=BC=9A=E7=A6=8F=E5=88=A9=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=8D=95=E4=BD=8D=E3=80=81=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WelfareListServiceImpl.java | 1 - .../zhgh/welfare/projectMange/filterUser.js | 51 ++----------------- .../welfare/selectionSituation/index.html | 4 -- .../zhgh/welfare/welfareUser/addUser.js | 50 +----------------- .../zhgh/welfare/welfareUser/index.html | 46 ----------------- 5 files changed, 5 insertions(+), 147 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java index 0d06541..f20dae4 100644 --- a/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java @@ -735,7 +735,6 @@ public class WelfareListServiceImpl extends BaseServiceImpl impleme entities.add(new ExcelExportEntity("在职状态", "userState", 20)); entities.add(new ExcelExportEntity("所属工会", "welfareUnionName", 20)); entities.add(new ExcelExportEntity("所属单位", "welfareUnitName", 20)); - entities.add(new ExcelExportEntity("三级单位", "threeUnitName", 20)); entities.add(new ExcelExportEntity("备注", "remark", 20)); // 设置导出参数 diff --git a/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js b/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js index 075c477..fe9e687 100644 --- a/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js +++ b/src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js @@ -62,7 +62,7 @@ const filterUser = { - - - - - - - - - - { - if (res.code === 0) { - this.threeUnitOptions = res.data || [] - } else { - this.$message.error(res.msg || "三级单位查询失败") - } - }) - .catch(() => { - this.$message.error("三级单位查询失败，请稍后重试") - }) - }, - pageData() { this.tableLoading = true this.$axios diff --git a/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html b/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html index ede80cb..77f903e 100644 --- a/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html @@ -65,10 +65,6 @@ layout("/layouts/platform.html"){ - - - diff --git a/src/main/resources/views/platform/zhgh/welfare/welfareUser/addUser.js b/src/main/resources/views/platform/zhgh/welfare/welfareUser/addUser.js index e204a55..1a0fdb7 100644 --- a/src/main/resources/views/platform/zhgh/welfare/welfareUser/addUser.js +++ b/src/main/resources/views/platform/zhgh/welfare/welfareUser/addUser.js @@ -63,7 +63,7 @@ const addUser = { - @@ -76,17 +76,6 @@ const addUser = { - - - - - - - - - { - if (res.code === 0) { - this.$set(this, "threeUnitOptions", res.data || []) - } else { - this.$message.error(res.msg || "三级单位查询失败") - } - }) - .catch(() => { - this.$message.error("三级单位查询失败，请稍后重试") - }) - }, - pageData() { this.tableLoading = true this.$axios diff --git a/src/main/resources/views/platform/zhgh/welfare/welfareUser/index.html b/src/main/resources/views/platform/zhgh/welfare/welfareUser/index.html index 7047496..6741ea4 100644 --- a/src/main/resources/views/platform/zhgh/welfare/welfareUser/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/welfareUser/index.html @@ -81,26 +81,12 @@ layout("/layouts/platform.html"){ collapse-tags placeholder="请选择所属单位" style="width: 100%" - @change="unitIdsChange" v-model="pageForm.unitIds" > - - - - - - - - @@ -283,7 +265,6 @@ layout("/layouts/platform.html"){ }, unionOptions: [], unitOptions: [], - threeUnitOptions: [], sexOptions: ["男", "女"], projectSelectOptions: [], tableColumns: [ @@ -295,7 +276,6 @@ layout("/layouts/platform.html"){ { prop: "userState", label: "在职状态", sortable: true }, { prop: "welfareUnionName", label: "所属工会", sortable: true }, { prop: "welfareUnitName", label: "所属单位", sortable: true }, - { prop: "threeUnitName", label: "三级单位", sortable: true }, { prop: "remark", label: "备注", sortable: true } ], @@ -423,32 +403,6 @@ layout("/layouts/platform.html"){ this.doSearch() }) }, - // 根据已选所属单位查询直属三级单位，筛选项只保留当前所属单位范围内的数据。 - async unitIdsChange(unitIds) { - this.$set(this.pageForm, "threeUnitIds", []) - this.$set(this, "threeUnitOptions", []) - if (!unitIds || unitIds.length === 0) { - return - } - try { - const responses = await Promise.all(unitIds.map((unitId) => this.$axios.post("/platform/sys/unit/child", { pid: unitId }))) - const failedResponse = responses.find((res) => res.code !== 0) - if (failedResponse) { - this.$message.error(failedResponse.msg || "三级单位查询失败") - return - } - const optionMap = {} - responses.forEach((res) => { - const options = res.data || [] - options.forEach((item) => { - optionMap[item.id] = item - }) - }) - this.$set(this, "threeUnitOptions", Object.keys(optionMap).map((id) => optionMap[id])) - } catch (e) { - this.$message.error("三级单位查询失败，请稍后重试") - } - }, pageData() { this.tableLoading = true this.$axios From 001d45651321227a68793b514d8e0e9c59db238f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A8=8B=E8=AF=9A?= <1009578407@qq.com> Date: Fri, 30 Oct 2026 15:14:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=EF=BC=9A=E7=96=97=E4=BC=91=E5=85=BB?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=BC=BA=E5=B0=91=E5=BF=85=E5=A1=AB=E6=A0=87?= =?UTF-8?q?=E8=AF=86=E8=A1=A5=E5=85=85=EF=BC=9B=E7=96=97=E4=BC=91=E5=85=BB?= =?UTF-8?q?=E6=8A=A5=E5=90=8D-=E6=95=99=E8=81=8C=E5=B7=A5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TourMySignupController.java | 3 + .../tour/controller/TourSignupController.java | 3 + .../zhgh/dayofficework/Tour/matter/index.html | 22 +-- .../dayofficework/Tour/mysignup/index.html | 142 +++++++++--------- .../dayofficework/Tour/setting/index.html | 6 +- .../zhgh/dayofficework/Tour/signup/index.html | 142 +++++++++--------- .../Tour/travelAgency/index.html | 8 +- 7 files changed, 174 insertions(+), 152 deletions(-) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourMySignupController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourMySignupController.java index 78ad0b3..c77385d 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourMySignupController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourMySignupController.java @@ -606,6 +606,9 @@ public class TourMySignupController { if (StrUtil.isBlank(ledger.getMobile())) { return Result.error("手机号不能为空"); } + if (!ledger.getMobile().matches("^1[3-9]\\d{9}$")) { + return Result.error("请输入正确的11位手机号"); + } return null; } diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSignupController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSignupController.java index e0269cb..e6a3b08 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSignupController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSignupController.java @@ -841,6 +841,9 @@ public class TourSignupController { if (StrUtil.isBlank(ledger.getMobile())) { return Result.error("手机号不能为空"); } + if (!ledger.getMobile().matches("^1[3-9]\\d{9}$")) { + return Result.error("请输入正确的11位手机号"); + } return null; } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/Tour/matter/index.html b/src/main/resources/views/platform/zhgh/dayofficework/Tour/matter/index.html index ce7e8c9..b68062a 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/Tour/matter/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/Tour/matter/index.html @@ -131,7 +131,7 @@ layout("/layouts/platform.html"){ - + @@ -255,7 +255,9 @@ layout("/layouts/platform.html"){ } } const validatePeople = (rule, value, callback) => { - if (!value || value <= 0) { + if (value === null || value === undefined || value === "") { + callback(new Error("必填")) + } else if (!value || value <= 0) { callback(new Error("人数必须大于0")) } else if (this.batchForm.minGroupPeople && this.batchForm.maxGroupPeople && this.batchForm.minGroupPeople > this.batchForm.maxGroupPeople) { @@ -317,15 +319,15 @@ layout("/layouts/platform.html"){ }, batchRules: { lineId: [{ required: true, message: "必填", trigger: ["blur", "change"] }], - signupStartTime: [{ validator: validateBatchTime, trigger: ["blur", "change"] }], - signupEndTime: [{ validator: validateBatchTime, trigger: ["blur", "change"] }], - travelStartTime: [{ validator: validateBatchTime, trigger: ["blur", "change"] }], - travelEndTime: [{ validator: validateBatchTime, trigger: ["blur", "change"] }], + signupStartTime: [{ required: true, validator: validateBatchTime, trigger: ["blur", "change"] }], + signupEndTime: [{ required: true, validator: validateBatchTime, trigger: ["blur", "change"] }], + travelStartTime: [{ required: true, validator: validateBatchTime, trigger: ["blur", "change"] }], + travelEndTime: [{ required: true, validator: validateBatchTime, trigger: ["blur", "change"] }], contactName: [{ required: true, message: "必填", trigger: ["blur", "change"] }], - contactPhone: [{ validator: validateMobile, trigger: ["blur", "change"] }], - minGroupPeople: [{ validator: validatePeople, trigger: ["blur", "change"] }], - maxGroupPeople: [{ validator: validatePeople, trigger: ["blur", "change"] }], - estimatedCost: [{ validator: validateMoney, trigger: ["blur", "change"] }] + contactPhone: [{ required: true, validator: validateMobile, trigger: ["blur", "change"] }], + minGroupPeople: [{ required: true, validator: validatePeople, trigger: ["blur", "change"] }], + maxGroupPeople: [{ required: true, validator: validatePeople, trigger: ["blur", "change"] }], + estimatedCost: [{ required: true, validator: validateMoney, trigger: ["blur", "change"] }] } } }, diff --git a/src/main/resources/views/platform/zhgh/dayofficework/Tour/mysignup/index.html b/src/main/resources/views/platform/zhgh/dayofficework/Tour/mysignup/index.html index fbf10c6..3c03a0c 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/Tour/mysignup/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/Tour/mysignup/index.html @@ -216,7 +216,7 @@ layout("/layouts/platform.html"){ - + @@ -233,8 +233,8 @@ layout("/layouts/platform.html"){ - - + + @@ -325,17 +325,17 @@ layout("/layouts/platform.html"){ - + - + - + @@ -344,12 +344,12 @@ layout("/layouts/platform.html"){ - + - + - + 增加一条 - + + -