From 4f8ccd1101e1891d25638950a2c1e00807763a89 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Thu, 13 Nov 2025 14:19:46 +0800 Subject: [PATCH] commit --- .../sys/controller/SysUnionController.java | 2 +- .../open/commons/CommonController.java | 1 + .../config/ProposalConfigUnitController.java | 11 +- .../TeacherCongressDelegationController.java | 2 +- .../controller/CondolenceMineController.java | 21 ++ ...ndolenceSchoolUnionApprovalController.java | 98 +++--- .../condolence/model/Condolence.java | 6 + .../grassrootscongress/meeting/info.js | 2 +- .../transact/committeeFiling/index.html | 2 + .../teachercongress/delegation/headForm.js | 4 +- .../teachercongress/meetings/index.html | 4 +- .../staffbenefit/condolence/apply/index.html | 136 +++---- .../condolence/branchUnionApproval/index.html | 4 + .../staffbenefit/condolence/common/info.js | 15 +- .../staffbenefit/condolence/mine/index.html | 28 +- .../condolence/schoolUnionApproval/index.html | 4 + .../maternityLeave/mine/index.html | 2 +- .../staffbenefit/condolence/apply/index.html | 332 +++++++++--------- .../condolence/branchUnionApproval/index.html | 47 ++- .../staffbenefit/condolence/common/info.js | 10 +- .../condolence/schoolUnionApproval/index.html | 47 ++- 21 files changed, 446 insertions(+), 332 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/controller/SysUnionController.java b/src/main/java/com/budwk/app/sys/controller/SysUnionController.java index 3cc8338..50cffeb 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysUnionController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysUnionController.java @@ -373,7 +373,7 @@ public class SysUnionController { @SaCheckPermission("sys.manager.union.partUnit") public Result branchUnionPartUnitTransferData(String unionId) { // List units = dao.query(Sys_unit.class, Cnd.where("unitLevel", "=", 2).asc("unitcode")); - List units = dao.query(Sys_unit.class, Cnd.where("unitTypeCode", "=", "1").asc("unitcode")); + List units = dao.query(Sys_unit.class, Cnd.where("unitTypeCode", "=", "1").and("LENGTH(unitcode)", "=", 7).asc("unitcode")); List selectUnitIds = units.stream().filter(unit -> StrUtil.isNotBlank(unit.getUnionId()) && unit.getUnionId().equals(unionId)).map(Sys_unit::getId).toList(); List matchUnits = units.stream().filter(unit -> StrUtil.isBlank(unit.getUnionId()) || (StrUtil.isNotBlank(unit.getUnionId()) && unit.getUnionId().equals(unionId))).toList(); NutMap transferData = NutMap.NEW().addv("selectUnitIds", selectUnitIds).addv("allUnits", matchUnits); diff --git a/src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java b/src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java index 4535fdd..5b87594 100644 --- a/src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java +++ b/src/main/java/com/budwk/app/web/controllers/open/commons/CommonController.java @@ -136,6 +136,7 @@ public class CommonController { Cnd cnd = Cnd.NEW(); cnd.andEX("unit.unionId", "=", unionId); cnd.and("unit.unitTypeCode", "=", "1"); + cnd.and("unit.unionId", "is not", null); cnd.asc("unit.unitcode"); sql.setCondition(cnd); List unitList = sysUserService.listMap(sql); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigUnitController.java b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigUnitController.java index 1034f6e..20c6ec6 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigUnitController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/proposal/controller/config/ProposalConfigUnitController.java @@ -114,7 +114,8 @@ public class ProposalConfigUnitController { @SLog(tag = "提案", msg = "承办单位同步系统单位") public Result syncSysUnit() { Sql sql = Sqls.create("select code from proposal_undertake"); - List sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitcode, "not in", sql).and(Sys_unit::getUnitTypeCode, "=", 1)); + List sysUnits = dao.query(Sys_unit.class, Cnd.where(Sys_unit::getUnitcode, "not in", sql) + .and(Sys_unit::getUnitTypeCode, "=", 1).and("unionId", "is not", null)); List proposalUndertakes = sysUnits.stream().map(unit -> { ProposalUndertake proposalUndertake = new ProposalUndertake(); proposalUndertake.setId(unit.getId()); @@ -198,10 +199,10 @@ public class ProposalConfigUnitController { //查询全部的校领导 Sql sql = Sqls.create("select id,username,loginname,unitname,concat(username,'(',loginname,')') label from vw_user where unitId in (@unitId)"); ProposalConfig proposalConfig = dao.fetch(ProposalConfig.class, Cnd.NEW()); - if(ObjectUtil.isNull(proposalConfig)){ + if (ObjectUtil.isNull(proposalConfig)) { return Result.error("提案全局配置未配置，请在提案管理-基础配置-提案配置页面进行配置。"); } - if(ObjectUtil.isEmpty(proposalConfig.getSchoolLeaderUnitIds())){ + if (ObjectUtil.isEmpty(proposalConfig.getSchoolLeaderUnitIds())) { return Result.error("校领导单位未配置，请在提案管理-基础配置-提案配置页面进行配置。"); } @@ -230,8 +231,8 @@ public class ProposalConfigUnitController { Sql sql = Sqls.create("select id,username,loginname,unitname,concat(username,'(',loginname,')') label from vw_user $condition"); Cnd cnd = Cnd.NEW(); - cnd.and("unitCode","=",proposalUndertake.getCode()); - cnd.orEX("id","in",selectUserIds); + cnd.and("unitCode", "=", proposalUndertake.getCode()); + cnd.orEX("id", "in", selectUserIds); sql.setCondition(cnd); // sql.setParam("unitCode", proposalUndertake.getCode()); // sql.setParam("selectUserIds", selectUserIds); diff --git a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java index b449b7c..a96a444 100644 --- a/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java +++ b/src/main/java/com/budwk/app/zhgh/democratic/teachercongress/delegation/controller/TeacherCongressDelegationController.java @@ -179,7 +179,7 @@ public class TeacherCongressDelegationController { seg.orEX("id", "in", selectUnitIds); // Cnd cnd = Cnd.where("unitLevel", "=", 2); - Cnd cnd = Cnd.where("unitTypeCode", "=", "1"); + Cnd cnd = Cnd.where("unitTypeCode", "=", "1").and("unionId","is not",null); if (!seg.isEmpty()) { cnd.and(seg); } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java index ad5f339..05ec07d 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java @@ -9,11 +9,13 @@ import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; +import com.budwk.app.base.utils.CommonDownloadUtil; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.flow.engine.FlowEngine; import com.budwk.app.sys.views.View_user; import com.budwk.app.web.commons.auth.utils.AuthUtil; import com.budwk.app.web.commons.auth.utils.SecurityUtil; +import com.budwk.app.zhgh.democratic.proposal.models.ProposalInfo; import com.budwk.app.zhgh.staffbenefit.condolence.model.Condolence; import com.budwk.app.zhgh.staffbenefit.condolence.model.CondolenceType; import com.budwk.app.zhgh.staffbenefit.condolence.service.CondolenceService; @@ -21,8 +23,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; +import org.nutz.dao.FieldFilter; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.Daos; import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; @@ -33,6 +37,11 @@ import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; import org.nutz.mvc.annotation.Param; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.io.ByteArrayOutputStream; +import java.io.IOException; + /** * @ClassName CondolenceApplyController * @Author JyuHsin @@ -138,4 +147,16 @@ public class CondolenceMineController { nutMap.put("typeName", type.getName()); return Result.success(nutMap); } + + @At + @ApiOperation("导出单个慰问申请信息") + @SaCheckPermission("condolence") + public void onExport(@Valid String id, HttpServletResponse response){ + Condolence condolence = condolenceService.fetch(id); + + String fileName; + + + + } } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java index ac36de4..4adb4e6 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceSchoolUnionApprovalController.java @@ -39,29 +39,31 @@ import java.util.List; @Ok("json:full") public class CondolenceSchoolUnionApprovalController { - @Inject - private CondolenceService condolenceService; + @Inject + private CondolenceService condolenceService; - @At("/") - @Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html") - @SaCheckPermission("condolence.schoolUnionApproval") - public void index() {} + @At("/") + @Ok("beetl:/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html") + @SaCheckPermission("condolence.schoolUnionApproval") + public void index() { + } - @At("/h5") - @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html") - @SaCheckPermission("h5.condolence.schoolUnionApproval") - public void h5Index() {} + @At("/h5") + @Ok("beetl:/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html") + @SaCheckPermission("h5.condolence.schoolUnionApproval") + public void h5Index() { + } - @At - @ApiOperation("分页查询") - @SaCheckPermission(value = {"condolence.schoolUnionApproval", "h5.condolence.schoolUnionApproval"}, mode = SaMode.OR) - public Result pageData(PageForm pageForm, - @Param(value = "year") Integer year, - @Param(value = "type") String type, - @Param(value = "unionId") String unionId, - @Param(value = "unitId") String unitId, - @Param(value = "approval") Boolean approval) { - Sql sql = Sqls.create(""" + @At + @ApiOperation("分页查询") + @SaCheckPermission(value = {"condolence.schoolUnionApproval", "h5.condolence.schoolUnionApproval"}, mode = SaMode.OR) + public Result pageData(PageForm pageForm, + @Param(value = "year") Integer year, + @Param(value = "type") String type, + @Param(value = "unionId") String unionId, + @Param(value = "unitId") String unitId, + @Param(value = "approval") Boolean approval) { + Sql sql = Sqls.create(""" SELECT info.*, type.name as typeName, @@ -91,35 +93,35 @@ public class CondolenceSchoolUnionApprovalController { LEFT JOIN wf_process_task rt ON rt.processInstanceId = ins.id AND rt.taskParentId = t.id AND rt.taskState = 10 $condition """); - Cnd cnd = Cnd.NEW(); - if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { - SqlExpressionGroup seg = new SqlExpressionGroup(); - seg.or(Condolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%"); - seg.or(Condolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%"); - cnd.and(seg); - } - cnd.andEX("info.type", "=", type); - cnd.andEX("YEAR(info.createTime)", "=", year); - cnd.andEX("info.applyUnionId", "=", unionId); - cnd.andEX("info.applyUnitId", "=", unitId); + Cnd cnd = Cnd.NEW(); + if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.or(Condolence::getHelpUserName, "like", "%" + pageForm.getSearchKeyword() + "%"); + seg.or(Condolence::getHelpLoginName, "like", "%" + pageForm.getSearchKeyword() + "%"); + cnd.and(seg); + } + cnd.andEX("info.type", "=", type); + cnd.andEX("YEAR(info.createTime)", "=", year); + cnd.andEX("info.applyUnionId", "=", unionId); + cnd.andEX("info.applyUnitId", "=", unitId); - cnd.and("t.taskName", "=", "ecdaef3b-edf4-4143-9a96-887dd5921711"); - cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); + cnd.and("t.taskName", "=", "ecdaef3b-edf4-4143-9a96-887dd5921711"); + cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); - if (approval) { - cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); - } else { - cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); - } + if (approval) { + cnd.and("t.taskState", "in", List.of(ProcessTaskStateEnum.FINISHED.getCode(), ProcessTaskStateEnum.INTERRUPT.getCode())); + } else { + cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); + } - if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { - cnd.desc("info.createTime"); - } else { - cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); - } - cnd.groupBy("t.id"); - sql.setCondition(cnd); - Pagination pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); - return Result.success(pageVO); - } + if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { + cnd.desc("info.createTime"); + } else { + cnd.orderBy(pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy())); + } + cnd.groupBy("t.id"); + sql.setCondition(cnd); + Pagination pageVO = condolenceService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql); + return Result.success(pageVO); + } } diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/model/Condolence.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/model/Condolence.java index 986da1a..e6e33f2 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/model/Condolence.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/model/Condolence.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import org.nutz.dao.entity.annotation.*; import org.nutz.dao.interceptor.annotation.PrevInsert; +import javax.validation.constraints.Size; import java.util.List; /** @@ -185,4 +186,9 @@ public class Condolence extends BaseModel { @ColDefine(type = ColType.VARCHAR, width = 30) private String createTime; + @Column + @Comment("职务") + @ColDefine(type = ColType.VARCHAR, width = 50) + private String position; + } diff --git a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/info.js b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/info.js index 071e2f3..a8f20c0 100644 --- a/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/info.js +++ b/src/main/resources/views/platform/zhgh/democratic/grassrootscongress/meeting/info.js @@ -31,7 +31,7 @@ const GRASSROOTS_CONGRESS_MEETING_INFO = { {{viewData.meetingRemark}} - + diff --git a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html index 8170879..191b53b 100644 --- a/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/proposal/transact/committeeFiling/index.html @@ -135,6 +135,8 @@ layout("/layouts/platform.html"){ diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headForm.js b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headForm.js index 1e0d779..44eeb8e 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headForm.js +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/delegation/headForm.js @@ -64,8 +64,8 @@ const HEAD_FORM_TEMPLATE = { name: [{required: true, message: "必填", trigger: ["change", "blur"]}], code: [{required: true, message: "必填", trigger: ["change", "blur"]}], userId: [{required: true, message: "必填", trigger: ["change", "blur"]}], - viceUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}], - contactUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}] + // viceUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}], + // contactUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}] } } }, diff --git a/src/main/resources/views/platform/zhgh/democratic/teachercongress/meetings/index.html b/src/main/resources/views/platform/zhgh/democratic/teachercongress/meetings/index.html index 0b7b056..20087bd 100644 --- a/src/main/resources/views/platform/zhgh/democratic/teachercongress/meetings/index.html +++ b/src/main/resources/views/platform/zhgh/democratic/teachercongress/meetings/index.html @@ -224,14 +224,14 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { - this.onDelete(id) - }).catch(() => { this.$axios.post("/platform/teacherCongress/meetings/delete", { id }).then((res) => { if (res.code === 0) { this.$message.success(res.msg) this.doSearch() } }) + }).catch(() => { + }) } }, diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html index c28c247..e37d28c 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html @@ -12,24 +12,30 @@ layout("/layouts/platform.html"){ {{formData.applyLoginName}} {{formData.applyUnitName}} {{formData.applyUnionName}} + + + + + + style="width: 100%" + v-model="formData.helpUserId" + filterable + clearable + remote + reserve-keyword + placeholder="请输入姓名或工号查询" + :remote-method="createRemoteMethod(helpUserOptions)" + @change="helpUserChange"> + v-for="item in helpUserOptions" + :key="item.id" + :label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'" + :value="item.id"> @@ -37,20 +43,20 @@ layout("/layouts/platform.html"){ + style="width: 100%" + v-model="formData.payUserId" + filterable + clearable + remote + reserve-keyword + placeholder="请输入姓名或工号查询" + :remote-method="createRemoteMethod(payUserOptions)" + @change="payUserChange"> + v-for="item in payUserOptions" + :key="item.id" + :label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'" + :value="item.id"> @@ -65,7 +71,7 @@ layout("/layouts/platform.html"){ :label="item.name"> - + + clearable + style="width: 100%" + v-model="formData.occurTime" + type="date" + value-format="yyyy-MM-dd" + placeholder="请选择慰问时间"> @@ -156,9 +162,9 @@ layout("/layouts/platform.html"){ - - - + + @@ -174,11 +180,11 @@ layout("/layouts/platform.html"){ @@ -208,21 +214,22 @@ layout("/layouts/platform.html"){ taskId: GetQueryString("taskId"), formData: {}, formRules: { - helpUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - payUserId: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - type: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - way: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - money: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - occurTime: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - child: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - hospital: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - hospitalHouseNum: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - hospitalHouseBedNum: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - hospitalBy: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - deadImmediateFamily: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - remark: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - files: [{ required: true, message: "必填", trigger: ["change", "blur"] }], - signature: [{ required: true, message: "必填", trigger: ["change", "blur"] }] + helpUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}], + payUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}], + type: [{required: true, message: "必填", trigger: ["change", "blur"]}], + way: [{required: true, message: "必填", trigger: ["change", "blur"]}], + money: [{required: true, message: "必填", trigger: ["change", "blur"]}], + occurTime: [{required: true, message: "必填", trigger: ["change", "blur"]}], + child: [{required: true, message: "必填", trigger: ["change", "blur"]}], + hospital: [{required: true, message: "必填", trigger: ["change", "blur"]}], + hospitalHouseNum: [{required: true, message: "必填", trigger: ["change", "blur"]}], + hospitalHouseBedNum: [{required: true, message: "必填", trigger: ["change", "blur"]}], + hospitalBy: [{required: true, message: "必填", trigger: ["change", "blur"]}], + deadImmediateFamily: [{required: true, message: "必填", trigger: ["change", "blur"]}], + remark: [{required: true, message: "必填", trigger: ["change", "blur"]}], + files: [{required: true, message: "必填", trigger: ["change", "blur"]}], + signature: [{required: true, message: "必填", trigger: ["change", "blur"]}], + position: [{required: true, message: "必填", trigger: ["change", "blur"]}] }, chooseType: {}, payUserOptions: [], @@ -238,7 +245,7 @@ layout("/layouts/platform.html"){ }, selectQueryUser(keyword, options) { options.length = 0 - this.$axios.post("/platform/condolence/apply/listUser", { keyword: keyword }).then((res) => { + this.$axios.post("/platform/condolence/apply/listUser", {keyword: keyword}).then((res) => { if (res.code === 0) { options.push(...res.data) } @@ -247,7 +254,7 @@ layout("/layouts/platform.html"){ helpUserChange(val) { const user = this.helpUserOptions.find(o => o.id === val) if (user) { - const { userName, loginName, unitId, unitName, unionId, unionName } = user + const {userName, loginName, unitId, unitName, unionId, unionName} = user this.$set(this.formData, "helpUserName", userName) this.$set(this.formData, "helpLoginName", loginName) this.$set(this.formData, "helpUnitId", unitId) @@ -259,7 +266,7 @@ layout("/layouts/platform.html"){ payUserChange(val) { const user = this.payUserOptions.find(o => o.id === val) if (user) { - const { userName, loginName } = user + const {userName, loginName} = user this.$set(this.formData, "payUserName", userName) this.$set(this.formData, "payLoginName", loginName) } @@ -277,7 +284,7 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/platform/condolence/apply/save", { data: JSON.stringify(this.formData) }).then(res => { + this.$axios.post("/platform/condolence/apply/save", {data: JSON.stringify(this.formData)}).then(res => { if (res.code === 0) { this.$message.success(res.msg) commonUtil.pjaxPush("/platform/condolence/mine") @@ -328,7 +335,7 @@ layout("/layouts/platform.html"){ }, init() { if (this.bizId) { - this.$axios.post("/platform/condolence/mine/info", { id: this.bizId }).then((res) => { + this.$axios.post("/platform/condolence/mine/info", {id: this.bizId}).then((res) => { if (res.code === 0) { this.formData = res.data this.selectQueryUser(this.formData.helpLoginName, this.helpUserOptions) @@ -337,7 +344,7 @@ layout("/layouts/platform.html"){ } }) } else { - const { username, loginname, id, unit, union, mobile } = this.$store.state.user + const {username, loginname, id, unit, union, mobile,position} = this.$store.state.user this.formData = { applyUserName: username, applyLoginName: loginname, @@ -345,7 +352,8 @@ layout("/layouts/platform.html"){ applyUnitId: unit?.id, applyUnitName: unit?.name, applyUnionId: union?.id, - applyUnionName: union?.name + applyUnionName: union?.name, + position: position } } }, diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html index 9ae6fb3..a75e109 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html @@ -81,6 +81,10 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> + + + 取消 diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js index fd7b42a..e445992 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/common/info.js @@ -10,10 +10,11 @@ const condolenceInfo = { {{ viewData.applyLoginName }} {{ viewData.applyUnitName }} {{ viewData.applyUnionName }} + {{ viewData.position }} {{ viewData.helpUserName }} {{ viewData.payUserName }} {{ viewData.typeName }} - {{ viewData.way }} + {{ viewData.money }} {{ viewData.occurTime }} {{ viewData.child }} @@ -22,7 +23,11 @@ const condolenceInfo = { {{ viewData.hospitalHouseBedNum }} {{ viewData.hospitalBy }} {{ viewData.deadImmediateFamily }} - {{ viewData.remark }} + +
+ {{ viewData.remark }} +
+ 暂无附件 @@ -59,9 +64,13 @@ const condolenceInfo = { - {{ + {{ task.taskFormData.opinion }} + + + diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html index 6fdc58c..5f37c51 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html @@ -54,17 +54,25 @@ layout("/layouts/platform.html"){ v-for="column in tableColumns" > @@ -102,11 +110,17 @@ layout("/layouts/platform.html"){ } }, methods: { + onExport(id) { + this.$downLoad('/platform/condolence/mine/onExport', { + id: id + }) + + }, onAdd() { commonUtil.pjaxPush('/platform/condolence/apply') }, onView(row) { - this.$refs.guava.view(()=>{ + this.$refs.guava.view(() => { this.$refs.condolenceInfoRef.onOpen(row) }) }, @@ -119,7 +133,7 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/flow/common/revokeTask", { taskId: row.startTaskId }).then((res) => { + this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => { if (res.code === 0) { this.$message.success(res.msg) this.pageData() @@ -133,7 +147,7 @@ layout("/layouts/platform.html"){ cancelButtonText: "取消", type: "warning" }).then(() => { - this.$axios.post("/platform/condolence/mine/delete", { id }).then((res) => { + this.$axios.post("/platform/condolence/mine/delete", {id}).then((res) => { if (res.code === 0) { this.$message.success(res.msg) this.pageData() diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html index 4503a92..effff27 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html @@ -101,6 +101,10 @@ layout("/layouts/platform.html"){ :rules="[{required:true,message:'必填',trigger:['change','blur']}]"> + + + 取消 diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html index 79a388d..b42a82c 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html @@ -36,7 +36,7 @@ layout("/layouts/platform.html"){ 撤回 删除 - 申请表导出 + 申请表导出 diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html index 9601c1f..e3edf7b 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html @@ -10,7 +10,8 @@ layout("/layouts/platform_h5.html"){
- + @@ -25,33 +26,43 @@ layout("/layouts/platform_h5.html"){ required name="applyUnitName"> +