c-hongqw1/zhgh_cqgmy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix_福利疗休养问卷调查' into release_20261030问题整改

Browse Source
This commit is contained in:
c-chengc1
2026-10-31 08:46:57 +08:00
parent 53005c448f c1ac3db4bf
commit e60d4d6c68
16 changed files with 439 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourMySignupController.java
+3
View File
@@ -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;
}
src/main/java/com/budwk/app/zhgh/dayofficework/tour/controller/TourSignupController.java
+3
View File
@@ -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;
}
src/main/java/com/budwk/app/zhgh/welfare/service/impl/WelfareListServiceImpl.java
-1
View File
@@ -735,7 +735,6 @@ public class WelfareListServiceImpl extends BaseServiceImpl<WelfareList> 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));
// 设置导出参数
src/main/resources/views/platform/zhgh/dayofficework/Tour/matter/index.html
+12 -10
View File
@@ -131,7 +131,7 @@ layout("/layouts/platform.html"){
<el-option v-for="item in organizationTypeOptions" :key="item.code" :label="item.name" :value="item.code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="所属工会" prop="unionId">
<el-form-item label="所属工会" prop="unionId" :required="formData.organizationType !== 'schoolUnion'">
<el-select v-model="formData.unionId" clearable filterable placeholder="请选择所属工会" style="width: 100%" :disabled="isUnionDisabled()">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
@@ -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"] }]
}
}
},
src/main/resources/views/platform/zhgh/dayofficework/Tour/mysignup/index.html
+74 -68
View File
@@ -216,7 +216,7 @@ layout("/layouts/platform.html"){
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="身份证号">
<el-form-item label="身份证号" prop="idCard" :rules="requiredRules" required>
<el-input v-model="signupForm.idCard" readonly></el-input>
</el-form-item>
</el-col>
@@ -233,8 +233,8 @@ layout("/layouts/platform.html"){
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="手机号" required>
<el-input v-model="signupForm.mobile" maxlength="30" placeholder="请输入手机号"></el-input>
<el-form-item label="手机号" prop="mobile" :rules="mobileRules" required>
<el-input v-model="signupForm.mobile" maxlength="11" placeholder="请输入手机号"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -325,17 +325,17 @@ layout("/layouts/platform.html"){
<el-form :model="directRelativeForm" label-width="110px" ref="directRelativeForm">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="亲属姓名">
<el-form-item label="亲属姓名" prop="relativeName" :rules="requiredRules" required>
<el-input v-model="directRelativeForm.relativeName" maxlength="100" placeholder="请输入亲属姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在单位">
<el-form-item label="所在单位" prop="unitName" :rules="requiredRules" required>
<el-input v-model="directRelativeForm.unitName" maxlength="100" placeholder="请输入所在单位"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="亲属关系">
<el-form-item label="亲属关系" prop="relationshipCode" :rules="requiredRules" required>
<el-select v-model="directRelativeForm.relationshipCode" clearable placeholder="请选择亲属关系" style="width: 100%" @change="directRelativeChange">
<el-option v-for="item in directRelativeOptions" :key="item.code" :label="item.name" :value="item.code"></el-option>
</el-select>
@@ -344,12 +344,12 @@ layout("/layouts/platform.html"){
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="线路名称">
<el-form-item label="线路名称" prop="lineName" :rules="requiredRules" required>
<el-input v-model="directRelativeForm.lineName" maxlength="100" placeholder="请输入线路名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出行开始日期">
<el-form-item label="出行开始日期" prop="travelStartTime" :rules="requiredRules" required>
<el-date-picker
v-model="directRelativeForm.travelStartTime"
type="date"
@@ -360,7 +360,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出行结束日期">
<el-form-item label="出行结束日期" prop="travelEndTime" :rules="requiredRules" required>
<el-date-picker
v-model="directRelativeForm.travelEndTime"
type="date"
@@ -379,34 +379,48 @@ layout("/layouts/platform.html"){
<div class="tour-actions">
<el-button size="medium" type="primary" icon="el-icon-plus" :disabled="!signupForm.hasFamily" @click="addFamily">增加一条</el-button>
</div>
<el-table :data="familyData" border :size="tableSize" empty-text="暂无亲属信息">
<el-form :model="{ rows: familyData }" ref="familyForm" label-width="0">
<el-table class="tour-family-table" :data="familyData" border :size="tableSize" empty-text="暂无亲属信息">
<el-table-column label="序号" type="index" width="70" align="center" header-align="center"></el-table-column>
<el-table-column label="家属姓名" min-width="130" align="center" header-align="center">
<template slot-scope="{row}">
<template slot="header"><span style="color: #f56c6c">*</span> 家属姓名</template>
<template slot-scope="{row, $index}">
<el-form-item :prop="'rows.' + $index + '.familyName'" :rules="requiredRules">
<el-input v-model="row.familyName" maxlength="100" placeholder="请输入"></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="性别" width="110" align="center" header-align="center">
<template slot-scope="{row}">
<template slot="header"><span style="color: #f56c6c">*</span> 性别</template>
<template slot-scope="{row, $index}">
<el-form-item :prop="'rows.' + $index + '.gender'" :rules="requiredRules">
<el-select v-model="row.gender" clearable placeholder="请选择">
<el-option label="男" value="男"></el-option>
<el-option label="女" value="女"></el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="身份证号码" min-width="180" align="center" header-align="center">
<template slot-scope="{row}">
<template slot-scope="{row, $index}">
<el-form-item :prop="'rows.' + $index + '.idCard'" :rules="[{ required: familyContactRequired(row), validator: validateFamilyIdCard, trigger: ['blur', 'change'] }]">
<el-input v-model="row.idCard" maxlength="18" :placeholder="familyContactRequired(row) ? '16岁及以上必填' : '选填'" @blur="normalizeFamilyIdCard(row)"></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="手机号" min-width="150" align="center" header-align="center">
<template slot-scope="{row}">
<template slot-scope="{row, $index}">
<el-form-item :prop="'rows.' + $index + '.mobile'" :rules="[{ required: familyContactRequired(row), message: '必填', trigger: ['blur', 'change'] }]">
<el-input v-model="row.mobile" maxlength="30" :placeholder="familyContactRequired(row) ? '16岁及以上必填' : '选填'"></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="年龄" width="110" align="center" header-align="center">
<template slot-scope="{row}">
<template slot="header"><span style="color: #f56c6c">*</span> 年龄</template>
<template slot-scope="{row, $index}">
<el-form-item :prop="'rows.' + $index + '.age'" :rules="requiredRules">
<el-input-number v-model="row.age" :min="0" :max="120" :precision="0" controls-position="right" style="width: 100%"></el-input-number>
</el-form-item>
</template>
</el-table-column>
<el-table-column v-if="fillBedInfo" label="床型" min-width="120" align="center" header-align="center">
@@ -427,10 +441,13 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column label="关系" width="120" align="center" header-align="center">
<template slot-scope="{row}">
<template slot="header"><span style="color: #f56c6c">*</span> 关系</template>
<template slot-scope="{row, $index}">
<el-form-item :prop="'rows.' + $index + '.relationship'" :rules="requiredRules">
<el-select v-model="row.relationship" clearable placeholder="请选择">
<el-option v-for="item in familyRelationshipOptions" :key="item.code" :label="item.name" :value="item.name"></el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="操作" width="90" align="center" header-align="center" fixed="right">
@@ -439,6 +456,8 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
</el-table>
<div v-if="familyValidationAttempted && familyData.length === 0" class="el-form-item__error" style="position: static">必填</div>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
@@ -520,6 +539,10 @@ layout("/layouts/platform.html"){
</div>
<style>
/* 覆盖全局表格 div 文字颜色，保留输入组件下方校验提示的红色。 */
.tour-family-table.el-table td.el-table__cell .el-form-item__error {
color: #f56c6c;
}
.tour-section {
margin-top: 10px;
padding: 0 2px;
@@ -763,6 +786,12 @@ layout("/layouts/platform.html"){
fillBedInfo: true,
signupForm: {},
familyData: [],
familyValidationAttempted: false,
requiredRules: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
mobileRules: [
{ required: true, message: "必填", trigger: ["blur", "change"] },
{ pattern: /^1[3-9]\d{9}$/, message: "请输入正确的11位手机号", trigger: ["blur", "change"] }
],
bedTypeOptions: [],
familyRelationshipOptions: [],
directRelativeOptions: [],
@@ -1161,6 +1190,11 @@ layout("/layouts/platform.html"){
this.signupForm.hasFamily = true
}
this.signupVisible = true
this.$nextTick(() => {
;[this.$refs.signupForm, this.$refs.directRelativeForm, this.$refs.familyForm].forEach(form => {
if (form) form.clearValidate()
})
})
} else {
this.$message.warning(res.msg || "查询失败")
}
@@ -1231,29 +1265,22 @@ layout("/layouts/platform.html"){
this.signupForm.hasFamily = false
}
},
// 家属表格按行校验，缺失项显示在对应输入组件下方。
validateFamilies() {
if (!this.allowFamily || !this.signupForm.hasFamily) return true
if (this.familyData.length === 0) {
this.$message.warning("请添加亲属信息")
return false
this.familyValidationAttempted = true
if (this.familyData.length === 0) return false
return new Promise(resolve => this.$refs.familyForm.validate(valid => resolve(valid)))
},
// 未满16岁的家属允许不填身份证，已填写时仍检查格式。
validateFamilyIdCard(rule, value, callback) {
if (!value) {
callback(rule.required ? new Error("必填") : undefined)
} else if (!this.isValidIdCard(value)) {
callback(new Error("请输入正确的身份证号码"))
} else {
callback()
}
const invalidBase = this.familyData.some(item => !item.familyName || item.age === null || item.age === undefined
|| !item.gender || !item.relationship)
if (invalidBase) {
this.$message.warning("请完善亲属姓名、年龄、性别和与本人关系")
return false
}
const invalidContact = this.familyData.some(item => this.familyContactRequired(item) && (!item.idCard || !item.mobile))
if (invalidContact) {
this.$message.warning("年满16周岁的亲属必须填写身份证号码和手机号")
return false
}
const invalidIdCard = this.familyData.some(item => item.idCard && !this.isValidIdCard(item.idCard))
if (invalidIdCard) {
this.$message.warning("请输入正确的身份证号码")
return false
}
return true
},
familyContactRequired(family) {
return family && family.age !== null && family.age !== undefined && Number(family.age) >= 16
@@ -1269,39 +1296,17 @@ layout("/layouts/platform.html"){
},
validateDirectRelative() {
if (!this.isDirectFamilyLine(this.signupForm)) return true
if (!this.directRelativeForm.relativeName) {
this.$message.warning("请输入亲属姓名")
return false
}
if (!this.directRelativeForm.unitName) {
this.$message.warning("请输入亲属所在单位")
return false
}
if (!this.directRelativeForm.relationshipCode) {
this.$message.warning("请选择亲属关系")
return false
}
if (!this.directRelativeForm.lineName) {
this.$message.warning("请输入直系亲属线路名称")
return false
}
if (!this.directRelativeForm.travelStartTime) {
this.$message.warning("请选择出行开始日期")
return false
}
if (!this.directRelativeForm.travelEndTime) {
this.$message.warning("请选择出行结束日期")
return false
}
return true
return new Promise(resolve => this.$refs.directRelativeForm.validate(valid => resolve(valid)))
},
submitSignup() {
if (!this.signupForm.idCard || !this.signupForm.mobile) {
this.$message.warning("请完善报名人身份证号码和手机号")
return
}
if (!this.validateFamilies()) return
if (!this.validateDirectRelative()) return
async submitSignup() {
if (this.signupLoading) return
// 同时校验各区域，一次展示所有字段错误，通过后才提交报名。
const results = await Promise.all([
new Promise(resolve => this.$refs.signupForm.validate(valid => resolve(valid))),
this.validateFamilies(),
this.validateDirectRelative()
])
if (results.some(valid => !valid)) return
const families = this.allowFamily && this.signupForm.hasFamily ? this.familyData : []
const form = Object.assign({}, this.signupForm, {
families: JSON.stringify(families),
@@ -1352,6 +1357,7 @@ layout("/layouts/platform.html"){
}).catch(() => {})
},
destroySignup() {
this.familyValidationAttempted = false
this.signupForm = {}
this.familyData = []
this.directRelativeForm = {}
src/main/resources/views/platform/zhgh/dayofficework/Tour/setting/index.html
+4 -2
View File
@@ -182,7 +182,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-col>
<el-col v-if="formData.outProvinceRatioType === '固定人数'" :span="12">
<el-form-item label="固定人数" prop="outProvinceFixedPeople">
<el-form-item label="固定人数" prop="outProvinceFixedPeople" :required="formData.outProvinceRatioType === '固定人数'">
<el-input-number v-model="formData.outProvinceFixedPeople" :controls="false" :min="0" :precision="0" placeholder="请输入固定人数" style="width: 100%"></el-input-number>
</el-form-item>
</el-col>
@@ -366,7 +366,9 @@ layout("/layouts/platform.html"){
}
const checkOutProvinceFixedPeople = (rule, value, callback) => {
if (this.formData.outProvinceRatioType === "固定人数"
&& (value === null || value === undefined || value === "" || value < 0)) {
&& (value === null || value === undefined || value === "")) {
callback(new Error("必填"))
} else if (this.formData.outProvinceRatioType === "固定人数" && value < 0) {
callback(new Error("固定人数必须大于等于0"))
} else {
callback()
src/main/resources/views/platform/zhgh/dayofficework/Tour/signup/index.html
+74 -68
View File
@@ -113,7 +113,7 @@ layout("/layouts/platform.html"){
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="身份证号">
<el-form-item label="身份证号" prop="idCard" :rules="requiredRules" required>
<el-input v-model="signupForm.idCard" readonly></el-input>
</el-form-item>
</el-col>
@@ -130,8 +130,8 @@ layout("/layouts/platform.html"){
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="手机号" required>
<el-input v-model="signupForm.mobile" maxlength="30" placeholder="请输入手机号"></el-input>
<el-form-item label="手机号" prop="mobile" :rules="mobileRules" required>
<el-input v-model="signupForm.mobile" maxlength="11" placeholder="请输入手机号"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -222,17 +222,17 @@ layout("/layouts/platform.html"){
<el-form :model="directRelativeForm" label-width="110px" ref="directRelativeForm">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="亲属姓名">
<el-form-item label="亲属姓名" prop="relativeName" :rules="requiredRules" required>
<el-input v-model="directRelativeForm.relativeName" maxlength="100" placeholder="请输入亲属姓名"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所在单位">
<el-form-item label="所在单位" prop="unitName" :rules="requiredRules" required>
<el-input v-model="directRelativeForm.unitName" maxlength="100" placeholder="请输入所在单位"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="亲属关系">
<el-form-item label="亲属关系" prop="relationshipCode" :rules="requiredRules" required>
<el-select v-model="directRelativeForm.relationshipCode" clearable placeholder="请选择亲属关系" style="width: 100%" @change="directRelativeChange">
<el-option v-for="item in directRelativeOptions" :key="item.code" :label="item.name" :value="item.code"></el-option>
</el-select>
@@ -241,12 +241,12 @@ layout("/layouts/platform.html"){
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="线路名称">
<el-form-item label="线路名称" prop="lineName" :rules="requiredRules" required>
<el-input v-model="directRelativeForm.lineName" maxlength="100" placeholder="请输入线路名称"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出行开始日期">
<el-form-item label="出行开始日期" prop="travelStartTime" :rules="requiredRules" required>
<el-date-picker
v-model="directRelativeForm.travelStartTime"
type="date"
@@ -257,7 +257,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出行结束日期">
<el-form-item label="出行结束日期" prop="travelEndTime" :rules="requiredRules" required>
<el-date-picker
v-model="directRelativeForm.travelEndTime"
type="date"
@@ -276,34 +276,48 @@ layout("/layouts/platform.html"){
<div class="tour-signup-actions">
<el-button size="medium" type="primary" icon="el-icon-plus" :disabled="!signupForm.hasFamily" @click="addFamily">增加一条</el-button>
</div>
<el-table :data="familyData" border :size="tableSize" empty-text="暂无亲属信息">
<el-form :model="{ rows: familyData }" ref="familyForm" label-width="0">
<el-table class="tour-family-table" :data="familyData" border :size="tableSize" empty-text="暂无亲属信息">
<el-table-column label="序号" type="index" width="70" align="center" header-align="center"></el-table-column>
<el-table-column label="家属姓名" min-width="130" align="center" header-align="center">
<template slot-scope="{row}">
<template slot="header"><span style="color: #f56c6c">*</span> 家属姓名</template>
<template slot-scope="{row, $index}">
<el-form-item :prop="'rows.' + $index + '.familyName'" :rules="requiredRules">
<el-input v-model="row.familyName" maxlength="100" placeholder="请输入"></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="性别" width="110" align="center" header-align="center">
<template slot-scope="{row}">
<template slot="header"><span style="color: #f56c6c">*</span> 性别</template>
<template slot-scope="{row, $index}">
<el-form-item :prop="'rows.' + $index + '.gender'" :rules="requiredRules">
<el-select v-model="row.gender" clearable placeholder="请选择">
<el-option label="男" value="男"></el-option>
<el-option label="女" value="女"></el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="身份证号码" min-width="180" align="center" header-align="center">
<template slot-scope="{row}">
<template slot-scope="{row, $index}">
<el-form-item :prop="'rows.' + $index + '.idCard'" :rules="[{ required: familyContactRequired(row), validator: validateFamilyIdCard, trigger: ['blur', 'change'] }]">
<el-input v-model="row.idCard" maxlength="18" :placeholder="familyContactRequired(row) ? '16岁及以上必填' : '选填'" @blur="normalizeFamilyIdCard(row)"></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="手机号" min-width="150" align="center" header-align="center">
<template slot-scope="{row}">
<template slot-scope="{row, $index}">
<el-form-item :prop="'rows.' + $index + '.mobile'" :rules="[{ required: familyContactRequired(row), message: '必填', trigger: ['blur', 'change'] }]">
<el-input v-model="row.mobile" maxlength="30" :placeholder="familyContactRequired(row) ? '16岁及以上必填' : '选填'"></el-input>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="年龄" width="110" align="center" header-align="center">
<template slot-scope="{row}">
<template slot="header"><span style="color: #f56c6c">*</span> 年龄</template>
<template slot-scope="{row, $index}">
<el-form-item :prop="'rows.' + $index + '.age'" :rules="requiredRules">
<el-input-number v-model="row.age" :min="0" :max="120" :precision="0" controls-position="right" style="width: 100%"></el-input-number>
</el-form-item>
</template>
</el-table-column>
<el-table-column v-if="fillBedInfo" label="床型" min-width="120" align="center" header-align="center">
@@ -336,10 +350,13 @@ layout("/layouts/platform.html"){
</el-table-column>
-->
<el-table-column label="关系" width="120" align="center" header-align="center">
<template slot-scope="{row}">
<template slot="header"><span style="color: #f56c6c">*</span> 关系</template>
<template slot-scope="{row, $index}">
<el-form-item :prop="'rows.' + $index + '.relationship'" :rules="requiredRules">
<el-select v-model="row.relationship" clearable placeholder="请选择">
<el-option v-for="item in familyRelationshipOptions" :key="item.code" :label="item.name" :value="item.name"></el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="操作" width="90" align="center" header-align="center" fixed="right">
@@ -348,6 +365,8 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
</el-table>
<div v-if="familyValidationAttempted && familyData.length === 0" class="el-form-item__error" style="position: static">必填</div>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
@@ -389,6 +408,10 @@ layout("/layouts/platform.html"){
</div>
<style>
/* 覆盖全局表格 div 文字颜色，保留输入组件下方校验提示的红色。 */
.tour-family-table.el-table td.el-table__cell .el-form-item__error {
color: #f56c6c;
}
.tour-signup-title {
border-left: 4px solid #0079c2;
color: #0079c2;
@@ -489,6 +512,12 @@ layout("/layouts/platform.html"){
fillBedInfo: true,
signupForm: {},
familyData: [],
familyValidationAttempted: false,
requiredRules: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
mobileRules: [
{ required: true, message: "必填", trigger: ["blur", "change"] },
{ pattern: /^1[3-9]\d{9}$/, message: "请输入正确的11位手机号", trigger: ["blur", "change"] }
],
bedTypeOptions: [],
familyRelationshipOptions: [],
directRelativeOptions: [],
@@ -791,6 +820,11 @@ layout("/layouts/platform.html"){
this.signupForm.hasFamily = true
}
this.signupVisible = true
this.$nextTick(() => {
;[this.$refs.signupForm, this.$refs.directRelativeForm, this.$refs.familyForm].forEach(form => {
if (form) form.clearValidate()
})
})
} else {
this.$message.warning(res.msg || "查询失败")
}
@@ -847,29 +881,22 @@ layout("/layouts/platform.html"){
this.signupForm.hasFamily = false
}
},
// 家属表格按行校验，缺失项显示在对应输入组件下方。
validateFamilies() {
if (!this.allowFamily || !this.signupForm.hasFamily) return true
if (this.familyData.length === 0) {
this.$message.warning("请添加亲属信息")
return false
this.familyValidationAttempted = true
if (this.familyData.length === 0) return false
return new Promise(resolve => this.$refs.familyForm.validate(valid => resolve(valid)))
},
// 未满16岁的家属允许不填身份证，已填写时仍检查格式。
validateFamilyIdCard(rule, value, callback) {
if (!value) {
callback(rule.required ? new Error("必填") : undefined)
} else if (!this.isValidIdCard(value)) {
callback(new Error("请输入正确的身份证号码"))
} else {
callback()
}
const invalidBase = this.familyData.some(item => !item.familyName || item.age === null || item.age === undefined
|| !item.gender || !item.relationship)
if (invalidBase) {
this.$message.warning("请完善亲属姓名、年龄、性别和与本人关系")
return false
}
const invalidContact = this.familyData.some(item => this.familyContactRequired(item) && (!item.idCard || !item.mobile))
if (invalidContact) {
this.$message.warning("年满16周岁的亲属必须填写身份证号码和手机号")
return false
}
const invalidIdCard = this.familyData.some(item => item.idCard && !this.isValidIdCard(item.idCard))
if (invalidIdCard) {
this.$message.warning("请输入正确的身份证号码")
return false
}
return true
},
familyContactRequired(family) {
return family && family.age !== null && family.age !== undefined && Number(family.age) >= 16
@@ -885,39 +912,17 @@ layout("/layouts/platform.html"){
},
validateDirectRelative() {
if (!this.isDirectFamilyLine(this.signupForm)) return true
if (!this.directRelativeForm.relativeName) {
this.$message.warning("请输入亲属姓名")
return false
}
if (!this.directRelativeForm.unitName) {
this.$message.warning("请输入亲属所在单位")
return false
}
if (!this.directRelativeForm.relationshipCode) {
this.$message.warning("请选择亲属关系")
return false
}
if (!this.directRelativeForm.lineName) {
this.$message.warning("请输入直系亲属线路名称")
return false
}
if (!this.directRelativeForm.travelStartTime) {
this.$message.warning("请选择出行开始日期")
return false
}
if (!this.directRelativeForm.travelEndTime) {
this.$message.warning("请选择出行结束日期")
return false
}
return true
return new Promise(resolve => this.$refs.directRelativeForm.validate(valid => resolve(valid)))
},
submitSignup() {
if (!this.signupForm.idCard || !this.signupForm.mobile) {
this.$message.warning("请完善报名人身份证号码和手机号")
return
}
if (!this.validateFamilies()) return
if (!this.validateDirectRelative()) return
async submitSignup() {
if (this.signupLoading) return
// 同时校验各区域，一次展示所有字段错误，通过后才提交报名。
const results = await Promise.all([
new Promise(resolve => this.$refs.signupForm.validate(valid => resolve(valid))),
this.validateFamilies(),
this.validateDirectRelative()
])
if (results.some(valid => !valid)) return
const families = this.allowFamily && this.signupForm.hasFamily ? this.familyData : []
const form = Object.assign({}, this.signupForm, {
families: JSON.stringify(families),
@@ -966,6 +971,7 @@ layout("/layouts/platform.html"){
}).catch(() => {})
},
destroySignup() {
this.familyValidationAttempted = false
this.signupForm = {}
this.familyData = []
this.directRelativeForm = {}
src/main/resources/views/platform/zhgh/dayofficework/Tour/travelAgency/index.html
+4 -4
View File
@@ -138,14 +138,14 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系人手机" prop="contactPhone">
<el-form-item label="联系人手机" prop="contactPhone" required>
<el-input v-model="formData.contactPhone" maxlength="30" placeholder="请输入联系人手机"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-form-item label="邮箱" prop="email" required>
<el-input v-model="formData.email" maxlength="100" placeholder="请输入邮箱"></el-input>
</el-form-item>
</el-col>
@@ -221,8 +221,8 @@ layout("/layouts/platform.html"){
agencyName: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
agencyCode: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
contactName: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
contactPhone: [{ validator: validateMobile, trigger: ["blur", "change"] }],
email: [{ validator: validateEmail, trigger: ["blur", "change"] }]
contactPhone: [{ required: true, validator: validateMobile, trigger: ["blur", "change"] }],
email: [{ required: true, validator: validateEmail, trigger: ["blur", "change"] }]
}
}
},
src/main/resources/views/platform/zhgh/dayofficework/qsv/online/index.html
+156 -5
View File
@@ -41,6 +41,30 @@ layout("/layouts/platform.html"){
box-sizing: border-box;
}
.qsv-online-answer-header {
display: flex;
align-items: center;
justify-content: space-between;
gap: 16px;
padding-right: 16px;
}
.qsv-online-quiz-timer {
flex-shrink: 0;
color: #e6a23c;
font-weight: 600;
}
.qsv-online-description {
line-height: 1.8;
overflow-wrap: break-word;
}
.qsv-online-description img {
max-width: 100%;
height: auto;
}
.qsv-online-preview-title {
margin: 0;
font-size: 18px;
@@ -90,6 +114,33 @@ layout("/layouts/platform.html"){
min-width: 72px;
}
.qsv-online-result-score {
color: #409eff;
font-size: 28px;
font-weight: 700;
}
.qsv-online-result-tags {
margin-bottom: 12px;
}
.qsv-online-result-option {
color: #303133;
}
.qsv-online-result-option.is-correct {
color: #67c23a;
}
.qsv-online-subject-result {
margin-top: 12px;
color: #f56c6c;
}
.qsv-online-subject-result.is-correct {
color: #67c23a;
}
.qsv-online-option-fill {
width: 520px;
max-width: 100%;
@@ -495,8 +546,22 @@ layout("/layouts/platform.html"){
size="1145px"
custom-class="qsv-online-drawer"
append-to-body
@closed="stopVoteCountdown">
@close="stopAnswerTimers">
<div slot="title" class="qsv-online-answer-header">
<span>{{answerDialog.title}}</span>
<span v-if="answerDialog.activity.category === 'QUIZ' && answerDialog.activity.timeLimit > 0 && !answerDialog.readonly" class="qsv-online-quiz-timer">
<i class="el-icon-time"></i> 剩余时间：{{quizRemainingText}}
</span>
</div>
<div class="qsv-online-preview-body" v-loading="answerDialog.loading">
<div v-if="answerDialog.activity.description" class="qsv-online-subject">
<div class="qsv-online-subject-title">说明</div>
<div class="qsv-online-description" v-html="answerDialog.activity.description"></div>
</div>
<div v-if="showQuizResult" class="qsv-online-subject">
<div class="qsv-online-subject-title">{{answerDialog.activity.title}}</div>
<div class="qsv-online-result-score">总分：{{quizTotalScore}} 分</div>
</div>
<div v-if="isVoteActivity" class="qsv-online-vote">
<div class="qsv-online-vote-header">
<h2 class="qsv-online-vote-title">{{answerDialog.activity.title}}</h2>
@@ -573,6 +638,11 @@ layout("/layouts/platform.html"){
</div>
<el-empty v-if="!isVoteActivity && visibleSubjects.length === 0 && !answerDialog.loading" description="暂无题目"></el-empty>
<div v-if="!isVoteActivity" v-for="(subject, index) in visibleSubjects" :key="subject.id" class="qsv-online-subject">
<div v-if="showQuizResult" class="qsv-online-result-tags">
<el-tag v-if="subject.type === 'radio'" size="small">单选</el-tag>
<el-tag v-else-if="subject.type === 'checkbox'" size="small">多选</el-tag>
<el-tag v-if="subject.score !== undefined && subject.score !== null" size="small">{{subject.score}}分</el-tag>
</div>
<div class="qsv-online-subject-title">
<span v-if="answerDialog.showIndex" class="qsv-online-subject-index">{{index + 1}}.</span>
<span>{{subject.title}}</span>
@@ -585,7 +655,7 @@ layout("/layouts/platform.html"){
:value="getRadioValue(subject)"
@input="setRadioValue(subject, $event)">
<template v-for="option in subject.options">
<el-radio :key="option.id" :label="option.id">{{option.text}}</el-radio>
<el-radio :key="option.id" :label="option.id"><span :class="{ 'qsv-online-result-option': showQuizResult, 'is-correct': showQuizResult && option.isCorrect }">{{option.text}}<span v-if="showQuizResult && option.isCorrect">（正确答案）</span></span></el-radio>
<el-input
v-if="isOptionFillVisible(subject, option)"
:key="option.id + '-fill'"
@@ -604,7 +674,7 @@ layout("/layouts/platform.html"){
:disabled="answerDialog.readonly"
@change="onCheckboxChange(subject)">
<template v-for="option in subject.options">
<el-checkbox :key="option.id" :label="option.id">{{option.text}}</el-checkbox>
<el-checkbox :key="option.id" :label="option.id"><span :class="{ 'qsv-online-result-option': showQuizResult, 'is-correct': showQuizResult && option.isCorrect }">{{option.text}}<span v-if="showQuizResult && option.isCorrect">（正确答案）</span></span></el-checkbox>
<el-input
v-if="isOptionFillVisible(subject, option)"
:key="option.id + '-fill'"
@@ -623,6 +693,10 @@ layout("/layouts/platform.html"){
:readonly="answerDialog.readonly"
v-model="subject.userFillContent"
:placeholder="'请输入' + subject.title"></el-input>
<div v-if="showQuizResult && getSubjectResult(subject)" class="qsv-online-subject-result" :class="{ 'is-correct': getSubjectResult(subject).isCorrect }">
<i :class="getSubjectResult(subject).isCorrect ? 'el-icon-circle-check' : 'el-icon-circle-close'"></i>
{{getSubjectResult(subject).isCorrect ? '回答正确' : '回答错误'}}，得分：{{getSubjectResult(subject).score || 0}} 分
</div>
</div>
</div>
<div class="qsv-online-footer">
@@ -709,6 +783,10 @@ layout("/layouts/platform.html"){
minutes: 0,
seconds: 0
},
quizTimer: null,
quizStartedAt: 0,
quizElapsedSeconds: 0,
quizExpired: false,
voteTimer: null,
voteRankVisible: false,
voteDetailVisible: false,
@@ -717,6 +795,21 @@ layout("/layouts/platform.html"){
}
},
computed: {
// 仅已完成的计分答题显示成绩和正确答案，普通调查与投票保持原有展示。
showQuizResult() {
return this.answerDialog.activity.category === "QUIZ" && !!this.answerDialog.answerRecord.isFinish
},
quizRemainingSeconds() {
return Math.max(0, Number(this.answerDialog.activity.timeLimit || 0) * 60 - this.answerDialog.quizElapsedSeconds)
},
quizRemainingText() {
const seconds = this.quizRemainingSeconds
return Math.floor(seconds / 60) + '分' + String(seconds % 60).padStart(2, '0') + '秒'
},
quizTotalScore() {
const answers = this.answerDialog.answerRecord.extJson || {}
return Object.keys(answers).reduce((total, id) => total + Number(answers[id].score || 0), 0)
},
visibleSubjects() {
return this.answerDialog.subjects.filter((subject) => {
return this.isSubjectVisible(subject)
@@ -862,6 +955,10 @@ layout("/layouts/platform.html"){
this.$message.warning(unavailableMessage)
return
}
this.stopAnswerTimers()
this.answerDialog.quizStartedAt = 0
this.answerDialog.quizElapsedSeconds = 0
this.answerDialog.quizExpired = false
this.answerDialog.visible = true
this.answerDialog.loading = true
this.answerDialog.readonly = row.actionType === "view"
@@ -908,6 +1005,7 @@ layout("/layouts/platform.html"){
this.answerDialog.answerRecord = res.data || {}
this.answerDialog.readonly = !!this.answerDialog.answerRecord.isFinish
this.initAnswer()
this.startQuizTimer()
}
})
},
@@ -928,6 +1026,10 @@ layout("/layouts/platform.html"){
this.clearHiddenSubjectAnswers()
}
},
getSubjectResult(subject) {
const answers = this.answerDialog.answerRecord.extJson || {}
return answers[subject.id]
},
getRadioValue(subject) {
return subject.userSelectOptionIds && subject.userSelectOptionIds.length > 0
? subject.userSelectOptionIds[0]
@@ -985,6 +1087,43 @@ layout("/layouts/platform.html"){
}
})
},
// 使用实际经过时间计时，避免切换浏览器标签后定时器节流导致倒计时变慢。
startQuizTimer() {
this.stopQuizTimer()
if (!this.answerDialog.visible || this.answerDialog.readonly || this.answerDialog.activity.category !== "QUIZ") return
this.answerDialog.quizStartedAt = Date.now()
this.answerDialog.quizElapsedSeconds = 0
this.answerDialog.quizExpired = false
this.answerDialog.quizTimer = setInterval(() => this.updateQuizTimer(), 1000)
},
updateQuizTimer() {
if (!this.answerDialog.quizStartedAt || this.answerDialog.readonly || !this.answerDialog.visible) return
this.answerDialog.quizElapsedSeconds = Math.floor((Date.now() - this.answerDialog.quizStartedAt) / 1000)
if (Number(this.answerDialog.activity.timeLimit) > 0 && this.quizRemainingSeconds === 0
&& !this.answerDialog.quizExpired && !this.answerDialog.submitLoading) {
this.answerDialog.quizExpired = true
this.stopQuizTimer()
// 与手机端一致：超时提示重新答题，不自动提交未完成的答卷。
this.$alert("答题时间到，请重新进入答题", "提示", {
confirmButtonText: "确定",
showClose: false,
closeOnClickModal: false,
closeOnPressEscape: false
}).then(() => {
this.answerDialog.visible = false
})
}
},
stopQuizTimer() {
if (this.answerDialog.quizTimer) {
clearInterval(this.answerDialog.quizTimer)
this.answerDialog.quizTimer = null
}
},
stopAnswerTimers() {
this.stopQuizTimer()
this.stopVoteCountdown()
},
startVoteCountdown() {
this.stopVoteCountdown()
this.updateVoteCountdown()
@@ -1196,6 +1335,8 @@ layout("/layouts/platform.html"){
return true
},
submitAnswer() {
this.updateQuizTimer()
if (this.answerDialog.readonly || this.answerDialog.quizExpired || this.answerDialog.submitLoading) return
if (!this.validateAnswer()) {
return
}
@@ -1204,11 +1345,14 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.updateQuizTimer()
if (!this.answerDialog.visible || this.answerDialog.readonly || this.answerDialog.quizExpired || this.answerDialog.submitLoading) return
this.answerDialog.submitLoading = true
$.post("/platform/qsv/online/submitAnswer", {
answer: JSON.stringify({
activityId: this.answerDialog.activity.id,
answerRecordId: this.answerDialog.answerRecordId,
answerTime: this.answerDialog.quizElapsedSeconds,
subjects: this.submitSubjects.map((subject) => {
return {
id: subject.id,
@@ -1221,7 +1365,14 @@ layout("/layouts/platform.html"){
}).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.answerDialog.visible = false
if (this.answerDialog.activity.category === "QUIZ") {
// 提交后读取服务端判题结果，直接展示成绩并防止重复提交。
this.answerDialog.readonly = true
this.stopQuizTimer()
this.loadAnswerRecord()
} else {
this.answerDialog.visible = false
}
this.pageData()
} else {
this.$message.error(res.msg)
@@ -1237,7 +1388,7 @@ layout("/layouts/platform.html"){
this.openAnswerFromUrl()
},
beforeDestroy() {
this.stopVoteCountdown()
this.stopAnswerTimers()
}
})
</script>
src/main/resources/views/platform/zhgh/welfare/projectMange/filterUser.js
+3 -48
View File
@@ -62,7 +62,7 @@ const filterUser = {
</search-item>
<search-item label="所属单位">
<el-select @change="unitChange" clearable filterable
<el-select clearable filterable
placeholder="请选择所属单位" style="width: 100%"
v-model="pageForm.unitId">
<el-option
@@ -74,17 +74,6 @@ const filterUser = {
</el-select>
</search-item>
<search-item label="三级单位">
<el-select clearable filterable placeholder="请先选择所属单位" style="width: 100%"
v-model="pageForm.threeUnitId">
<el-option
:key="item.id"
:label="item.name"
:value="item.id"
v-for="item in threeUnitOptions">
</el-option>
</el-select>
</search-item>
<search-item label="人员类型：">
<dict-select clearable code="USER_PERSON_TYPE"
@@ -94,13 +83,6 @@ const filterUser = {
v-model="pageForm.personTypes"></dict-select>
</search-item>
<search-item label="人员属性：">
<dict-select clearable code="USER_ATTRIBUTE"
multiple
collapse-tags
placeholder="请选择人员属性"
v-model="pageForm.userAttributes"></dict-select>
</search-item>
<search-item label="在职状态：">
<dict-select clearable code="USER_STATE"
@@ -169,14 +151,11 @@ const filterUser = {
userStates: [],
personTypes: [],
preparedBys: [],
userAttributes: [],
unitId: null,
threeUnitId: null
unitId: null
},
sexOptions: ["男", "女"],
unionOptions: [],
unitOptions: [],
threeUnitOptions: [],
tableColumns: [
{ prop: "loginname", label: "工号" },
{ prop: "username", label: "姓名" },
@@ -185,8 +164,7 @@ const filterUser = {
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "threeUnitName", label: "三级单位", sortable: true }
{ prop: "unitName", label: "所属单位", sortable: true }
]
}
},
@@ -208,35 +186,12 @@ const filterUser = {
this.$set(this.pageForm, "birthMonths", [])
this.$set(this.pageForm, "unionId", null)
this.$set(this.pageForm, "unitId", null)
this.$set(this.pageForm, "threeUnitId", null)
this.threeUnitOptions = []
this.$set(this.pageForm, "personTypes", [])
this.$set(this.pageForm, "preparedBys", [])
this.$set(this.pageForm, "userAttributes", [])
this.$set(this.pageForm, "userStates", [])
this.$set(this.pageForm, "isMember", null)
},
// 所属单位改变后，仅加载该单位直属的三级单位，避免跨单位筛选。
unitChange(unitId) {
this.$set(this.pageForm, "threeUnitId", null)
this.threeUnitOptions = []
if (!unitId) {
return
}
this.$axios.post("/platform/sys/unit/child", { pid: unitId })
.then((res) => {
if (res.code === 0) {
this.threeUnitOptions = res.data || []
} else {
this.$message.error(res.msg || "三级单位查询失败")
}
})
.catch(() => {
this.$message.error("三级单位查询失败，请稍后重试")
})
},
pageData() {
this.tableLoading = true
this.$axios
src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html
-4
View File
@@ -65,10 +65,6 @@ layout("/layouts/platform.html"){
<dict-select v-model="pageForm.aidFundMemberUserType" placeholder="请选择人员分类" @change="doSearch"
code="AIDFUND_MEMBER_USER_TYPE"></dict-select>
</search-item>
<search-item label="人员属性">
<dict-select v-model="pageForm.userAttribute" placeholder="请选择人员属性" @change="doSearch"
code="USER_ATTRIBUTE"></dict-select>
</search-item>
</search>
</el-card>
src/main/resources/views/platform/zhgh/welfare/welfareUser/addUser.js
+2 -48
View File
@@ -63,7 +63,7 @@ const addUser = {
</search-item>
<search-item label="所属单位">
<el-select @change="unitChange" clearable
<el-select clearable
filterable
placeholder="请选择所属单位" style="width: 100%"
v-model="pageForm.unitId">
@@ -76,17 +76,6 @@ const addUser = {
</el-select>
</search-item>
<search-item label="三级单位">
<el-select clearable filterable placeholder="请先选择所属单位" style="width: 100%"
v-model="pageForm.threeUnitId">
<el-option
:key="item.id"
:label="item.name"
:value="item.id"
v-for="item in threeUnitOptions">
</el-option>
</el-select>
</search-item>
<search-item label="人员类型：">
<dict-select clearable code="USER_PERSON_TYPE"
@@ -96,13 +85,6 @@ const addUser = {
v-model="pageForm.personTypes"></dict-select>
</search-item>
<search-item label="人员属性：">
<dict-select clearable code="USER_ATTRIBUTE"
multiple
collapse-tags
placeholder="请选择人员属性"
v-model="pageForm.userAttributes"></dict-select>
</search-item>
<search-item label="在职状态：">
<dict-select clearable code="USER_STATE"
@@ -171,9 +153,7 @@ const addUser = {
birthMonths: [],
unionId: null,
unitId: null,
threeUnitId: null,
personTypes: [],
userAttributes: [],
preparedBys: [],
userStates: [],
isMember: null
@@ -181,7 +161,6 @@ const addUser = {
sexOptions: ["男", "女"],
unionOptions: [],
unitOptions: [],
threeUnitOptions: [],
tableColumns: [
{ prop: "loginname", label: "工号" },
{ prop: "username", label: "姓名" },
@@ -190,8 +169,7 @@ const addUser = {
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "userState", label: "在职状态", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "threeUnitName", label: "三级单位", sortable: true }
{ prop: "unitName", label: "所属单位", sortable: true }
]
}
},
@@ -213,10 +191,7 @@ const addUser = {
this.$set(this.pageForm, "birthMonths", [])
this.$set(this.pageForm, "unionId", null)
this.$set(this.pageForm, "unitId", null)
this.$set(this.pageForm, "threeUnitId", null)
this.$set(this, "threeUnitOptions", [])
this.$set(this.pageForm, "personTypes", [])
this.$set(this.pageForm, "userAttributes", [])
this.$set(this.pageForm, "preparedBys", [])
this.$set(this.pageForm, "userStates", [])
this.$set(this.pageForm, "isMember", null)
@@ -224,7 +199,6 @@ const addUser = {
async unionIdChange(val) {
this.$set(this.pageForm, "unitId", null)
this.unitChange(null)
if (val) {
this.$set(this, "unitOptions", await this.$businessTool.listUnit(val))
} else {
@@ -232,26 +206,6 @@ const addUser = {
}
},
// 所属单位改变后，仅加载该单位直属的三级单位，避免跨单位筛选。
unitChange(unitId) {
this.$set(this.pageForm, "threeUnitId", null)
this.$set(this, "threeUnitOptions", [])
if (!unitId) {
return
}
this.$axios.post("/platform/sys/unit/child", { pid: unitId })
.then((res) => {
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
src/main/resources/views/platform/zhgh/welfare/welfareUser/index.html
-46
View File
@@ -81,26 +81,12 @@ layout("/layouts/platform.html"){
collapse-tags
placeholder="请选择所属单位"
style="width: 100%"
@change="unitIdsChange"
v-model="pageForm.unitIds"
>
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitOptions"></el-option>
</el-select>
</search-item>
<search-item label="三级单位">
<el-select
clearable
filterable
multiple
collapse-tags
placeholder="请先选择所属单位"
style="width: 100%"
v-model="pageForm.threeUnitIds"
>
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in threeUnitOptions"></el-option>
</el-select>
</search-item>
<search-item label="人员类型：">
<dict-select
@@ -128,10 +114,6 @@ layout("/layouts/platform.html"){
<dict-select v-model="pageForm.aidFundMemberUserType" placeholder="请选择人员分类" @change="doSearch"
code="AIDFUND_MEMBER_USER_TYPE"></dict-select>
</search-item>
<search-item label="人员属性">
<dict-select v-model="pageForm.userAttributes" placeholder="请选择人员属性" @change="doSearch"
code="USER_ATTRIBUTE" clearable multiple collapse-tags></dict-select>
</search-item>
<!-- <search-item label="所选福利：">-->
<!-- <el-select clearable placeholder="请选择所选福利" style="width: 100%" v-model="pageForm.optionId">-->
@@ -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
src/main/resources/views/platform/zhghh5/dayofficework/qsv/quiz/index.html
+47
View File
@@ -16,6 +16,11 @@ layout("/layouts/platform_h5.html"){
</div>
<div class="quiz-card-scroll" v-if="!answerRecord.isFinish">
<van-collapse v-if="activity.description" v-model="descriptionPanels" class="quiz-description" @change="adaptDescriptionToMobile">
<van-collapse-item title="说明" name="description" :value="descriptionPanels.length ? '收起' : '展开'">
<div ref="descriptionContent" class="quiz-description-content" v-html="activity.description"></div>
</van-collapse-item>
</van-collapse>
<div v-for="(subject, index) in subjects" :key="index" class="subject">
<p>{{index+1}}、{{ subject.title }}</p>
<div class="tag">
@@ -65,6 +70,7 @@ layout("/layouts/platform_h5.html"){
H5JumpTo: GetQueryString("H5JumpTo"),
subjects: [],
activity: {},
descriptionPanels: [],
isFinished: false,
answerRecord: {},
answerRecordId: null,
@@ -100,6 +106,28 @@ layout("/layouts/platform_h5.html"){
}
},
methods: {
// 按原有字号层次缩小大字，不覆盖富文本颜色、字重、对齐等样式。
adaptDescriptionToMobile() {
this.$nextTick(() => {
const content = this.$refs.descriptionContent
if (!content || !this.descriptionPanels.length || content.dataset.mobileAdapted) return
// 先读取全部字号，避免父元素缩放后影响子元素的继承字号计算。
const sizes = [content, ...content.querySelectorAll('*')].map(element => ({
element,
size: parseFloat(window.getComputedStyle(element).fontSize)
}))
const maxSize = sizes.reduce((max, item) => Math.max(max, item.size || 0), 0)
if (maxSize > 22) {
const ratio = 8 / (maxSize - 14)
sizes.forEach(({ element, size }) => {
if (!Number.isFinite(size)) return
const mobileSize = size > 14 ? 14 + (size - 14) * ratio : size
element.style.setProperty('font-size', mobileSize + 'px', 'important')
})
}
content.dataset.mobileAdapted = 'true'
})
},
getCategoryPageTitle(category, defaultTitle) {
const titleMap = {
QUIZ: "在线答题",
@@ -412,6 +440,25 @@ layout("/layouts/platform_h5.html"){
box-sizing: border-box;
}
.quiz-description {
margin-bottom: 14px;
border-radius: 8px;
overflow: hidden;
}
.quiz-description-content {
color: #303133;
line-height: 1.8;
overflow-wrap: break-word;
overflow-x: auto;
}
/deep/ .quiz-description-content img {
max-width: 100%;
height: auto;
}
.subject {
background: #fff;
padding: 15px;
src/main/resources/views/platform/zhghh5/dayofficework/tour/mysignup/index.html
+45 -17
View File
@@ -276,8 +276,22 @@ layout("/layouts/platform_h5.html"){
font-weight: 600;
}
/* 导航栏参与弹层布局，正文独立滚动，避免固定导航遮住首张卡片。 */
.tour-record-popup {
display: flex;
flex-direction: column;
overflow: hidden;
padding-top: env(safe-area-inset-top);
box-sizing: border-box;
}
.tour-record-popup > .van-nav-bar {
flex-shrink: 0;
}
.tour-popup-body {
height: calc(100vh - 46px);
flex: 1;
min-height: 0;
overflow-y: auto;
padding: 10px 12px 76px;
background: #f4f6f8;
@@ -594,7 +608,7 @@ layout("/layouts/platform_h5.html"){
}
.tour-popup-body {
padding: 12px 12px 82px;
padding: 12px 12px calc(82px + env(safe-area-inset-bottom));
background-color: #f3f7fd;
}
@@ -616,6 +630,12 @@ layout("/layouts/platform_h5.html"){
box-shadow: 0 -6px 18px rgba(38, 66, 103, .08);
}
.tour-bottom-bar .tour-cancel-button {
border: 0;
color: #65748a;
background-color: #f0f2f5;
}
/* 列表页结构与提案校工会预审核保持一致，业务字段及操作条件继续沿用疗休养逻辑。 */
.tour-my-page .van-nav-bar {
background-color: #fff;
@@ -917,8 +937,8 @@ layout("/layouts/platform_h5.html"){
</div>
</van-popup>
<van-popup v-model="detailVisible" position="right" :style="{ width: '100%', height: '100%' }" :close-on-click-overlay="false">
<van-nav-bar title="报名详情" left-text="返回" left-arrow @click-left="closeHistoryPopup('detail')" fixed placeholder></van-nav-bar>
<van-popup v-model="detailVisible" class="tour-record-popup" position="right" :style="{ width: '100%', height: '100%' }" :close-on-click-overlay="false">
<van-nav-bar title="报名详情" left-text="返回" left-arrow @click-left="closeHistoryPopup('detail')"></van-nav-bar>
<div class="tour-popup-body">
<div class="tour-section">
<div class="tour-section-title">教职工信息</div>
@@ -926,6 +946,7 @@ layout("/layouts/platform_h5.html"){
<van-cell title="姓名" :value="detail.userName || ''"></van-cell>
<van-cell title="性别" :value="detail.gender || ''"></van-cell>
<van-cell title="身份证号" :value="detail.idCard || ''"></van-cell>
<van-cell title="手机号" :value="detail.mobile || ''"></van-cell>
<van-cell title="所在单位" :value="detail.unitName || ''"></van-cell>
<van-cell title="所在工会" :value="detail.unionName || ''"></van-cell>
</div>
@@ -972,14 +993,15 @@ layout("/layouts/platform_h5.html"){
</div>
</van-popup>
<van-popup v-model="signupVisible" position="right" :style="{ width: '100%', height: '100%' }" :close-on-click-overlay="false" @closed="destroySignup">
<van-nav-bar title="修改报名" left-text="返回" left-arrow @click-left="closeHistoryPopup('signup')" fixed placeholder></van-nav-bar>
<van-popup v-model="signupVisible" class="tour-record-popup" position="right" :style="{ width: '100%', height: '100%' }" :close-on-click-overlay="false" @closed="destroySignup">
<van-nav-bar title="修改报名" left-text="返回" left-arrow @click-left="closeHistoryPopup('signup')"></van-nav-bar>
<div class="tour-popup-body">
<div class="tour-section">
<div class="tour-section-title">教职工信息</div>
<van-field label="姓名" readonly v-model="signupForm.userName"></van-field>
<van-field label="工号" readonly v-model="signupForm.jobNo"></van-field>
<van-field label="身份证号" v-model="signupForm.idCard" maxlength="30" placeholder="请填写身份证号"></van-field>
<van-field required label="身份证号" v-model="signupForm.idCard" maxlength="30" placeholder="请填写身份证号"></van-field>
<van-field required label="手机号" v-model="signupForm.mobile" type="tel" maxlength="11" placeholder="请填写手机号"></van-field>
<van-field label="所在工会" readonly v-model="signupForm.unionName"></van-field>
</div>
@@ -1007,12 +1029,12 @@ layout("/layouts/platform_h5.html"){
<div v-if="isDirectFamilyLine(signupForm)" class="tour-section">
<div class="tour-section-title">直系亲属线路</div>
<van-field label="亲属姓名" v-model="directRelativeForm.relativeName" maxlength="100" placeholder="请输入亲属姓名"></van-field>
<van-field label="所在单位" v-model="directRelativeForm.unitName" maxlength="100" placeholder="请输入所在单位"></van-field>
<van-field readonly clickable is-link label="亲属关系" v-model="directRelativeForm.relationshipName" placeholder="请选择亲属关系" @click="openDirectRelativePicker"></van-field>
<van-field label="线路名称" v-model="directRelativeForm.lineName" maxlength="100" placeholder="请输入线路名称"></van-field>
<van-field label="出行开始" v-model="directRelativeForm.travelStartTime" type="date" placeholder="请选择出行开始日期"></van-field>
<van-field label="出行结束" v-model="directRelativeForm.travelEndTime" type="date" placeholder="请选择出行结束日期"></van-field>
<van-field required label="亲属姓名" v-model="directRelativeForm.relativeName" maxlength="100" placeholder="请输入亲属姓名"></van-field>
<van-field required label="所在单位" v-model="directRelativeForm.unitName" maxlength="100" placeholder="请输入所在单位"></van-field>
<van-field required readonly clickable is-link label="亲属关系" v-model="directRelativeForm.relationshipName" placeholder="请选择亲属关系" @click="openDirectRelativePicker"></van-field>
<van-field required label="线路名称" v-model="directRelativeForm.lineName" maxlength="100" placeholder="请输入线路名称"></van-field>
<van-field required label="出行开始" v-model="directRelativeForm.travelStartTime" type="date" placeholder="请选择出行开始日期"></van-field>
<van-field required label="出行结束" v-model="directRelativeForm.travelEndTime" type="date" placeholder="请选择出行结束日期"></van-field>
</div>
<div v-if="allowFamily && !isDirectFamilyLine(signupForm)" class="tour-section">
@@ -1054,7 +1076,7 @@ layout("/layouts/platform_h5.html"){
:title="familyTabTitle(family, familyIndex)">
<div class="tour-family-form">
<van-field required label="姓名" v-model="family.familyName" maxlength="100" placeholder="请填写姓名"></van-field>
<van-field required label="年龄" v-model.number="family.age" type="digit" placeholder="请填写年龄"></van-field>
<van-field required label="年龄" v-model.number="family.age" type="number" :formatter="formatFamilyAge" placeholder="请填写年龄"></van-field>
<van-field required label="性别">
<template #input>
<van-radio-group v-model="family.gender" direction="horizontal">
@@ -1065,7 +1087,7 @@ layout("/layouts/platform_h5.html"){
</van-field>
<van-field :required="familyContactRequired(family)" label="身份证号码" v-model="family.idCard" maxlength="18" placeholder="请填写身份证号码" @blur="normalizeFamilyIdCard(family)"></van-field>
<van-field :required="familyContactRequired(family)" label="手机号" v-model="family.mobile" type="tel" maxlength="30" placeholder="请填写手机号"></van-field>
<van-field required readonly clickable is-link label="与本人关系" v-model="family.relationship" placeholder="请选择关系" @click="openRelationshipPicker"></van-field>
<van-field required readonly clickable is-link label="与本人关系" v-model="family.relationship" placeholder="请选择关系" @click="openRelationshipPicker(familyIndex)"></van-field>
<van-field v-if="fillBedInfo" readonly clickable is-link label="床型" v-model="family.bedType" placeholder="请选择房型" @click="openBedPicker('family')"></van-field>
<van-field v-if="fillBedInfo" label="床位" v-model="family.bedInfo" maxlength="100" placeholder="请输入床位数量"></van-field>
<van-field v-if="fillBedInfo" label="意向拼床人" v-model="family.intendedRoommate" maxlength="100" placeholder="请输入意向拼床人"></van-field>
@@ -1087,8 +1109,8 @@ layout("/layouts/platform_h5.html"){
<div v-else class="tour-family-empty">暂无亲属，请按需添加</div>
</div>
</div>
<div class="tour-bottom-bar">
<van-button v-if="signupForm.id" type="danger" plain block round :loading="cancelLoading" @click="cancelSignup">取消报名</van-button>
<div class="tour-bottom-bar tour-h5-fixed-bar">
<van-button v-if="signupForm.id" class="tour-cancel-button" type="default" block round :loading="cancelLoading" @click="cancelSignup">取消报名</van-button>
<van-button type="info" block round :loading="signupLoading" @click="submitSignup">提交</van-button>
</div>
</van-popup>
@@ -1442,6 +1464,7 @@ layout("/layouts/platform_h5.html"){
userName: "",
gender: "",
idCard: "",
mobile: "",
unitId: "",
unitName: "",
unionId: "",
@@ -1601,6 +1624,11 @@ layout("/layouts/platform_h5.html"){
isBlankValue(value) {
return value === undefined || value === null || !String(value).trim()
},
// 与 Web 端一致，亲属年龄限定为 0～120 岁整数，清空时保留必填状态。
formatFamilyAge(value) {
const age = parseInt(value, 10)
return Number.isNaN(age) ? "" : String(Math.min(120, Math.max(0, age)))
},
// 年满16周岁的亲属才强制填写身份证号码和手机号。
familyContactRequired(family) {
return family && !this.isBlankValue(family.age) && Number(family.age) >= 16
src/main/resources/views/platform/zhghh5/dayofficework/tour/signup/apply.html
+12 -7
View File
@@ -307,9 +307,9 @@ layout("/layouts/platform_tour_signup_h5.html"){
<div v-if="isDirectFamilyLine(signupForm)" class="tour-apply-card">
<div class="tour-apply-title">直系亲属线路</div>
<van-field label="亲属姓名" v-model="directRelativeForm.relativeName" maxlength="100" placeholder="请输入亲属姓名"></van-field>
<van-field label="所在单位" v-model="directRelativeForm.unitName" maxlength="100" placeholder="请输入所在单位"></van-field>
<van-field
<van-field required label="亲属姓名" v-model="directRelativeForm.relativeName" maxlength="100" placeholder="请输入亲属姓名"></van-field>
<van-field required label="所在单位" v-model="directRelativeForm.unitName" maxlength="100" placeholder="请输入所在单位"></van-field>
<van-field required
label="亲属关系"
readonly
clickable
@@ -318,9 +318,9 @@ layout("/layouts/platform_tour_signup_h5.html"){
v-model="directRelativeForm.relationshipName"
@click="openDirectRelativePicker">
</van-field>
<van-field label="线路名称" v-model="directRelativeForm.lineName" maxlength="100" placeholder="请输入线路名称"></van-field>
<van-field label="出行开始" v-model="directRelativeForm.travelStartTime" type="date" placeholder="请选择出行开始日期"></van-field>
<van-field label="出行结束" v-model="directRelativeForm.travelEndTime" type="date" placeholder="请选择出行结束日期"></van-field>
<van-field required label="线路名称" v-model="directRelativeForm.lineName" maxlength="100" placeholder="请输入线路名称"></van-field>
<van-field required label="出行开始" v-model="directRelativeForm.travelStartTime" type="date" placeholder="请选择出行开始日期"></van-field>
<van-field required label="出行结束" v-model="directRelativeForm.travelEndTime" type="date" placeholder="请选择出行结束日期"></van-field>
</div>
<div class="tour-apply-card">
@@ -365,7 +365,7 @@ layout("/layouts/platform_tour_signup_h5.html"){
:title="familyTabTitle(family, familyIndex)">
<div class="tour-family-form">
<van-field required label="姓名" v-model="family.familyName" maxlength="100" placeholder="请填写姓名"></van-field>
<van-field required label="年龄" v-model.number="family.age" type="digit" placeholder="请填写年龄"></van-field>
<van-field required label="年龄" v-model.number="family.age" type="number" :formatter="formatFamilyAge" placeholder="请填写年龄"></van-field>
<van-field required label="性别">
<template #input>
<van-radio-group v-model="family.gender" direction="horizontal">
@@ -753,6 +753,11 @@ layout("/layouts/platform_tour_signup_h5.html"){
isBlankValue(value) {
return value === undefined || value === null || !String(value).trim()
},
// 与 Web 端一致，亲属年龄限定为 0～120 岁整数，清空时保留必填状态。
formatFamilyAge(value) {
const age = parseInt(value, 10)
return Number.isNaN(age) ? "" : String(Math.min(120, Math.max(0, age)))
},
// 年满16周岁的亲属才强制填写身份证号码和手机号。
familyContactRequired(family) {
return family && !this.isBlankValue(family.age) && Number(family.age) >= 16