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/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/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"){ - + - + - + 增加一条 - + + -