diff --git a/src/main/java/io/v/nutz/sys/models/Sys_local_process_instance_task.java b/src/main/java/io/v/nutz/sys/models/Sys_local_process_instance_task.java index 19df0b3..a5311bc 100644 --- a/src/main/java/io/v/nutz/sys/models/Sys_local_process_instance_task.java +++ b/src/main/java/io/v/nutz/sys/models/Sys_local_process_instance_task.java @@ -105,7 +105,7 @@ public class Sys_local_process_instance_task extends BaseModel { @Column @Comment("处理意见") - @ColDefine(type = ColType.VARCHAR, width = 1000) + @ColDefine(type = ColType.TEXT) private String taskComment; @Column diff --git a/src/main/java/io/v/nutz/zhgh/proposal/constants/ProposalToDoHandler.java b/src/main/java/io/v/nutz/zhgh/proposal/constants/ProposalToDoHandler.java index 9f53672..1df3b2f 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/constants/ProposalToDoHandler.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/constants/ProposalToDoHandler.java @@ -3,6 +3,7 @@ package io.v.nutz.zhgh.proposal.constants; import cn.hutool.core.util.ObjectUtil; import io.v.nutz.base.utils.DateUtil; import io.v.nutz.base.utils.ViResource; +import io.v.nutz.sys.controllers.platform.sys.handler.ClubEvaluateToDoHandler; import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.services.SysLocalProcessService; import io.v.nutz.sys.services.impl.SysLocalProcessServiceImpl; @@ -355,6 +356,28 @@ public enum ProposalToDoHandler { } }, + CREATE_UNDERTAKE_PROXY_TASK { + @Override + public void exec(String proposalId, NutMap extra) { + ProposalReplyForward replyForward = extra.getAs("reply_forward", ProposalReplyForward.class); + Sys_user user = dao.fetch(Sys_user.class, replyForward.getProxyReplyUserId()); + localProcessService.createTask("proposal_info@" + proposalId, "proposal_reply_proxy@" + replyForward.getId(), "承办单位转交办理", ShiroUtil.getUserId(), List.of(user.getLoginname()), "/platform/proposal/transact/reply", "/platform/proposal/transact/reply", null, null); + } + }, + + COMPLETE_UNDERTAKE_PROXY_TASK { + @Override + public void exec(String proposalId, NutMap extra) { + ProposalReplyForward replyForward = extra.getAs("reply_forward", ProposalReplyForward.class); + localProcessService.completeTask( + "proposal_reply_proxy@" + replyForward.getId(), + "proposal_info@" + proposalId, + ShiroUtil.getUserId(), + null + ); + } + }, + CREATE_FEEDBACK_TASK() { @Override @@ -447,14 +470,6 @@ public enum ProposalToDoHandler { } }; - - /** - * @param proposalId 提案id - * @param secondedId 附议表id - * @param schoolLeaderPrefixId 校领导批示id - * @param replyId 答复id - * @param schoolLeaderSuffixId 校领导批示id - */ public abstract void exec(String proposalId, NutMap extra); diff --git a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalReplyController.java b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalReplyController.java index fe52b39..29aba0a 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalReplyController.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/controller/transact/ProposalReplyController.java @@ -6,8 +6,14 @@ import cn.wizzer.framework.base.Result; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.utils.*; import io.v.nutz.base.query.PageForm; +import io.v.nutz.sys.models.Sys_local_process_instance_task; +import io.v.nutz.sys.models.Sys_user; +import io.v.nutz.sys.models.Sys_user_role; +import io.v.nutz.sys.services.SysRoleService; +import io.v.nutz.sys.services.SysUserService; import io.v.nutz.web.commons.slog.annotation.SLog; import io.v.nutz.zhgh.proposal.constants.ProposalState; +import io.v.nutz.zhgh.proposal.constants.ProposalToDoHandler; import io.v.nutz.zhgh.proposal.models.*; import io.v.nutz.zhgh.proposal.services.ProposalCommonService; import io.v.nutz.zhgh.proposal.services.ProposalInfoService; @@ -16,14 +22,17 @@ import io.v.nutz.zhgh.proposal.services.ProposalReplyService; import io.v.nutz.web.commons.utils.ShiroUtil; import io.v.nutz.web.commons.base.Globals; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.json.Json; +import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; @@ -65,6 +74,12 @@ public class ProposalReplyController { @Inject private MsgApi msgApi; + @Inject + private SysUserService sysUserService; + + @Inject + private SysRoleService sysRoleService; + @At("") @Ok("beetl:/platform/proposal/transact/reply.html") @RequiresPermissions("proposal.transact.reply") @@ -168,10 +183,10 @@ public class ProposalReplyController { return proposalCommonService.conJoinInfoList(proposalId); } - @At("/findSameUnitUser/?") + @At("/findSameUnitUser") @ViReturn @RequiresPermissions("proposal.transact.reply") - public Object findSameUnitUser(String val) { + public Object findSameUnitUser(@Param("key") String val) { if (StrUtil.isBlank(val)) { return Collections.emptyList(); } @@ -239,4 +254,53 @@ public class ProposalReplyController { } } + @At + @ViReturn + @Aop(TransAop.READ_COMMITTED) + @RequiresPermissions("proposal.transact.reply") + public Result setProxyUser(@Param(value = "proposalId") String proposalId, + @Param(value = "proxyUserId") String proxyUserId, + @Param(value = "replyId") String replyId) { + ProposalReplyForward sourceReplyForward = dao.fetch(ProposalReplyForward.class, Cnd.where("proposalId", "=", proposalId).and("replyId", "=", replyId)); + if (Lang.isNotEmpty(sourceReplyForward)) { + // 删除之前答复人的角色 + dao.update(Sys_local_process_instance_task.class, Chain.make("taskDeleteFlag", true).add("delFlag", true), + Cnd.where("processUniqueId", "=", "proposal_info@" + proposalId) + .and("taskUniqueId", "=", "proposal_reply_proxy@" + sourceReplyForward.getId())); + + dao.clear(Sys_user_role.class, Cnd.where("userId", "=", sourceReplyForward.getProxyReplyUserId()).and("roleId", "=", Roles.CONTRACTOR_PROXY_PERSON)); + } + // 删除之前的代答复人 + dao.clear(ProposalReplyForward.class, Cnd.where("proposalId", "=", proposalId).and("replyId", "=", replyId)); + + // 修改代答复人 + ProposalReplyForward replyForward = new ProposalReplyForward(); + replyForward.setProposalId(proposalId); + replyForward.setReplyId(replyId); + replyForward.setProxyReplyUserId(proxyUserId); + dao.insert(replyForward); + + // 添加代答复人角色 + int count = dao.count(Sys_user_role.class, Cnd.where("userId", "=", proxyUserId).and("roleId", "=", Roles.CONTRACTOR_PROXY_PERSON)); + if (count == 0) { + Sys_user_role userRole = new Sys_user_role(); + userRole.setRoleId(Roles.CONTRACTOR_PROXY_PERSON); + userRole.setUserId(proxyUserId); + dao.insert(userRole); + } + + // 发送消息提醒 + Sys_user proxyUser = dao.fetch(Sys_user.class, proxyUserId); + String msgContent = "{}您好！您有一条转交的提案待办理，请点击消息办理。"; + msgApi.sendMsg(List.of("DingTalk"), proxyUser.getLoginname(), 2, "提案转交办理", StrUtil.format(msgContent, proxyUser.getUsername()), "", Globals.AppDomain + "/platform/proposal/transact/reply"); + + ProposalToDoHandler.CREATE_UNDERTAKE_PROXY_TASK.exec(proposalId, NutMap.NEW().addv("reply_forward", replyForward)); + + // 清缓存 + sysUserService.clearCache(); + sysRoleService.clearCache(); + + return Result.success(); + } + } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/models/ProposalReply.java b/src/main/java/io/v/nutz/zhgh/proposal/models/ProposalReply.java index 364b3db..3a4be78 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/models/ProposalReply.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/models/ProposalReply.java @@ -75,6 +75,12 @@ public class ProposalReply extends BaseModel { @ColDefine(type = ColType.BOOLEAN) private Boolean isReply; + @Column + @Comment("是否代理答复") + @ColDefine(type = ColType.BOOLEAN) + @Default("0") + private Boolean isProxyReply; + @Column @Comment("附件") @ColDefine(type = ColType.MYSQL_JSON) @@ -114,6 +120,4 @@ public class ProposalReply extends BaseModel { @Comment("是否批示") @ColDefine(type = ColType.BOOLEAN) private Boolean isLeaderAudit; - - } diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalReplyService.java b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalReplyService.java index 46b4f4e..88ca242 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalReplyService.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/ProposalReplyService.java @@ -41,6 +41,7 @@ public interface ProposalReplyService extends ViService { pr.replyNumber, pr.replyPersonId, pr.isReply, + pr.isProxyReply, pr.leaderId, pr.replyContent, pr.implementState, @@ -55,6 +56,7 @@ public interface ProposalReplyService extends ViService { where JSON_CONTAINS (proposalIds,JSON_QUOTE(info.id)) ) AS isConjoin, (count(prf.id) > 0) isForward, + GROUP_CONCAT(proxyReplyUser.id) proxyReplyUserId, GROUP_CONCAT(proxyReplyUser.username) proxyReplyUserName FROM proposal_reply pr @@ -97,9 +99,11 @@ public interface ProposalReplyService extends ViService { pr.replyNumber, pr.replyPersonId, pr.isReply, + pr.isProxyReply, pr.leaderId, pr.replyContent, pr.replyFiles, + pr.implementState, IF(pr.underTakeType=1,'主办','协办') AS undertakeType, pu.unitName as underTakeName, max(pr.replyNumber), @@ -111,6 +115,7 @@ public interface ProposalReplyService extends ViService { where JSON_CONTAINS (proposalIds,JSON_QUOTE(info.id)) ) AS isConjoin, (count(prf.id) > 0) isForward, + GROUP_CONCAT(proxyReplyUser.id) proxyReplyUserId, GROUP_CONCAT(proxyReplyUser.username) proxyReplyUserName FROM proposal_reply pr diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExportServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExportServiceImpl.java index 8d54649..13f8d8c 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExportServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalExportServiceImpl.java @@ -105,6 +105,8 @@ public class ProposalExportServiceImpl extends BaseServiceImpl implements Propos nutMap.setv("brief", nutMap.getString("brief")); nutMap.setv("measures", nutMap.getString("measures")); + nutMap.setv("hostUnitName", nutMap.getString("under1Unit")); + nutMap.setv("helpUnitName", nutMap.getString("under2Unit", "暂无协办")); String createUserSignData = nutMap.getString("createUserSignData"); // nutMap.setv("createUserSign", StrUtil.isNotBlank(createUserSignData) ? getImg(createUserSignData) : null); @@ -238,9 +240,9 @@ public class ProposalExportServiceImpl extends BaseServiceImpl implements Propos } catch (IOException e) { e.printStackTrace(); } - if (nutMap.getString("resultCode").equals("determine")) { + if ("determine".equals(nutMap.getString("resultCode"))) { v.setv("resultAudit", "经提案工作委员会研究，符合提案立案条件，予以立案，此提案建议由%s办理，%s协办。".formatted(nutMap.getString("under1Unit"), (Strings.isNotBlank(nutMap.getString("under2Unit")) ? nutMap.getString("under2Unit") : "暂无"))); - } else if (nutMap.getString("resultCode").equals("opinion")) { + } else if ("opinion".equals(nutMap.getString("resultCode"))) { v.setv("resultAudit", "作为意见建议转送参考"); } else { v.setv("resultAudit", "该提案不予立项，不予立案原因属于以下提案内容"); @@ -403,7 +405,10 @@ public class ProposalExportServiceImpl extends BaseServiceImpl implements Propos map.put("helpundertakeReplyList", helpundertakeReplyList); map.put("leaderList", leaderList); map.put("feedbackList", feedbackList); - XWPFTemplate.compile(officeTemplateUtil.getPath("proposal_info"), config).render(map).writeAndClose(outputStream); + String templateUrl = StrUtil.isBlank(nutMap.getString("hostUnitName")) ? + officeTemplateUtil.getPath("proposal_info") : + officeTemplateUtil.getPath("proposal_host_help_unit"); + XWPFTemplate.compile(templateUrl, config).render(map).writeAndClose(outputStream); } private PictureRenderData getImg(String base64) throws IOException { diff --git a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalReplyServiceImpl.java b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalReplyServiceImpl.java index 3c476d1..76443d8 100644 --- a/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalReplyServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/proposal/services/impl/ProposalReplyServiceImpl.java @@ -4,9 +4,12 @@ import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; import cn.wizzer.framework.page.Pagination; import io.v.nutz.base.utils.DateUtil; +import io.v.nutz.base.utils.MsgApi; import io.v.nutz.base.utils.Roles; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.query.PageForm; +import io.v.nutz.base.utils.Vi; +import io.v.nutz.sys.models.Sys_local_process_instance_task; import io.v.nutz.sys.models.Sys_user; import io.v.nutz.sys.services.SysLocalProcessService; import io.v.nutz.web.commons.base.Globals; @@ -24,6 +27,7 @@ import io.v.nutz.sys.models.Sys_user_role; import io.v.nutz.sys.services.SysRoleService; import io.v.nutz.sys.services.SysUserService; import io.v.nutz.web.commons.utils.ShiroUtil; +import lombok.val; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; @@ -34,6 +38,7 @@ import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.Lang; import org.nutz.lang.Strings; import org.nutz.lang.util.NutMap; @@ -68,6 +73,9 @@ public class ProposalReplyServiceImpl extends ViServiceImpl imple @Inject private SysLocalProcessService sysLocalProcessService; + @Inject + private MsgApi msgApi; + /** * 系统管理员查询记录 * @@ -137,8 +145,14 @@ public class ProposalReplyServiceImpl extends ViServiceImpl imple // cnd.and("pr.replyUnitId", "in", manageUnderTakeIds); if (Strings.isNotBlank(search.getIsAudit())) { - cnd.and("pr.isReply", "=", "true".equals(search.getIsAudit()) ? 1 : 0); - cnd.and("info.stateCode", "true".equals(search.getIsAudit()) ? ">=" : "=", ProposalState.UNITREPLY); + + if(ShiroUtil.hasRole("proxyT01")){ + cnd.and("pr.isProxyReply", "=", "true".equals(search.getIsAudit()) ? 1 : 0); + cnd.and("info.stateCode", "true".equals(search.getIsAudit()) ? ">=" : "=", ProposalState.UNITREPLY); + }else{ + cnd.and("pr.isReply", "=", "true".equals(search.getIsAudit()) ? 1 : 0); + cnd.and("info.stateCode", "true".equals(search.getIsAudit()) ? ">=" : "=", ProposalState.UNITREPLY); + } } else { cnd.and("info.stateCode", ">=", ProposalState.UNITREPLY); } @@ -304,7 +318,11 @@ public class ProposalReplyServiceImpl extends ViServiceImpl imple chain.add("replyPersonId", auditUserId); chain.add("replyTime", auditTime); chain.add("replySignId", signId); - chain.add("isReply", isSave ? 0 : 1); + if (ShiroUtil.hasRole("proxyT01")) { + chain.add("isProxyReply", isSave ? 0 : 1); + } else { + chain.add("isReply", isSave ? 0 : 1); + } chain.add("replyFiles", reply.getReplyFiles()); List conjoin = proposalCommonService.findConjoin(proposalId); @@ -315,13 +333,36 @@ public class ProposalReplyServiceImpl extends ViServiceImpl imple dao().update(ProposalReply.class, chain, cnd); if (!isSave) { - //完成自己待办 - ProposalToDoHandler.COMPLETE_UNDERTAKE_TASK.exec(proposalId, NutMap.NEW().addv("reply", reply)); + if (ShiroUtil.hasRole("proxyT01")) { + //完成自己待办 + ProposalReplyForward replyForward = dao().fetch(ProposalReplyForward.class, Cnd.where("replyId", "=", reply.getId())); + ProposalToDoHandler.COMPLETE_UNDERTAKE_PROXY_TASK.exec(proposalId, NutMap.NEW().addv("reply_forward", replyForward)); + // 提醒一把手 + List underTakeLeader = proposalCommonService.getUnderTakeLeader(reply.getReplyUnitId()); + String msgContent = "您转交的提案已由转交人办理完成，请您及时提交提案办理内容！"; + msgApi.sendMsg(List.of("DingTalk"),underTakeLeader, 2, "转交答复完成", msgContent, "", Globals.AppDomain + "/platform/proposal/transact/reply"); + + return; + + } else { + //完成自己待办 + ProposalToDoHandler.COMPLETE_UNDERTAKE_TASK.exec(proposalId, NutMap.NEW().addv("reply", reply)); + + ProposalReply proposalReply = dao().fetch(ProposalReply.class, reply.getId()); + ProposalReplyForward proposalReplyForward = dao().fetch(ProposalReplyForward.class, Cnd.where("replyId", "=", reply.getId()).and("proposalId", "=", proposalId)); + if (Lang.isNotEmpty(proposalReplyForward)) { + dao().update(Sys_local_process_instance_task.class, Chain.make("status", 2), + Cnd.where("processUniqueId", "=", "proposal_info@" + proposalId) + .and("taskUniqueId", "=", "proposal_reply_proxy@" + proposalReplyForward.getId())); + proposalReply.setIsProxyReply(true); + dao().update(proposalReply, "isProxyReply"); + } + } //全部答复完 if (checkAllReply(proposalId)) { ProposalInfo proposalInfo = dao().fetch(ProposalInfo.class, proposalId); - if (proposalInfo.getResultCode().equals(ProposalConstant.DETERMINE)) { + if (proposalInfo.getResultCode().equals(ProposalConstant.DETERMINE) || proposalInfo.getResultCode().equals(ProposalConstant.OPINION)) { int stateCode = proposalProcessService.getStateCode(proposalId, ProposalStateDirectionEnum.NEXT, false); proposalInfo.setStateCode(stateCode); //插入领导审批记录 @@ -333,6 +374,11 @@ public class ProposalReplyServiceImpl extends ViServiceImpl imple dao().insert(leaderSuffixAudit); ProposalToDoHandler.CREATE_BRANCH_LEADER_SUFFIX_AUDIT_TASK.exec(proposalId, NutMap.NEW().addv("leaderSuffixAudit", leaderSuffixAudit)); + + // 发送短信 + List underTakeSchoolLeader = proposalCommonService.getUnderTakeSchoolLeader(leaderSuffixAudit.getUnderTakeId()); + String msgContent = "校领导，您分管部门承办的提案（建议）已提交办理结果，请您审核！"; + msgApi.sendMsg(List.of("DingTalk"), underTakeSchoolLeader, 2, "提案校领导审批", msgContent, "", Globals.AppDomain + "/platform/proposal/transact/branchLeaderSuffixAudit"); } else { proposalInfo.setStateCode(ProposalState.FINISH); //流程完结 @@ -358,14 +404,28 @@ public class ProposalReplyServiceImpl extends ViServiceImpl imple @Override public List findSameUnitUser(String val) { - String unitId = ShiroUtil.getUnitId(); - String userId = (String) ShiroUtil.getPrincipalProperty("id"); - Sql sql = Sqls.create(""" - select id,username,loginname from `user` - where unitid = @unitid and id != @me - and (username like @keyWord or loginname like @keyWord) - """).setParam("unitid", unitId).setParam("me", userId); - sql.setParam("keyWord", "%" + val + "%"); +// String unitId = ShiroUtil.getUnitId(); + String unionId = Vi.getUnionId(); + String userId = ShiroUtil.getUserId(); + Sql sql = Sqls.create("select id,loginname,username from `user` $condition"); + Cnd cnd = Cnd.NEW(); + if (!ShiroUtil.hasAnyRoles("sysadmin")) { +// cnd.and("unitId", "=", unitId); + cnd.and("unionId", "=", unionId); + } + cnd.and("id", "!=", userId); + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.or("username", "like", val); + seg.or("loginname", "like", val); + cnd.and(seg); + sql.setCondition(cnd); +// +// Sql sql = Sqls.create(""" +// select id,username,loginname from `user` +// where unitid = @unitid and id != @me +// and (username like @keyWord or loginname like @keyWord) +// """).setParam("unitid", unitId).setParam("me", userId); +// sql.setParam("keyWord", "%" + val + "%"); return listPage(1, 10, sql).getList(); } diff --git a/src/main/resources/static/components/proposal/ProposalInfo.vue b/src/main/resources/static/components/proposal/ProposalInfo.vue index 4c0351a..91a3d67 100644 --- a/src/main/resources/static/components/proposal/ProposalInfo.vue +++ b/src/main/resources/static/components/proposal/ProposalInfo.vue @@ -365,7 +365,7 @@ module.exports = { } return this.panes.includes(name) }, - async openView(id) { + async openView(id, activeName = "1") { this.loading = true this.viewData = await proposal.getProposalInfo(id) @@ -404,7 +404,7 @@ module.exports = { }) } - this.activeName = this.handle ? "999" : "1" + this.activeName = this.handle ? "999" : activeName this.loading = false } }, diff --git a/src/main/resources/views/mobile/home.html b/src/main/resources/views/mobile/home.html index d33519e..caa4f33 100644 --- a/src/main/resources/views/mobile/home.html +++ b/src/main/resources/views/mobile/home.html @@ -617,7 +617,7 @@ layout("/mobile/platform.html"){ await this.getWelfareCheckSelfAgenda() await this.getCompletes(); await this.getMsg() - this.listActivity(); + await this.listActivity(); this.needCount = this.needItems.length }, async setNeedItems() { @@ -705,12 +705,11 @@ layout("/mobile/platform.html"){ this.perfectPersonInfo = resp.data } }, - listActivity() { - $.get("/platform/sys/homeActivity/listHomeActivity").then((resp) => { - if (resp.code === 0) { - this.activityList = resp.data - } - }) + async listActivity() { + const resp = await $.get("/platform/sys/homeActivity/listHomeActivity") + if (resp.code === 0) { + this.activityList = resp.data + } }, }, beforeMount() { @@ -720,12 +719,14 @@ layout("/mobile/platform.html"){ await this.getMenus(); this.getAllMonth(); this.createYearList(); - this.initData(); + await this.initData(); const active = sessionStorage.getItem("zhgh-mobile-home-active") this.active = active ? parseInt(active) : 0 - this.clickIndex = 2 - this.clickMenu = this.moduleMenus.find(o => o.moduleName === '职工权益') + if (!this.activityList || !this.activityList.length > 0) { + this.clickIndex = 2 + this.clickMenu = this.moduleMenus.find(o => o.moduleName === '职工权益') + } } }) diff --git a/src/main/resources/views/platform/proposal/transact/branchLeaderSuffixAudit.html b/src/main/resources/views/platform/proposal/transact/branchLeaderSuffixAudit.html index 4a3c364..74ab37a 100644 --- a/src/main/resources/views/platform/proposal/transact/branchLeaderSuffixAudit.html +++ b/src/main/resources/views/platform/proposal/transact/branchLeaderSuffixAudit.html @@ -72,66 +72,63 @@ layout("/layouts/platform.html"){ @@ -171,19 +196,19 @@ layout("/layouts/platform.html"){ + v-for="item in proxyUserList" + :key="item.id" + :label="item.username+'('+item.loginname+')'" + :value="item.id"> @@ -208,7 +233,6 @@ layout("/layouts/platform.html"){ - 确 定 + + + + + + + + + + + 取 消 + 确 定 + + + +