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

feat: 困难帮扶 优化

Browse Source
This commit is contained in:
c-chenxs1
2026-10-09 17:30:07 +08:00
parent 7d76ae4e36
commit 45121f7b2e
8 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/staffbenefit/difficulthelp/controller/DifficultHelpReadingController.java
-3
View File
@@ -398,9 +398,6 @@ public class DifficultHelpReadingController {
if (!taskKeys[i].equals(task.getTaskName())) continue; if (!taskKeys[i].equals(task.getTaskName())) continue;
cn.hutool.core.lang.Dict data = taskVO.getTaskFormData(); cn.hutool.core.lang.Dict data = taskVO.getTaskFormData();
String opinion = StrUtil.nullToEmpty(data.getStr("opinion")); String opinion = StrUtil.nullToEmpty(data.getStr("opinion"));
if (i < 2 && data.get("money") != null) {
opinion += "\n级别：" + StrUtil.nullToEmpty(data.getStr("level")) + " 帮扶金额：" + data.get("money") + "元";
}
docData.put(fields[i] + "Opinion", opinion); docData.put(fields[i] + "Opinion", opinion);
docData.put(fields[i] + "User", StrUtil.nullToEmpty(data.getStr("userName"))); docData.put(fields[i] + "User", StrUtil.nullToEmpty(data.getStr("userName")));
if (StrUtil.isNotBlank(data.getStr("sign"))) { if (StrUtil.isNotBlank(data.getStr("sign"))) {
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/form.html
+4 -4
View File
@@ -426,10 +426,10 @@
this.$set(this.formData, 'proxyLoginName', user.loginname) this.$set(this.formData, 'proxyLoginName', user.loginname)
this.$set(this.formData, 'mode', "1") this.$set(this.formData, 'mode', "1")
this.$set(this.formData, 'sex', user.sex) this.$set(this.formData, 'sex', user.sex)
this.$set(this.formData, 'unitId', user.unit.id) this.$set(this.formData, 'unitId', (user.unit || {}).id || user.unitId || null)
this.$set(this.formData, 'unitName', user.unit.name) this.$set(this.formData, 'unitName', (user.unit || {}).name || '')
this.$set(this.formData, 'unionId', user.union.id) this.$set(this.formData, 'unionId', (user.union || {}).id || (user.unit || {}).unionId || null)
this.$set(this.formData, 'unionName', user.union.name) this.$set(this.formData, 'unionName', (user.union || {}).name || '')
this.$set(this.formData, 'monthlyIncome', null) this.$set(this.formData, 'monthlyIncome', null)
this.$set(this.formData, 'birthday', user.birthday) this.$set(this.formData, 'birthday', user.birthday)
this.$set(this.formData, 'mobile', user.mobile) this.$set(this.formData, 'mobile', user.mobile)
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html
+5 -5
View File
@@ -297,7 +297,7 @@ layout("/layouts/platform.html"){
</el-card> </el-card>
<div v-else> <div v-else>
<el-card class="box-card" style="height: 92vh" shadow="never"> <el-card class="box-card" style="height: 92vh" shadow="never">
<el-result icon="warning" title="温馨提醒" subTitle=""> <el-result icon="warning" title="温馨提醒" sub-title="">
<template slot="extra"> <template slot="extra">
<span v-if="blockMessage">{{blockMessage}}</span> <span v-if="blockMessage">{{blockMessage}}</span>
<span v-else>抱歉，当前时间不能申请，可申请时间为{{time}}。</span> <span v-else>抱歉，当前时间不能申请，可申请时间为{{time}}。</span>
@@ -495,10 +495,10 @@ layout("/layouts/platform.html"){
this.$set(this.formData, 'proxyLoginName', user.loginname) this.$set(this.formData, 'proxyLoginName', user.loginname)
this.$set(this.formData, 'mode', "1") this.$set(this.formData, 'mode', "1")
this.$set(this.formData, 'sex', user.sex) this.$set(this.formData, 'sex', user.sex)
this.$set(this.formData, 'unitId', user.unit.id) this.$set(this.formData, 'unitId', (user.unit || {}).id || user.unitId || null)
this.$set(this.formData, 'unitName', user.unit.name) this.$set(this.formData, 'unitName', (user.unit || {}).name || '')
this.$set(this.formData, 'unionId', user.union.id) this.$set(this.formData, 'unionId', (user.union || {}).id || (user.unit || {}).unionId || null)
this.$set(this.formData, 'unionName', user.union.name) this.$set(this.formData, 'unionName', (user.union || {}).name || '')
this.$set(this.formData, 'yearIncome', null) this.$set(this.formData, 'yearIncome', null)
this.$set(this.formData, 'birthday', user.birthday) this.$set(this.formData, 'birthday', user.birthday)
this.$set(this.formData, 'idCard', user.idCard) this.$set(this.formData, 'idCard', user.idCard)
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/branchunionapproval/index.html
+2 -2
View File
@@ -350,7 +350,7 @@ layout("/layouts/platform.html"){
if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) { if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
this.units = await this.$businessTool.listUnit(this.pageForm.unionId) this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
} else { } else {
this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id) this.units = await this.$businessTool.listUnit((this.$store.state.user.union || {}).id || this.pageForm.unionId)
} }
}, },
handleSelectionChange: function (val) { handleSelectionChange: function (val) {
@@ -362,7 +362,7 @@ layout("/layouts/platform.html"){
if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) { if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
this.unions = await this.$businessTool.listUnion() this.unions = await this.$businessTool.listUnion()
} else { } else {
this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id) this.unions = await this.$businessTool.listUnion((this.$store.state.user.union || {}).id)
} }
} }
}) })
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/mine/index.html
+2 -2
View File
@@ -184,7 +184,7 @@ layout("/layouts/platform.html"){
if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) { if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
this.units = await this.$businessTool.listUnit(this.pageForm.unionId) this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
} else { } else {
this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id) this.units = await this.$businessTool.listUnit((this.$store.state.user.union || {}).id || this.pageForm.unionId)
} }
}, },
doExportApply(row, format) { doExportApply(row, format) {
@@ -196,7 +196,7 @@ layout("/layouts/platform.html"){
if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) { if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
this.unions = await this.$businessTool.listUnion() this.unions = await this.$businessTool.listUnion()
} else { } else {
this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id) this.unions = await this.$businessTool.listUnion((this.$store.state.user.union || {}).id)
} }
} }
}) })
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/reading/index.html
+2 -2
View File
@@ -181,7 +181,7 @@ layout("/layouts/platform.html"){
if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) { if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
this.units = await this.$businessTool.listUnit(this.pageForm.unionId) this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
} else { } else {
this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id) this.units = await this.$businessTool.listUnit((this.$store.state.user.union || {}).id || this.pageForm.unionId)
} }
}, },
exportYearPayRecord(){ exportYearPayRecord(){
@@ -207,7 +207,7 @@ layout("/layouts/platform.html"){
if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) { if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
this.unions = await this.$businessTool.listUnion() this.unions = await this.$businessTool.listUnion()
} else { } else {
this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id) this.unions = await this.$businessTool.listUnion((this.$store.state.user.union || {}).id)
} }
} }
}) })
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/schoolunionapproval/index.html
+2 -2
View File
@@ -296,7 +296,7 @@ layout("/layouts/platform.html"){
if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) { if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
this.units = await this.$businessTool.listUnit(this.pageForm.unionId) this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
} else { } else {
this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id) this.units = await this.$businessTool.listUnit((this.$store.state.user.union || {}).id || this.pageForm.unionId)
} }
}, },
}, },
@@ -305,7 +305,7 @@ layout("/layouts/platform.html"){
if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) { if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
this.unions = await this.$businessTool.listUnion() this.unions = await this.$businessTool.listUnion()
} else { } else {
this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id) this.unions = await this.$businessTool.listUnion((this.$store.state.user.union || {}).id)
} }
} }
}) })
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/unionLeaderApproval/index.html
+2 -2
View File
@@ -343,7 +343,7 @@ layout("/layouts/platform.html"){
if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) { if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
this.units = await this.$businessTool.listUnit(this.pageForm.unionId) this.units = await this.$businessTool.listUnit(this.pageForm.unionId)
} else { } else {
this.units = await this.$businessTool.listUnit(this.$store.state.user.union.id) this.units = await this.$businessTool.listUnit((this.$store.state.user.union || {}).id || this.pageForm.unionId)
} }
}, },
handleSelectionChange: function (val) { handleSelectionChange: function (val) {
@@ -355,7 +355,7 @@ layout("/layouts/platform.html"){
if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) { if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) {
this.unions = await this.$businessTool.listUnion() this.unions = await this.$businessTool.listUnion()
} else { } else {
this.unions = await this.$businessTool.listUnion(this.$store.state.user.union.id) this.unions = await this.$businessTool.listUnion((this.$store.state.user.union || {}).id)
} }
} }
}) })