diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html index 928284ac..a9569d89 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html @@ -3,164 +3,156 @@ layout("/layouts/platform.html"){ #-->
- - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 根据《河北省人口与计划生育条例》第四章第三十四条第四款"独生子女父母是国家工作人员、企事业单位员工的，退休时分别给予不低于三千元一次性奖励"的规定。
+ 说明：1. 本人应如实填写各项情况。2. 申报时需持《独生子女父母光荣证》、《退休证》原件及其复印件各一份。 + + + + + + 保存 + 提交 + 提交1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 根据《河北省人口与计划生育条例》第四章第三十四条第四款"独生子女父母是国家工作人员、企事业单位员工的，退休时分别给予不低于三千元一次性奖励"的规定。
- 说明：1. 本人应如实填写各项情况。2. 申报时需持《独生子女父母光荣证》、《退休证》原件及其复印件各一份。 - - - - - - 保存 - 提交 - 提交1 -
@@ -176,9 +168,23 @@ layout("/layouts/platform.html"){ taskId: GetQueryString("taskId"), formData: {}, formRules: { - declarationAgreed: [ - { required: true, message: '请勾选申报理由', trigger: 'change' } - ] + userName: [{ required: true, message: '职工姓名不能为空', trigger: 'blur' }], + sex: [{ required: true, message: '性别不能为空', trigger: 'blur' }], + birthday: [{ required: true, message: '出生年月不能为空', trigger: 'blur' }], + unitName: [{ required: true, message: '原工作单位不能为空', trigger: 'blur' }], + retireTime: [{ required: true, message: '请选择退休时间', trigger: 'change' }], + loverName: [{ required: true, message: '请输入爱人姓名', trigger: 'blur' }], + loverSex: [{ required: true, message: '请选择爱人性别', trigger: 'change' }], + loverUnitName: [{ required: true, message: '请输入爱人工作单位', trigger: 'blur' }], + marryTime: [{ required: true, message: '请选择结婚日期', trigger: 'change' }], + childrenBirthday: [{ required: true, message: '请选择子女出生日', trigger: 'change' }], + getCertificateTime: [{ required: true, message: '请选择领独生子女证日', trigger: 'change' }], + childrenGraceNumber: [{ required: true, message: '请输入独生子女光荣证号', trigger: 'blur' }], + office: [{ required: true, message: '请输入办证机关', trigger: 'blur' }], + honorFiles: [{ required: true, message: '请上传独生子女父母光荣证', trigger: 'change' }], + retireFiles: [{ required: true, message: '请上传退休证', trigger: 'change' }], + sign: [{ required: true, message: '请签字', trigger: 'change' }], + declarationAgreed: [{ required: true, message: '请勾选申报理由', trigger: 'change', type: 'enum', enum: [true] }] }, } }, @@ -199,54 +205,101 @@ layout("/layouts/platform.html"){ }) }) }, - // 提交 - onSubmit() { - this.$refs.formRef.validate((valid) => { - if (valid) { - this.$confirm("您确定要提交吗？", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - this.$axios.post('/platform/dsznfmtx/apply/submit', { - data: JSON.stringify(this.formData) - }).then(res => { - if (res.code === 0) { - this.$message.success("提交成功") - commonUtil.pjaxPush('/platform/dsznfmtx/mine/index') - } - }) - }) - } else { - this.$message.error('请完善表单信息并勾选申报理由'); - return false; - } + // 提交验证 + validateBeforeSubmit() { + return new Promise((resolve) => { + this.$refs.formRef.validate((valid) => { + if (valid) { + resolve(true); + } else { + this.$message.error('请完善表单信息并勾选申报理由'); + resolve(false); + } + }); }); }, - // 再次提交 - onFinishTask() { - this.$refs.formRef.validate((valid) => { - if (valid) { - this.$confirm("您确定要提交吗？", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(() => { - this.$axios.post('/platform/dsznfmtx/apply/submitAgain', { - data: JSON.stringify(this.formData), - taskId: GetQueryString("taskId") - }).then(res => { - if (res.code === 0) { - this.$message.success("提交成功") - commonUtil.pjaxPush('/platform/dsznfmtx/mine/index') - } - }) - }) - } else { - this.$message.error('请完善表单信息并勾选申报理由'); - return false; + // 添加检查是否为退休人员的方法 + async checkRetirementStatus() { + try { + const resp = await this.$axios.post('/platform/dsznfmtx/apply/checkRetirementStatus'); + // 如果返回code为0且data为true，表示用户是退休人员 + if (resp.code === 0 && resp.data === true) { + return true; } - }); + return false; + } catch (error) { + console.error('检查退休状态失败:', error); + return false; + } + }, + // 检查用户是否已申请过 + async checkUserApplication() { + try { + const resp = await this.$axios.post('/platform/dsznfmtx/apply/checkUserApplied'); + // 如果返回code为0且data为true，表示用户已申请过 + if (resp.code === 0 && resp.data === true) { + return true; + } + return false; + } catch (error) { + console.error('检查用户申请状态失败:', error); + return false; + } + }, + // 提交 + async onSubmit() { + // 检查是否为退休人员 + const isRetired = await this.checkRetirementStatus(); + if (!isRetired) { + this.$message.warning('您不是退休人员，无法申请此项福利'); + return; + } + + if (!this.bizId) { + const isApplied = await this.checkUserApplication(); + if (isApplied) { + this.$message.warning('您已经提交过申请，不能重复申请'); + return; + } + } + const isValid = await this.validateBeforeSubmit(); + if (!isValid) return; + + this.$confirm("您确定要提交吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + this.$axios.post('/platform/dsznfmtx/apply/submit', { + data: JSON.stringify(this.formData) + }).then(res => { + if (res.code === 0) { + this.$message.success("提交成功") + commonUtil.pjaxPush('/platform/dsznfmtx/mine/index') + } + }) + }) + }, + // 再次提交 + async onFinishTask() { + const isValid = await this.validateBeforeSubmit(); + if (!isValid) return; + + this.$confirm("您确定要提交吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + this.$axios.post('/platform/dsznfmtx/apply/submitAgain', { + data: JSON.stringify(this.formData), + taskId: GetQueryString("taskId") + }).then(res => { + if (res.code === 0) { + this.$message.success("提交成功") + commonUtil.pjaxPush('/platform/dsznfmtx/mine/index') + } + }) + }) }, async findOne(id) { const resp = await $.get('/platform/dsznfmtx/apply/findOne', {id}) @@ -272,9 +325,7 @@ layout("/layouts/platform.html"){ sex: sex, birthday: birthday, } - } - } }, created() { @@ -284,6 +335,7 @@ layout("/layouts/platform.html"){ + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/common/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/common/info.js index e65bb213..567ccfc5 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/common/info.js @@ -63,6 +63,12 @@ const DSZNFMTX_INFO = { {{ task.taskFormData.opinion }} + + + 暂无 + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html index d18b3e05..f0e8edb0 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html @@ -88,9 +88,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - - + + + 取消 diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html index 96d6d712..94a9507a 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html @@ -86,9 +86,9 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - - + + + 取消 diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html index f599d1c9..034e96a2 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html @@ -111,12 +111,8 @@ layout("/layouts/platform.html"){ {{formData.leaveDays}} - - - - {{viewData.winterLeave}} {{viewData.summerLeave}} - {{viewData.leaveDays}} - + {{viewData.leaveDays}} - - {{viewData.startTime}} {{viewData.endTime}} {{viewData.childrenBirthday}} @@ -76,9 +73,15 @@ const maternityLeaveInfo = { - {{ + {{ task.taskFormData.opinion }} + + + 暂无 + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html index 77486188..7de9ea33 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html @@ -87,8 +87,8 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html index f9ece2fc..dd273a85 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html @@ -86,8 +86,8 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> - - + + @@ -131,6 +131,7 @@ layout("/layouts/platform.html"){ methods: { onView(row) { this.$refs.guava.view(()=>{ + this.showApprovalForm = false; this.$refs.maternityLeaveInfoRef.onOpen(row) }) }, diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/apply/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/apply/index.html index 6c17e2ca..848c776b 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/apply/index.html @@ -9,7 +9,7 @@ layout("/layouts/platform_h5.html"){ }
-
@@ -101,10 +101,11 @@ layout("/layouts/platform_h5.html"){ > - - - - + + + diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/common/info.js b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/common/info.js index 5124e59a..7db1a8ac 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/common/info.js +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/common/info.js @@ -24,10 +24,11 @@ const DSZNFMTX_INFO = { - - - - + + +