diff --git a/src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java b/src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java index b33bbbe..81d2ada 100644 --- a/src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java +++ b/src/main/java/io/v/nutz/zhgh/data/constant/SourceData.java @@ -53,6 +53,7 @@ public interface SourceData { put("XBM", new String[]{"sex"});// 性别码 put("MZMC", new String[]{"nation"});// 民族码 put("SJ", new String[]{"mobile"}); // 手机号 + put("SFZJH", new String[]{"idcard"}); // 身份证件号 put("ZZMMM", new String[]{"political"}); // 政治面貌码 put("DQZTM", new String[]{"userState", "personalStatus"}); // 在职状态码 put("RYFLMC", new String[]{"personType"}); // 人员类型码 diff --git a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java index 5a4b1e8..2561781 100644 --- a/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java @@ -189,7 +189,7 @@ public class SourceUserServiceImpl extends ViServiceImpl implements //不更新会员和福利会员字段 source.setMember(null); source.setWelfareMember(null); - Sys_user user = userMap.get(source.getLoginname().toLowerCase()); + Sys_user user = userMap.get(source.getLoginname()); if (user != null && userIds.contains(user.getId())) { continue; diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java index 482f3f3..6f04990 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/ReimbursementCon.java @@ -52,6 +52,8 @@ import java.math.RoundingMode; import java.util.Base64; import java.util.Calendar; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * @author zhf @@ -66,16 +68,14 @@ public class ReimbursementCon { @Inject private Vi vi; - + @Inject + private Dao dao; @Inject private ActivityBxService activityBxService; - @Inject private SysSignatureService sysSignatureService; - @Inject private BaseService baseService; - @Inject private FtpService ftpService; @@ -194,14 +194,6 @@ public class ReimbursementCon { } activityBxService.update(activityBx); - - if (Lang.isNotEmpty(activityBx.getGoods())) { - baseService.dao().clear(Goods.class, Cnd.where("reid", "=", activityBx.getActivity_id())); - activityBx.getGoods().forEach(v -> { - v.setReid(activityBx.getActivity_id()); - }); - baseService.dao().insert(activityBx.getGoods()); - } return null; } @@ -227,7 +219,32 @@ public class ReimbursementCon { @ViReturn public void doExport(String id, HttpServletResponse response) throws Exception { NutMap one = activityBxService.queryOne(id); - if (StrUtil.isNotBlank(one.getString("activity_content"))) { + ActivityBx fetch = dao.fetch(ActivityBx.class, id); + + List budgets = fetch.getBudgets(); + + Map> map = budgets.stream().collect(Collectors.groupingBy(ActivityBx.Budget::getCategory)); + + map.forEach((k, v) -> { + NutMap result = NutMap.NEW(); + result.put("unitName", fetch.getFundsUnitName()); + + }); + + + + String fileName = Globals.schoolName + "【" + one.getString("activity_name") + "】报销凭证"; + + HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); + Configure config = Configure.newBuilder().bind("goods", policy).build(); + + InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("docTemplate/funds3.docx"); + response.addHeader("Content-Type", "application/octet-stream"); + response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(fileName.getBytes("UTF-8"), "ISO-8859-1") + "\".docx"); + XWPFTemplate.compile(inputStream, config).render(one, response.getOutputStream()); + inputStream.close(); + +/* if (StrUtil.isNotBlank(one.getString("activity_content"))) { one.setv("activity_content", Html2Text.getContent(one.getString("activity_content"))); } one.setv("money_big", Convert.digitToChinese(one.getDouble("activity_money"))); @@ -272,29 +289,29 @@ public class ReimbursementCon { one.setv("nine", (hundredths % 10) + 1); - /*基层工会主席签字*/ + *//*基层工会主席签字*//* if (one.get("reimbursement_union_audit") != null) { Audit reimbursementUnionChairman = one.getAs("reimbursement_union_audit", Audit.class); one.setv("dc_sign", getImage(reimbursementUnionChairman.getAuditSign())); } - /*协会负责人*/ + *//*协会负责人*//* if (one.get("reimbursement_club_audit") != null) { Audit reimbursementClubChairman = one.getAs("reimbursement_club_audit", Audit.class); one.setv("ap_sign", getImage(reimbursementClubChairman.getAuditSign())); } - /*校工会主席签字*/ + *//*校工会主席签字*//* if (one.get("reimbursement_school_chairman") != null) { Audit reimbursementSchoolChairman = one.getAs("reimbursement_school_chairman", Audit.class); one.setv("ucc_sign", getImage(reimbursementSchoolChairman.getAuditSign())); } - /*会计*/ + *//*会计*//* if (one.get("user_signature") != null) { Sys_signature sysSignature = sysSignatureService.dao().fetch(Sys_signature.class, Cnd.where("id", "=", one.getString("user_signature"))); one.setv("a_sign", getImage(sysSignature.getData())); - } + }*/ /* // 基层工会活动 @@ -313,17 +330,6 @@ public class ReimbursementCon { inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("docTemplate/association.docx"); } */ - - String fileName = Globals.schoolName + "【" + one.getString("activity_name") + "】报销凭证"; - - HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy(); - Configure config = Configure.newBuilder().bind("goods", policy).build(); - - InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("docTemplate/funds3.docx"); - response.addHeader("Content-Type", "application/octet-stream"); - response.addHeader("Content-Disposition", "attachment; filename=\"" + new String(fileName.getBytes("UTF-8"), "ISO-8859-1") + "\".docx"); - XWPFTemplate.compile(inputStream, config).render(one, response.getOutputStream()); - inputStream.close(); } private PictureRenderData getImage(String base64) throws IOException { diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java index 88d1b0f..a272602 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/activitybx/UnionCon.java @@ -142,7 +142,6 @@ public class UnionCon { aid.setUnion_chairman_idea(nutMap.getString("idea")); aid.setActivity_money(nutMap.getDouble("activity_money")); List goods = nutMap.getAsList("goods", Goods.class); - aid.setGoods(goods); if (Strings.isNotBlank(nutMap.getString("sign"))) { aid.setUnion_chairman(sysSignatureService.insert(new Sys_signature(nutMap.getString("sign"))).getId()); diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java index eaa1a70..c7c01d5 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementApplyController.java @@ -66,31 +66,22 @@ public class ActivityReimbursementApplyController { @ViReturn @RequiresPermissions("sys.jf.reimbursement.apply") @Aop(TransAop.READ_COMMITTED) - public Object doSave(@Param("activityBx") ActivityBx activityBx, @Param(value = "sign", required = false) String sign) { - if (Strings.isNotBlank(sign)) { - activityBx.setUser_signature(sysSignatureService.insert(new Sys_signature(sign)).getId()); - } + public Object doSave(@Param("activityBx") ActivityBx activityBx) { this.setEntityValue(activityBx); + activityBx.setReimbursement_state_id(999); activityBxService.insertOrUpdate(activityBx); return null; } private void setEntityValue(ActivityBx activityBx) { - int count = activityBxService.count(Cnd.where("id", "=", activityBx.getId())); +// int count = activityBxService.count(Cnd.where("id", "=", activityBx.getId())); - activityBx.setReimbursement_state_id(999); - ActivityTissue tissue = dao.fetch(ActivityTissue.class, activityBx.getActivity_id()); +// ActivityTissue tissue = dao.fetch(ActivityTissue.class, activityBx.getActivity_id()); activityBx.setApply_time(DateUtil.now()); activityBx.setReimbursement_apply_time(DateUtil.now()); activityBx.setUser_id(ShiroUtil.getUserId()); - activityBx.setYear(DateUtil.year(DateUtil.parseDate(tissue.getApplyTime()))); - activityBx.setActivity_name(tissue.getName()); + activityBx.setYear(DateUtil.thisYear()); activityBx.setUser_name(ShiroUtil.getPlatformUsername()); - activityBx.setActivity_type(tissue.getType()); - activityBx.setProjectTypeCode(tissue.getProjectTypeCode()); - activityBx.setMobile(tissue.getMobile()); - activityBx.setProjectCode(tissue.getActivityCode()); - activityBx.setActivity_content(tissue.getActivityContent()); List budgets = activityBx.getBudgets(); double sum = budgets.stream().mapToDouble(ActivityBx.Budget::getActualPrice).sum(); @@ -99,25 +90,40 @@ public class ActivityReimbursementApplyController { activityBx.setReimbursement_apply_time(DateUtil.today()); } - if (StrUtil.isNotBlank(activityBx.getId()) && count > 0) { - activityBx.setFiles(null); - activityBx.setActivity_content(null); - } +// if (StrUtil.isNotBlank(activityBx.getId()) && count > 0) { +// activityBx.setFiles(null); +// activityBx.setActivity_content(null); +// } } @At @ViReturn @RequiresPermissions("sys.jf.reimbursement.apply") @Aop(TransAop.READ_COMMITTED) - public Object doEdit(@Param("activityBx") ActivityBx activityBx, @Param(value = "sign", required = false) String sign) { - if (Strings.isNotBlank(sign)) { - activityBx.setUser_signature(sysSignatureService.insert(new Sys_signature(sign)).getId()); - } + public Object doEdit(@Param("activityBx") ActivityBx activityBx) { this.setEntityValue(activityBx); + + boolean isUnionAdmin = ShiroUtil.hasAnyRoles("H04"); + boolean isClubAdmin = ShiroUtil.hasAnyRoles("club01"); + switch (activityBx.getActivity_type()) { case 40001 -> activityBx.setReimbursement_state_id(1020); - case 40002 -> activityBx.setReimbursement_state_id(1010); - case 40003 -> activityBx.setReimbursement_state_id(1000); + case 40002 -> { + // 如果是基层工会管理员申请，则直接进入校工会审核 + if (isUnionAdmin) { + activityBx.setReimbursement_state_id(1020); + } else { + activityBx.setReimbursement_state_id(1010); + } + } + case 40003 -> { + // 如果是协会会长申请，则直接进入校工会审核 + if (isClubAdmin) { + activityBx.setReimbursement_state_id(1020); + } else { + activityBx.setReimbursement_state_id(1000); + } + } } activityBxService.insertOrUpdate(activityBx); NutMap map = new NutMap(); @@ -129,10 +135,18 @@ public class ActivityReimbursementApplyController { ReimbursementToHandler.CREATE_SCHOOL_DIRECTOR_TASK.exec(activityBx.getId(), map); } else if (activityBx.getActivity_type() == 40002) { //分工会 - ReimbursementToHandler.CREATE_UNION_TASK.exec(activityBx.getId(), map); + if (isUnionAdmin) { + ReimbursementToHandler.CREATE_SCHOOL_DIRECTOR_TASK.exec(activityBx.getId(), map); + } else { + ReimbursementToHandler.CREATE_UNION_TASK.exec(activityBx.getId(), map); + } } else if (activityBx.getActivity_type() == 40003) { //协会 - ReimbursementToHandler.CREATE_CLUB_TASK.exec(activityBx.getId(), map); + if (isClubAdmin) { + ReimbursementToHandler.CREATE_SCHOOL_DIRECTOR_TASK.exec(activityBx.getId(), map); + } else { + ReimbursementToHandler.CREATE_CLUB_TASK.exec(activityBx.getId(), map); + } } return null; diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java index 86a7055..4d8a154 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementMineController.java @@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import io.v.nutz.sys.services.SysLocalProcessService; import io.v.nutz.zhgh.activity.models.ActivityTissuePerson; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.utils.Vi; @@ -63,12 +64,12 @@ public class ActivityReimbursementMineController { @Inject private Vi vi; - - @Inject - private ActivityBxService activityBxService; - @Inject private FtpService ftpService; + @Inject + private ActivityBxService activityBxService; + @Inject + private SysLocalProcessService sysLocalProcessService; @At("") @Ok("beetl:/platform/jf/reimbursement/mine.html") @@ -228,6 +229,17 @@ public class ActivityReimbursementMineController { } + @At + @ViReturn + @Aop(TransAop.READ_COMMITTED) + @RequiresPermissions("sys.jf.reimbursement.mine") + public Object doBack(String id) { + activityBxService.update(Chain.make("reimbursement_apply_time", null).add("reimbursement_state_id",999), + Cnd.where("id", "=", id)); + sysLocalProcessService.deleteProcessInstance("activity_reimbursement@" + id); + return null; + } + @At @Ok("void") diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolChairmanController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolChairmanController.java index 1360489..bfcfc4d 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolChairmanController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolChairmanController.java @@ -80,21 +80,21 @@ public class ActivityReimbursementSchoolChairmanController { @RequiresPermissions("sys.jf.reimbursement.schoolChairman") @SLog(type = "文体活动", tag = "活动报销", msg = "校工会主席审核", param = true, result = true) public Object doAuditing(@Param("id") String id,@Param("audit") Audit audit){ - audit.setAuditor(ShiroUtil.getPrincipalProperty("id").toString()); + audit.setAuditor(ShiroUtil.getUserId()); audit.setUsername(ShiroUtil.getPrincipalProperty("username").toString()); audit.setLoginname(ShiroUtil.getPrincipalProperty("loginname").toString()); audit.setAuditTime(new Date()); activityBxService.dao().insert(audit); Chain chain = Chain.make("reimbursement_school_chairman_id", audit.getId()); - chain.add("reimbursement_state_id", audit.getAuditPass() ? 1060 : 1045); + chain.add("reimbursement_state_id", audit.getAuditPass() ? 1050 : 1045); activityBxService.update(chain,Cnd.where("id","=",id)); ReimbursementToHandler.COMPLETE_SCHOOL_CHAIRMAN_TASK.exec(id, NutMap.NEW().addv("nodeName",audit.getAuditPass() ? "校工会主席通过" : "校工会主席拒绝")); if (audit.getAuditPass()) { - ReimbursementToHandler.COMPLETE_PROCESS.exec(id,null); + ReimbursementToHandler.CREATE_SCHOOL_FINANCE_TASK.exec(id, null); } else { - ReimbursementToHandler.REFUSE_UNION_TASK.exec(id,NutMap.NEW().addv("nodeName","校工会主席拒绝")); + ReimbursementToHandler.REFUSE_UNION_TASK.exec(id, NutMap.NEW().addv("nodeName","校工会主席拒绝")); } return null; } diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolDirectorController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolDirectorController.java index 76365a3..d20fdcb 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolDirectorController.java +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolDirectorController.java @@ -76,9 +76,9 @@ public class ActivityReimbursementSchoolDirectorController { @At @ViReturn @RequiresPermissions("sys.jf.reimbursement.schoolDirector") - @SLog(type = "文体活动", tag = "活动报销", msg = "校工会负责人审核", param = true, result = true) + @SLog(type = "文体活动", tag = "活动报销", msg = "校工会办公室主管审核", param = true, result = true) public Object doAuditing(@Param("id") String id,@Param("audit") Audit audit){ - audit.setAuditor(ShiroUtil.getPrincipalProperty("id").toString()); + audit.setAuditor(ShiroUtil.getUserId()); audit.setUsername(ShiroUtil.getPrincipalProperty("username").toString()); audit.setLoginname(ShiroUtil.getPrincipalProperty("loginname").toString()); audit.setAuditTime(new Date()); @@ -89,11 +89,11 @@ public class ActivityReimbursementSchoolDirectorController { chain.add("reimbursement_state_id", audit.getAuditPass() ? 1040 : 1025); activityBxService.update(chain,Cnd.where("id","=",id)); - ReimbursementToHandler.COMPLETE_SCHOOL_DIRECTOR_TASK.exec(id, NutMap.NEW().addv("nodeName",audit.getAuditPass() ? "校工会负责人通过" : "校工会负责人拒绝")); + ReimbursementToHandler.COMPLETE_SCHOOL_DIRECTOR_TASK.exec(id, NutMap.NEW().addv("nodeName",audit.getAuditPass() ? "校办主管通过" : "校办主管拒绝")); if (audit.getAuditPass()) { ReimbursementToHandler.CREATE_SCHOOL_CHAIRMAN_TASK.exec(id,null); } else { - ReimbursementToHandler.REFUSE_UNION_TASK.exec(id,NutMap.NEW().addv("nodeName","校工会负责人拒绝")); + ReimbursementToHandler.REFUSE_UNION_TASK.exec(id,NutMap.NEW().addv("nodeName","校办主管拒绝")); } return null; } diff --git a/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolFinanceController.java b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolFinanceController.java new file mode 100644 index 0000000..95ba030 --- /dev/null +++ b/src/main/java/io/v/nutz/zhgh/jf/controller/reimbursement/ActivityReimbursementSchoolFinanceController.java @@ -0,0 +1,98 @@ +package io.v.nutz.zhgh.jf.controller.reimbursement; + +import cn.hutool.core.util.StrUtil; +import io.v.nutz.base.annontation.ViReturn; +import io.v.nutz.base.model.Audit; +import io.v.nutz.base.query.PageForm; +import io.v.nutz.web.commons.slog.annotation.SLog; +import io.v.nutz.web.commons.utils.ShiroUtil; +import io.v.nutz.zhgh.jf.handle.reimbursement.ReimbursementToHandler; +import io.v.nutz.zhgh.jf.service.ActivityBxService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.nutz.dao.Chain; +import org.nutz.dao.Cnd; +import org.nutz.dao.sql.Sql; +import org.nutz.ioc.loader.annotation.Inject; +import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.lang.util.NutMap; +import org.nutz.mvc.annotation.At; +import org.nutz.mvc.annotation.Ok; +import org.nutz.mvc.annotation.Param; + +import java.util.Date; + +/** + * @version 1.0 + * @Author zzr + * @name：ActivityReimbursementSchoolFinanceController + * @Date 2025/6/6 10:13 + * @注释 报销，校工会财务 + */ +@IocBean +@Ok("json:full") +@At("/platform/jf/reimbursement/schoolFinance") +public class ActivityReimbursementSchoolFinanceController { + + @Inject + private ActivityBxService activityBxService; + + @At("") + @Ok("beetl:/platform/jf/reimbursement/schoolFinance.html") + @RequiresPermissions("sys.jf.reimbursement.schoolFinance") + public void index() { + } + + + @At + @ViReturn + @RequiresPermissions("sys.jf.reimbursement.schoolFinance") + public Object pageData(PageForm pageForm, + @Param(value = "year", required = false) Integer year, + @Param(value = "unionId", required = false) String unionId, + @Param(value = "unitId", required = false) String unitId, + @Param(value = "clubId",required = false) String clubId, + @Param(value = "activityName", required = false) String activityName, + @Param(value = "isAudit", required = false) String isAudit) { + Sql sql = activityBxService.activityReimbursementSql(); + Cnd cnd = Cnd.NEW(); + cnd.andEX("act.`year`","=",year); + if (StrUtil.isNotBlank(activityName)) { + cnd.and(Cnd.likeEX("act.activity_name", activityName)); + } + + //1已审核；2未审核；0全部 + cnd.and("act.reimbursement_state_id", "1".equals(isAudit) ? ">" : "2".equals(isAudit) ? "=" : ">=", 1050); + + cnd.andEX("u.unionid","=",unionId); + cnd.andEX("u.unitId","=",unitId); + cnd.andEX("act.clubId","=",clubId); + sql.setCondition(cnd); + return activityBxService.listPageMap(pageForm.getPageNumber(),pageForm.getPageSize(),sql); + } + + + @At + @ViReturn + @RequiresPermissions("sys.jf.reimbursement.schoolFinance") + @SLog(type = "文体活动", tag = "活动报销", msg = "校工会财务审核", param = true, result = true) + public Object doAuditing(@Param("id") String id,@Param("audit") Audit audit){ + audit.setAuditor(ShiroUtil.getUserId()); + audit.setUsername(ShiroUtil.getPrincipalProperty("username").toString()); + audit.setLoginname(ShiroUtil.getPrincipalProperty("loginname").toString()); + audit.setAuditTime(new Date()); + activityBxService.dao().insert(audit); + + Chain chain = Chain.make("reimbursement_finance_audit_id", audit.getId()); + chain.add("reimbursement_state_id", audit.getAuditPass() ? 1060 : 1055); + activityBxService.update(chain,Cnd.where("id","=",id)); + + ReimbursementToHandler.COMPLETE_SCHOOL_FINANCE_TASK.exec(id, NutMap.NEW().addv("nodeName",audit.getAuditPass() ? "校工会财务通过" : "校工会财务拒绝")); + if (audit.getAuditPass()) { + ReimbursementToHandler.COMPLETE_PROCESS.exec(id, null); + } else { + ReimbursementToHandler.REFUSE_UNION_TASK.exec(id, NutMap.NEW().addv("nodeName","校工会财务拒绝")); + } + return null; + } + +} diff --git a/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java b/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java index 3f5534f..a864927 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java +++ b/src/main/java/io/v/nutz/zhgh/jf/handle/reimbursement/ReimbursementToHandler.java @@ -14,6 +14,9 @@ import io.v.nutz.zhgh.zgfw.service.impl.CondolenceServiceImpl; import lombok.Getter; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; +import org.nutz.dao.Sqls; +import org.nutz.dao.sql.Sql; +import org.nutz.lang.Lang; import org.nutz.lang.util.NutMap; import java.util.List; @@ -39,7 +42,7 @@ public enum ReimbursementToHandler { User user = dao.fetch(User.class, Cnd.where("id", "=", userId)); localProcessService.startProcess( - "【活动报销】" + user.getUnionname() + "（" + user.getUsername() + "）", + "【报销】" + user.getUnionname() + "（" + user.getUsername() + "）", "activity_reimbursement@" + reimbursementId, "", userId, @@ -187,19 +190,20 @@ public enum ReimbursementToHandler { }, /** - * 创建校工会负责人任务 + * 创建校工会办公室主管任务 */ CREATE_SCHOOL_DIRECTOR_TASK() { @Override public void exec(String reimbursementId, NutMap extra) { - List userRoles = dao.query(Sys_user_role.class, Cnd.where("roleId", "=", Roles.SchoolUnionActivityReimburseAdmin)); + // ff0e310a1d954054824c0ed85f1904b7 校工会办公室主管（原宣传与文体工作办公室负责人）code是xcywt + List userRoles = dao.query(Sys_user_role.class, Cnd.where("roleId", "=", "ff0e310a1d954054824c0ed85f1904b7")); List list = userRoles.stream().map(Sys_user_role::getUserId).toList(); List userList = dao.query(Sys_user.class, Cnd.where("id", "in", list)); List userLoginNameList = userList.stream().map(Sys_user::getLoginname).toList(); localProcessService.createTask( "activity_reimbursement@" + reimbursementId, "activity_reimbursement_school_director_audit", - "校工会负责人审核", + "校办主管审核", ShiroUtil.getUserId(), userLoginNameList, "/platform/jf/reimbursement/schoolDirector", @@ -208,7 +212,7 @@ public enum ReimbursementToHandler { "/platform/jf/reimbursement/schoolDirector" ); - localProcessService.updateProcessNodeName("activity_reimbursement@" + reimbursementId, "校工会负责人审核"); + localProcessService.updateProcessNodeName("activity_reimbursement@" + reimbursementId, "校办主管审核"); } }, @@ -273,6 +277,52 @@ public enum ReimbursementToHandler { } }, + /** + * 创建校工会财务任务 + */ + CREATE_SCHOOL_FINANCE_TASK() { + @Override + public void exec(String reimbursementId, NutMap extra) { + //查询校工会财务 + List schoolUnionFinance = Vi.getSchoolUnionAccountant(); + if (Lang.isEmpty(schoolUnionFinance)) { + throw new RuntimeException("未设置校财务"); + } + localProcessService.createTask( + "activity_reimbursement@" + reimbursementId, + "activity_reimbursement_school_finance_audit", + "校工会财务审核", + ShiroUtil.getUserId(), + schoolUnionFinance, + "/platform/jf/reimbursement/schoolFinance", + "/platform/jf/reimbursement/schoolFinance", + "/platform/jf/reimbursement/schoolFinance", + "/platform/jf/reimbursement/schoolFinance" + ); + + localProcessService.updateProcessNodeName("activity_reimbursement@" + reimbursementId, "校工会财务审核"); + } + }, + + /** + * 校工会财务完成 + */ + COMPLETE_SCHOOL_FINANCE_TASK() { + @Override + public void exec(String reimbursementId, NutMap extra) { + String nodeName = extra.getString("nodeName"); + localProcessService.completeTask( + "activity_reimbursement_school_finance_audit", + "activity_reimbursement@" + reimbursementId, + ShiroUtil.getUserId(), + nodeName + ); + + localProcessService.updateProcessNodeName("activity_reimbursement@" + reimbursementId, nodeName); + } + }, + + /** * 流程结束 */ diff --git a/src/main/java/io/v/nutz/zhgh/jf/model/ActivityBx.java b/src/main/java/io/v/nutz/zhgh/jf/model/ActivityBx.java index fedd011..bbcef28 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/model/ActivityBx.java +++ b/src/main/java/io/v/nutz/zhgh/jf/model/ActivityBx.java @@ -39,6 +39,7 @@ public class ActivityBx { @Comment("申报（承办）单位") @ColDefine(type = ColType.VARCHAR, width = 200) private String fundsUnitName; + @Column @Comment("协会id") @ColDefine(type = ColType.VARCHAR, width = 32) @@ -55,8 +56,8 @@ public class ActivityBx { private String user_id; @Column - @Comment("用户签字id") - @ColDefine(type = ColType.VARCHAR, width = 32) + @Comment("用户签字") + @ColDefine(type = ColType.VARCHAR, width = 100) private String user_signature; @Column @@ -100,7 +101,7 @@ public class ActivityBx { @Column @Comment("活动名称") - @ColDefine(type = ColType.VARCHAR, width = 50) + @ColDefine(type = ColType.VARCHAR, width = 200) private String activity_name; @Column @@ -364,14 +365,6 @@ public class ActivityBx { @ColDefine(type = ColType.MYSQL_JSON) private List files; - @Column - @Comment("附件数量") - @ColDefine(type = ColType.VARCHAR, width = 100) - private String files_num; - - @Many(field = "reid") - private List goods; - @Column @Comment("发票") @@ -389,22 +382,6 @@ public class ActivityBx { private List otherFiles; - @Column - @Comment("新闻稿件说明") - @ColDefine(type = ColType.TEXT) - private String newsRemark; - - @Column - @Comment("图片附件") - @ColDefine(type = ColType.MYSQL_JSON) - private List picFiles; - - @Column - @Comment("新闻附件") - @ColDefine(type = ColType.MYSQL_JSON) - private List newsFiles; - - @Column @Comment("活动经费预算") @ColDefine(type = ColType.MYSQL_JSON) @@ -415,15 +392,17 @@ public class ActivityBx { */ @Data public static class Budget{ - // 名称 + // 科目 + private String category; + // 具体内容 private String name; - // 预算费用 - private Double budgetPrice; - // 实际费用 + // 类别 + private String type; + // 金额 private Double actualPrice; // 收款人id private String payeeId; - // 收款人姓名 + // 收款对象(个人/单位) private String username; // 收款人工号 private String loginName; diff --git a/src/main/java/io/v/nutz/zhgh/jf/service/impl/ActivityBxServiceImpl.java b/src/main/java/io/v/nutz/zhgh/jf/service/impl/ActivityBxServiceImpl.java index 92e2109..5f350dd 100644 --- a/src/main/java/io/v/nutz/zhgh/jf/service/impl/ActivityBxServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/jf/service/impl/ActivityBxServiceImpl.java @@ -65,10 +65,6 @@ public class ActivityBxServiceImpl extends ViServiceImpl implements @Aop(TransAop.READ_COMMITTED) public void doAdd(ActivityBx activityBx) { insert(activityBx); - activityBx.getGoods().forEach(v -> { - v.setReid(activityBx.getId()); - }); - this.dao().insert(activityBx.getGoods()); // insertWith(activityBx, "goods"); } @@ -172,6 +168,11 @@ public class ActivityBxServiceImpl extends ViServiceImpl implements Audit audit = dao().fetch(Audit.class, Cnd.where("id", "=", record.getString("reimbursement_school_chairman_id"))); record.setv("reimbursement_school_chairman",audit); } + + if (StrUtil.isNotBlank(record.getString("reimbursement_finance_audit_id"))){ + Audit audit = dao().fetch(Audit.class, Cnd.where("id", "=", record.getString("reimbursement_finance_audit_id"))); + record.setv("reimbursement_school_finance",audit); + } return record; } diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java index ab1049e..173a828 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/baseManage/TheRapyRecuperationBaseManagerController.java @@ -6,16 +6,24 @@ import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; +import com.aspose.words.Document; +import com.aspose.words.SaveFormat; +import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.data.PictureRenderData; +import com.deepoove.poi.data.PictureType; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.dao.CndPlus; import io.v.nutz.base.service.BaseService; import io.v.nutz.base.utils.Vi; import io.v.nutz.base.query.PageForm; import io.v.nutz.base.utils.ViTool; +import io.v.nutz.sys.models.Sys_user; import io.v.nutz.zhgh.therapyRecuperation.model.TheRapyRecuperationBaseManagement; import io.v.nutz.zhgh.therapyRecuperation.model.TheRapyRecuperationLot; import io.v.nutz.zhgh.therapyRecuperation.model.TheRapyRecuperationTravelAgency; @@ -27,6 +35,7 @@ import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresRoles; import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.boot.starter.ftp.FtpService; import org.nutz.dao.Chain; import org.nutz.dao.Cnd; import org.nutz.dao.Dao; @@ -36,12 +45,14 @@ 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.util.NutMap; import org.nutz.mvc.annotation.*; import org.nutz.mvc.upload.TempFile; import org.nutz.mvc.upload.UploadAdaptor; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.*; import java.lang.reflect.Field; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Proxy; @@ -61,11 +72,12 @@ import java.util.stream.Collectors; @Ok("json:full") public class TheRapyRecuperationBaseManagerController { - @Inject - private BaseService baseService; @Inject private Dao dao; - + @Inject + private FtpService ftpService; + @Inject + private BaseService baseService; @Inject private TheRapyRecuperationBaseManagerService theRapyRecuperationBaseManagerService; @@ -229,7 +241,7 @@ public class TheRapyRecuperationBaseManagerController { @ViReturn @RequiresAuthentication public Object listAllBase(String startYear, String endYear, String year) { - Sql sql = Sqls.create("select * from `the_rapy_recuperation_base_management` tb left join `the_rapy_recuperation_lot` lot on lot.id=tb.lotId $condition"); + Sql sql = Sqls.create("select tb.* from `the_rapy_recuperation_base_management` tb left join `the_rapy_recuperation_lot` lot on lot.id=tb.lotId $condition"); CndPlus cnd = new CndPlus(); cnd.andEX("tb.`year`", ">=", startYear); @@ -255,6 +267,20 @@ public class TheRapyRecuperationBaseManagerController { } + @At("/getTimeArray") + @ViReturn + @RequiresAuthentication + public Object getTimeArray(@Param("id") String id) { + if (StrUtil.isBlank(id)) { + return Result.error("参数错误"); + } + TheRapyRecuperationBaseManagement management = dao.fetch(TheRapyRecuperationBaseManagement.class, id); + return Map.of("minDate", DateUtil.formatDate(management.getActivityStartTime()), + "maxDate", DateUtil.formatDate(management.getActivityEndTime())); + } + + + /** * 目的地导入模版 * @@ -358,4 +384,56 @@ public class TheRapyRecuperationBaseManagerController { return null; } + + + @At("/showBaseApplyPdf") + @Ok("void") + @RequiresAuthentication + public void showBaseApplyPdf(String idCard, String specificTime, String baseName, + String sign, HttpServletResponse response){ + NutMap map = NutMap.NEW(); + map.put("idCard", ObjectUtil.defaultIfBlank(idCard, "--预览展示--")); + map.put("specificTime", ObjectUtil.defaultIfBlank(specificTime, "--预览展示--")); + map.put("baseName", ObjectUtil.defaultIfBlank(baseName, "--预览展示--")); + Sys_user user = (Sys_user) ShiroUtil.getPrincipal(); + map.put("username", user.getUsername()); + map.put("unitName", user.getUnit().getName()); + map.put("appDate", DateUtil.formatChineseDate(new Date(), false, false)); + if (StrUtil.isNotBlank(sign)) { + try { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + ftpService.download(sign, os); + os.close(); + PictureRenderData data = new PictureRenderData(70, 30, PictureType.PNG, os.toByteArray()); + map.put("sign", data); + } catch (Exception e) { + e.printStackTrace(); + } + } + + try { + response.addHeader("Content-Type", "application/octet-stream"); + response.addHeader("Content-Disposition", "inline; filename=\"" + new String("定点自由行申请表".getBytes("UTF-8"), "ISO-8859-1") + "\".docx"); + InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("docTemplate/therapyrecuperation/base_apply.docx"); + + //将模版写成docx + ByteArrayOutputStream os = new ByteArrayOutputStream(); + XWPFTemplate.compile(inputStream).render(map, os); + + InputStream resultInputStream = new ByteArrayInputStream(os.toByteArray()); + + Document doc = new Document(resultInputStream); + doc.save(response.getOutputStream(), SaveFormat.PDF); + + /*File localPdfPath = File.createTempFile("file_convert", ".pdf"); + File file = new File(targetPath); + FileOutputStream os = new FileOutputStream(file); + XWPFTemplate.compile(inputStream).render(map, );*/ + + } catch (Exception e) { + e.printStackTrace(); + } + + } + } diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java index 6510c74..53e7d52 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationUserQueryController.java @@ -9,8 +9,14 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.wizzer.framework.base.Result; +import com.aspose.words.Document; +import com.aspose.words.SaveFormat; +import com.deepoove.poi.XWPFTemplate; +import com.deepoove.poi.data.PictureRenderData; +import com.deepoove.poi.data.PictureType; import io.v.nutz.base.annontation.ViReturn; import io.v.nutz.base.service.BaseService; import io.v.nutz.base.utils.Vi; @@ -24,6 +30,7 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.aop.interceptor.ioc.TransAop; +import org.nutz.boot.starter.ftp.FtpService; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; @@ -43,14 +50,10 @@ import org.nutz.mvc.upload.UploadAdaptor; import org.springframework.util.CollectionUtils; import javax.servlet.http.HttpServletResponse; -import java.io.BufferedOutputStream; -import java.io.IOException; +import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -62,6 +65,8 @@ import java.util.zip.ZipOutputStream; public class TheRapyRecuperationUserQueryController { + @Inject + private FtpService ftpService; @Inject private BaseService baseService; @@ -357,6 +362,14 @@ public class TheRapyRecuperationUserQueryController { date_format( lineu.playStartTime, '%Y-%m-%d' ) playStartTime, lineu.lineId, ( SELECT COUNT( 1 ) FROM the_rapy_recuperation_enroll_companion WHERE trreId = enroll.id) familyCount, + ( + SELECT + GROUP_CONCAT(ec.userName, '-', ec.sex, '-', ec.age, '（', ec.idcard, '、', ec.mobile, '）') + FROM + the_rapy_recuperation_enroll_companion ec + WHERE + ec.trreId = enroll.id + ) AS companionInfo, u.schoolTime FROM `the_rapy_recuperation_enroll` enroll @@ -451,6 +464,9 @@ public class TheRapyRecuperationUserQueryController { lineEntities.add(new ExcelExportEntity("线路名称", "lineName", 20)); lineEntities.add(new ExcelExportEntity("旅行社", "travelAgencyName", 20)); lineEntities.add(new ExcelExportEntity("随行人数", "familyCount", 20)); + ExcelExportEntity lineEntity = new ExcelExportEntity("随行人信息", "companionInfo", 50); + lineEntity.setWrap(true); + lineEntities.add(lineEntity); //自由组团表头 ArrayList travelEntities = new ArrayList<>(commonEntities); @@ -501,4 +517,141 @@ public class TheRapyRecuperationUserQueryController { e.printStackTrace(); } } + + + @At + @Ok("void") + @RequiresAuthentication + public void doExportBaseApply(@Param(value = "id", required = false) String id, + @Param(value = "searchKeyword", required = false) String searchKeyword, + @Param(value = "startYear", required = false) Integer startYear, + @Param(value = "endYear", required = false) Integer endYear, + @Param(value = "unionId", required = false) String unionId, + @Param(value = "unitId", required = false) String unitId, + @Param(value = "lotId", required = false) String lotId, + @Param(value = "takePartInBaseManagementId", required = false) String takePartInBaseManagementId, + HttpServletResponse response){ + Sql sql = Sqls.create(""" + SELECT + enroll.*, + base.baseName + FROM + the_rapy_recuperation_enroll enroll + LEFT JOIN the_rapy_recuperation_base_management base ON base.id = enroll.takePartInBaseManagementId + $condition + """); + + Cnd cnd = Cnd.NEW(); + if (StrUtil.isNotBlank(id)) { + cnd.and("enroll.id", "=", id); + sql.setCondition(cnd); + List list = baseService.listMap(sql); + + NutMap nutMap = list.stream().findFirst().orElse(NutMap.NEW()); + NutMap map = buildBaseApplyFormMap(nutMap); + + try { + response.setContentType("application/pdf"); + response.setHeader("Content-Disposition", "attachment; filename=\"" + new String((map.getString("username") + "定点自由行申请表").getBytes("UTF-8"), StandardCharsets.ISO_8859_1) + "\".pdf"); + + InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("docTemplate/therapyrecuperation/base_apply.docx"); + // 生成 DOCX 内容到字节数组输出流 + ByteArrayOutputStream docxOut = new ByteArrayOutputStream(); + XWPFTemplate.compile(inputStream).render(map, docxOut); + inputStream.close(); + + // 将 DOCX 转换为 PDF + Document doc = new com.aspose.words.Document(new ByteArrayInputStream(docxOut.toByteArray())); + ByteArrayOutputStream pdfOut = new ByteArrayOutputStream(); + doc.save(pdfOut, SaveFormat.PDF); + + // 将 PDF 写入响应输出流 + response.getOutputStream().write(pdfOut.toByteArray()); + response.getOutputStream().flush(); + response.getOutputStream().close(); + } catch (Exception e) { + e.printStackTrace(); + } + } else { + cnd.and("enroll.isNormal", "=", true); + cnd.and("enroll.stateId", "=", TheRapyRecuperationState.PASS); + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("enroll.userName", searchKeyword); + seg.orLike("enroll.loginName", searchKeyword); + cnd.and(seg); + } + cnd.andEX("enroll.lotId", "=", lotId); + cnd.andEX("YEAR(enroll.signingUptime)", ">=", startYear); + cnd.andEX("YEAR(enroll.signingUptime)", "<=", endYear); + cnd.and("enroll.takePartInBaseManagementId", "is not", null); + cnd.andEX("enroll.takePartInBaseManagementId", "=", takePartInBaseManagementId); + cnd.andEX("enroll.selfUnionId", "=", unionId); + cnd.andEX("enroll.selfUnitId", "=", unitId); + sql.setCondition(cnd); + + List enrollList = baseService.listMap(sql); + + try { + response.setContentType("application/octet-stream"); + response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("疗休养报名人员名单.zip", StandardCharsets.UTF_8).replaceAll("\\+", "%20")); + + try (ZipOutputStream zipOutputStream = new ZipOutputStream(response.getOutputStream())) { + for (NutMap enroll : enrollList) { + NutMap map = buildBaseApplyFormMap(enroll); + + String fileName = map.getString("username") + "定点自由行申请表.pdf"; + ZipEntry zipEntry = new ZipEntry(fileName); + zipOutputStream.putNextEntry(zipEntry); + + InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("docTemplate/therapyrecuperation/base_apply.docx"); + + ByteArrayOutputStream docxOut = new ByteArrayOutputStream(); + XWPFTemplate.compile(inputStream).render(map, docxOut); + inputStream.close(); + + Document doc = new Document(new ByteArrayInputStream(docxOut.toByteArray())); + ByteArrayOutputStream pdfOut = new ByteArrayOutputStream(); + doc.save(pdfOut, SaveFormat.PDF); + + zipOutputStream.write(pdfOut.toByteArray()); + zipOutputStream.closeEntry(); + } + zipOutputStream.finish(); // 完成 ZIP 压缩包的写入 + } catch (Exception e) { + e.printStackTrace(); + // Handle exception appropriately + } + } catch (Exception e) { + e.printStackTrace(); + } + + } + } + + + + private NutMap buildBaseApplyFormMap(NutMap enroll){ + NutMap map = NutMap.NEW(); + map.put("idCard", enroll.getString("idCard")); + map.put("specificTime", enroll.getString("specificTime")); + map.put("baseName", enroll.getString("baseName")); + map.put("username", enroll.getString("userName")); + map.put("unitName", enroll.getString("unitName")); + map.put("appDate", DateUtil.formatChineseDate(enroll.getTime("signingUptime"), false, false)); + String sign = enroll.getString("sign"); + if (StrUtil.isNotBlank(sign)) { + try { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + ftpService.download(sign, os); + os.close(); + PictureRenderData data = new PictureRenderData(70, 30, PictureType.PNG, os.toByteArray()); + map.put("sign", data); + } catch (Exception e) { + e.printStackTrace(); + } + } + return map; + } + } diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationEnroll.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationEnroll.java index 75fb6fd..5317f3f 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationEnroll.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/model/TheRapyRecuperationEnroll.java @@ -202,5 +202,15 @@ public class TheRapyRecuperationEnroll extends BaseModel { @Comment("家属数量") private Integer familyNumber; + @Column + @ColDefine(type = ColType.VARCHAR, width = 100) + @Comment("签字") + private String sign; + + @Column + @ColDefine(type = ColType.VARCHAR, width = 100) + @Comment("出行时间") + private String specificTime; + private String firstLetter; } diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java index fda3523..ceb96be 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java @@ -147,20 +147,20 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl> '$[0].id' as char) as fileId, - l.lotName, - t.travelAgencyName + (select count(1) from the_rapy_recuperation_enroll where takePartInBaseManagementId=b.id and isNormal = true and stateId not in (2715,2725,2735) and YEAR(signingUptime)=@year) as signUpUserNum from the_rapy_recuperation_base_management b left join the_rapy_recuperation_lot l on l.id = b.lotId left join the_rapy_recuperation_travel_agency t on t.id = b.travelAgencyId $condition - """); + """).setParam("year", queryYear); cnd.asc("sortNumber"); taSql.setCondition(cnd); return listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), taSql); @@ -1409,14 +1409,15 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl - - - - - - 活动预算费用 - + 报销信息条例 - - - - - - - - - + + + + + + + + + -
- 其他报销附件 - - - - - - - - - - - - - - -
发票： - - 暂无 -
活动报道照片/总结/链接： - - 暂无 -
奖品/纪念品/服装/道具等活动人员名单： - - 暂无 -
- - - -
+ 其他报销附件 + + + + + + + + + + + + + + +
发票： + + 暂无 +
活动报道照片/总结/链接： + + 暂无 +
奖品/纪念品/服装/道具等活动人员名单： + + 暂无 +
+ - - - - - - {{ viewData.dc_username }} - - - - - {{ viewData.division_chairman_time }} - - - - -
{{ - viewData.division_chairman_idea ? viewData.division_chairman_idea : "暂无" - }} -
- - - - 暂无 - - - - - - - - - - - - {{ viewData.a_username }} - - - - - {{ viewData.accounting_time }} - - - - -
{{ viewData.accounting_idea ? viewData.accounting_idea : "暂无" }} -
- - - - 暂无 - - - - - - - - - - - - {{ viewData.ct_username }} - - - - - {{ viewData.confirm_trade_time }} - - - - -
{{ viewData.confirm_trade_idea ? viewData.confirm_trade_idea : "暂无" - }} -
- - - - 暂无 - - - - - - - - - - {{ viewData.ucc_username }} - - - - - {{ viewData.union_chairman_time }} - - - - -
{{ viewData.union_chairman_idea ? viewData.union_chairman_idea : "暂无" - }} -
- - - - 暂无 - - - - - - - - - - - - {{ viewData.uc_username }} - - - - - {{ viewData.union_cashier_time }} - - - - -
{{ viewData.union_cashier_idea ? viewData.union_cashier_idea : "暂无" - }} -
- - - - 暂无 - - - - - @@ -371,7 +106,7 @@ - @@ -394,7 +129,7 @@ - @@ -417,7 +152,7 @@ - @@ -427,9 +162,7 @@ {{ viewData.reimbursement_school_chairman.auditTime }} - {{ - viewData.reimbursement_school_chairman.auditOpinion ? viewData.reimbursement_school_chairman.auditOpinion : "暂无" - }} + {{viewData.reimbursement_school_chairman.auditOpinion ? viewData.reimbursement_school_chairman.auditOpinion : "暂无" }} + + + + {{ viewData.reimbursement_school_finance.username }} + + + {{ viewData.reimbursement_school_finance.auditTime }} + + + {{viewData.reimbursement_school_finance.auditOpinion ? viewData.reimbursement_school_finance.auditOpinion : "暂无" }} + + + + 暂无 + + + + @@ -477,7 +232,7 @@ module.exports = { }, components: { "file-upload": httpVueLoader("/components/plugins/FileUpload.vue"), - "tissue-info": httpVueLoader("/components/activity/school/tissueInfo.vue") + // "tissue-info": httpVueLoader("/components/activity/school/tissueInfo.vue") }, methods: { hasPane(name) { @@ -507,9 +262,9 @@ module.exports = { if (data.newsFiles && data.newsFiles.length > 0) this.viewData.newsFiles = JSON.parse(data.newsFiles) if (data.budgets && data.budgets.length > 0) this.viewData.budgets = JSON.parse(data.budgets) // this.viewData.goods = data.Goods - this.$nextTick(() => { - this.$refs.info.getInfo(data.activity_id) - }) + // this.$nextTick(() => { + // this.$refs.info.getInfo(data.activity_id) + // }) } else { this.viewData = {} this.$message({ diff --git a/src/main/resources/static/components/msgNotify/msgNotify.vue b/src/main/resources/static/components/msgNotify/msgNotify.vue index 7ef4289..32b9c9f 100644 --- a/src/main/resources/static/components/msgNotify/msgNotify.vue +++ b/src/main/resources/static/components/msgNotify/msgNotify.vue @@ -472,7 +472,7 @@ module.exports = { success: (data) => { this.importLoading = false if (data.code === 0) { - this.notifySuccess("核对成功!") + this.$message.success("核对成功!") this.errorInfoData = data.data this.formData.existsLoginNameRedisKey = data.data.existsLoginNameRedisKey } else { @@ -485,7 +485,7 @@ module.exports = { this.errorInfoData = data.data }, error: (data) => { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.importLoading = false } }); diff --git a/src/main/resources/static/components/plugins/UserScope.vue b/src/main/resources/static/components/plugins/UserScope.vue index 91fc574..8d10e56 100644 --- a/src/main/resources/static/components/plugins/UserScope.vue +++ b/src/main/resources/static/components/plugins/UserScope.vue @@ -562,7 +562,7 @@ module.exports = { this.tableData = resp.data.list this.pageForm.totalCount = resp.data.totalCount } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doSetActivityUser() { @@ -600,7 +600,7 @@ module.exports = { // this.userScopeDialog = false await this.getActivityGroup() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.formData = { setGroupType: null, setGroupId: null, diff --git a/src/main/resources/static/components/sys/union/cadre/Audit.vue b/src/main/resources/static/components/sys/union/cadre/Audit.vue index 720a21a..2f6d08d 100644 --- a/src/main/resources/static/components/sys/union/cadre/Audit.vue +++ b/src/main/resources/static/components/sys/union/cadre/Audit.vue @@ -98,7 +98,7 @@ module.exports = { if (resp.code === 0) { this.pageData() this.$refs.table.clearSelection(); - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ this.notifyError(resp.msg) } diff --git a/src/main/resources/static/components/userpartupdate/UserPartUpdateSet.vue b/src/main/resources/static/components/userpartupdate/UserPartUpdateSet.vue index d6e07e0..11cdd21 100644 --- a/src/main/resources/static/components/userpartupdate/UserPartUpdateSet.vue +++ b/src/main/resources/static/components/userpartupdate/UserPartUpdateSet.vue @@ -523,7 +523,7 @@ module.exports = { this.tableData = resp.data.list this.pageForm.totalCount = resp.data.totalCount } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doSetActivityUser() { @@ -561,7 +561,7 @@ module.exports = { // this.userScopeDialog = false await this.getActivityGroup() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.formData = { setGroupType: null, setGroupId: null, diff --git a/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html b/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html index 7e10f0a..5b61e1d 100644 --- a/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html +++ b/src/main/resources/views/mobile/therapyRecuperation/baseManagement.html @@ -215,9 +215,9 @@ layout("/mobile/platform.html"){
- + {{baseData.baseName}}
@@ -279,6 +279,10 @@ layout("/mobile/platform.html"){ +
@@ -292,17 +296,31 @@ layout("/mobile/platform.html"){
- - + +
+
+ +
+
+
+ 签字 +
+
+
-
+ - + :rules="[{ required: true }]">–>
- + <!–随行人信息–>
- + <!––> @@ -385,7 +403,7 @@ layout("/mobile/platform.html"){ placeholder="随行人与本人关系" v-model="item.relation" :rules="[{ required: true }]"> - + v-model="item.bedInfo.otherSleepUser">–>
@@ -420,13 +438,15 @@ layout("/mobile/platform.html"){ -
- +
-->
提交报名
+
+ 查看定点自由行申请表 +
@@ -462,6 +482,22 @@ layout("/mobile/platform.html"){ + + + + + + + + + +
+ + + \ No newline at end of file + diff --git a/src/main/resources/views/platform/activity/union/layoutPlan.html b/src/main/resources/views/platform/activity/union/layoutPlan.html index 7721fff..89639c5 100644 --- a/src/main/resources/views/platform/activity/union/layoutPlan.html +++ b/src/main/resources/views/platform/activity/union/layoutPlan.html @@ -324,7 +324,7 @@ if (resp.code === 0) { this.pageData() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } @@ -342,7 +342,7 @@ if (resp.code === 0) { this.pageData() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/activity/union/layoutStatisticsActivity.html b/src/main/resources/views/platform/activity/union/layoutStatisticsActivity.html index 7880a33..7269ea1 100644 --- a/src/main/resources/views/platform/activity/union/layoutStatisticsActivity.html +++ b/src/main/resources/views/platform/activity/union/layoutStatisticsActivity.html @@ -150,7 +150,7 @@ if (resp.code === 0) { this.doSearch() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/benefiting/manage.html b/src/main/resources/views/platform/benefiting/manage.html index 656f5fc..29b83d0 100644 --- a/src/main/resources/views/platform/benefiting/manage.html +++ b/src/main/resources/views/platform/benefiting/manage.html @@ -353,9 +353,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doDelete", {id}) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -377,9 +377,9 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.guava.index() this.deleteRowIds = [] - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, diff --git a/src/main/resources/views/platform/benefiting/type.html b/src/main/resources/views/platform/benefiting/type.html index b302338..cc01e9c 100644 --- a/src/main/resources/views/platform/benefiting/type.html +++ b/src/main/resources/views/platform/benefiting/type.html @@ -144,10 +144,10 @@ layout("/layouts/platform.html"){ if ("confirm" === a) { const resp = await $.get(loc() + "/doDelete", {id: row.id}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/contribution/contributionList.html b/src/main/resources/views/platform/contribution/contributionList.html index ee18221..b09df02 100644 --- a/src/main/resources/views/platform/contribution/contributionList.html +++ b/src/main/resources/views/platform/contribution/contributionList.html @@ -303,10 +303,10 @@ layout("/layouts/platform.html"){ this.formData = data const resp = await $.post(loc() + "/doEdit", {contribution: JSON.stringify(this.formData)}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async operation() { @@ -329,7 +329,7 @@ layout("/layouts/platform.html"){ this.DialogVisible = false; this.pageData(); }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); @@ -344,10 +344,10 @@ layout("/layouts/platform.html"){ if ("confirm" === a) { const resp = await $.get(loc() + "/doDelete", {id: id}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) self.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/contribution/contributionType.html b/src/main/resources/views/platform/contribution/contributionType.html index 5747abc..7b313dd 100644 --- a/src/main/resources/views/platform/contribution/contributionType.html +++ b/src/main/resources/views/platform/contribution/contributionType.html @@ -209,11 +209,11 @@ layout("/layouts/platform.html"){ }) loading.close() if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.DialogVisible = false; this.pageData(); }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); @@ -231,7 +231,7 @@ layout("/layouts/platform.html"){ self.notifySuccess(resp.msg) self.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/data/unit/UpdateUnit.html b/src/main/resources/views/platform/data/unit/UpdateUnit.html index ec01ab2..0c4e22a 100644 --- a/src/main/resources/views/platform/data/unit/UpdateUnit.html +++ b/src/main/resources/views/platform/data/unit/UpdateUnit.html @@ -431,7 +431,7 @@ layout("/layouts/platform.html"){ this.pageData(); this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); @@ -445,7 +445,7 @@ layout("/layouts/platform.html"){ this.$refs['form'].resetFields() } }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, doAdd() { @@ -459,7 +459,7 @@ layout("/layouts/platform.html"){ this.pageData(); this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); @@ -541,4 +541,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/data/user/SourceUser.html b/src/main/resources/views/platform/data/user/SourceUser.html index 5108f1a..849a4bd 100644 --- a/src/main/resources/views/platform/data/user/SourceUser.html +++ b/src/main/resources/views/platform/data/user/SourceUser.html @@ -223,12 +223,12 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/deleteUser', {sourceTime: JSON.stringify(this.sourceTime)}) this.deleteLoading = false if (resp.code === 0) { - this.notifySuccess((resp.msg)) + this.$message.success((resp.msg)) this.pageData() this.getLatelyUpdateTimes() this.dialogVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -237,7 +237,7 @@ layout("/layouts/platform.html"){ if(resp.code===0){ this.latelyDeleteTimes = resp.data }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openDeleteUser() { @@ -268,7 +268,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -288,7 +288,7 @@ layout("/layouts/platform.html"){ await this.getLatelyUpdateTimes() this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -304,7 +304,7 @@ layout("/layouts/platform.html"){ if(resp.code===0){ this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/data/user/UpdateUser.html b/src/main/resources/views/platform/data/user/UpdateUser.html index 784d09f..e1edd50 100644 --- a/src/main/resources/views/platform/data/user/UpdateUser.html +++ b/src/main/resources/views/platform/data/user/UpdateUser.html @@ -386,10 +386,10 @@ layout("/layouts/platform.html"){ }).then(async () => { const resp = await $.post(loc() + '/clearHistory') if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -473,7 +473,7 @@ layout("/layouts/platform.html"){ this.dialogVisible = false this.reset() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, diff --git a/src/main/resources/views/platform/evaluate/evaluateApply.html b/src/main/resources/views/platform/evaluate/evaluateApply.html index 05258e1..9d92e9b 100644 --- a/src/main/resources/views/platform/evaluate/evaluateApply.html +++ b/src/main/resources/views/platform/evaluate/evaluateApply.html @@ -680,7 +680,7 @@ layout("/layouts/platform.html"){ this.formData.files = JSON.stringify(this.formData.files) const resp = await $.post('/platform/evaluate/apply/saveForm', this.formData) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() }else{ @@ -887,7 +887,7 @@ layout("/layouts/platform.html"){ this.formData.files = JSON.stringify(this.formData.files) const resp = await $.post('/platform/evaluate/apply/doSubmit', this.formData) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() }else{ diff --git a/src/main/resources/views/platform/fellowship/manage/activity.html b/src/main/resources/views/platform/fellowship/manage/activity.html index 2a78311..b9a3869 100644 --- a/src/main/resources/views/platform/fellowship/manage/activity.html +++ b/src/main/resources/views/platform/fellowship/manage/activity.html @@ -268,7 +268,7 @@ layout("/layouts/platform.html"){ id }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } @@ -280,7 +280,7 @@ layout("/layouts/platform.html"){ id }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } @@ -296,7 +296,7 @@ layout("/layouts/platform.html"){ }) if (confirm === "confirm") { const resp = await $.post(loc() + '/doDelete', {id: row.id}) - this.notifySuccess("删除成功") + this.$message.success("删除成功") this.doSearch() } }, diff --git a/src/main/resources/views/platform/fellowship/manage/userAdjust.html b/src/main/resources/views/platform/fellowship/manage/userAdjust.html index b938071..4501c6a 100644 --- a/src/main/resources/views/platform/fellowship/manage/userAdjust.html +++ b/src/main/resources/views/platform/fellowship/manage/userAdjust.html @@ -242,7 +242,7 @@ layout("/layouts/platform.html"){ }, async doAdjust() { if (!this.afterAdjustCourse) { - this.notifyWarning('请选择要调整的' + this.trainType + '！') + this.$message.warning('请选择要调整的' + this.trainType + '！') return } diff --git a/src/main/resources/views/platform/fellowship/manage/user_black_list.html b/src/main/resources/views/platform/fellowship/manage/user_black_list.html index df83fed..66fcad0 100644 --- a/src/main/resources/views/platform/fellowship/manage/user_black_list.html +++ b/src/main/resources/views/platform/fellowship/manage/user_black_list.html @@ -192,7 +192,7 @@ layout("/layouts/platform.html"){ async handleUser(userId) { const resp = await $.post(loc() + '/doHandleUser', {userId}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } }, diff --git a/src/main/resources/views/platform/fourOneActivity/fourOneApply.html b/src/main/resources/views/platform/fourOneActivity/fourOneApply.html index a019fd3..5d6ffb8 100644 --- a/src/main/resources/views/platform/fourOneActivity/fourOneApply.html +++ b/src/main/resources/views/platform/fourOneActivity/fourOneApply.html @@ -459,7 +459,7 @@ layout("/layouts/platform.html"){ if ((this.activityName === 0 && a) || (this.activityName === 1 && b) || (this.activityName === 2 && c) || (this.activityName === 3 && d)) { this.activityName++ } else { - this.notifyWarning("请填写完整") + this.$message.warning("请填写完整") } }, async doSubmit() { @@ -503,7 +503,7 @@ layout("/layouts/platform.html"){ flag: true }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) sublime.jumpPagePjax("/platform/fourOne/activity/applyList") } else { this.notifyError(resp.msg) @@ -511,7 +511,7 @@ layout("/layouts/platform.html"){ } } else { - this.notifyWarning("请填写完整再提交") + this.$message.warning("请填写完整再提交") } @@ -526,7 +526,7 @@ layout("/layouts/platform.html"){ flag: false }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) sublime.jumpPagePjax("/platform/fourOne/activity/applyList") } else { this.notifyError(resp.msg) @@ -621,4 +621,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/fourOneActivity/fourOneApplyList.html b/src/main/resources/views/platform/fourOneActivity/fourOneApplyList.html index 49a11d0..300e00f 100644 --- a/src/main/resources/views/platform/fourOneActivity/fourOneApplyList.html +++ b/src/main/resources/views/platform/fourOneActivity/fourOneApplyList.html @@ -262,7 +262,7 @@ layout("/layouts/platform.html"){ id: this.id }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs.guava.index() } else { @@ -295,7 +295,7 @@ layout("/layouts/platform.html"){ if (confirm === "confirm") { const resp = await $.post(loc() + "/doDelete", {id: data.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { this.notifyError(resp.msg) @@ -311,7 +311,7 @@ layout("/layouts/platform.html"){ if (confirm === "confirm") { const resp = await $.post(loc() + "/doSubmit", {id: data.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { this.notifyError(resp.msg) @@ -328,4 +328,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/fourOneActivity/fourOneAssess.html b/src/main/resources/views/platform/fourOneActivity/fourOneAssess.html index 6b91069..f07efb7 100644 --- a/src/main/resources/views/platform/fourOneActivity/fourOneAssess.html +++ b/src/main/resources/views/platform/fourOneActivity/fourOneAssess.html @@ -187,7 +187,7 @@ layout("/layouts/platform.html"){ }, async doReview() { if (this.formData.assessGrade === "") { - this.notifyWarning("请选择评审等级") + this.$message.warning("请选择评审等级") return } const confirm = await this.$confirm('确定要提交吗？', '提示', { @@ -198,7 +198,7 @@ layout("/layouts/platform.html"){ if (confirm === "confirm") { const resp = await $.post(loc() + "/doReview", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs.guava.index() } else { @@ -218,4 +218,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/fourOneActivity/fourOneSchoolAudit.html b/src/main/resources/views/platform/fourOneActivity/fourOneSchoolAudit.html index 100ff9a..aaacd69 100644 --- a/src/main/resources/views/platform/fourOneActivity/fourOneSchoolAudit.html +++ b/src/main/resources/views/platform/fourOneActivity/fourOneSchoolAudit.html @@ -190,7 +190,7 @@ layout("/layouts/platform.html"){ this.formData.pass = flag const resp = await $.post(loc() + "/doReview", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs.guava.index() } else { @@ -210,4 +210,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/fourOneActivity/fourOneUnionAudit.html b/src/main/resources/views/platform/fourOneActivity/fourOneUnionAudit.html index 83dc31c..ed859c3 100644 --- a/src/main/resources/views/platform/fourOneActivity/fourOneUnionAudit.html +++ b/src/main/resources/views/platform/fourOneActivity/fourOneUnionAudit.html @@ -178,7 +178,7 @@ layout("/layouts/platform.html"){ this.formData.pass = flag const resp = await $.post(loc() + "/doReview", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs.guava.index() } else { @@ -196,4 +196,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/fourOneActivity/fourOneUnionPartyAudit.html b/src/main/resources/views/platform/fourOneActivity/fourOneUnionPartyAudit.html index 41f564a..f7333a2 100644 --- a/src/main/resources/views/platform/fourOneActivity/fourOneUnionPartyAudit.html +++ b/src/main/resources/views/platform/fourOneActivity/fourOneUnionPartyAudit.html @@ -178,7 +178,7 @@ layout("/layouts/platform.html"){ this.formData.pass = flag const resp = await $.post(loc() + "/doReview", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs.guava.index() } else { @@ -197,4 +197,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/hd/wmhd/sbxxyl.html b/src/main/resources/views/platform/hd/wmhd/sbxxyl.html index 2159a04..b017027 100644 --- a/src/main/resources/views/platform/hd/wmhd/sbxxyl.html +++ b/src/main/resources/views/platform/hd/wmhd/sbxxyl.html @@ -563,7 +563,7 @@ layout("/layouts/platform.html"){ if (confirm) { const resp = await $.post(loc() + '/doDelete', {id: id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { this.notifyError(resp.msg) diff --git a/src/main/resources/views/platform/hd/wmhd/schoolAudit.html b/src/main/resources/views/platform/hd/wmhd/schoolAudit.html index 9774570..6547936 100644 --- a/src/main/resources/views/platform/hd/wmhd/schoolAudit.html +++ b/src/main/resources/views/platform/hd/wmhd/schoolAudit.html @@ -340,9 +340,9 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection() this.doSearch() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } diff --git a/src/main/resources/views/platform/hd/wmhd/unionAudit.html b/src/main/resources/views/platform/hd/wmhd/unionAudit.html index 6660767..d91cf27 100644 --- a/src/main/resources/views/platform/hd/wmhd/unionAudit.html +++ b/src/main/resources/views/platform/hd/wmhd/unionAudit.html @@ -345,9 +345,9 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection() this.doSearch() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/healthCheckup/listMange.html b/src/main/resources/views/platform/healthCheckup/listMange.html index 3a61b14..416bd1e 100644 --- a/src/main/resources/views/platform/healthCheckup/listMange.html +++ b/src/main/resources/views/platform/healthCheckup/listMange.html @@ -242,10 +242,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doEditHealthCheckupData", this.editHealthCheckupData) this.exportHealthCheckupDialog = false if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.loading = false } @@ -315,4 +315,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/healthCheckup/projectMange.html b/src/main/resources/views/platform/healthCheckup/projectMange.html index 034afd9..3e605c5 100644 --- a/src/main/resources/views/platform/healthCheckup/projectMange.html +++ b/src/main/resources/views/platform/healthCheckup/projectMange.html @@ -386,9 +386,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doDelete", {id}) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -431,7 +431,7 @@ layout("/layouts/platform.html"){ this.$refs.guava.index() this.deleteRowIds = [] } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, diff --git a/src/main/resources/views/platform/honor/apply.html b/src/main/resources/views/platform/honor/apply.html index d1fe896..07e9b82 100644 --- a/src/main/resources/views/platform/honor/apply.html +++ b/src/main/resources/views/platform/honor/apply.html @@ -475,7 +475,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doDelete', {id: row.id}) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/honor/audit/party.html b/src/main/resources/views/platform/honor/audit/party.html index bd33a3d..fc53ab8 100644 --- a/src/main/resources/views/platform/honor/audit/party.html +++ b/src/main/resources/views/platform/honor/audit/party.html @@ -215,7 +215,7 @@ layout("/layouts/platform.html"){ this.pageData() this.getHonorNum() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ this.notifyError(resp.msg) } @@ -276,4 +276,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/honor/audit/school.html b/src/main/resources/views/platform/honor/audit/school.html index 0a2a07e..5c8fd02 100644 --- a/src/main/resources/views/platform/honor/audit/school.html +++ b/src/main/resources/views/platform/honor/audit/school.html @@ -216,7 +216,7 @@ layout("/layouts/platform.html"){ this.pageData() this.getHonorNum() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ this.notifyError(resp.msg) } @@ -279,4 +279,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/honor/audit/union.html b/src/main/resources/views/platform/honor/audit/union.html index ad4d3a7..ece9f6a 100644 --- a/src/main/resources/views/platform/honor/audit/union.html +++ b/src/main/resources/views/platform/honor/audit/union.html @@ -215,7 +215,7 @@ layout("/layouts/platform.html"){ this.pageData() this.getHonorNum() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/honor/audit/unit.html b/src/main/resources/views/platform/honor/audit/unit.html index 082f6a9..9f64530 100644 --- a/src/main/resources/views/platform/honor/audit/unit.html +++ b/src/main/resources/views/platform/honor/audit/unit.html @@ -190,7 +190,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doReview", this.formData) if (resp.code===0){ this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs.guava.index() }else{ this.notifyError(resp.msg) @@ -232,4 +232,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/honor/board.html b/src/main/resources/views/platform/honor/board.html index 04b695d..8e9b835 100644 --- a/src/main/resources/views/platform/honor/board.html +++ b/src/main/resources/views/platform/honor/board.html @@ -161,23 +161,23 @@ layout("/layouts/platform.html"){ doFilter() { if (this.startYear == null) { - this.notifyWarning('请输入开始年份') + this.$message.warning('请输入开始年份') return } if (this.endYear == null) { - this.notifyWarning('请输入结束年份') + this.$message.warning('请输入结束年份') return } if (parseInt(this.startYear) > parseInt(moment().format('YYYY'))) { - this.notifyWarning('开始年份不能大于当前年份') + this.$message.warning('开始年份不能大于当前年份') return } if (parseInt(this.endYear) > parseInt(moment().format('YYYY'))) { - this.notifyWarning('结束年份不能大于当前年份') + this.$message.warning('结束年份不能大于当前年份') return } if (parseInt(this.startYear) > parseInt(this.endYear)) { - this.notifyWarning('开始年份不能大于结束年份') + this.$message.warning('开始年份不能大于结束年份') return } @@ -215,4 +215,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/jdh/db/audit.html b/src/main/resources/views/platform/jdh/db/audit.html index 26ef66b..a0af7b1 100644 --- a/src/main/resources/views/platform/jdh/db/audit.html +++ b/src/main/resources/views/platform/jdh/db/audit.html @@ -285,11 +285,11 @@ layout("/layouts/platform.html"){ if (!valid) return const resp = await $.post(loc() + '/doEditTeacher', this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.editDialogVisible = false this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, diff --git a/src/main/resources/views/platform/jdh/db/excelImport.js b/src/main/resources/views/platform/jdh/db/excelImport.js index beea8ab..2b85bf2 100644 --- a/src/main/resources/views/platform/jdh/db/excelImport.js +++ b/src/main/resources/views/platform/jdh/db/excelImport.js @@ -135,16 +135,16 @@ this.importLoading = false if (res.code === 0) { this.pageData(); - this.notifySuccess("导入成功") + this.$message.success("导入成功") this.errorInfoData = res.data this.$emit('refresh',null) } else { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.errorInfoData = res.data } }, error: (data) => { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.importLoading = false } }); diff --git a/src/main/resources/views/platform/jdh/db/preselection.html b/src/main/resources/views/platform/jdh/db/preselection.html index 9d4b184..4148e98 100644 --- a/src/main/resources/views/platform/jdh/db/preselection.html +++ b/src/main/resources/views/platform/jdh/db/preselection.html @@ -184,7 +184,7 @@ layout("/layouts/platform.html"){ if(resp.code===0){ window.location.href = '/platform/jdh/db/preselection' }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/jdh/db/push.html b/src/main/resources/views/platform/jdh/db/push.html index 12f42ec..2833ceb 100644 --- a/src/main/resources/views/platform/jdh/db/push.html +++ b/src/main/resources/views/platform/jdh/db/push.html @@ -340,7 +340,7 @@ layout("/layouts/platform.html"){ this.pageData() this.dialogVisible = false }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async pageData() { diff --git a/src/main/resources/views/platform/jdh/two/apply.html b/src/main/resources/views/platform/jdh/two/apply.html index 26797ad..7f7f579 100644 --- a/src/main/resources/views/platform/jdh/two/apply.html +++ b/src/main/resources/views/platform/jdh/two/apply.html @@ -328,7 +328,7 @@ layout("/layouts/platform.html"){ }, 100) }) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, initPage() { diff --git a/src/main/resources/views/platform/jdh/two/audit.html b/src/main/resources/views/platform/jdh/two/audit.html index f7b90e5..a23431c 100644 --- a/src/main/resources/views/platform/jdh/two/audit.html +++ b/src/main/resources/views/platform/jdh/two/audit.html @@ -203,9 +203,9 @@ layout("/layouts/platform.html"){ if(resp.code===0){ this.pageData() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) @@ -218,4 +218,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/jdh/two/reading.html b/src/main/resources/views/platform/jdh/two/reading.html index 567f570..82c6b31 100644 --- a/src/main/resources/views/platform/jdh/two/reading.html +++ b/src/main/resources/views/platform/jdh/two/reading.html @@ -114,7 +114,7 @@ layout("/layouts/platform.html"){ if(resp.code===0){ this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/jdh/zzjg/dbt.html b/src/main/resources/views/platform/jdh/zzjg/dbt.html index 84bdcd8..3d47ef2 100644 --- a/src/main/resources/views/platform/jdh/zzjg/dbt.html +++ b/src/main/resources/views/platform/jdh/zzjg/dbt.html @@ -327,7 +327,7 @@ layout("/layouts/platform.html"){ this.pageData() this.addDialogVisible = false }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/jdh/zzjg/delegation.html b/src/main/resources/views/platform/jdh/zzjg/delegation.html index 8eb87ce..aedd6c9 100644 --- a/src/main/resources/views/platform/jdh/zzjg/delegation.html +++ b/src/main/resources/views/platform/jdh/zzjg/delegation.html @@ -570,7 +570,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.dbTableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async dbDoSearch() { @@ -595,7 +595,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.dbtList = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doAdd() { @@ -607,7 +607,7 @@ layout("/layouts/platform.html"){ this.pageData() this.addDialogVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) @@ -621,10 +621,10 @@ layout("/layouts/platform.html"){ if ("confirm" == a) { const resp = await $.post(loc() + "/doDelete", {id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.undertakeUnitTree() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -640,10 +640,10 @@ layout("/layouts/platform.html"){ if ("confirm" == a) { const resp = await $.post(loc() + "/fghdoDelete", {id: id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) await this.adminPageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -660,10 +660,10 @@ layout("/layouts/platform.html"){ if ("confirm" == a) { const resp = await $.post(loc() + "/dwdoDelete", {id: id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) await this.unitPageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -686,10 +686,10 @@ layout("/layouts/platform.html"){ if ("confirm" == a) { const resp = await $.post(loc() + "/userDoDelete", data) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.getTzList() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -788,12 +788,12 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/fghdoAdd", data) this.fghSubLoading = false if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.fghDialogVisible = false this.pageData() await this.adminPageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, //添加单位 @@ -804,12 +804,12 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/dwdoAdd", data) this.dwSubLoading = false if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.dwDialogVisible = false this.pageData() await this.unitPageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async undertakeUnitTree() { @@ -823,7 +823,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.adminTableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, //该代表团下的组成单位 @@ -832,7 +832,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.unitTableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, //获取团长副团长 @@ -841,7 +841,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.TzTableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, //添加团长或者副团长 @@ -858,9 +858,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doAddTz", this.userFormData) if (resp.code === 0) { this.getTzList() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.userList = [] this.userFormData.userid = '' diff --git a/src/main/resources/views/platform/jdh/zzjg/mechanism.html b/src/main/resources/views/platform/jdh/zzjg/mechanism.html index b5b5c88..1476f8b 100644 --- a/src/main/resources/views/platform/jdh/zzjg/mechanism.html +++ b/src/main/resources/views/platform/jdh/zzjg/mechanism.html @@ -575,7 +575,7 @@ layout("/layouts/platform.html"){ this.pageData(); this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); @@ -624,9 +624,9 @@ layout("/layouts/platform.html"){ if(resp.code===0){ this.cyDialogVisible = false this.cyPageData(); - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.cyPageData() this.cyFormData.userid = '' @@ -661,7 +661,7 @@ layout("/layouts/platform.html"){ this.pageData(); this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); @@ -676,11 +676,11 @@ layout("/layouts/platform.html"){ if ("confirm" == a) { const resp = await $.post(loc() + "/doDelete", {id: id}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.loadTree(true) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -695,12 +695,12 @@ layout("/layouts/platform.html"){ if ("confirm" == a) { const resp = await $.post(loc() + "/doDeleteCy", row) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.cyPageData() this.loadTree(true) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/jf/activitybx/apply.html b/src/main/resources/views/platform/jf/activitybx/apply.html index b501d6e..cd328a1 100644 --- a/src/main/resources/views/platform/jf/activitybx/apply.html +++ b/src/main/resources/views/platform/jf/activitybx/apply.html @@ -442,7 +442,7 @@ layout("/layouts/platform.html"){ if(resp.code===0){ location.reload(); }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } // 添加成功 跳转到申请记录页面 //window.location.href = '/platform/jf/activity_bx/reimbursement' @@ -468,7 +468,7 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/jf/bxFundsLayout/accounting.html b/src/main/resources/views/platform/jf/bxFundsLayout/accounting.html index a17ec5e..b01dd21 100644 --- a/src/main/resources/views/platform/jf/bxFundsLayout/accounting.html +++ b/src/main/resources/views/platform/jf/bxFundsLayout/accounting.html @@ -244,9 +244,9 @@ this.subLoading2 = false this.pageData1() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } diff --git a/src/main/resources/views/platform/jf/bxFundsLayout/association.html b/src/main/resources/views/platform/jf/bxFundsLayout/association.html index b9aae74..989a957 100644 --- a/src/main/resources/views/platform/jf/bxFundsLayout/association.html +++ b/src/main/resources/views/platform/jf/bxFundsLayout/association.html @@ -237,9 +237,9 @@ this.subLoading2 = false this.pageData1() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } diff --git a/src/main/resources/views/platform/jf/bxFundsLayout/reimbursement.html b/src/main/resources/views/platform/jf/bxFundsLayout/reimbursement.html index 7fd2212..9c8a73a 100644 --- a/src/main/resources/views/platform/jf/bxFundsLayout/reimbursement.html +++ b/src/main/resources/views/platform/jf/bxFundsLayout/reimbursement.html @@ -446,11 +446,11 @@ async doSubmit(){ const resp = await $.post('/platform/jf/activity_bx/reimbursement/doEdit',{activityBx:JSON.stringify(this.modifyFilesData)}) if (resp.code === 0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.fileDialog = false this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, toHrefActivity(row){ diff --git a/src/main/resources/views/platform/jf/bxFundsLayout/union.html b/src/main/resources/views/platform/jf/bxFundsLayout/union.html index 54eba9d..e616878 100644 --- a/src/main/resources/views/platform/jf/bxFundsLayout/union.html +++ b/src/main/resources/views/platform/jf/bxFundsLayout/union.html @@ -296,9 +296,9 @@ this.subLoading2 = false this.pageData1() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } diff --git a/src/main/resources/views/platform/jf/club/clubys.html b/src/main/resources/views/platform/jf/club/clubys.html index efcdf5d..635ae56 100644 --- a/src/main/resources/views/platform/jf/club/clubys.html +++ b/src/main/resources/views/platform/jf/club/clubys.html @@ -364,9 +364,9 @@ layout("/layouts/platform.html"){ const resp = await $.get("/platform/jf/st/fp/reset") if (resp.code === 0) { this.flag = false; - this.notifySuccess("操作成功") + this.$message.success("操作成功") } else { - this.notifyWarning("操作失败") + this.$message.warning("操作失败") } this.doSearch() }).catch(() => { @@ -399,9 +399,9 @@ layout("/layouts/platform.html"){ const resp = await $.get("/platform/jf/st/fp/issue") if (resp.code === 0) { this.flag = true; - this.notifySuccess("操作成功") + this.$message.success("操作成功") } else { - this.notifyWarning("操作失败") + this.$message.warning("操作失败") } this.doSearch() }).catch(() => { diff --git a/src/main/resources/views/platform/jf/financial/import.html b/src/main/resources/views/platform/jf/financial/import.html index 02e9199..3ce5593 100644 --- a/src/main/resources/views/platform/jf/financial/import.html +++ b/src/main/resources/views/platform/jf/financial/import.html @@ -42,7 +42,7 @@ layout("/layouts/platform.html"){ :file-list="files" :limit="1" :on-error="handleError" - :on-exceed="()=>{this.notifyWarning('只能上传一个文件')}" + :on-exceed="()=>{this.$message.warning('只能上传一个文件')}" :on-remove="(f,fl)=>{fileList = fl;excelTableData=[];}" :on-success="handleSuccess" accept=".xls,.xlsx" @@ -126,7 +126,7 @@ layout("/layouts/platform.html"){ }, async importData(){ if (!this.excelTableData.length) { - this.notifyWarning('无数据') + this.$message.warning('无数据') return } const confirm = await this.$confirm('您确定导入吗?', '提示', { @@ -145,11 +145,11 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doImport', {data: JSON.stringify(this.excelTableData)}) loading.close() if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.excelTableData = [] this.files = [] } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, } diff --git a/src/main/resources/views/platform/jf/reimbursement/apply.html b/src/main/resources/views/platform/jf/reimbursement/apply.html index 50ae778..308f596 100644 --- a/src/main/resources/views/platform/jf/reimbursement/apply.html +++ b/src/main/resources/views/platform/jf/reimbursement/apply.html @@ -32,248 +32,268 @@ layout("/layouts/platform.html"){ - - @@ -138,11 +134,11 @@ layout("/layouts/platform.html"){ 导出申请方案表 --> - 导出活动报销凭证 + 导出报销凭证 - + 导出发票 @@ -194,14 +190,10 @@ layout("/layouts/platform.html"){ {prop: 'unitname', label: '所属单位', sortable: true}, {prop: 'clubName', label: '所属协会', sortable: true}, {prop: 'activity_type', label: '活动主体类型', sortable: true}, - {prop: 'absName', label: '活动项目类型', sortable: true}, + // {prop: 'absName', label: '活动项目类型', sortable: true}, {prop: 'reimbursement_apply_time', label: '申请时间', sortable: true}, {prop: 'reimbursement_state_id', label: '申请状态', sortable: true}, ], - formRules:{ - auditOpinion: [{required: true, message: '请填写意见', trigger: ['change', 'blur']}], - auditSign: [{required: true, message: '请签字', trigger: ['change', 'blur']}], - }, typeNum:{}, } }, diff --git a/src/main/resources/views/platform/jf/reimbursement/unionChairman.html b/src/main/resources/views/platform/jf/reimbursement/unionChairman.html index da04f26..47b287e 100644 --- a/src/main/resources/views/platform/jf/reimbursement/unionChairman.html +++ b/src/main/resources/views/platform/jf/reimbursement/unionChairman.html @@ -31,13 +31,12 @@ layout("/layouts/platform.html"){ -
+
所属工会：
@@ -151,7 +150,7 @@ layout("/layouts/platform.html"){ - + @@ -192,7 +191,7 @@ layout("/layouts/platform.html"){ {prop: 'unionname', label: '所属工会', sortable: true}, {prop: 'unitname', label: '所属单位', sortable: true}, {prop: 'activity_type', label: '活动主体类型', sortable: true}, - {prop: 'absName', label: '活动项目类型', sortable: true}, + // {prop: 'absName', label: '活动项目类型', sortable: true}, {prop: 'reimbursement_apply_time', label: '申请时间', sortable: true}, {prop: 'reimbursement_state_id', label: '申请状态', sortable: true}, ], @@ -241,7 +240,7 @@ layout("/layouts/platform.html"){ }) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } }) diff --git a/src/main/resources/views/platform/jf/yjgh/ghys.html b/src/main/resources/views/platform/jf/yjgh/ghys.html index 3f30ea8..1cad61f 100644 --- a/src/main/resources/views/platform/jf/yjgh/ghys.html +++ b/src/main/resources/views/platform/jf/yjgh/ghys.html @@ -332,9 +332,9 @@ layout("/layouts/platform.html"){ const resp = await $.get("/platform/jf/yjgh/ghys/reset") if (resp.code === 0) { this.flag = false; - this.notifySuccess("操作成功") + this.$message.success("操作成功") } else { - this.notifyWarning("操作失败") + this.$message.warning("操作失败") } this.doSearch() }).catch(() => { @@ -379,9 +379,9 @@ layout("/layouts/platform.html"){ const resp = await $.get("/platform/jf/yjgh/ghys/issue") if (resp.code === 0) { this.flag = true; - this.notifySuccess("操作成功") + this.$message.success("操作成功") } else { - this.notifyWarning("操作失败") + this.$message.warning("操作失败") } this.doSearch() } diff --git a/src/main/resources/views/platform/jsz/pc/cloudbackup.html b/src/main/resources/views/platform/jsz/pc/cloudbackup.html index bfccc94..0a0a198 100644 --- a/src/main/resources/views/platform/jsz/pc/cloudbackup.html +++ b/src/main/resources/views/platform/jsz/pc/cloudbackup.html @@ -129,10 +129,10 @@ layout("/layouts/platform.html"){ } = await $.get(loc() + '/databaseMigrateExport', {collections: JSON.stringify(this.formData.collections)}) loading.close() if (code === 0) { - this.notifySuccess(msg) + this.$message.success(msg) this.backUpDialog = false } else { - this.notifyWarning(msg) + this.$message.warning(msg) } }, @@ -152,4 +152,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/jsz/pc/prize.html b/src/main/resources/views/platform/jsz/pc/prize.html index a59583d..6c04ac0 100644 --- a/src/main/resources/views/platform/jsz/pc/prize.html +++ b/src/main/resources/views/platform/jsz/pc/prize.html @@ -101,7 +101,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.prizeData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, yearChange(val) { @@ -131,7 +131,7 @@ layout("/layouts/platform.html"){ exportExcel() { const data = this.prizeData[this.pageForm.currentSelectedType] if (!data) { - this.notifyWarning('暂无数据！') + this.$message.warning('暂无数据！') return } const {activityId, currentSelectedType} = this.pageForm @@ -146,4 +146,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/leadthought/basic/manage.html b/src/main/resources/views/platform/leadthought/basic/manage.html index 664700e..898a3b0 100644 --- a/src/main/resources/views/platform/leadthought/basic/manage.html +++ b/src/main/resources/views/platform/leadthought/basic/manage.html @@ -151,10 +151,10 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.dialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() } @@ -170,10 +170,10 @@ layout("/layouts/platform.html"){ const resp = await $.get(loc() + "/doDelete", {id: row.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -183,10 +183,10 @@ layout("/layouts/platform.html"){ this.formData = data const resp = await $.post(loc() + "/doEdit", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, diff --git a/src/main/resources/views/platform/leadthought/basic/type.html b/src/main/resources/views/platform/leadthought/basic/type.html index ef20247..fde1dec 100644 --- a/src/main/resources/views/platform/leadthought/basic/type.html +++ b/src/main/resources/views/platform/leadthought/basic/type.html @@ -159,10 +159,10 @@ layout("/layouts/platform.html"){ if ("confirm" === a) { const resp = await $.get(loc() + "/doDelete", {id: row.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -172,10 +172,10 @@ layout("/layouts/platform.html"){ this.formData = data const resp = await $.post(loc() + "/doEdit", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, }, diff --git a/src/main/resources/views/platform/leadthought/fghOption.html b/src/main/resources/views/platform/leadthought/fghOption.html index b17a36b..0d2c69d 100644 --- a/src/main/resources/views/platform/leadthought/fghOption.html +++ b/src/main/resources/views/platform/leadthought/fghOption.html @@ -191,7 +191,7 @@ layout("/layouts/platform.html"){ async doRollBack(row) { const resp = await $.get('/platform/leadThought/fghOption/doRollBack', {id: row.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } }, diff --git a/src/main/resources/views/platform/leadthought/myApply.html b/src/main/resources/views/platform/leadthought/myApply.html index f5cffdd..aaeef6b 100644 --- a/src/main/resources/views/platform/leadthought/myApply.html +++ b/src/main/resources/views/platform/leadthought/myApply.html @@ -172,7 +172,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post('/platform/leadThought/myApply/doDelete', {id: id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } } diff --git a/src/main/resources/views/platform/leadthought/statistics.html b/src/main/resources/views/platform/leadthought/statistics.html index c984e57..c08ee8f 100644 --- a/src/main/resources/views/platform/leadthought/statistics.html +++ b/src/main/resources/views/platform/leadthought/statistics.html @@ -180,7 +180,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post('/platform/leadThought/myApply/doDelete', {id: id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } } diff --git a/src/main/resources/views/platform/leadthought/xghOption.html b/src/main/resources/views/platform/leadthought/xghOption.html index eedf2f5..652ad22 100644 --- a/src/main/resources/views/platform/leadthought/xghOption.html +++ b/src/main/resources/views/platform/leadthought/xghOption.html @@ -205,7 +205,7 @@ layout("/layouts/platform.html"){ async doRollBack(row) { const resp = await $.get('/platform/leadThought/xghOption/doRollBack', {id: row.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } }, @@ -218,7 +218,7 @@ layout("/layouts/platform.html"){ }) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } } diff --git a/src/main/resources/views/platform/legalAid/applyList.html b/src/main/resources/views/platform/legalAid/applyList.html index 72f484d..6be9e3c 100644 --- a/src/main/resources/views/platform/legalAid/applyList.html +++ b/src/main/resources/views/platform/legalAid/applyList.html @@ -265,7 +265,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post(loc() + '/doCancel', {id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { this.notifyError(resp.msg) @@ -287,4 +287,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/legalAid/appointmentApply.html b/src/main/resources/views/platform/legalAid/appointmentApply.html index 1b0137e..09a86cd 100644 --- a/src/main/resources/views/platform/legalAid/appointmentApply.html +++ b/src/main/resources/views/platform/legalAid/appointmentApply.html @@ -339,13 +339,13 @@ layout("/layouts/platform.html"){ } const resp = await $.post(loc() + '/doApply', params) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.appointmentDialogVisible = false await this.getData() } else if (resp.code === 1) { this.notifyError(resp.msg) } else if (resp.code === 2) { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) await this.getData() } } @@ -372,4 +372,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/legalAid/appointmentSet.html b/src/main/resources/views/platform/legalAid/appointmentSet.html index e813690..d1fba80 100644 --- a/src/main/resources/views/platform/legalAid/appointmentSet.html +++ b/src/main/resources/views/platform/legalAid/appointmentSet.html @@ -454,7 +454,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { await this.getData() this.appointmentDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } } }, @@ -515,13 +515,13 @@ layout("/layouts/platform.html"){ }, async doAdd() { if (Date.parse(this.formData.startTime) < new Date().getTime()) { - this.notifyWarning('预约时间不能小于当前时间，请重新设置！') + this.$message.warning('预约时间不能小于当前时间，请重新设置！') this.dateDialogVisible = false calendar.fullCalendar('unselect'); return } /*if(this.formData.doctorUser === '' || this.formData.doctorUser === undefined) { - this.notifyWarning('请设置咨询师！') + this.$message.warning('请设置咨询师！') return }*/ this.$refs["ruleForm"].validate(async (valid) => { @@ -530,10 +530,10 @@ layout("/layouts/platform.html"){ this.formData.askType = JSON.stringify(this.formData.askType) const resp = await $.post(loc() + '/doAdd', this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) await this.getData() } else if (resp.code === 1) { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.dateDialogVisible = false this.setDoctorDialogVisible = false @@ -542,7 +542,7 @@ layout("/layouts/platform.html"){ }, async doDelete() { /*if (this.formData.appointmentUser) { - this.notifyWarning('该时间段已有预约人，不能进行删除！') + this.$message.warning('该时间段已有预约人，不能进行删除！') return }*/ let msg = '确定删除吗?' @@ -560,13 +560,13 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { await this.getData() this.appointmentDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } } }, async doSetDoctor() { if (!this.formData.doctorUser) { - this.notifyWarning('请先分配心理咨询师') + this.$message.warning('请先分配心理咨询师') return } const {id, doctorUser} = this.formData @@ -576,7 +576,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { await this.getData() this.setDoctorDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } }, initCalendar() { diff --git a/src/main/resources/views/platform/legalAid/doctorManager.html b/src/main/resources/views/platform/legalAid/doctorManager.html index 4e588be..7c82a6a 100644 --- a/src/main/resources/views/platform/legalAid/doctorManager.html +++ b/src/main/resources/views/platform/legalAid/doctorManager.html @@ -305,7 +305,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + methodName, this.formData) switch (resp.code) { case 0: - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs['guava'].index() break @@ -313,7 +313,7 @@ layout("/layouts/platform.html"){ this.notifyError(resp.msg) break case 2: - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) break } } @@ -376,4 +376,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/legalAid/onlinePost/post.html b/src/main/resources/views/platform/legalAid/onlinePost/post.html index 832fb22..4163908 100644 --- a/src/main/resources/views/platform/legalAid/onlinePost/post.html +++ b/src/main/resources/views/platform/legalAid/onlinePost/post.html @@ -170,7 +170,7 @@ layout("/layouts/platform.html"){ const method = this.formData.id ? '/doEdit' : '/doAdd' const resp = await $.post(loc() + method, this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.addDialogVisible = false this.doSearch() } @@ -185,7 +185,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post(loc() + '/doDelete', {id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } } @@ -213,4 +213,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/legalAid/onlinePost/reply.html b/src/main/resources/views/platform/legalAid/onlinePost/reply.html index d9f4167..91634af 100644 --- a/src/main/resources/views/platform/legalAid/onlinePost/reply.html +++ b/src/main/resources/views/platform/legalAid/onlinePost/reply.html @@ -148,7 +148,7 @@ layout("/layouts/platform.html"){ } const resp = await $.post(loc() + '/doReply', params) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.replyDialogVisible = false this.doSearch() } @@ -170,4 +170,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/loveSubsidy/branchUnionAudit.html b/src/main/resources/views/platform/loveSubsidy/branchUnionAudit.html index b36e171..3f6451b 100644 --- a/src/main/resources/views/platform/loveSubsidy/branchUnionAudit.html +++ b/src/main/resources/views/platform/loveSubsidy/branchUnionAudit.html @@ -210,9 +210,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.doSearch() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, diff --git a/src/main/resources/views/platform/loveSubsidy/schoolUnionAudit.html b/src/main/resources/views/platform/loveSubsidy/schoolUnionAudit.html index c584ce4..cc5dac7 100644 --- a/src/main/resources/views/platform/loveSubsidy/schoolUnionAudit.html +++ b/src/main/resources/views/platform/loveSubsidy/schoolUnionAudit.html @@ -215,9 +215,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.doSearch() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, diff --git a/src/main/resources/views/platform/loveSubsidy/schoolUnionZxAudit.html b/src/main/resources/views/platform/loveSubsidy/schoolUnionZxAudit.html index 2329502..a8b3ba5 100644 --- a/src/main/resources/views/platform/loveSubsidy/schoolUnionZxAudit.html +++ b/src/main/resources/views/platform/loveSubsidy/schoolUnionZxAudit.html @@ -216,9 +216,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.doSearch() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, diff --git a/src/main/resources/views/platform/loveSubsidy/userMyApply.html b/src/main/resources/views/platform/loveSubsidy/userMyApply.html index 444ba8b..d009e67 100644 --- a/src/main/resources/views/platform/loveSubsidy/userMyApply.html +++ b/src/main/resources/views/platform/loveSubsidy/userMyApply.html @@ -124,9 +124,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/delete', {id}) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } diff --git a/src/main/resources/views/platform/manuscript/apply.html b/src/main/resources/views/platform/manuscript/apply.html index d12f36e..161b290 100644 --- a/src/main/resources/views/platform/manuscript/apply.html +++ b/src/main/resources/views/platform/manuscript/apply.html @@ -199,7 +199,7 @@ layout("/layouts/platform.html"){ data.files = JSON.parse(data.files) } }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async init() { diff --git a/src/main/resources/views/platform/manuscript/applyList.html b/src/main/resources/views/platform/manuscript/applyList.html index aa16e36..7d41311 100644 --- a/src/main/resources/views/platform/manuscript/applyList.html +++ b/src/main/resources/views/platform/manuscript/applyList.html @@ -159,10 +159,10 @@ layout("/layouts/platform.html"){ if ("confirm" === a) { const resp = await $.get(loc() + "/doSubmit", {id: row.id, type: row.type}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -177,10 +177,10 @@ layout("/layouts/platform.html"){ if ("confirm" === a) { const resp = await $.get(loc() + "/doDelete", {id: id}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/manuscript/basic.html b/src/main/resources/views/platform/manuscript/basic.html index c3b8572..f3e36f4 100644 --- a/src/main/resources/views/platform/manuscript/basic.html +++ b/src/main/resources/views/platform/manuscript/basic.html @@ -132,7 +132,7 @@ layout("/layouts/platform.html"){ this.$notify.success({title: '成功', message: resp.msg}); this.pageData(); }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); diff --git a/src/main/resources/views/platform/manuscript/school.html b/src/main/resources/views/platform/manuscript/school.html index 2e25940..7b0f6ad 100644 --- a/src/main/resources/views/platform/manuscript/school.html +++ b/src/main/resources/views/platform/manuscript/school.html @@ -228,7 +228,7 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/manuscript/union.html b/src/main/resources/views/platform/manuscript/union.html index 846f1e0..9810196 100644 --- a/src/main/resources/views/platform/manuscript/union.html +++ b/src/main/resources/views/platform/manuscript/union.html @@ -225,7 +225,7 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/medicalMutualAidFund/branchUnionAudit.html b/src/main/resources/views/platform/medicalMutualAidFund/branchUnionAudit.html index d8ca971..3292b72 100644 --- a/src/main/resources/views/platform/medicalMutualAidFund/branchUnionAudit.html +++ b/src/main/resources/views/platform/medicalMutualAidFund/branchUnionAudit.html @@ -181,9 +181,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -200,9 +200,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, diff --git a/src/main/resources/views/platform/medicalMutualAidFund/myApply.html b/src/main/resources/views/platform/medicalMutualAidFund/myApply.html index 62cff93..58ef2e5 100644 --- a/src/main/resources/views/platform/medicalMutualAidFund/myApply.html +++ b/src/main/resources/views/platform/medicalMutualAidFund/myApply.html @@ -115,9 +115,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/delete', {id}) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } diff --git a/src/main/resources/views/platform/medicalMutualAidFund/schoolHospitalAudit.html b/src/main/resources/views/platform/medicalMutualAidFund/schoolHospitalAudit.html index 0eb3a0e..e19b354 100644 --- a/src/main/resources/views/platform/medicalMutualAidFund/schoolHospitalAudit.html +++ b/src/main/resources/views/platform/medicalMutualAidFund/schoolHospitalAudit.html @@ -378,9 +378,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } @@ -404,7 +404,7 @@ layout("/layouts/platform.html"){ , doImport() { if (this.importData.fileList.length === 0) { - this.notifyWarning("请选择文件！") + this.$message.warning("请选择文件！") return } const data = new FormData(); diff --git a/src/main/resources/views/platform/medicalMutualAidFund/schoolUnionAudit.html b/src/main/resources/views/platform/medicalMutualAidFund/schoolUnionAudit.html index 048e633..5ccd9dc 100644 --- a/src/main/resources/views/platform/medicalMutualAidFund/schoolUnionAudit.html +++ b/src/main/resources/views/platform/medicalMutualAidFund/schoolUnionAudit.html @@ -360,9 +360,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } @@ -385,7 +385,7 @@ layout("/layouts/platform.html"){ , doImport() { if (this.importData.fileList.length === 0) { - this.notifyWarning("请选择文件！") + this.$message.warning("请选择文件！") return } const data = new FormData(); diff --git a/src/main/resources/views/platform/meeting/basic/type.html b/src/main/resources/views/platform/meeting/basic/type.html index 766cf3e..0632404 100644 --- a/src/main/resources/views/platform/meeting/basic/type.html +++ b/src/main/resources/views/platform/meeting/basic/type.html @@ -299,7 +299,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doHandle', {data: JSON.stringify(this.formData)}) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.findAll() } else { this.notifyError(resp.msg) @@ -330,7 +330,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post(loc() + '/delete/' + id) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.findAll() } else { this.notifyError(resp.msg) @@ -419,4 +419,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/meeting/index.html b/src/main/resources/views/platform/meeting/index.html index ceb4d21..3ee4b2d 100644 --- a/src/main/resources/views/platform/meeting/index.html +++ b/src/main/resources/views/platform/meeting/index.html @@ -116,7 +116,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post(loc() + '/doDelete', {id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } } diff --git a/src/main/resources/views/platform/meeting/manage/add.html b/src/main/resources/views/platform/meeting/manage/add.html index 35b53a5..a82582d 100644 --- a/src/main/resources/views/platform/meeting/manage/add.html +++ b/src/main/resources/views/platform/meeting/manage/add.html @@ -213,7 +213,7 @@ layout("/layouts/platform.html"){ users: JSON.stringify(this.msgData.users.length > 0 ? this.msgData.users.map(v => v.id) : this.msgData.users), }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) sublime.jumpPagePjax('/platform/meeting/manage') } @@ -260,4 +260,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/meeting/manage/index.html b/src/main/resources/views/platform/meeting/manage/index.html index c63bab1..6564c5a 100644 --- a/src/main/resources/views/platform/meeting/manage/index.html +++ b/src/main/resources/views/platform/meeting/manage/index.html @@ -105,7 +105,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post(loc() + '/doDelete', {id: id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } } @@ -125,4 +125,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/member/apply/audit/Layout.html b/src/main/resources/views/platform/member/apply/audit/Layout.html index 0c92061..bd233c2 100644 --- a/src/main/resources/views/platform/member/apply/audit/Layout.html +++ b/src/main/resources/views/platform/member/apply/audit/Layout.html @@ -383,7 +383,7 @@ this.$refs.guava.index() this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async openAudit(row, audit) { @@ -416,7 +416,7 @@ auditTime: moment().format('YYYY-MM-DD'), } } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) this.info = {} } }, diff --git a/src/main/resources/views/platform/member/change/Apply.html b/src/main/resources/views/platform/member/change/Apply.html index 3d6b8bd..b80461f 100644 --- a/src/main/resources/views/platform/member/change/Apply.html +++ b/src/main/resources/views/platform/member/change/Apply.html @@ -145,7 +145,7 @@ layout("/layouts/platform.html"){ this.$refs.guava.index() this.$message.success(resp.msg) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, apply() { @@ -162,14 +162,14 @@ layout("/layouts/platform.html"){ if(resp.code===0){ this.unionInfo = resp.data }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.unionInfoLoading = false if(resp.code===0){ this.unionInfo = resp.data }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, }, diff --git a/src/main/resources/views/platform/member/change/Manage.html b/src/main/resources/views/platform/member/change/Manage.html index 4455d80..7699825 100644 --- a/src/main/resources/views/platform/member/change/Manage.html +++ b/src/main/resources/views/platform/member/change/Manage.html @@ -660,7 +660,7 @@ layout("/layouts/platform.html"){ }, async doBatchJoinMember() { if (!this.selectUsers.length) { - this.notifyWarning("请先勾选需要设置为会员的用户") + this.$message.warning("请先勾选需要设置为会员的用户") return } @@ -672,7 +672,7 @@ layout("/layouts/platform.html"){ this.$refs.userSelect.init() this.selectUserVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, pushDropdownCommand({type}) { @@ -743,11 +743,11 @@ layout("/layouts/platform.html"){ }, async doUnitMove() { if (this.unitMoveFormData.unitId === '') { - this.notifyWarning('请选择新单位！') + this.$message.warning('请选择新单位！') return } if (this.unitMoveFormData.threeUnitId === '') { - this.notifyWarning('请选择新科室！') + this.$message.warning('请选择新科室！') return } @@ -764,7 +764,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.unitMoveVisibile = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, changeDateRangeChange(val) { @@ -784,7 +784,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.batchEditVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, handleClose(done) { @@ -876,7 +876,7 @@ layout("/layouts/platform.html"){ // if (resp.code === 0) { // this.numData = resp.data // } else { - // this.notifyWarning(resp.msg) + // this.$message.warning(resp.msg) // } }, getChangeTypes(changeTypes) { diff --git a/src/main/resources/views/platform/member/change/Records.html b/src/main/resources/views/platform/member/change/Records.html index ac57fa3..74fa3a5 100644 --- a/src/main/resources/views/platform/member/change/Records.html +++ b/src/main/resources/views/platform/member/change/Records.html @@ -275,7 +275,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$set(row, "info", data) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) this.$set(row, "info", {}) } }, @@ -292,7 +292,7 @@ layout("/layouts/platform.html"){ this.$refs.guava.index() this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openView(userId) { diff --git a/src/main/resources/views/platform/member/change/audit/Layout.html b/src/main/resources/views/platform/member/change/audit/Layout.html index 2e82b0d..59f4a84 100644 --- a/src/main/resources/views/platform/member/change/audit/Layout.html +++ b/src/main/resources/views/platform/member/change/audit/Layout.html @@ -499,9 +499,9 @@ if (resp.code === 0) { this.pageData() this.dialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } @@ -538,9 +538,9 @@ this.info.userId = "" this.pageData() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async openAudit(row, audit) { @@ -572,7 +572,7 @@ auditTime: moment().format('YYYY-MM-DD'), } } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, diff --git a/src/main/resources/views/platform/member/change/manage/index.html b/src/main/resources/views/platform/member/change/manage/index.html index 7e4436a..132a4fd 100644 --- a/src/main/resources/views/platform/member/change/manage/index.html +++ b/src/main/resources/views/platform/member/change/manage/index.html @@ -653,7 +653,7 @@ layout("/layouts/platform.html"){ }, async doBatchJoinMember() { if (!this.selectUsers.length) { - this.notifyWarning("请先勾选需要设置为会员的用户") + this.$message.warning("请先勾选需要设置为会员的用户") return } @@ -665,7 +665,7 @@ layout("/layouts/platform.html"){ this.$refs.userSelect.init() this.selectUserVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, pushDropdownCommand({type}) { @@ -736,11 +736,11 @@ layout("/layouts/platform.html"){ }, async doUnitMove() { if (this.unitMoveFormData.unitId === '') { - this.notifyWarning('请选择新单位！') + this.$message.warning('请选择新单位！') return } if (this.unitMoveFormData.threeUnitId === '') { - this.notifyWarning('请选择新科室！') + this.$message.warning('请选择新科室！') return } @@ -757,7 +757,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.unitMoveVisibile = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, changeDateRangeChange(val) { @@ -777,7 +777,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.batchEditVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, handleClose(done) { @@ -865,7 +865,7 @@ layout("/layouts/platform.html"){ // if (resp.code === 0) { // this.numData = resp.data // } else { - // this.notifyWarning(resp.msg) + // this.$message.warning(resp.msg) // } }, getChangeTypes(changeTypes){ diff --git a/src/main/resources/views/platform/member/change/record/index.html b/src/main/resources/views/platform/member/change/record/index.html index 91ab285..9eaed15 100644 --- a/src/main/resources/views/platform/member/change/record/index.html +++ b/src/main/resources/views/platform/member/change/record/index.html @@ -270,7 +270,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$set(row, "info", data) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) this.$set(row, "info", {}) } }, @@ -287,7 +287,7 @@ layout("/layouts/platform.html"){ this.$refs.guava.index() this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async flushUnits() { diff --git a/src/main/resources/views/platform/member/check/personal.html b/src/main/resources/views/platform/member/check/personal.html index 71ae4bc..2d01d30 100644 --- a/src/main/resources/views/platform/member/check/personal.html +++ b/src/main/resources/views/platform/member/check/personal.html @@ -199,7 +199,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.finishNum = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doExport() { diff --git a/src/main/resources/views/platform/member/check/school.html b/src/main/resources/views/platform/member/check/school.html index 03be711..8cb099c 100644 --- a/src/main/resources/views/platform/member/check/school.html +++ b/src/main/resources/views/platform/member/check/school.html @@ -602,7 +602,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.tableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async tableColumnExpandChange(row, expandedRows) { diff --git a/src/main/resources/views/platform/member/check/task.html b/src/main/resources/views/platform/member/check/task.html index 2c7f96b..a6b6354 100644 --- a/src/main/resources/views/platform/member/check/task.html +++ b/src/main/resources/views/platform/member/check/task.html @@ -161,10 +161,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + methodName, this.formData) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.dialogVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doDelete(id) { @@ -177,9 +177,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doDelete', {id}) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, diff --git a/src/main/resources/views/platform/member/check/union.html b/src/main/resources/views/platform/member/check/union.html index 83af08d..25c806d 100644 --- a/src/main/resources/views/platform/member/check/union.html +++ b/src/main/resources/views/platform/member/check/union.html @@ -436,7 +436,7 @@ layout("/layouts/platform.html"){ }, async doBatchJoinMember() { if (!this.selectUsers.length) { - this.notifyWarning("请先勾选需要设置为会员的用户") + this.$message.warning("请先勾选需要设置为会员的用户") return } let aa = false @@ -460,7 +460,7 @@ layout("/layouts/platform.html"){ this.$refs.userSelect.init() this.selectUserVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) .catch(_ => { @@ -526,11 +526,11 @@ layout("/layouts/platform.html"){ }, async doUnitMove() { if (this.unitMoveFormData.unitId === '') { - this.notifyWarning('请选择新单位！') + this.$message.warning('请选择新单位！') return } if (this.unitMoveFormData.threeUnitId === '') { - this.notifyWarning('请选择新科室！') + this.$message.warning('请选择新科室！') return } @@ -547,7 +547,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.unitMoveVisibile = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, tableHandleSelectionChange(val) { @@ -595,7 +595,7 @@ layout("/layouts/platform.html"){ */ async submitCheck() { if (!this.pageForm.unionId) { - this.notifyWarning("请选择需要核对的分工会！") + this.$message.warning("请选择需要核对的分工会！") return } const confirm = await this.$confirm('此操作会提交至校工会确认，请确认核对完成了吗?', '提示', { @@ -608,10 +608,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/submitCheck', this.pageForm) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.getUnionTaskStatus() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -650,7 +650,7 @@ layout("/layouts/platform.html"){ }, async checkAgain() { if (!this.pageForm.unionId) { - this.notifyWarning("请选择需要重新核对的工会！") + this.$message.warning("请选择需要重新核对的工会！") return } const confirm = await this.$confirm('您确定要重新核对吗?', '提示', { @@ -676,7 +676,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.numData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, diff --git a/src/main/resources/views/platform/member/info/BatchMake.html b/src/main/resources/views/platform/member/info/BatchMake.html index 1dc3bf7..3abc8af 100644 --- a/src/main/resources/views/platform/member/info/BatchMake.html +++ b/src/main/resources/views/platform/member/info/BatchMake.html @@ -299,7 +299,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, diff --git a/src/main/resources/views/platform/member/info/GroupInfo.html b/src/main/resources/views/platform/member/info/GroupInfo.html index 30286cc..9fcbfcf 100644 --- a/src/main/resources/views/platform/member/info/GroupInfo.html +++ b/src/main/resources/views/platform/member/info/GroupInfo.html @@ -369,7 +369,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.archiveDialogVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -380,7 +380,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.archiveDialogVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -407,7 +407,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/member/info/Make.html b/src/main/resources/views/platform/member/info/Make.html index 58946dd..e22529d 100644 --- a/src/main/resources/views/platform/member/info/Make.html +++ b/src/main/resources/views/platform/member/info/Make.html @@ -295,7 +295,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/member/info/dataManage.html b/src/main/resources/views/platform/member/info/dataManage.html index 06f9cf2..b4facdc 100644 --- a/src/main/resources/views/platform/member/info/dataManage.html +++ b/src/main/resources/views/platform/member/info/dataManage.html @@ -407,7 +407,7 @@ layout("/layouts/platform.html"){ this.tableData = data.list this.pageForm.totalCount = data.totalCount } else { - this.notifyWarning(msg) + this.$message.warning(msg) } }, @@ -420,9 +420,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/setBirthdayByIdCard") if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -467,9 +467,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/setMemberByCnd", pageForm) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, setWelfareMember() { @@ -501,9 +501,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/setWelfareMemberByCnd", pageForm) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openView(userId) { diff --git a/src/main/resources/views/platform/member/inquire/Analysis.html b/src/main/resources/views/platform/member/inquire/Analysis.html index b3b8afc..ba87419 100644 --- a/src/main/resources/views/platform/member/inquire/Analysis.html +++ b/src/main/resources/views/platform/member/inquire/Analysis.html @@ -197,7 +197,7 @@ layout("/layouts/platform.html"){ this.tableData = resp.data this.fullTableData = this.tableData } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, searchTypeChange(val) { @@ -227,4 +227,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/member/inquire/DataBoard.html b/src/main/resources/views/platform/member/inquire/DataBoard.html index c49a2c4..bcfb007 100644 --- a/src/main/resources/views/platform/member/inquire/DataBoard.html +++ b/src/main/resources/views/platform/member/inquire/DataBoard.html @@ -209,7 +209,7 @@ layout("/layouts/platform.html"){ this.memberNumberData = {memberNum, lastYearMemberNum, diff, ratio} this.loading.memberNumber = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, /** @@ -249,7 +249,7 @@ layout("/layouts/platform.html"){ }); chart.growthTrendChart.render(); } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, /** @@ -287,7 +287,7 @@ layout("/layouts/platform.html"){ }); chart.memberPercentageChart.render(); } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, /** @@ -317,7 +317,7 @@ layout("/layouts/platform.html"){ }); chart.memberSexPercentageChart.render(); } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, /** @@ -372,7 +372,7 @@ layout("/layouts/platform.html"){ }) chart.unionMemberChart.render(); } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -423,7 +423,7 @@ layout("/layouts/platform.html"){ }); chart.personTypeMemberChart.render() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -473,7 +473,7 @@ layout("/layouts/platform.html"){ }); chart.userStateMemberChart.render(); } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, diff --git a/src/main/resources/views/platform/mutualInsurance/zhejiang/project/index.html b/src/main/resources/views/platform/mutualInsurance/zhejiang/project/index.html index 9f17b7e..43510d4 100644 --- a/src/main/resources/views/platform/mutualInsurance/zhejiang/project/index.html +++ b/src/main/resources/views/platform/mutualInsurance/zhejiang/project/index.html @@ -149,10 +149,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/switchChange", this.formData) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doSubmit() { @@ -163,10 +163,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doSave", this.formData) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doDelete(id) { @@ -179,9 +179,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doRemove', {id}) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, diff --git a/src/main/resources/views/platform/offerAdvice/leaderAudit.html b/src/main/resources/views/platform/offerAdvice/leaderAudit.html index 58c2040..238c326 100644 --- a/src/main/resources/views/platform/offerAdvice/leaderAudit.html +++ b/src/main/resources/views/platform/offerAdvice/leaderAudit.html @@ -186,9 +186,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -200,4 +200,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/offerAdvice/mine.html b/src/main/resources/views/platform/offerAdvice/mine.html index 4800da7..f9b49b6 100644 --- a/src/main/resources/views/platform/offerAdvice/mine.html +++ b/src/main/resources/views/platform/offerAdvice/mine.html @@ -118,9 +118,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doSubmit/' + id) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -134,9 +134,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doDelete/' + id) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -148,4 +148,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/offerAdvice/schoolUnionAudit.html b/src/main/resources/views/platform/offerAdvice/schoolUnionAudit.html index e2f5189..24b4003 100644 --- a/src/main/resources/views/platform/offerAdvice/schoolUnionAudit.html +++ b/src/main/resources/views/platform/offerAdvice/schoolUnionAudit.html @@ -211,9 +211,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -226,4 +226,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/offerAdvice/write.html b/src/main/resources/views/platform/offerAdvice/write.html index 08bdea1..9ed946a 100644 --- a/src/main/resources/views/platform/offerAdvice/write.html +++ b/src/main/resources/views/platform/offerAdvice/write.html @@ -171,10 +171,10 @@ layout("/layouts/platform.html"){ } const resp = await $.post(loc() + '/doHandler', {offerAdvice: JSON.stringify(this.formData)}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) sublime.jumpPagePjax('/platform/offerAdviceMine') } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -188,4 +188,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/projectfunding/manage.html b/src/main/resources/views/platform/projectfunding/manage.html index efaf150..4b19d50 100644 --- a/src/main/resources/views/platform/projectfunding/manage.html +++ b/src/main/resources/views/platform/projectfunding/manage.html @@ -141,10 +141,10 @@ layout("/layouts/platform.html"){ if(resp.code===0){ this.DialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() } @@ -159,10 +159,10 @@ layout("/layouts/platform.html"){ if ("confirm" === a) { const resp = await $.get(loc() + "/doDelete", {id: row.id}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/projectfunding/twoOrganization.html b/src/main/resources/views/platform/projectfunding/twoOrganization.html index 3ae577c..0c2e253 100644 --- a/src/main/resources/views/platform/projectfunding/twoOrganization.html +++ b/src/main/resources/views/platform/projectfunding/twoOrganization.html @@ -192,14 +192,14 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platform/projectfunding/twoOrganization/doHandle', this.formData) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } }, async doRollBack(row){ const resp = await $.get('/platform/projectfunding/twoOrganization/doRollBack',{id:row.id,state:row.state}) if (resp.code === 0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } }, diff --git a/src/main/resources/views/platform/projectfunding/xghAudit.html b/src/main/resources/views/platform/projectfunding/xghAudit.html index ff82300..43f8bc0 100644 --- a/src/main/resources/views/platform/projectfunding/xghAudit.html +++ b/src/main/resources/views/platform/projectfunding/xghAudit.html @@ -231,14 +231,14 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platform/projectfunding/xghAudit/doHandle', this.formData) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } }, async doRollBack(row){ const resp = await $.get('/platform/projectfunding/twoOrganization/doRollBack',{id:row.id,state:row.state}) if (resp.code === 0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } }, diff --git a/src/main/resources/views/platform/proposal/basics/state.html b/src/main/resources/views/platform/proposal/basics/state.html index e1f5f4d..33311dd 100644 --- a/src/main/resources/views/platform/proposal/basics/state.html +++ b/src/main/resources/views/platform/proposal/basics/state.html @@ -232,11 +232,11 @@ layout("/layouts/platform.html"){ this.formData = data const resp = await $.post(loc() + "/doEdit", {"data": JSON.stringify(this.formData)}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) await proposal.getProposalEnableStateCode() await proposal.getProposalNeedSignStateCode() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.pageData() }, @@ -259,10 +259,10 @@ layout("/layouts/platform.html"){ if(resp.code===0){ this.dialogVisible = false this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) await proposal.getProposalAllStateCode() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() this.subLoading = false diff --git a/src/main/resources/views/platform/proposal/basics/type.html b/src/main/resources/views/platform/proposal/basics/type.html index ced053d..e9ce645 100644 --- a/src/main/resources/views/platform/proposal/basics/type.html +++ b/src/main/resources/views/platform/proposal/basics/type.html @@ -139,10 +139,10 @@ layout("/layouts/platform.html"){ loading.close() if(resp.code===0){ this.DialogVisible = false; - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData(); }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); @@ -174,4 +174,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/basics/undertake.html b/src/main/resources/views/platform/proposal/basics/undertake.html index 55ed6ad..f4a121b 100644 --- a/src/main/resources/views/platform/proposal/basics/undertake.html +++ b/src/main/resources/views/platform/proposal/basics/undertake.html @@ -402,10 +402,10 @@ layout("/layouts/platform.html"){ roleId: row.roleid }) if(resp.code===0){ - this.notifySuccess({title: '成功', message: resp.msg}); + this.$message.success({title: '成功', message: resp.msg}); this.adminPageData() }else{ - this.notifySuccess('审核失败') + this.$message.success('审核失败') } } } @@ -416,7 +416,7 @@ layout("/layouts/platform.html"){ if(resp.code===0){ this.adminTableData = resp.data; }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openAdd() { @@ -451,9 +451,9 @@ layout("/layouts/platform.html"){ this.adminDialogVisible = false this.pageData() this.adminPageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, resetForm() { @@ -466,9 +466,9 @@ layout("/layouts/platform.html"){ this.formData = data const resp = await $.post(loc() + "/doEdit", {"data": JSON.stringify(this.formData)}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.undertakeUnitTree() }, @@ -489,9 +489,9 @@ layout("/layouts/platform.html"){ if(resp.code===0){ this.dialogVisible = false this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); @@ -505,10 +505,10 @@ layout("/layouts/platform.html"){ if ("confirm" == a) { const resp = await $.post(loc() + "/doDelete", {id}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.undertakeUnitTree() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/proposal/senior/ModifyBasicInfo.html b/src/main/resources/views/platform/proposal/senior/ModifyBasicInfo.html index 159636a..3b7393b 100644 --- a/src/main/resources/views/platform/proposal/senior/ModifyBasicInfo.html +++ b/src/main/resources/views/platform/proposal/senior/ModifyBasicInfo.html @@ -188,7 +188,7 @@ layout("/layouts/platform.html"){ } const resp = await $.post(loc() + '/updateBasicInfo', param) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs.guava.index() }else{ diff --git a/src/main/resources/views/platform/proposal/senior/ModifyFeedback.html b/src/main/resources/views/platform/proposal/senior/ModifyFeedback.html index ea14e64..5ae2a63 100644 --- a/src/main/resources/views/platform/proposal/senior/ModifyFeedback.html +++ b/src/main/resources/views/platform/proposal/senior/ModifyFeedback.html @@ -219,9 +219,9 @@ layout("/layouts/platform.html"){ this.feedbackData = data this.$refs['addForm'].resetFields() feedbackEditor.txt.clear() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() this.feedbackDialog = false diff --git a/src/main/resources/views/platform/proposal/senior/ModifyStateCode.html b/src/main/resources/views/platform/proposal/senior/ModifyStateCode.html index f9bd5e5..a7e4216 100644 --- a/src/main/resources/views/platform/proposal/senior/ModifyStateCode.html +++ b/src/main/resources/views/platform/proposal/senior/ModifyStateCode.html @@ -149,7 +149,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doConfirm', param) if (resp.code === 0) { this.isDelete = "false" - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.dialogVisible = false } else { diff --git a/src/main/resources/views/platform/proposal/senior/again.html b/src/main/resources/views/platform/proposal/senior/again.html index 2f09094..a0dd02d 100644 --- a/src/main/resources/views/platform/proposal/senior/again.html +++ b/src/main/resources/views/platform/proposal/senior/again.html @@ -149,10 +149,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/reType", this.formData) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() this.typeDialog = false diff --git a/src/main/resources/views/platform/proposal/senior/modifyResultCode.html b/src/main/resources/views/platform/proposal/senior/modifyResultCode.html index 6acb87e..544822a 100644 --- a/src/main/resources/views/platform/proposal/senior/modifyResultCode.html +++ b/src/main/resources/views/platform/proposal/senior/modifyResultCode.html @@ -251,10 +251,10 @@ layout("/layouts/platform.html"){ helpUnits: JSON.stringify(this.formData.helpUnit), }) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() this.resultCodeDialog = false diff --git a/src/main/resources/views/platform/proposal/senior/modifyUndertake.html b/src/main/resources/views/platform/proposal/senior/modifyUndertake.html index 474829a..4fbbce3 100644 --- a/src/main/resources/views/platform/proposal/senior/modifyUndertake.html +++ b/src/main/resources/views/platform/proposal/senior/modifyUndertake.html @@ -204,10 +204,10 @@ layout("/layouts/platform.html"){ }) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.undertakeDialog = false this.submitDisabled = false diff --git a/src/main/resources/views/platform/proposal/senior/second.html b/src/main/resources/views/platform/proposal/senior/second.html index e8acd32..83bea53 100644 --- a/src/main/resources/views/platform/proposal/senior/second.html +++ b/src/main/resources/views/platform/proposal/senior/second.html @@ -189,11 +189,11 @@ layout("/layouts/platform.html"){ flag: flag }) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() this.submitDisabled = false diff --git a/src/main/resources/views/platform/proposal/senior/seniorDelete.html b/src/main/resources/views/platform/proposal/senior/seniorDelete.html index bfd6284..48b734b 100644 --- a/src/main/resources/views/platform/proposal/senior/seniorDelete.html +++ b/src/main/resources/views/platform/proposal/senior/seniorDelete.html @@ -312,10 +312,10 @@ layout("/layouts/platform.html"){ if (confirm) { const resp = await $.post(loc() + "/doBatchDelete", {proposalIds: JSON.stringify(this.batchSelection)}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, diff --git a/src/main/resources/views/platform/proposal/senior/urge.html b/src/main/resources/views/platform/proposal/senior/urge.html index 6ad71ba..2848e1a 100644 --- a/src/main/resources/views/platform/proposal/senior/urge.html +++ b/src/main/resources/views/platform/proposal/senior/urge.html @@ -81,10 +81,10 @@ layout("/layouts/platform.html"){ this.$confirm('确定催办吗?', '提示', {type: 'warning'}).then(async () => { const resp = await $.post(loc() + "/doBatchUrge", {ids: JSON.stringify(this.selectIds)}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.urgeLoading = false }).catch(() => { @@ -101,7 +101,7 @@ layout("/layouts/platform.html"){ if(resp.code===0){ this.urgeRecordList = resp.data }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doUrge(row) { @@ -111,10 +111,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doUrge", {proposalId: row.id}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.$set(row, "submitDisabled", false) }).catch(() => { diff --git a/src/main/resources/views/platform/proposal/statistics/board.html b/src/main/resources/views/platform/proposal/statistics/board.html index 4cb9241..4aa37eb 100644 --- a/src/main/resources/views/platform/proposal/statistics/board.html +++ b/src/main/resources/views/platform/proposal/statistics/board.html @@ -344,7 +344,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.numData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.topBlockLoading = false }, @@ -371,7 +371,7 @@ layout("/layouts/platform.html"){ chart.changeData(data) } } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, }, diff --git a/src/main/resources/views/platform/proposal/statistics/chart.html b/src/main/resources/views/platform/proposal/statistics/chart.html index f8a357d..1b6bbbf 100644 --- a/src/main/resources/views/platform/proposal/statistics/chart.html +++ b/src/main/resources/views/platform/proposal/statistics/chart.html @@ -133,7 +133,7 @@ layout("/layouts/platform.html"){ chart.satisfiedChart.render(); } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -192,7 +192,7 @@ layout("/layouts/platform.html"){ }); chart.resultChart.render(); } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -234,7 +234,7 @@ layout("/layouts/platform.html"){ }); chart.typeChart.render(); } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -286,7 +286,7 @@ layout("/layouts/platform.html"){ }); chart.stateChart.render(); } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async initData() { diff --git a/src/main/resources/views/platform/proposal/statistics/complex.html b/src/main/resources/views/platform/proposal/statistics/complex.html index c0d564a..5635ff1 100644 --- a/src/main/resources/views/platform/proposal/statistics/complex.html +++ b/src/main/resources/views/platform/proposal/statistics/complex.html @@ -111,7 +111,7 @@ layout("/layouts/platform.html"){ chart.changeData(data) } }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async getMeetingByYear() { @@ -130,4 +130,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/proposal/statistics/delegation.html b/src/main/resources/views/platform/proposal/statistics/delegation.html index b6bd52f..4557b07 100644 --- a/src/main/resources/views/platform/proposal/statistics/delegation.html +++ b/src/main/resources/views/platform/proposal/statistics/delegation.html @@ -154,7 +154,7 @@ layout("/layouts/platform.html"){ }) this.corpsTableData = data; }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, diff --git a/src/main/resources/views/platform/proposal/statistics/progress.html b/src/main/resources/views/platform/proposal/statistics/progress.html index 20f0bb1..36ea72f 100644 --- a/src/main/resources/views/platform/proposal/statistics/progress.html +++ b/src/main/resources/views/platform/proposal/statistics/progress.html @@ -295,7 +295,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post(loc() + '/remindProposalCreator', {teacherMeetingId: this.pageForm.meetingId}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/proposal/statistics/undertake/summary.html b/src/main/resources/views/platform/proposal/statistics/undertake/summary.html index e90f4ed..fbbd115 100644 --- a/src/main/resources/views/platform/proposal/statistics/undertake/summary.html +++ b/src/main/resources/views/platform/proposal/statistics/undertake/summary.html @@ -248,7 +248,7 @@ layout("/layouts/platform.html"){ if(resp.code===0){ this.urgeRecordList = resp.data }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, doExport() { @@ -260,10 +260,10 @@ layout("/layouts/platform.html"){ const resp = await $.post("/platform/proposal/senior/urge/doUrge", {proposalId: row.id}) this.submitDisabled = false if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }).catch(() => { this.submitDisabled = false diff --git a/src/main/resources/views/platform/proposal/statistics/yearReport.html b/src/main/resources/views/platform/proposal/statistics/yearReport.html index 810b69f..3c6a86b 100644 --- a/src/main/resources/views/platform/proposal/statistics/yearReport.html +++ b/src/main/resources/views/platform/proposal/statistics/yearReport.html @@ -217,7 +217,7 @@ layout("/layouts/platform.html"){ doExport() { if (this.selectProposal.length === 0) { - this.notifyWarning('请先选择提案后再导出提案报告') + this.$message.warning('请先选择提案后再导出提案报告') return } diff --git a/src/main/resources/views/platform/proposal/transact/branchLeaderPrefixAudit.html b/src/main/resources/views/platform/proposal/transact/branchLeaderPrefixAudit.html index e91c449..b0bf10b 100644 --- a/src/main/resources/views/platform/proposal/transact/branchLeaderPrefixAudit.html +++ b/src/main/resources/views/platform/proposal/transact/branchLeaderPrefixAudit.html @@ -228,11 +228,11 @@ layout("/layouts/platform.html"){ proposalId:this.formData.proposalId, }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } @@ -259,13 +259,13 @@ layout("/layouts/platform.html"){ loading.close() this.submitDisabled = false if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.batchDialog = false this.batchSelection = [] this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -278,7 +278,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post(loc() + '/rollback', {id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { this.notifyError(resp.msg) diff --git a/src/main/resources/views/platform/proposal/transact/branchLeaderRead.html b/src/main/resources/views/platform/proposal/transact/branchLeaderRead.html index 5dd99d7..ea8e131 100644 --- a/src/main/resources/views/platform/proposal/transact/branchLeaderRead.html +++ b/src/main/resources/views/platform/proposal/transact/branchLeaderRead.html @@ -271,11 +271,11 @@ layout("/layouts/platform.html"){ }) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() if (this.$refs['auditForm']) { @@ -311,13 +311,13 @@ layout("/layouts/platform.html"){ }) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.batchDialog = false this.batchSelection = [] this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() this.submitDisabled = false @@ -333,7 +333,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post(loc() + '/rollback', {proposalId: row.id, underTakeId: row.underTakeId}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { this.notifyError(resp.msg) diff --git a/src/main/resources/views/platform/proposal/transact/branchLeaderSuffixAudit.html b/src/main/resources/views/platform/proposal/transact/branchLeaderSuffixAudit.html index d4013f3..4a3c364 100644 --- a/src/main/resources/views/platform/proposal/transact/branchLeaderSuffixAudit.html +++ b/src/main/resources/views/platform/proposal/transact/branchLeaderSuffixAudit.html @@ -207,7 +207,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post(loc() + '/rollback', {proposalId: row.id, replyUnitId: row.replyUnitId}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { this.notifyError(resp.msg) @@ -232,7 +232,7 @@ layout("/layouts/platform.html"){ leaderCheckOpinion: this.formData.leaderCheckOpinion }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs.guava.index() } diff --git a/src/main/resources/views/platform/proposal/transact/caseRead.html b/src/main/resources/views/platform/proposal/transact/caseRead.html index 0ec9299..bbd6188 100644 --- a/src/main/resources/views/platform/proposal/transact/caseRead.html +++ b/src/main/resources/views/platform/proposal/transact/caseRead.html @@ -203,9 +203,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doSend", {meetingId: this.pageForm.meetingId}) loading.close() if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -251,11 +251,11 @@ layout("/layouts/platform.html"){ }) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() this.submitDisabled = false diff --git a/src/main/resources/views/platform/proposal/transact/compose.html b/src/main/resources/views/platform/proposal/transact/compose.html index c2b22c5..14dd2dc 100644 --- a/src/main/resources/views/platform/proposal/transact/compose.html +++ b/src/main/resources/views/platform/proposal/transact/compose.html @@ -388,7 +388,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { await this.secondedData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }).catch(() => { this.$set(row, "loading", false) @@ -427,14 +427,14 @@ layout("/layouts/platform.html"){ users: JSON.stringify(this.dbUserSelection), }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs.multipleTable.clearSelection(); this.pageForm2.searchKeyword = '' this.doSearch() this.queryDb() this.getProposalSecondedNum() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -516,10 +516,10 @@ layout("/layouts/platform.html"){ if ("confirm" === a) { const resp = await $.post(loc() + "/doDelete", {id: row.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -534,10 +534,10 @@ layout("/layouts/platform.html"){ if ("confirm" === a) { const resp = await $.post(loc() + "/doSubmit", {id: row.id, mannerCode: row.mannerCode}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -562,11 +562,11 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + method, {data: JSON.stringify(data), sign: data.sign}) loading.close() if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); diff --git a/src/main/resources/views/platform/proposal/transact/delegation.html b/src/main/resources/views/platform/proposal/transact/delegation.html index 5705bbb..a0520ab 100644 --- a/src/main/resources/views/platform/proposal/transact/delegation.html +++ b/src/main/resources/views/platform/proposal/transact/delegation.html @@ -174,7 +174,7 @@ layout("/layouts/platform.html"){ async openOneClickRemind() { const {meetingId} = this.pageForm if (!meetingId) { - this.notifyWarning('请先选择教代会') + this.$message.warning('请先选择教代会') return } const resp = await $.post(loc() + '/readyToRemindRecords', {meetingId}) @@ -182,22 +182,22 @@ layout("/layouts/platform.html"){ this.oneKeyRemindDialogVisible = true this.oneKeyTableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async confirmOneKeyRemind() { const selection = this.$refs.oneKeyRemindTable.selection if (selection.length === 0) { - this.notifyWarning('没有可提醒的记录！') + this.$message.warning('没有可提醒的记录！') return } const proposalIds = selection.map(v => v.id) const resp = await $.post(loc() + '/doConfirmRemind', {proposalIds: JSON.stringify(proposalIds)}) if (resp.code === 0) { this.oneKeyRemindDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openView(row) { diff --git a/src/main/resources/views/platform/proposal/transact/feedback.html b/src/main/resources/views/platform/proposal/transact/feedback.html index 8cb000b..07e760b 100644 --- a/src/main/resources/views/platform/proposal/transact/feedback.html +++ b/src/main/resources/views/platform/proposal/transact/feedback.html @@ -221,7 +221,7 @@ layout("/layouts/platform.html"){ async oneKeyRemind() { const {meetingId} = this.pageForm if (!meetingId) { - this.notifyWarning('请先选择教代会届次') + this.$message.warning('请先选择教代会届次') return } const resp = await $.get(loc() + '/selectReadySendMsgUsers', {meetingId}) @@ -229,14 +229,14 @@ layout("/layouts/platform.html"){ this.oneKeyRemindDialogVisible = true this.oneKeyTableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async confirmOneKeyRemind() { const selection = this.$refs.oneKeyRemindTable.selection if (selection.length === 0) { - this.notifyWarning('请选择需要提醒的提案') + this.$message.warning('请选择需要提醒的提案') return } const confirm = await this.$confirm('确认要一键提醒未反馈评价的提案人吗？', '提示', { @@ -250,9 +250,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.oneKeyRemindDialogVisible = false this.oneKeyTableData = [] - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -268,11 +268,11 @@ layout("/layouts/platform.html"){ }) this.submitDisabled = false if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openView(row) { @@ -310,11 +310,11 @@ layout("/layouts/platform.html"){ scoreSign: this.formData.scoreSign }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/proposal/transact/instructions.html b/src/main/resources/views/platform/proposal/transact/instructions.html index 63512cd..c5359da 100644 --- a/src/main/resources/views/platform/proposal/transact/instructions.html +++ b/src/main/resources/views/platform/proposal/transact/instructions.html @@ -170,11 +170,11 @@ layout("/layouts/platform.html"){ loading.close() this.submitDisabled = false if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); diff --git a/src/main/resources/views/platform/proposal/transact/reply.html b/src/main/resources/views/platform/proposal/transact/reply.html index fb22cf4..0dac5a6 100644 --- a/src/main/resources/views/platform/proposal/transact/reply.html +++ b/src/main/resources/views/platform/proposal/transact/reply.html @@ -288,7 +288,7 @@ layout("/layouts/platform.html"){ async oneKeyRemind() { const {meetingId} = this.pageForm if (!meetingId) { - this.notifyWarning('请先选择教代会届次') + this.$message.warning('请先选择教代会届次') return } const resp = await $.get(loc() + '/selectReadySendMsgUsers', {meetingId}) @@ -296,18 +296,18 @@ layout("/layouts/platform.html"){ this.oneKeyRemindDialogVisible = true this.oneKeyTableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async confirmOneKeyRemind() { const selection = this.$refs.oneKeyRemindTable.selection if (selection.length === 0) { - this.notifyWarning('请选择需要提醒的提案') + this.$message.warning('请选择需要提醒的提案') return } // if (this.oneKeyTableData.length === 0) { - // this.notifyWarning('没有可提醒的记录') + // this.$message.warning('没有可提醒的记录') // return // } const {meetingId} = this.pageForm @@ -322,9 +322,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.oneKeyRemindDialogVisible = false this.oneKeyTableData = [] - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, handleSelectionChange(val) { @@ -349,7 +349,7 @@ layout("/layouts/platform.html"){ }) const resp = await $.post(loc() + '/doForwardReply', {data: JSON.stringify(params)}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['proTable'].clearSelection() this.doSearch() this.forwardDialog = false @@ -371,7 +371,7 @@ layout("/layouts/platform.html"){ if (confirm) { const resp = await $.post(loc() + "/doRollBack", {proposalId: row.id, replyUnitId: row.replyUnitId}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } } @@ -404,7 +404,7 @@ layout("/layouts/platform.html"){ } = row const resp = await this.checkCanReply(id, replyUnitId) if (resp.data.valid !== 0) { - this.notifyWarning(resp.data.msg) + this.$message.warning(resp.data.msg) return } // const res = await $.get('/platform/proposal/common/findConjoinProposal', {proposalId: row.id}) diff --git a/src/main/resources/views/platform/proposal/transact/seconded.html b/src/main/resources/views/platform/proposal/transact/seconded.html index 7e24405..4fd57cf 100644 --- a/src/main/resources/views/platform/proposal/transact/seconded.html +++ b/src/main/resources/views/platform/proposal/transact/seconded.html @@ -175,7 +175,7 @@ layout("/layouts/platform.html"){ async openOneClickRemind() { const {meetingId} = this.pageForm if (!meetingId) { - this.notifyWarning('请先选择教代会') + this.$message.warning('请先选择教代会') return } const resp = await $.post(loc() + '/readyToRemindRecords', {meetingId}) @@ -183,22 +183,22 @@ layout("/layouts/platform.html"){ this.oneKeyRemindDialogVisible = true this.oneKeyTableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async confirmOneKeyRemind() { const selection = this.$refs.oneKeyRemindTable.selection if (selection.length === 0) { - this.notifyWarning('没有可提醒的记录！') + this.$message.warning('没有可提醒的记录！') return } const proposalIds = selection.map(v => v.id) const resp = await $.post(loc() + '/doConfirmRemind', {proposalIds: JSON.stringify(proposalIds)}) if (resp.code === 0) { this.oneKeyRemindDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async load(tree, treeNode, resolve) { diff --git a/src/main/resources/views/platform/proposal/transact/underTakeRead.html b/src/main/resources/views/platform/proposal/transact/underTakeRead.html index 05485dd..d6ea4de 100644 --- a/src/main/resources/views/platform/proposal/transact/underTakeRead.html +++ b/src/main/resources/views/platform/proposal/transact/underTakeRead.html @@ -210,7 +210,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doAudit', this.formData) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } } diff --git a/src/main/resources/views/platform/proposal/transact/undersign.html b/src/main/resources/views/platform/proposal/transact/undersign.html index 2eee17d..5c80e3a 100644 --- a/src/main/resources/views/platform/proposal/transact/undersign.html +++ b/src/main/resources/views/platform/proposal/transact/undersign.html @@ -166,11 +166,11 @@ layout("/layouts/platform.html"){ loading.close() this.submitDisabled = false if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); diff --git a/src/main/resources/views/platform/proposal/transact/write.html b/src/main/resources/views/platform/proposal/transact/write.html index 7e106a0..d805ae7 100644 --- a/src/main/resources/views/platform/proposal/transact/write.html +++ b/src/main/resources/views/platform/proposal/transact/write.html @@ -261,10 +261,10 @@ layout("/layouts/platform.html"){ data: JSON.stringify(data) }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) sublime.jumpPagePjax('/platform/proposal/transact/compose') } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -370,7 +370,7 @@ layout("/layouts/platform.html"){ this.initEditor() this.meetingOptions = await proposal.getOpenMeeting() if (this.meetingOptions.length === 0) { - this.notifyWarning('当前没有开启的教代会，无法撰写提案！') + this.$message.warning('当前没有开启的教代会，无法撰写提案！') return } this.pageForm.teacherMeetingId = this.meetingOptions ? this.meetingOptions[0].id : null diff --git a/src/main/resources/views/platform/psychology/applyList.html b/src/main/resources/views/platform/psychology/applyList.html index 72f484d..6be9e3c 100644 --- a/src/main/resources/views/platform/psychology/applyList.html +++ b/src/main/resources/views/platform/psychology/applyList.html @@ -265,7 +265,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post(loc() + '/doCancel', {id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { this.notifyError(resp.msg) @@ -287,4 +287,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/psychology/appointmentApply.html b/src/main/resources/views/platform/psychology/appointmentApply.html index 005f5f2..1a0902d 100644 --- a/src/main/resources/views/platform/psychology/appointmentApply.html +++ b/src/main/resources/views/platform/psychology/appointmentApply.html @@ -339,13 +339,13 @@ layout("/layouts/platform.html"){ } const resp = await $.post(loc() + '/doApply', params) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.appointmentDialogVisible = false await this.getData() } else if (resp.code === 1) { this.notifyError(resp.msg) } else if (resp.code === 2) { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) await this.getData() } } @@ -372,4 +372,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/psychology/appointmentSet.html b/src/main/resources/views/platform/psychology/appointmentSet.html index a8d6eb6..40495b2 100644 --- a/src/main/resources/views/platform/psychology/appointmentSet.html +++ b/src/main/resources/views/platform/psychology/appointmentSet.html @@ -454,7 +454,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { await this.getData() this.appointmentDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } } }, @@ -515,13 +515,13 @@ layout("/layouts/platform.html"){ }, async doAdd() { if (Date.parse(this.formData.startTime) < new Date().getTime()) { - this.notifyWarning('预约时间不能小于当前时间，请重新设置！') + this.$message.warning('预约时间不能小于当前时间，请重新设置！') this.dateDialogVisible = false calendar.fullCalendar('unselect'); return } /*if(this.formData.doctorUser === '' || this.formData.doctorUser === undefined) { - this.notifyWarning('请设置咨询师！') + this.$message.warning('请设置咨询师！') return }*/ this.$refs["ruleForm"].validate(async (valid) => { @@ -530,10 +530,10 @@ layout("/layouts/platform.html"){ this.formData.askType = JSON.stringify(this.formData.askType) const resp = await $.post(loc() + '/doAdd', this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) await this.getData() } else if (resp.code === 1) { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.dateDialogVisible = false this.setDoctorDialogVisible = false @@ -542,7 +542,7 @@ layout("/layouts/platform.html"){ }, async doDelete() { /*if (this.formData.appointmentUser) { - this.notifyWarning('该时间段已有预约人，不能进行删除！') + this.$message.warning('该时间段已有预约人，不能进行删除！') return }*/ let msg = '确定删除吗?' @@ -560,13 +560,13 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { await this.getData() this.appointmentDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } } }, async doSetDoctor() { if (!this.formData.doctorUser) { - this.notifyWarning('请先分配心理咨询师') + this.$message.warning('请先分配心理咨询师') return } const {id, doctorUser} = this.formData @@ -576,7 +576,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { await this.getData() this.setDoctorDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } }, initCalendar() { diff --git a/src/main/resources/views/platform/psychology/doctorManager.html b/src/main/resources/views/platform/psychology/doctorManager.html index bac10f2..f8af633 100644 --- a/src/main/resources/views/platform/psychology/doctorManager.html +++ b/src/main/resources/views/platform/psychology/doctorManager.html @@ -315,7 +315,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + methodName, this.formData) switch (resp.code) { case 0: - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs['guava'].index() break @@ -323,7 +323,7 @@ layout("/layouts/platform.html"){ this.notifyError(resp.msg) break case 2: - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) break } } diff --git a/src/main/resources/views/platform/psychology/onlinePost/post.html b/src/main/resources/views/platform/psychology/onlinePost/post.html index 8014b12..dc43e67 100644 --- a/src/main/resources/views/platform/psychology/onlinePost/post.html +++ b/src/main/resources/views/platform/psychology/onlinePost/post.html @@ -170,7 +170,7 @@ layout("/layouts/platform.html"){ const method = this.formData.id ? '/doEdit' : '/doAdd' const resp = await $.post(loc() + method, this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.addDialogVisible = false this.doSearch() } @@ -185,7 +185,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post(loc() + '/doDelete', {id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } } @@ -213,4 +213,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/psychology/onlinePost/reply.html b/src/main/resources/views/platform/psychology/onlinePost/reply.html index 5c86317..aa604c9 100644 --- a/src/main/resources/views/platform/psychology/onlinePost/reply.html +++ b/src/main/resources/views/platform/psychology/onlinePost/reply.html @@ -148,7 +148,7 @@ layout("/layouts/platform.html"){ } const resp = await $.post(loc() + '/doReply', params) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.replyDialogVisible = false this.doSearch() } @@ -170,4 +170,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/question/question.html b/src/main/resources/views/platform/question/question.html index 92fc56f..892b829 100644 --- a/src/main/resources/views/platform/question/question.html +++ b/src/main/resources/views/platform/question/question.html @@ -1167,10 +1167,10 @@ layout("/layouts/platform.html"){ async upStatus(qid, flag) { const {msg, code} = await $.post(loc() + "/upStatus", {qid: qid, flag: flag}) if (code === 0) { - this.notifySuccess(msg) + this.$message.success(msg) this.pageData() } else { - this.notifyWarning(msg) + this.$message.warning(msg) } }, @@ -1202,7 +1202,7 @@ layout("/layouts/platform.html"){ this.viewData = data.data this.$refs.guava.view() } else { - this.notifyWarning(msg) + this.$message.warning(msg) } }, @@ -1305,10 +1305,10 @@ layout("/layouts/platform.html"){ if ('confirm' === confirm) { const {code, msg} = await $.post(loc() + "/deleteQuestion", {qid: id}) if (code === 0) { - this.notifySuccess(msg) + this.$message.success(msg) this.pageData() } else { - this.notifyWarning(msg) + this.$message.warning(msg) } } }, @@ -1339,7 +1339,7 @@ layout("/layouts/platform.html"){ this.editMode = 'basicInfo' this.$refs.guava.edit() } else { - this.notifyWarning(msg) + this.$message.warning(msg) } }, async modifyBasicInfo() { @@ -1434,11 +1434,11 @@ layout("/layouts/platform.html"){ }) loading.close() if (code === 0) { - this.notifySuccess(msg) + this.$message.success(msg) this.$refs.guava.index() this.pageData() } else { - this.notifyWarning(msg) + this.$message.warning(msg) } } diff --git a/src/main/resources/views/platform/reimbursement/AuditConfirm.html b/src/main/resources/views/platform/reimbursement/AuditConfirm.html index d731e68..3ebd3d9 100644 --- a/src/main/resources/views/platform/reimbursement/AuditConfirm.html +++ b/src/main/resources/views/platform/reimbursement/AuditConfirm.html @@ -304,9 +304,9 @@ layout("/layouts/platform.html"){ }); if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() @@ -335,10 +335,10 @@ layout("/layouts/platform.html"){ }); if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() diff --git a/src/main/resources/views/platform/reimbursement/ReimbursementList.html b/src/main/resources/views/platform/reimbursement/ReimbursementList.html index 127e06a..8330995 100644 --- a/src/main/resources/views/platform/reimbursement/ReimbursementList.html +++ b/src/main/resources/views/platform/reimbursement/ReimbursementList.html @@ -280,7 +280,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doSubmit", {id: reimbursementId}); if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ this.notifyError(resp.msg) } @@ -303,7 +303,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doDelete", {id: id}); if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/reimbursement/StandingViceChairman.html b/src/main/resources/views/platform/reimbursement/StandingViceChairman.html index 71f5a6a..a3c6272 100644 --- a/src/main/resources/views/platform/reimbursement/StandingViceChairman.html +++ b/src/main/resources/views/platform/reimbursement/StandingViceChairman.html @@ -316,7 +316,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/reimbursement/ViceChairman.html b/src/main/resources/views/platform/reimbursement/ViceChairman.html index fec7975..db4d9e0 100644 --- a/src/main/resources/views/platform/reimbursement/ViceChairman.html +++ b/src/main/resources/views/platform/reimbursement/ViceChairman.html @@ -316,7 +316,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/reimbursement/applyNew.html b/src/main/resources/views/platform/reimbursement/applyNew.html index 8eb745a..9d14de5 100644 --- a/src/main/resources/views/platform/reimbursement/applyNew.html +++ b/src/main/resources/views/platform/reimbursement/applyNew.html @@ -580,7 +580,7 @@ layout("/layouts/platform.html"){ this.$refs["addForm"].validate(async (valid) => { if (valid) { if (this.balance < this.formData.money) { - this.notifyWarning("余额不足，请联系校工会") + this.$message.warning("余额不足，请联系校工会") return } const loading = this.$loading({ @@ -597,10 +597,10 @@ layout("/layouts/platform.html"){ sign: this.formData.sign }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) window.location.href = '/activity/reimbursement/list' } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) loading.close() } } diff --git a/src/main/resources/views/platform/reimbursement/dma.html b/src/main/resources/views/platform/reimbursement/dma.html index 233fbb3..91a9734 100644 --- a/src/main/resources/views/platform/reimbursement/dma.html +++ b/src/main/resources/views/platform/reimbursement/dma.html @@ -307,7 +307,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/reimbursement/finance.html b/src/main/resources/views/platform/reimbursement/finance.html index 71782b3..c941336 100644 --- a/src/main/resources/views/platform/reimbursement/finance.html +++ b/src/main/resources/views/platform/reimbursement/finance.html @@ -328,7 +328,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else{ this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/reimbursement/secretary.html b/src/main/resources/views/platform/reimbursement/secretary.html index 4add25c..1540f4b 100644 --- a/src/main/resources/views/platform/reimbursement/secretary.html +++ b/src/main/resources/views/platform/reimbursement/secretary.html @@ -332,7 +332,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/retired/group/manage.html b/src/main/resources/views/platform/retired/group/manage.html index 003101b..1355fcb 100644 --- a/src/main/resources/views/platform/retired/group/manage.html +++ b/src/main/resources/views/platform/retired/group/manage.html @@ -309,7 +309,7 @@ layout("/layouts/platform.html"){ } } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -329,12 +329,12 @@ layout("/layouts/platform.html"){ async doSetGroup() { const resp = await $.post(loc() + '/doSetGroup', this.groupFormData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.groupDialogVisible = false this.getTree() this.groupPageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, //小组分页数据 @@ -354,11 +354,11 @@ layout("/layouts/platform.html"){ }).then(async res => { const resp = await $.post(loc() + '/deleteGroup', {id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.getTree() this.groupPageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -406,11 +406,11 @@ layout("/layouts/platform.html"){ } const resp = await $.post(loc() + '/doSetComponentUnit', params) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.componentUnitDialogVisible = false this.componentUnitPageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -421,7 +421,7 @@ layout("/layouts/platform.html"){ this.userTableData = resp.data.list this.pageForm.totalCount = resp.data.totalCount } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -436,10 +436,10 @@ layout("/layouts/platform.html"){ groupId: this.currentData.id }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.getGroupUser() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -455,10 +455,10 @@ layout("/layouts/platform.html"){ groupId: this.currentData.id }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.getGroupUser() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } diff --git a/src/main/resources/views/platform/retired/group/statistics.html b/src/main/resources/views/platform/retired/group/statistics.html index 75634d1..30b8e33 100644 --- a/src/main/resources/views/platform/retired/group/statistics.html +++ b/src/main/resources/views/platform/retired/group/statistics.html @@ -56,7 +56,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.statisticsData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, summaryMethod(param) { @@ -96,4 +96,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/retired/partyBranch/manage.html b/src/main/resources/views/platform/retired/partyBranch/manage.html index edc9f5c..d17288a 100644 --- a/src/main/resources/views/platform/retired/partyBranch/manage.html +++ b/src/main/resources/views/platform/retired/partyBranch/manage.html @@ -366,7 +366,7 @@ layout("/layouts/platform.html"){ } } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -386,12 +386,12 @@ layout("/layouts/platform.html"){ async doSetPartyBranch() { const resp = await $.post(loc() + '/doSetPartyBranch', this.partyBranchFormData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.partyBranchDialogVisible = false this.getTree() this.partyBranchPageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, //党支部分页数据 @@ -411,11 +411,11 @@ layout("/layouts/platform.html"){ }).then(async res => { const resp = await $.post(loc() + '/deletePartyBranch', {id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.getTree() this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -428,7 +428,7 @@ layout("/layouts/platform.html"){ this.userTableData = resp.data.list this.pageForm.totalCount = resp.data.totalCount } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openAddUser() { @@ -458,10 +458,10 @@ layout("/layouts/platform.html"){ }) if (resp.code === 0) { this.userDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.partyBranchUserPageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) @@ -475,10 +475,10 @@ layout("/layouts/platform.html"){ }).then(async res => { const resp = await $.post(loc() + '/deleteUser', {userId, partyBranchId: this.currentData.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -514,9 +514,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.committeeDialogVisible = false this.partyBranchCommitteePageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) @@ -531,7 +531,7 @@ layout("/layouts/platform.html"){ this.committeeTableData = resp.data.list this.pageForm.totalCount = resp.data.totalCount } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -543,10 +543,10 @@ layout("/layouts/platform.html"){ }).then(async () => { const resp = await $.post(loc() + '/deleteCommittee', {userId, partyBranchId: this.currentData.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } diff --git a/src/main/resources/views/platform/retired/partyBranch/statistics.html b/src/main/resources/views/platform/retired/partyBranch/statistics.html index ed8dced..bf6efcd 100644 --- a/src/main/resources/views/platform/retired/partyBranch/statistics.html +++ b/src/main/resources/views/platform/retired/partyBranch/statistics.html @@ -56,7 +56,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.statisticsData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, summaryMethod(param) { @@ -96,4 +96,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/retired/user/change.html b/src/main/resources/views/platform/retired/user/change.html index 620c9cf..b96f64a 100644 --- a/src/main/resources/views/platform/retired/user/change.html +++ b/src/main/resources/views/platform/retired/user/change.html @@ -154,10 +154,10 @@ layout("/layouts/platform.html"){ }).then(async res => { const resp = await $.post(loc() + '/changeToDie', {userId: row.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } @@ -174,4 +174,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/retired/user/list.html b/src/main/resources/views/platform/retired/user/list.html index 073daef..e6c1c74 100644 --- a/src/main/resources/views/platform/retired/user/list.html +++ b/src/main/resources/views/platform/retired/user/list.html @@ -186,22 +186,22 @@ layout("/layouts/platform.html"){ this.nonRetiredUserTableData = resp.data.list this.nonRetiredUserPageForm.totalCount = resp.data.totalCount } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doBatchJoinRetire() { const selection = this.$refs.nonRetiredUserTable.selection if (!selection.length) { - this.notifyWarning("请先勾选需要设置为退休的人员") + this.$message.warning("请先勾选需要设置为退休的人员") return } const resp = await $.post(loc() + "/doBatchJoinRetire", {userIds: JSON.stringify(selection.map(v => v.id))}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.retireUserAddDialogVisible = false this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } @@ -224,10 +224,10 @@ layout("/layouts/platform.html"){ }).then(async res => { const resp = await $.post(loc() + '/changeToDie', {userId: row.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } @@ -242,4 +242,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/retired/user/statistics.html b/src/main/resources/views/platform/retired/user/statistics.html index 5eecb83..a7ea636 100644 --- a/src/main/resources/views/platform/retired/user/statistics.html +++ b/src/main/resources/views/platform/retired/user/statistics.html @@ -137,10 +137,10 @@ layout("/layouts/platform.html"){ }).then(async res => { const resp = await $.post(loc() + '/changeToDie', {userId: row.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } @@ -156,4 +156,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/retiredUser/change.html b/src/main/resources/views/platform/retiredUser/change.html index 9d9e817..0f4a8ec 100644 --- a/src/main/resources/views/platform/retiredUser/change.html +++ b/src/main/resources/views/platform/retiredUser/change.html @@ -155,10 +155,10 @@ layout("/layouts/platform.html"){ }).then(async res => { const resp = await $.post(loc() + '/changeToDie', {userId: row.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) } @@ -175,4 +175,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/retiredUser/list.html b/src/main/resources/views/platform/retiredUser/list.html index 683e5fb..f6dd133 100644 --- a/src/main/resources/views/platform/retiredUser/list.html +++ b/src/main/resources/views/platform/retiredUser/list.html @@ -269,9 +269,9 @@ layout("/layouts/platform.html"){ }).then(async () => { const resp = await $.post(loc() + '/backUp') if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -290,22 +290,22 @@ layout("/layouts/platform.html"){ this.nonRetiredUserTableData = resp.data.list this.nonRetiredUserPageForm.totalCount = resp.data.totalCount } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doBatchJoinRetire() { const selection = this.$refs.nonRetiredUserTable.selection if (!selection.length) { - this.notifyWarning("请先勾选需要设置为退休的人员") + this.$message.warning("请先勾选需要设置为退休的人员") return } const resp = await $.post(loc() + "/doBatchJoinRetire", {userIds: JSON.stringify(selection.map(v => v.id))}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.retireUserAddDialogVisible = false this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -331,10 +331,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/changeToDie', {userId, deathDate}) if (resp.code === 0) { this.deadDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) @@ -366,4 +366,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/roleAuthorize/manage.html b/src/main/resources/views/platform/roleAuthorize/manage.html index 2df4506..b8ba55a 100644 --- a/src/main/resources/views/platform/roleAuthorize/manage.html +++ b/src/main/resources/views/platform/roleAuthorize/manage.html @@ -227,10 +227,10 @@ layout("/layouts/platform.html"){ if (confirm === "confirm") { const resp = await $.post('/platform/roleAuthorize/enableDo', {id: row.id, flag: flag}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -256,10 +256,10 @@ layout("/layouts/platform.html"){ if (confirm === "confirm") { const resp = await $.post('/platform/roleAuthorize/doDelete', {id: row.id}) if(resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -278,9 +278,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() } else { diff --git a/src/main/resources/views/platform/shopping/shoppingTypeApply.html b/src/main/resources/views/platform/shopping/shoppingTypeApply.html index 2e5bf60..9b2e411 100644 --- a/src/main/resources/views/platform/shopping/shoppingTypeApply.html +++ b/src/main/resources/views/platform/shopping/shoppingTypeApply.html @@ -679,7 +679,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doDeleteUser", {id: id}) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } @@ -707,7 +707,7 @@ layout("/layouts/platform.html"){ }, async doSubmitWelfare() { if (!this.projectId) { - this.notifyWarning("请选择需要录入的福利") + this.$message.warning("请选择需要录入的福利") return } const resp = await $.post(loc() + "/doSubmitWelfare", { @@ -716,10 +716,10 @@ layout("/layouts/platform.html"){ shoppingId: this.shoppingId, }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.packageDrawer = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -760,7 +760,7 @@ layout("/layouts/platform.html"){ }, openPackage(row) { if (!row.isEnable) { - this.notifyWarning("福利已开启，如需修改套餐请联系管理员") + this.$message.warning("福利已开启，如需修改套餐请联系管理员") return } @@ -840,7 +840,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doDelete", {id: id}) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } @@ -852,7 +852,7 @@ layout("/layouts/platform.html"){ async isEnableChange(val, id) { const resp = await $.post(loc() + "/isEnableChange", {isEnable: val, id: id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } @@ -891,7 +891,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.doSearch() this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/single/apply.html b/src/main/resources/views/platform/single/apply.html index 26a3b13..357c7ac 100644 --- a/src/main/resources/views/platform/single/apply.html +++ b/src/main/resources/views/platform/single/apply.html @@ -218,7 +218,7 @@ layout("/layouts/platform.html"){ async updateInfo() { const resp = await $.post(loc() + '/doModifyInfo', this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) setTimeout(() => { sublime.jumpPagePjax('/platform/single/myApply') }, 1000) @@ -236,7 +236,7 @@ layout("/layouts/platform.html"){ this.formData.isSubmit = false const resp = await $.post(postUrl, this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) setTimeout(() => { sublime.jumpPagePjax('/platform/single/myApply') }, 1000) @@ -258,7 +258,7 @@ layout("/layouts/platform.html"){ this.formData.singleState = '8010' const resp = await $.post(postUrl, this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) setTimeout(() => { sublime.jumpPagePjax('/platform/single/myApply') }, 1000) @@ -296,7 +296,7 @@ layout("/layouts/platform.html"){ async isJoinedBeforeAndIsAudit() { const resp = await $.get(loc() + '/isJoinedBeforeAndIsAudit') if (resp.data.auditUser) { - this.notifyWarning("您的申请正在处理中或已加入成功，请勿重复提交！") + this.$message.warning("您的申请正在处理中或已加入成功，请勿重复提交！") this.disabled = true; return } diff --git a/src/main/resources/views/platform/single/list.html b/src/main/resources/views/platform/single/list.html index effa70f..fa0f90a 100644 --- a/src/main/resources/views/platform/single/list.html +++ b/src/main/resources/views/platform/single/list.html @@ -438,9 +438,9 @@ layout("/layouts/platform.html"){ const resp = await $.post("/platform/single/myApply/removeById", {userId}); if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/single/myApply.html b/src/main/resources/views/platform/single/myApply.html index bdf3579..cbc4b8e 100644 --- a/src/main/resources/views/platform/single/myApply.html +++ b/src/main/resources/views/platform/single/myApply.html @@ -238,7 +238,7 @@ layout("/layouts/platform.html"){ const resp = await $.get(loc() + '/removeById',{id:id}) if (resp.code === 0){ this.pageData(); - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else { this.notifyError(resp.msg) } @@ -253,7 +253,7 @@ layout("/layouts/platform.html"){ const resp = await $.get(loc() + '/exitSingle',{id:id}) if (resp.code === 0){ this.pageData(); - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) }else { this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/single/schoolAudit.html b/src/main/resources/views/platform/single/schoolAudit.html index e32b551..1821cf2 100644 --- a/src/main/resources/views/platform/single/schoolAudit.html +++ b/src/main/resources/views/platform/single/schoolAudit.html @@ -286,10 +286,10 @@ layout("/layouts/platform.html"){ if (code === 0) { this.pageData() await this.getAuditNum(); - this.notifySuccess(msg) + this.$message.success(msg) this.$refs.guava.index() } else { - this.notifyWarning(msg) + this.$message.warning(msg) } }) } @@ -331,7 +331,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData(); await this.getAuditNum(); - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/single/unionAudit.html b/src/main/resources/views/platform/single/unionAudit.html index bea7b54..a82edbb 100644 --- a/src/main/resources/views/platform/single/unionAudit.html +++ b/src/main/resources/views/platform/single/unionAudit.html @@ -286,10 +286,10 @@ layout("/layouts/platform.html"){ if (code === 0) { this.pageData() await this.getAuditNum(); - this.notifySuccess(msg) + this.$message.success(msg) this.$refs.guava.index() } else { - this.notifyWarning(msg) + this.$message.warning(msg) } }) } @@ -331,7 +331,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData(); await this.getAuditNum(); - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } diff --git a/src/main/resources/views/platform/suggestion/process/apply.html b/src/main/resources/views/platform/suggestion/process/apply.html index 4ba0c32..3790618 100644 --- a/src/main/resources/views/platform/suggestion/process/apply.html +++ b/src/main/resources/views/platform/suggestion/process/apply.html @@ -300,7 +300,7 @@ layout("/layouts/platform.html"){ }, async doSubmit() { if (this.dbTableData.length === 0) { - this.notifyWarning(this.isStartJdh > 0 ? "请搜索并选择本单位的二级教代会代表" : "请搜索并选择校工会代表") + this.$message.warning(this.isStartJdh > 0 ? "请搜索并选择本单位的二级教代会代表" : "请搜索并选择校工会代表") return } const params = { @@ -311,7 +311,7 @@ layout("/layouts/platform.html"){ const resp_data = await $.post('/platform/suggestions/apply/doSave', params) if (resp_data.code === 0) { this.submitDialog = false - this.notifySuccess(resp_data.msg) + this.$message.success(resp_data.msg) this.doSearch() } }, @@ -336,7 +336,7 @@ layout("/layouts/platform.html"){ }).then(async () => { const resp_data = await $.post('/platform/suggestions/apply/doDelete', {id}) if (resp_data.code === 0) { - this.notifySuccess(resp_data.msg) + this.$message.success(resp_data.msg) this.doSearch() } }).catch(() => { diff --git a/src/main/resources/views/platform/suggestion/process/delegatetwoadopt.html b/src/main/resources/views/platform/suggestion/process/delegatetwoadopt.html index 247d27d..1530414 100644 --- a/src/main/resources/views/platform/suggestion/process/delegatetwoadopt.html +++ b/src/main/resources/views/platform/suggestion/process/delegatetwoadopt.html @@ -193,7 +193,7 @@ layout("/layouts/platform.html"){ const resp_data = await $.post('/platform/suggestions/delegatetwoadopt/doSubmit', this.formData) if (resp_data.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp_data.msg) + this.$message.success(resp_data.msg) this.doSearch() } } diff --git a/src/main/resources/views/platform/suggestion/process/depExamine.html b/src/main/resources/views/platform/suggestion/process/depExamine.html index 7915f5a..3035a93 100644 --- a/src/main/resources/views/platform/suggestion/process/depExamine.html +++ b/src/main/resources/views/platform/suggestion/process/depExamine.html @@ -262,7 +262,7 @@ layout("/layouts/platform.html"){ const resp_data = await $.post('/platform/suggestions/depExamine/doSubmit', this.formData) if (resp_data.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp_data.msg) + this.$message.success(resp_data.msg) this.doSearch() } } diff --git a/src/main/resources/views/platform/swufeDifficultSubsidy/basicSetting/project.html b/src/main/resources/views/platform/swufeDifficultSubsidy/basicSetting/project.html index e61705d..ad0aac5 100644 --- a/src/main/resources/views/platform/swufeDifficultSubsidy/basicSetting/project.html +++ b/src/main/resources/views/platform/swufeDifficultSubsidy/basicSetting/project.html @@ -223,10 +223,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/saveProject', this.projectFormData) if (resp.code === 0) { this.projectDialog = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) @@ -238,7 +238,7 @@ layout("/layouts/platform.html"){ type: 'warning' }).then(() => { $.post(loc() + '/delProject', {id}).then(({msg}) => { - this.notifySuccess(msg) + this.$message.success(msg) this.projectList() }) }) @@ -273,7 +273,7 @@ layout("/layouts/platform.html"){ this.diseaseFormData.typeId = this.selectProject.id $.post(loc() + '/saveDisease', this.diseaseFormData).then((res) => { this.diseaseDialogVisible = false - this.notifySuccess(res.msg) + this.$message.success(res.msg) this.diseaseList() }) } @@ -286,7 +286,7 @@ layout("/layouts/platform.html"){ type: 'warning' }).then(() => { $.post('/platform/sys/appMenu/delDisease', {id}).then(({msg}) => { - this.notifySuccess(msg) + this.$message.success(msg) this.projectList() this.diseaseList() }) diff --git a/src/main/resources/views/platform/swufeDifficultSubsidy/basicSetting/project1.html b/src/main/resources/views/platform/swufeDifficultSubsidy/basicSetting/project1.html index c1ead60..0c75cad 100644 --- a/src/main/resources/views/platform/swufeDifficultSubsidy/basicSetting/project1.html +++ b/src/main/resources/views/platform/swufeDifficultSubsidy/basicSetting/project1.html @@ -80,10 +80,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/saveProject', this.projectFormData) if (resp.code === 0) { this.projectDialog = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) @@ -95,7 +95,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.tableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -107,4 +107,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/swufeDifficultSubsidy/process/applyHistory.html b/src/main/resources/views/platform/swufeDifficultSubsidy/process/applyHistory.html index 3388c0c..79089eb 100644 --- a/src/main/resources/views/platform/swufeDifficultSubsidy/process/applyHistory.html +++ b/src/main/resources/views/platform/swufeDifficultSubsidy/process/applyHistory.html @@ -119,9 +119,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/delete', {id}) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -149,4 +149,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/swufeDifficultSubsidy/process/branchUnionAudit.html b/src/main/resources/views/platform/swufeDifficultSubsidy/process/branchUnionAudit.html index cf6aad6..3327848 100644 --- a/src/main/resources/views/platform/swufeDifficultSubsidy/process/branchUnionAudit.html +++ b/src/main/resources/views/platform/swufeDifficultSubsidy/process/branchUnionAudit.html @@ -197,9 +197,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/revoke', {id}) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -216,9 +216,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -235,9 +235,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -251,9 +251,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -275,4 +275,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/swufeDifficultSubsidy/process/schoolAudit.html b/src/main/resources/views/platform/swufeDifficultSubsidy/process/schoolAudit.html index 0075858..4ea758b 100644 --- a/src/main/resources/views/platform/swufeDifficultSubsidy/process/schoolAudit.html +++ b/src/main/resources/views/platform/swufeDifficultSubsidy/process/schoolAudit.html @@ -370,9 +370,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/revoke', {id}) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -389,9 +389,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -408,9 +408,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -440,9 +440,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -467,9 +467,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }, @@ -513,4 +513,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/syr/basic/project.html b/src/main/resources/views/platform/syr/basic/project.html index b385885..44b5ea4 100644 --- a/src/main/resources/views/platform/syr/basic/project.html +++ b/src/main/resources/views/platform/syr/basic/project.html @@ -178,10 +178,10 @@ layout("/layouts/platform.html"){ if(resp.code===0){ // this.DialogVisible = false this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } loading.close() } @@ -198,10 +198,10 @@ layout("/layouts/platform.html"){ const resp = await $.get(loc() + "/doDelete", {id: row.id}) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/syr/basic/pwgl.html b/src/main/resources/views/platform/syr/basic/pwgl.html index 9ecb217..d105cdd 100644 --- a/src/main/resources/views/platform/syr/basic/pwgl.html +++ b/src/main/resources/views/platform/syr/basic/pwgl.html @@ -159,7 +159,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.userOptions = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -177,12 +177,12 @@ layout("/layouts/platform.html"){ const methodName = this.formData.id ? '/doEdit' : '/doAdd' const resp = await $.post(loc() + methodName, this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.userDialogVisible = false this.doSearch() this.getGroupNameOptions() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openEdit(row) { @@ -206,10 +206,10 @@ layout("/layouts/platform.html"){ if ('confirm' !== confirm) return const resp = await $.post(loc() + '/doDelete/' + row.id) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async getGroupNameOptions() { @@ -217,7 +217,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.groupNameOptions = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async getPeriodOptions() { @@ -225,7 +225,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.periodOptions = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, }, diff --git a/src/main/resources/views/platform/syr/cxtj/lxhz.html b/src/main/resources/views/platform/syr/cxtj/lxhz.html index 2412e62..cb3a289 100644 --- a/src/main/resources/views/platform/syr/cxtj/lxhz.html +++ b/src/main/resources/views/platform/syr/cxtj/lxhz.html @@ -219,7 +219,7 @@ layout("/layouts/platform.html"){ exportLxhz() { const {year} = this.pageForm if (!year) { - this.notifyWarning('请先选择年度') + this.$message.warning('请先选择年度') return } window.open(loc() + '/export?year=' + year) @@ -227,7 +227,7 @@ layout("/layouts/platform.html"){ exportLxpshz() { const {year} = this.pageForm if (!year) { - this.notifyWarning('请先选择年度') + this.$message.warning('请先选择年度') return } window.open(loc() + '/exportLxpshz?year=' + year) @@ -235,7 +235,7 @@ layout("/layouts/platform.html"){ exportJtpshz() { const {year} = this.pageForm if (!year) { - this.notifyWarning('请先选择年度') + this.$message.warning('请先选择年度') return } window.open(loc() + '/exportJtpshz?year=' + year) @@ -243,7 +243,7 @@ layout("/layouts/platform.html"){ exportGoodProject() { const {year} = this.pageForm if (!year) { - this.notifyWarning('请先选择年度') + this.$message.warning('请先选择年度') return } window.open(loc() + '/exportGoodProject?year=' + year) diff --git a/src/main/resources/views/platform/syr/info/jtsq.html b/src/main/resources/views/platform/syr/info/jtsq.html index 7eeb4cf..4c33d15 100644 --- a/src/main/resources/views/platform/syr/info/jtsq.html +++ b/src/main/resources/views/platform/syr/info/jtsq.html @@ -489,9 +489,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doRevoke', {xmid: id}) if (resp.code === 0) { this.$refs.syrTable.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } console.log(id) }, @@ -749,7 +749,7 @@ layout("/layouts/platform.html"){ }).then(resp => { if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() this.formData = { cgml: [], @@ -803,7 +803,7 @@ layout("/layouts/platform.html"){ }).then(resp => { if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() this.formData = { cgml: [], diff --git a/src/main/resources/views/platform/syr/info/jtsqxjcs.html b/src/main/resources/views/platform/syr/info/jtsqxjcs.html index a69194f..48283d9 100644 --- a/src/main/resources/views/platform/syr/info/jtsqxjcs.html +++ b/src/main/resources/views/platform/syr/info/jtsqxjcs.html @@ -348,7 +348,7 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platfotm/syr/info/jtsqxjcs/doAudit', this.formData) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData(); } }, @@ -356,7 +356,7 @@ layout("/layouts/platform.html"){ if ('batch' === command) { const selection = this.$refs.table.selection if (selection.length === 0) { - this.notifyWarning('请先勾选需要批量分配评委的选题') + this.$message.warning('请先勾选需要批量分配评委的选题') return } this.tableSelection = selection @@ -368,11 +368,11 @@ layout("/layouts/platform.html"){ const distributionPeriod = this.distributionPeriod const distributionGroupName = this.distributionGroupName if (!distributionPeriod) { - this.notifyWarning('请选择需要分配的评委期数') + this.$message.warning('请选择需要分配的评委期数') return } if (!distributionGroupName) { - this.notifyWarning('请选择需要分配的评委组别') + this.$message.warning('请选择需要分配的评委组别') return } const projectIds = this.$refs.table.selection.map(v => v.id) @@ -384,20 +384,20 @@ layout("/layouts/platform.html"){ }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.tableSelection = [] this.distributionGroupName = null this.distributionDialogVisible = false this.$refs.table.clearSelection() this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doRollBack(row) { const resp = await $.get('/platfotm/syr/info/yjsh/doRollBack', {id: row.id, state: row.state}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData(); } }, @@ -406,7 +406,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.groupNameOptions = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async getPeriodOptions() { @@ -414,7 +414,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.periodOptions = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, }, diff --git a/src/main/resources/views/platform/syr/info/jtsqyjcs.html b/src/main/resources/views/platform/syr/info/jtsqyjcs.html index c202221..a9f7454 100644 --- a/src/main/resources/views/platform/syr/info/jtsqyjcs.html +++ b/src/main/resources/views/platform/syr/info/jtsqyjcs.html @@ -114,14 +114,14 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platfotm/syr/info/jtsqyjcs/doAudit', this.formData) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } }, async doRollBack(row) { const resp = await $.get('/platfotm/syr/info/yjsh/doRollBack', {id: row.id, state: row.state}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } } diff --git a/src/main/resources/views/platform/syr/info/lxresult.html b/src/main/resources/views/platform/syr/info/lxresult.html index afea3c6..8b3dbfb 100644 --- a/src/main/resources/views/platform/syr/info/lxresult.html +++ b/src/main/resources/views/platform/syr/info/lxresult.html @@ -133,13 +133,13 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.$refs['syrTable'].doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } }, async doRollBack(row){ const resp = await $.get('/platfotm/syr/info/yjsh/doRollBack',{id:row.id,state:row.state}) if (resp.code === 0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } }, diff --git a/src/main/resources/views/platform/syr/info/mykt.html b/src/main/resources/views/platform/syr/info/mykt.html index 070b187..4a2f80d 100644 --- a/src/main/resources/views/platform/syr/info/mykt.html +++ b/src/main/resources/views/platform/syr/info/mykt.html @@ -93,7 +93,7 @@ layout("/layouts/platform.html"){ if (confirm === 'confirm') { const resp = await $.post('/platfotm/syr/info/mykt/doDelete', {id: id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs.syrTable.doSearch() } } diff --git a/src/main/resources/views/platform/syr/info/psjg.html b/src/main/resources/views/platform/syr/info/psjg.html index 6384875..722f9cb 100644 --- a/src/main/resources/views/platform/syr/info/psjg.html +++ b/src/main/resources/views/platform/syr/info/psjg.html @@ -117,14 +117,14 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platfotm/syr/info/psjg/doHandle', this.formData) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } }, async doRollBack(row) { const resp = await $.get('/platfotm/syr/info/yjsh/doRollBack', {id: row.id, state: row.state}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } } diff --git a/src/main/resources/views/platform/syr/info/pwjtps.html b/src/main/resources/views/platform/syr/info/pwjtps.html index d19eea4..ad1e1f1 100644 --- a/src/main/resources/views/platform/syr/info/pwjtps.html +++ b/src/main/resources/views/platform/syr/info/pwjtps.html @@ -183,7 +183,7 @@ layout("/layouts/platform.html"){ this.$set(this.formData, 'pwid', resp.data.pwid) this.$set(this.formData, 'pwjtqz', resp.data.pwjtqz) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.getWpsPwList(row.id) /*console.log(resp.data) @@ -203,7 +203,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(reqUrl, this.formData) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } } @@ -215,7 +215,7 @@ layout("/layouts/platform.html"){ async doRollBack(row) { const resp = await $.get('/platfotm/syr/info/yjsh/doRollBack', {id: row.id, state: row.state}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } } diff --git a/src/main/resources/views/platform/syr/info/pwlxps.html b/src/main/resources/views/platform/syr/info/pwlxps.html index 37e2dcf..a2ee11a 100644 --- a/src/main/resources/views/platform/syr/info/pwlxps.html +++ b/src/main/resources/views/platform/syr/info/pwlxps.html @@ -189,7 +189,7 @@ layout("/layouts/platform.html"){ this.$set(this.formData, 'pwid', resp.data.pwid) this.$set(this.formData, 'pwlxqz', resp.data.pwlxqz) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.getWpsPwList(row.id) /*console.log(resp.data) @@ -215,7 +215,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(reqUrl, this.formData) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } } @@ -240,7 +240,7 @@ layout("/layouts/platform.html"){ async doRollBack(row) { const resp = await $.get('/platfotm/syr/info/yjsh/doRollBack', {id: row.id, state: row.state}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } } diff --git a/src/main/resources/views/platform/syr/info/xjsh.html b/src/main/resources/views/platform/syr/info/xjsh.html index 4625d8d..312d6b4 100644 --- a/src/main/resources/views/platform/syr/info/xjsh.html +++ b/src/main/resources/views/platform/syr/info/xjsh.html @@ -311,7 +311,7 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platfotm/syr/info/xjsh/doHandle', this.formData) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } }, @@ -319,7 +319,7 @@ layout("/layouts/platform.html"){ if ('batch' === command) { const selection = this.$refs.table.selection if (selection.length === 0) { - this.notifyWarning('请先勾选需要批量分配评委的选题') + this.$message.warning('请先勾选需要批量分配评委的选题') return } this.tableSelection = selection @@ -331,11 +331,11 @@ layout("/layouts/platform.html"){ const distributionPeriod = this.distributionPeriod const distributionGroupName = this.distributionGroupName if (!distributionPeriod) { - this.notifyWarning('请选择需要分配的评委期数') + this.$message.warning('请选择需要分配的评委期数') return } if (!distributionGroupName) { - this.notifyWarning('请选择需要分配的评委组别') + this.$message.warning('请选择需要分配的评委组别') return } const projectIds = this.$refs.table.selection.map(v => v.id) @@ -347,14 +347,14 @@ layout("/layouts/platform.html"){ }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.tableSelection = [] this.distributionGroupName = null this.distributionDialogVisible = false this.$refs.table.clearSelection() this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -367,13 +367,13 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.groupNameOptions = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doRollBack(row){ const resp = await $.get('/platfotm/syr/info/yjsh/doRollBack',{id:row.id,state:row.state}) if (resp.code === 0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } }, @@ -382,7 +382,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.periodOptions = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, }, diff --git a/src/main/resources/views/platform/syr/info/yjsh.html b/src/main/resources/views/platform/syr/info/yjsh.html index b2166f2..b946e48 100644 --- a/src/main/resources/views/platform/syr/info/yjsh.html +++ b/src/main/resources/views/platform/syr/info/yjsh.html @@ -101,14 +101,14 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platfotm/syr/info/yjsh/doHandle', this.formData) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } }, async doRollBack(row){ const resp = await $.get('/platfotm/syr/info/yjsh/doRollBack',{id:row.id,state:row.state}) if (resp.code === 0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } } diff --git a/src/main/resources/views/platform/syr/info/zqsh.html b/src/main/resources/views/platform/syr/info/zqsh.html index c7a80bb..2ec40e0 100644 --- a/src/main/resources/views/platform/syr/info/zqsh.html +++ b/src/main/resources/views/platform/syr/info/zqsh.html @@ -92,14 +92,14 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platfotm/syr/info/zqsh/doHandle', this.formData) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } }, async doRollBack(row){ const resp = await $.get('/platfotm/syr/info/yjsh/doRollBack',{id:row.id,state:row.state}) if (resp.code === 0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } }, diff --git a/src/main/resources/views/platform/syr/info/zqtb.html b/src/main/resources/views/platform/syr/info/zqtb.html index 67cadda..6600a29 100644 --- a/src/main/resources/views/platform/syr/info/zqtb.html +++ b/src/main/resources/views/platform/syr/info/zqtb.html @@ -101,7 +101,7 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platfotm/syr/info/zqtb/doHandle', this.formData) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } } diff --git a/src/main/resources/views/platform/syr/info/zqtx.html b/src/main/resources/views/platform/syr/info/zqtx.html index d8702a8..8dc3b8b 100644 --- a/src/main/resources/views/platform/syr/info/zqtx.html +++ b/src/main/resources/views/platform/syr/info/zqtx.html @@ -161,14 +161,14 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platfotm/syr/info/zqtx/doHandle', {data: JSON.stringify(this.formData)}) if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) location.reload() } }, async doRollBack(row){ const resp = await $.get('/platfotm/syr/info/yjsh/doRollBack',{id:row.id,state:row.state}) if (resp.code === 0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['syrTable'].doSearch() } }, diff --git a/src/main/resources/views/platform/sys/appMenu/index.html b/src/main/resources/views/platform/sys/appMenu/index.html index 6774db0..a470f7b 100644 --- a/src/main/resources/views/platform/sys/appMenu/index.html +++ b/src/main/resources/views/platform/sys/appMenu/index.html @@ -341,7 +341,7 @@ layout("/layouts/platform.html"){ menuIds: JSON.stringify(menuIds) }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.sortMenuDialogVisible = false this.menuList() } @@ -361,7 +361,7 @@ layout("/layouts/platform.html"){ if (valid) { $.post('/platform/sys/appMenu/' + (this.moduleForm.moduleId ? 'updateModule' : 'saveModule'), this.moduleForm).then(({msg}) => { this.moduleDialogVisible = false - this.notifySuccess(msg) + this.$message.success(msg) this.moduleList() }) } @@ -374,7 +374,7 @@ layout("/layouts/platform.html"){ type: 'warning' }).then(() => { $.post('/platform/sys/appMenu/delModule', {id: moduleId}).then(({msg}) => { - this.notifySuccess(msg) + this.$message.success(msg) this.moduleList() }) }) @@ -409,7 +409,7 @@ layout("/layouts/platform.html"){ if (valid) { $.post('/platform/sys/appMenu/' + (this.formData.menuId ? 'updateMenu' : 'saveMenu'), {appMenu: JSON.stringify(this.formData)}).then((res) => { this.menuDialogVisible = false - this.notifySuccess(res.msg) + this.$message.success(res.msg) this.menuList() }) } @@ -422,7 +422,7 @@ layout("/layouts/platform.html"){ type: 'warning' }).then(() => { $.post('/platform/sys/appMenu/delMenu', {id}).then(({msg}) => { - this.notifySuccess(msg) + this.$message.success(msg) this.moduleList() this.menuList() }) diff --git a/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateHzAudit.html b/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateHzAudit.html index 6acc6b1..305e3fd 100644 --- a/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateHzAudit.html +++ b/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateHzAudit.html @@ -173,9 +173,9 @@ layout("/layouts/platform.html"){ }) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -186,10 +186,10 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platform/sys/club/clubEvaluateHzAudit/doReview', this.formData) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['guava'].index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateMine.html b/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateMine.html index dac3de7..d9caeaa 100644 --- a/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateMine.html +++ b/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateMine.html @@ -148,7 +148,7 @@ layout("/layouts/platform.html"){ }) if (confirm === "confirm") { const resp = await $.post('/platform/sys/club/clubEvaluateMine/doDelete', {id: row.id}) - this.notifySuccess("删除成功") + this.$message.success("删除成功") this.doSearch() } }, diff --git a/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateMszAudit.html b/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateMszAudit.html index b009bc6..ef30b8d 100644 --- a/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateMszAudit.html +++ b/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateMszAudit.html @@ -169,9 +169,9 @@ layout("/layouts/platform.html"){ }) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -182,10 +182,10 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platform/sys/club/clubEvaluateMszAudit/doReview', this.formData) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['guava'].index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateSchoolAudit.html b/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateSchoolAudit.html index 13636f3..266476b 100644 --- a/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateSchoolAudit.html +++ b/src/main/resources/views/platform/sys/club/clubEvaluate/clubEvaluateSchoolAudit.html @@ -176,9 +176,9 @@ layout("/layouts/platform.html"){ }) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -189,10 +189,10 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platform/sys/club/clubEvaluateSchoolAudit/doReview', this.formData) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['guava'].index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/sys/club/examine/register.html b/src/main/resources/views/platform/sys/club/examine/register.html index 38cf5d3..b6cb56b 100644 --- a/src/main/resources/views/platform/sys/club/examine/register.html +++ b/src/main/resources/views/platform/sys/club/examine/register.html @@ -317,7 +317,7 @@ layout("/layouts/platform.html"){ flag: false }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) sublime.jumpPagePjax("/platform/sys/club/examine/registerManage") } @@ -331,7 +331,7 @@ layout("/layouts/platform.html"){ flag: true }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) sublime.jumpPagePjax("/platform/sys/club/examine/registerManage") } }, @@ -356,7 +356,7 @@ layout("/layouts/platform.html"){ this.jcClubId = this.jc.clubId this.registerTypeName++ } else { - this.notifyWarning("请填写完整") + this.$message.warning("请填写完整") } }, setIncomeDetailed() { @@ -465,7 +465,7 @@ layout("/layouts/platform.html"){ clubId: clubId }) if (resp.code === 1) { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) return } this.$set(this.jc, "changeUserNum", resp.data) diff --git a/src/main/resources/views/platform/sys/club/examine/registerFzrAudit.html b/src/main/resources/views/platform/sys/club/examine/registerFzrAudit.html index 0bc0152..f329eb4 100644 --- a/src/main/resources/views/platform/sys/club/examine/registerFzrAudit.html +++ b/src/main/resources/views/platform/sys/club/examine/registerFzrAudit.html @@ -179,7 +179,7 @@ layout("/layouts/platform.html"){ this.formData.flag = flag const resp = await $.post(loc() + "/doReview", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs.guava.index() } else { @@ -199,7 +199,7 @@ layout("/layouts/platform.html"){ }) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } } } diff --git a/src/main/resources/views/platform/sys/club/examine/registerHzAudit.html b/src/main/resources/views/platform/sys/club/examine/registerHzAudit.html index 6ec7c97..f9c9f55 100644 --- a/src/main/resources/views/platform/sys/club/examine/registerHzAudit.html +++ b/src/main/resources/views/platform/sys/club/examine/registerHzAudit.html @@ -181,7 +181,7 @@ layout("/layouts/platform.html"){ this.formData.flag = flag const resp = await $.post(loc() + "/doReview", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs.guava.index() } else { @@ -201,7 +201,7 @@ layout("/layouts/platform.html"){ }) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } } } diff --git a/src/main/resources/views/platform/sys/club/examine/registerManage.html b/src/main/resources/views/platform/sys/club/examine/registerManage.html index 3c7a8b8..bc87a9f 100644 --- a/src/main/resources/views/platform/sys/club/examine/registerManage.html +++ b/src/main/resources/views/platform/sys/club/examine/registerManage.html @@ -111,7 +111,7 @@ layout("/layouts/platform.html"){ if (confirm === "confirm") { const resp = await $.post(loc() + "/doDelete", {id: row.id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { this.notifyError(resp.msg) diff --git a/src/main/resources/views/platform/sys/club/examine/registerUnitPartAudit.html b/src/main/resources/views/platform/sys/club/examine/registerUnitPartAudit.html index 4774a30..6fc68b5 100644 --- a/src/main/resources/views/platform/sys/club/examine/registerUnitPartAudit.html +++ b/src/main/resources/views/platform/sys/club/examine/registerUnitPartAudit.html @@ -193,7 +193,7 @@ layout("/layouts/platform.html"){ this.formData.flag = flag const resp = await $.post(loc() + "/doReview", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs.guava.index() } else { @@ -213,7 +213,7 @@ layout("/layouts/platform.html"){ }) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } } } diff --git a/src/main/resources/views/platform/sys/club/examine/registerXghAudit.html b/src/main/resources/views/platform/sys/club/examine/registerXghAudit.html index 5b9536b..ec24929 100644 --- a/src/main/resources/views/platform/sys/club/examine/registerXghAudit.html +++ b/src/main/resources/views/platform/sys/club/examine/registerXghAudit.html @@ -195,7 +195,7 @@ layout("/layouts/platform.html"){ this.formData.flag = flag const resp = await $.post(loc() + "/doReview", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs.guava.index() } else { @@ -215,7 +215,7 @@ layout("/layouts/platform.html"){ }) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } } } diff --git a/src/main/resources/views/platform/sys/club/manage/clubInfoManage.html b/src/main/resources/views/platform/sys/club/manage/clubInfoManage.html index b7bb3f4..3d37600 100644 --- a/src/main/resources/views/platform/sys/club/manage/clubInfoManage.html +++ b/src/main/resources/views/platform/sys/club/manage/clubInfoManage.html @@ -980,7 +980,7 @@ layout("/layouts/platform.html"){ }) if (confirm === "confirm") { const resp = await $.post('/platform/sys/club/clubMyApply/doDelete', {id: id}) - this.notifySuccess("删除成功") + this.$message.success("删除成功") this.doSearch() await this.loadTree() } diff --git a/src/main/resources/views/platform/sys/club/regist/clubConfirm.html b/src/main/resources/views/platform/sys/club/regist/clubConfirm.html index 416b950..079134f 100644 --- a/src/main/resources/views/platform/sys/club/regist/clubConfirm.html +++ b/src/main/resources/views/platform/sys/club/regist/clubConfirm.html @@ -193,10 +193,10 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platform/sys/club/clubConfirm/doReview', this.formData) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['guava'].index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/sys/club/regist/clubMyApply.html b/src/main/resources/views/platform/sys/club/regist/clubMyApply.html index 380cde3..f4ca6dd 100644 --- a/src/main/resources/views/platform/sys/club/regist/clubMyApply.html +++ b/src/main/resources/views/platform/sys/club/regist/clubMyApply.html @@ -224,7 +224,7 @@ layout("/layouts/platform.html"){ }) if (confirm === "confirm") { const resp = await $.post('/platform/sys/club/clubMyApply/doDelete', {id: row.id}) - this.notifySuccess("删除成功") + this.$message.success("删除成功") this.doSearch() } }, diff --git a/src/main/resources/views/platform/sys/club/regist/xghReply.html b/src/main/resources/views/platform/sys/club/regist/xghReply.html index f4d9f6a..526bfd1 100644 --- a/src/main/resources/views/platform/sys/club/regist/xghReply.html +++ b/src/main/resources/views/platform/sys/club/regist/xghReply.html @@ -175,9 +175,9 @@ layout("/layouts/platform.html"){ }) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -188,10 +188,10 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platform/sys/club/xghReply/doReview', this.formData) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['guava'].index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/sys/club/regist/xldAudit.html b/src/main/resources/views/platform/sys/club/regist/xldAudit.html index 62fe1b2..16a85cf 100644 --- a/src/main/resources/views/platform/sys/club/regist/xldAudit.html +++ b/src/main/resources/views/platform/sys/club/regist/xldAudit.html @@ -160,9 +160,9 @@ layout("/layouts/platform.html"){ }) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -173,10 +173,10 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platform/sys/club/xldAudit/doReview', this.formData) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['guava'].index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/sys/club/regist/xtAudit.html b/src/main/resources/views/platform/sys/club/regist/xtAudit.html index 9a59df7..dd218d5 100644 --- a/src/main/resources/views/platform/sys/club/regist/xtAudit.html +++ b/src/main/resources/views/platform/sys/club/regist/xtAudit.html @@ -168,9 +168,9 @@ layout("/layouts/platform.html"){ }) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -182,10 +182,10 @@ layout("/layouts/platform.html"){ const resp = await $.post('/platform/sys/club/xtAudit/doReview', this.formData) if(resp.code === 0) { await this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs['guava'].index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/sys/entranceModule/index.html b/src/main/resources/views/platform/sys/entranceModule/index.html index 799bf0c..da157e3 100644 --- a/src/main/resources/views/platform/sys/entranceModule/index.html +++ b/src/main/resources/views/platform/sys/entranceModule/index.html @@ -154,13 +154,13 @@ layout("/layouts/platform.html"){ const resp = await $.post(url, {entranceModule: JSON.stringify(this.formData)}) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs.guava.index() if (headerNavBarVueApp) { headerNavBarVueApp.init() } } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async pageData() { @@ -170,7 +170,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.tableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doDelete(id) { @@ -183,12 +183,12 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doDelete/' + id) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) if (headerNavBarVueApp) { headerNavBarVueApp.init() } } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openEdit(row) { @@ -223,4 +223,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/sys/officeTemplate/index.html b/src/main/resources/views/platform/sys/officeTemplate/index.html index a20fbf3..305ad35 100644 --- a/src/main/resources/views/platform/sys/officeTemplate/index.html +++ b/src/main/resources/views/platform/sys/officeTemplate/index.html @@ -117,10 +117,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/save', this.formData) if (resp.code === 0) { this.dialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } @@ -144,10 +144,10 @@ layout("/layouts/platform.html"){ }).then(async () => { const resp = await $.post(loc() + '/delete', row) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) @@ -166,4 +166,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/sys/pictureLibrary/index.html b/src/main/resources/views/platform/sys/pictureLibrary/index.html index efbdf89..02571d8 100644 --- a/src/main/resources/views/platform/sys/pictureLibrary/index.html +++ b/src/main/resources/views/platform/sys/pictureLibrary/index.html @@ -306,7 +306,7 @@ layout("/layouts/platform.html"){ if (valid) { $.post(loc() + (this.moduleForm.id ? '/updateModule' : '/saveModule'), this.moduleForm).then(({msg}) => { this.moduleDialogVisible = false - this.notifySuccess(msg) + this.$message.success(msg) this.moduleList() }) } @@ -319,7 +319,7 @@ layout("/layouts/platform.html"){ type: 'warning' }).then(() => { $.post(loc() + '/delModule', {id}).then(({msg}) => { - this.notifySuccess(msg) + this.$message.success(msg) this.moduleList() }) }) @@ -353,7 +353,7 @@ layout("/layouts/platform.html"){ if (valid) { $.post(loc() + (this.formData.id ? '/updatePic' : '/savePic'), {sysPictureLibrary: JSON.stringify(this.formData)}).then((res) => { this.picDialogVisible = false - this.notifySuccess(res.msg) + this.$message.success(res.msg) this.picList() }) } @@ -366,7 +366,7 @@ layout("/layouts/platform.html"){ type: 'warning' }).then(() => { $.post(loc() + '/delPic', {id}).then(({msg}) => { - this.notifySuccess(msg) + this.$message.success(msg) this.moduleList() this.picList() }) diff --git a/src/main/resources/views/platform/tempActivity/houseChoose/pc/houseSetUp.html b/src/main/resources/views/platform/tempActivity/houseChoose/pc/houseSetUp.html index 53cbbef..2c90437 100644 --- a/src/main/resources/views/platform/tempActivity/houseChoose/pc/houseSetUp.html +++ b/src/main/resources/views/platform/tempActivity/houseChoose/pc/houseSetUp.html @@ -349,10 +349,10 @@ layout("/layouts/platform.html"){ }) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async pageData() { @@ -363,7 +363,7 @@ layout("/layouts/platform.html"){ this.pageForm.totalCount = resp.data.totalCount this.tableData = resp.data.list } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openView(row) { @@ -409,10 +409,10 @@ layout("/layouts/platform.html"){ if ('confirm' !== confirm) return const resp = await $.post('/platform/tempActivity/house/actSetUp/doDelete/' + id) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, doExportHasSelUsers() { @@ -446,4 +446,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/theRapyRecuperation/baseManage/baseManagement.html b/src/main/resources/views/platform/theRapyRecuperation/baseManage/baseManagement.html index 013e7be..e8999c7 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/baseManage/baseManagement.html +++ b/src/main/resources/views/platform/theRapyRecuperation/baseManage/baseManagement.html @@ -552,15 +552,15 @@ layout("/layouts/platform.html"){ this.formData = {...data} this.initLineContentEditor(data.content) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async baseStatusChange(id) { const resp = await $.post(loc() + '/openClosedBase/' + id) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doDelete(id) { @@ -574,9 +574,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/deleteBase/' + id) if (resp.code === 0) { await this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doSubmit() { @@ -594,10 +594,10 @@ layout("/layouts/platform.html"){ loading.close() if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, yearChange() { @@ -651,7 +651,7 @@ layout("/layouts/platform.html"){ }, doImport() { if (this.importData.fileList.length === 0) { - this.notifyWarning("请选择文件！") + this.$message.warning("请选择文件！") return } const data = new FormData(); @@ -674,7 +674,7 @@ layout("/layouts/platform.html"){ } }, error: (data) => { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.importLoading = false } }); diff --git a/src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html b/src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html index 15cb5ac..e6fad9b 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html +++ b/src/main/resources/views/platform/theRapyRecuperation/basicManage/line.html @@ -728,7 +728,7 @@ layout("/layouts/platform.html"){ this.formData = {...data} this.initLineContentEditor(data.content) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doSubmit() { @@ -746,18 +746,18 @@ layout("/layouts/platform.html"){ loading.close() if (resp.code === 0) { this.$refs.guava.index() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async lineStatusChange(id) { const resp = await $.post(loc() + '/openClosedLine/' + id) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doDelete(id) { @@ -771,9 +771,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/deleteLine/' + id) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async openView(id) { @@ -825,7 +825,7 @@ layout("/layouts/platform.html"){ this.lineUnionSetTimeDialog = true this.lineUnionSetTimeInfos = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async getConfig() { @@ -833,7 +833,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.config = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async getTravelAgencyOptions() { @@ -852,7 +852,7 @@ layout("/layouts/platform.html"){ }, async doImport() { if (this.importData.fileList.length === 0) { - this.notifyWarning("请选择文件！") + this.$message.warning("请选择文件！") return } const data = new FormData(); @@ -865,7 +865,7 @@ layout("/layouts/platform.html"){ this.pageData(); this.importVisible = false }else { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.importLoading = false } }, diff --git a/src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html b/src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html index 762f1e3..c413d45 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html +++ b/src/main/resources/views/platform/theRapyRecuperation/basicManage/travelAgency.html @@ -358,18 +358,18 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doSubmit', {travelAgency: JSON.stringify(this.formData)}) if (resp.code === 0) { this.editDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async travelAgencyStatusChange(id) { const resp = await $.post(loc() + '/openClosedTravelAgency/' + id) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doDelete(id) { @@ -383,9 +383,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/deleteTravelAgency/' + id) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -403,7 +403,7 @@ layout("/layouts/platform.html"){ }, async doImport() { if (this.importData.fileList.length === 0) { - this.notifyWarning("请选择文件！") + this.$message.warning("请选择文件！") return } const data = new FormData(); @@ -419,7 +419,7 @@ layout("/layouts/platform.html"){ this.importVisible = false this.importLoading = false }else { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.importLoading = false } }, diff --git a/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyQuery.html b/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyQuery.html index d25512c..7953db6 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyQuery.html +++ b/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyQuery.html @@ -1042,7 +1042,7 @@ layout("/layouts/platform.html"){ }, setLot(val) { if (this.multipleSelection2 && this.multipleSelection2.length === 0) { - this.notifyWarning("设置前请先勾选需要设置的用户") + this.$message.warning("设置前请先勾选需要设置的用户") this.lotId = null return; } @@ -1058,7 +1058,7 @@ layout("/layouts/platform.html"){ }, setTakePartInTime(val) { if (this.multipleSelection2 && this.multipleSelection2.length === 0) { - this.notifyWarning("设置前请先勾选需要设置的用户") + this.$message.warning("设置前请先勾选需要设置的用户") this.takePartInTime = null return; } @@ -1101,18 +1101,18 @@ layout("/layouts/platform.html"){ } }) if (arr && arr.length > 0) { - this.notifyWarning("请检查【" + arr.toString() + "】条数据后在提交") + this.$message.warning("请检查【" + arr.toString() + "】条数据后在提交") return } const refs = await $.post(loc() + "/doAttend", {data: JSON.stringify(this.multipleSelection)}) if (refs.code == 0) { - this.notifySuccess(refs.msg); + this.$message.success(refs.msg); this.doSearch() this.$refs.table2.clearSelection(); this.userDrawer = false } else { - this.notifyWarning(refs.msg) + this.$message.warning(refs.msg) } }, @@ -1148,9 +1148,9 @@ layout("/layouts/platform.html"){ if (confirm === "confirm") { const refs = await $.post(loc() + "/doEmail", {id: row.id}) if (refs.code == 0) { - this.notifySuccess(refs.msg); + this.$message.success(refs.msg); } else { - this.notifyWarning(refs.msg) + this.$message.warning(refs.msg) } } }, @@ -1163,9 +1163,9 @@ layout("/layouts/platform.html"){ if (confirm === "confirm") { const refs = await $.post(loc() + "/doRemind", {id: row.id}) if (refs.code == 0) { - this.notifySuccess(refs.msg); + this.$message.success(refs.msg); } else { - this.notifyWarning(refs.msg) + this.$message.warning(refs.msg) } } }, @@ -1508,7 +1508,7 @@ layout("/layouts/platform.html"){ }, async doImport() { if (this.importData.fileList.length === 0) { - this.notifyWarning("请选择文件！") + this.$message.warning("请选择文件！") return } const data = new FormData(); @@ -1523,7 +1523,7 @@ layout("/layouts/platform.html"){ await this.pageData(); this.importVisible = false } else { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.importLoading = false } }, diff --git a/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyUserQuery.html b/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyUserQuery.html index 8af0294..ba78b85 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyUserQuery.html +++ b/src/main/resources/views/platform/theRapyRecuperation/process/TheRapyUserQuery.html @@ -217,10 +217,12 @@ layout("/layouts/platform.html"){ + + + - + @@ -697,6 +707,26 @@ layout("/layouts/platform.html"){ "&types=" + types + "&linePlayTime=" + linePlayTime) }, + doExportBaseApply(id){ + const { + takePartInBaseManagementId, + startYear, + endYear, + searchKeyword, + unionId, + unitId, + lotId, + } = this.pageForm + + window.open(loc() + "/doExportBaseApply?takePartInBaseManagementId=" + (takePartInBaseManagementId ? takePartInBaseManagementId : '') + + "&searchKeyword=" + (searchKeyword ? searchKeyword : '') + + "&startYear=" + (startYear ? startYear : '') + + "&endYear=" + (endYear ? endYear : '') + + "&unionId=" + (unionId ? unionId : '') + + "&unitId=" + (unitId ? unitId : '') + + "&lotId=" + (lotId ? lotId : '') + + "&id=" + (id ? id : '')) + }, async validateLine() { const resp = await $.post('/platform/theRapyRecuperation/line/enroll/validSignUpInfo' , {enroll: JSON.stringify(this.editFormData)}) @@ -784,7 +814,7 @@ layout("/layouts/platform.html"){ }, setLot(val) { if (this.multipleSelection2 && this.multipleSelection2.length === 0) { - this.notifyWarning("设置前请先勾选需要设置的用户") + this.$message.warning("设置前请先勾选需要设置的用户") this.lotId = null return; } @@ -800,7 +830,7 @@ layout("/layouts/platform.html"){ }, setTakePartInTime(val) { if (this.multipleSelection2 && this.multipleSelection2.length === 0) { - this.notifyWarning("设置前请先勾选需要设置的用户") + this.$message.warning("设置前请先勾选需要设置的用户") this.takePartInTime = null return; } @@ -833,17 +863,17 @@ layout("/layouts/platform.html"){ } }) if (arr && arr.length > 0) { - this.notifyWarning("请检查【" + arr.toString() + "】条数据后在提交") + this.$message.warning("请检查【" + arr.toString() + "】条数据后在提交") return } const refs = await $.post("/platform/theRapyRecuperation/query/doAttend", {data: JSON.stringify(this.multipleSelection)}) if (refs.code === 0) { - this.notifySuccess(refs.msg); + this.$message.success(refs.msg); await this.doSearch() this.$refs.table2.clearSelection(); this.userDrawer = false } else { - this.notifyWarning(refs.msg) + this.$message.warning(refs.msg) } }, @@ -968,7 +998,7 @@ layout("/layouts/platform.html"){ }, doImport() { if (this.importData.fileList.length === 0) { - this.notifyWarning("请选择文件！") + this.$message.warning("请选择文件！") return } const data = new FormData(); @@ -992,7 +1022,7 @@ layout("/layouts/platform.html"){ } }, error: (data) => { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.importLoading = false } }); diff --git a/src/main/resources/views/platform/theRapyRecuperation/process/joinUserImport.html b/src/main/resources/views/platform/theRapyRecuperation/process/joinUserImport.html index 9f20c31..b61d49c 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/process/joinUserImport.html +++ b/src/main/resources/views/platform/theRapyRecuperation/process/joinUserImport.html @@ -106,8 +106,8 @@ layout("/layouts/platform.html"){ :data="{lineId:lineId,travelAgencyId:travelId}" :file-list="fileList" :limit="1" - :on-error="(err)=>{this.notifyWarning(err)}" - :on-exceed="()=>{this.notifyWarning('最多只能选择一个文件')}" + :on-error="(err)=>{this.$message.warning(err)}" + :on-exceed="()=>{this.$message.warning('最多只能选择一个文件')}" :on-success="fileHandleSuccess" accept="xls,xlsx" drag @@ -193,7 +193,7 @@ layout("/layouts/platform.html"){ this.excelRows = resp.data.excelRows this.stepActive++ } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) this.$refs.upload.clearFiles() } }, @@ -207,13 +207,13 @@ layout("/layouts/platform.html"){ const i = this.stepActive if (i === 0) { if (this.lineId === '' && this.travelId === '') { - this.notifyWarning('请先选择线路或者旅行社') + this.$message.warning('请先选择线路或者旅行社') return } } else if (i === 1) { const files = this.$refs.upload.uploadFiles if (files.length === 0) { - this.notifyWarning('请先选择文件') + this.$message.warning('请先选择文件') return } const isReady = files.every(v => v.status === 'ready') @@ -223,14 +223,14 @@ layout("/layouts/platform.html"){ } } else if (i === 2) { if (this.tableData.length === 0) { - this.notifyWarning('没有合法数据，无法导入') + this.$message.warning('没有合法数据，无法导入') return } const resp = await $.post(loc() + '/doImportTakePartInUsers', {enroll: JSON.stringify(this.tableData)}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) return } } else if (i === 3) { diff --git a/src/main/resources/views/platform/theRapyRecuperation/process/lineAdjustment.html b/src/main/resources/views/platform/theRapyRecuperation/process/lineAdjustment.html index fd77540..f5d2e36 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/process/lineAdjustment.html +++ b/src/main/resources/views/platform/theRapyRecuperation/process/lineAdjustment.html @@ -325,7 +325,7 @@ layout("/layouts/platform.html"){ this.tableData = resp.data.list this.pageForm.totalCount = resp.data.totalCount } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async openViewSignUpUsers(lineId, unionId) { @@ -338,7 +338,7 @@ layout("/layouts/platform.html"){ } this.schoolFreeSignUpUserList = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, //调整人员 @@ -353,15 +353,15 @@ layout("/layouts/platform.html"){ const lineId = this.currentLineId const resp = await $.post(loc() + '/adjustmentUser', {lineId, loginNames: JSON.stringify([loginName])}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) await this.openViewSignUpUsers(this.currentLineId, this.currentLineSelectUnionId) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async aKeyToAdjust() { if (this.$refs.adjustTable.selection.length === 0) { - this.notifyWarning('请选择需要调整的人员') + this.$message.warning('请选择需要调整的人员') return } @@ -382,16 +382,16 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/adjustmentUser', {lineId, loginNames: JSON.stringify(loginNames)}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) await this.openViewSignUpUsers(this.currentLineId, this.currentLineSelectUnionId) await this.pageData(); } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async smsAlerts() { if (this.$refs.adjustTable.selection.length === 0) { - this.notifyWarning('请选择需要发送短信通知的人员') + this.$message.warning('请选择需要发送短信通知的人员') return } const confirm = await this.$confirm('此操作会向已调整的人员发送短信，您确定要发送短信提醒吗？', '提示', { @@ -412,19 +412,19 @@ layout("/layouts/platform.html"){ const resp = await $.post( loc() + '/smsAlerts',{lineId:lineId,loginNames: JSON.stringify(loginNames)}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) await this.openViewSignUpUsers(this.currentLineId, this.currentLineSelectUnionId) await this.pageData(); } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async lineStatusChange(id) { const resp = await $.post('/platform/theRapyRecuperation/line/openClosedLine/' + id) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async getConfigData() { diff --git a/src/main/resources/views/platform/theRapyRecuperation/process/lineCluster.html b/src/main/resources/views/platform/theRapyRecuperation/process/lineCluster.html index b443732..4b8a8b4 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/process/lineCluster.html +++ b/src/main/resources/views/platform/theRapyRecuperation/process/lineCluster.html @@ -393,7 +393,7 @@ layout("/layouts/platform.html"){ this.selectClusterTagId = null } } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async openCluster(id, ascriptionUnionId) { @@ -427,7 +427,7 @@ layout("/layouts/platform.html"){ async setClusterMembers() { const emptyCluster = Object.values(vue.clusterData).filter(v => v.clusterName !== '线路未分配人员').find(v => v.members.length === 0) if (emptyCluster) { - this.notifyWarning(emptyCluster.clusterName + '未分配成员,请分配后再提交！') + this.$message.warning(emptyCluster.clusterName + '未分配成员,请分配后再提交！') return } @@ -436,12 +436,12 @@ layout("/layouts/platform.html"){ lineId: this.lineId }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs.guava.index() this.lineId = null this.clusterData = {} } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, setMemberRole(key, loginName, isLeader) { diff --git a/src/main/resources/views/platform/theRapyRecuperation/process/lineUnionSelect.html b/src/main/resources/views/platform/theRapyRecuperation/process/lineUnionSelect.html index e1b433a..87351ff 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/process/lineUnionSelect.html +++ b/src/main/resources/views/platform/theRapyRecuperation/process/lineUnionSelect.html @@ -852,7 +852,7 @@ layout("/layouts/platform.html"){ this.timeLots = resp.data this.timeLotsDialogVisible = true } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -880,7 +880,7 @@ layout("/layouts/platform.html"){ this.setLineTimeDialog = true } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doSelect() { @@ -907,9 +907,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.setLineTimeDialog = false this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, createModeName(val) { @@ -932,9 +932,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/deSelect', {lineId, unionId}) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async getTravelAgencyOptions() { diff --git a/src/main/resources/views/platform/theRapyRecuperation/theRapyConfig/TheRapyConfig.html b/src/main/resources/views/platform/theRapyRecuperation/theRapyConfig/TheRapyConfig.html index 9767a6d..4e14ad5 100644 --- a/src/main/resources/views/platform/theRapyRecuperation/theRapyConfig/TheRapyConfig.html +++ b/src/main/resources/views/platform/theRapyRecuperation/theRapyConfig/TheRapyConfig.html @@ -200,9 +200,13 @@ layout("/layouts/platform.html"){ - + + 重 置 提 交 diff --git a/src/main/resources/views/platform/thirtyteach/manage.html b/src/main/resources/views/platform/thirtyteach/manage.html index e79b4c5..dda1c1d 100644 --- a/src/main/resources/views/platform/thirtyteach/manage.html +++ b/src/main/resources/views/platform/thirtyteach/manage.html @@ -406,7 +406,7 @@ layout("/layouts/platform.html"){ }, async doSet() { if (!this.setData.setNum) { - this.notifyWarning("请填写年限!!!") + this.$message.warning("请填写年限!!!") return } const resp = await $.post(loc() + '/setThirtyTeach', { @@ -416,9 +416,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() this.setVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openImport() { @@ -442,7 +442,7 @@ layout("/layouts/platform.html"){ async batchDelete() { try { if (!this.checkUsers.length) { - this.notifyWarning("请先勾选需要删除的数据!!!") + this.$message.warning("请先勾选需要删除的数据!!!") return } const confirm = await this.$confirm('您确定要删除吗?', '提示', { @@ -456,9 +456,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() this.$refs.table.clearSelection(); - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } catch (e) { @@ -480,7 +480,7 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.table.clearSelection(); } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } catch (e) { @@ -514,7 +514,7 @@ layout("/layouts/platform.html"){ }, doImport() { if (this.importData.fileList.length === 0) { - this.notifyWarning("请选择文件！") + this.$message.warning("请选择文件！") return } const data = new FormData(); @@ -533,15 +533,15 @@ layout("/layouts/platform.html"){ this.importLoading = false if (data.code === 0 && data.data === null) { this.pageData(); - this.notifySuccess("导入成功") + this.$message.success("导入成功") this.importVisible = false } else { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.errorInfoData = data.data } }, error: (data) => { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.importLoading = false } }); diff --git a/src/main/resources/views/platform/trainEdu/album.html b/src/main/resources/views/platform/trainEdu/album.html index ef54013..3c52078 100644 --- a/src/main/resources/views/platform/trainEdu/album.html +++ b/src/main/resources/views/platform/trainEdu/album.html @@ -277,7 +277,7 @@ layout("/layouts/platform.html"){ const methodName = typeof this.formData.id === 'undefined' ? '/doAdd' : '/doEdit' const resp = await $.post(loc() + methodName, this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs['guava'].index() } else { diff --git a/src/main/resources/views/platform/trainEdu/study.html b/src/main/resources/views/platform/trainEdu/study.html index 136c5fc..e2bd13d 100644 --- a/src/main/resources/views/platform/trainEdu/study.html +++ b/src/main/resources/views/platform/trainEdu/study.html @@ -300,7 +300,7 @@ layout("/layouts/platform.html"){ this.playTimeUpdate() } } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async playVideo(item) { @@ -439,4 +439,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/trainEdu/type.html b/src/main/resources/views/platform/trainEdu/type.html index 7622930..8f5fcc4 100644 --- a/src/main/resources/views/platform/trainEdu/type.html +++ b/src/main/resources/views/platform/trainEdu/type.html @@ -149,7 +149,7 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + methodName, {trainEduType: JSON.stringify(this.formData)}) if (resp.code === 0) { this.dialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } else { this.notifyError(resp.msg) @@ -185,4 +185,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/trainEdu/video.html b/src/main/resources/views/platform/trainEdu/video.html index 4e64d10..cad24d4 100644 --- a/src/main/resources/views/platform/trainEdu/video.html +++ b/src/main/resources/views/platform/trainEdu/video.html @@ -296,7 +296,7 @@ layout("/layouts/platform.html"){ }) loading.close() if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.$refs['guava'].index() } else { diff --git a/src/main/resources/views/platform/trainSingUp/manage/activity.html b/src/main/resources/views/platform/trainSingUp/manage/activity.html index a017cfd..4dee03b 100644 --- a/src/main/resources/views/platform/trainSingUp/manage/activity.html +++ b/src/main/resources/views/platform/trainSingUp/manage/activity.html @@ -280,7 +280,7 @@ layout("/layouts/platform.html"){ async activityStatusChange(notice, val, id) { const resp = await $.post(loc() + '/activityStatusChange', {notice: notice, isDisabled: val, id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } @@ -288,7 +288,7 @@ layout("/layouts/platform.html"){ async activityNoticeChange(isDisabled, val, id) { const resp = await $.post(loc() + '/activityStatusChange', {isDisabled: isDisabled, notice: val, id}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { this.notifyError(resp.msg) } @@ -304,7 +304,7 @@ layout("/layouts/platform.html"){ }) if (confirm === "confirm") { const resp = await $.post(loc() + '/doDelete', {id: row.id}) - this.notifySuccess("删除成功") + this.$message.success("删除成功") this.doSearch() } }, diff --git a/src/main/resources/views/platform/trainSingUp/manage/userAdjust.html b/src/main/resources/views/platform/trainSingUp/manage/userAdjust.html index a8a556b..4c969db 100644 --- a/src/main/resources/views/platform/trainSingUp/manage/userAdjust.html +++ b/src/main/resources/views/platform/trainSingUp/manage/userAdjust.html @@ -385,7 +385,7 @@ layout("/layouts/platform.html"){ }, async doAdjust() { if (!this.afterAdjustCourse) { - this.notifyWarning('请选择要调整的' + this.trainType + '！') + this.$message.warning('请选择要调整的' + this.trainType + '！') return } diff --git a/src/main/resources/views/platform/trainSingUp/manage/user_black_list.html b/src/main/resources/views/platform/trainSingUp/manage/user_black_list.html index 64af025..aad051f 100644 --- a/src/main/resources/views/platform/trainSingUp/manage/user_black_list.html +++ b/src/main/resources/views/platform/trainSingUp/manage/user_black_list.html @@ -281,7 +281,7 @@ layout("/layouts/platform.html"){ async handleUser(userId) { const resp = await $.post(loc() + '/doHandleUser', {userId}) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() } }, diff --git a/src/main/resources/views/platform/unionComment/exportZp.html b/src/main/resources/views/platform/unionComment/exportZp.html index 5cfddf7..2d68b7a 100644 --- a/src/main/resources/views/platform/unionComment/exportZp.html +++ b/src/main/resources/views/platform/unionComment/exportZp.html @@ -190,7 +190,7 @@ layout("/layouts/platform.html"){ const res = await $.post(loc() + "/doDelete", {id: row.id}) if (res.code === 0) { this.doSearch() - this.notifySuccess(res.msg) + this.$message.success(res.msg) } } }, @@ -213,11 +213,11 @@ layout("/layouts/platform.html"){ }, async doAdd() { if (this.formData.zbIds.length === 0) { - this.notifyWarning("请在右侧选择需要导出的测评") + this.$message.warning("请在右侧选择需要导出的测评") return } if (!this.formData.exportName) { - this.notifyWarning("请输入导出的名称") + this.$message.warning("请输入导出的名称") return } const confirm = await this.$confirm('确定要保存吗？') @@ -226,7 +226,7 @@ layout("/layouts/platform.html"){ if (res.code === 0) { this.doSearch() this.drawer = false - this.notifySuccess(res.msg) + this.$message.success(res.msg) } this.$refs.table.clearSelection(); } diff --git a/src/main/resources/views/platform/welfare/list/ListMange.html b/src/main/resources/views/platform/welfare/list/ListMange.html index 2f5b870..00a0bb2 100644 --- a/src/main/resources/views/platform/welfare/list/ListMange.html +++ b/src/main/resources/views/platform/welfare/list/ListMange.html @@ -829,7 +829,7 @@ layout("/layouts/platform.html"){ methods: { async sendMsg(){ if (!this.pageForm.projectId) { - this.notifyWarning('请选择福利项目') + this.$message.warning('请选择福利项目') return } const valid = await this.$refs['sendForm'].validate() @@ -849,9 +849,9 @@ layout("/layouts/platform.html"){ }) if (resp.code === 0) { this.sendMsgDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, @@ -1044,10 +1044,10 @@ layout("/layouts/platform.html"){ expressExcelHandleSuccess(response, file, fileList) { if (response.code !== 0) { - this.notifyWarning(response.msg) + this.$message.warning(response.msg) this.$refs.expressExcelUpload.clearFiles() } else { - this.notifySuccess(response.msg) + this.$message.success(response.msg) this.$refs.expressExcelUpload.clearFiles() this.importExpressExcelDialog = false this.doSearch() @@ -1145,7 +1145,7 @@ layout("/layouts/platform.html"){ const selectNums = this.welfareOptions.map(v => v.selectNum) const sum = selectNums.reduce((accumulator, currentValue) => accumulator + currentValue, 0) if (sum === 0) { - this.notifyWarning("请先选择份数") + this.$message.warning("请先选择份数") return } @@ -1168,10 +1168,10 @@ layout("/layouts/platform.html"){ }) this.exportWelfareListDialog = false if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) @@ -1193,7 +1193,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -1204,7 +1204,7 @@ layout("/layouts/platform.html"){ }, doWholeReceive(id) { if (this.choiceList.length === 0) { - this.notifyWarning('请先在左侧勾选') + this.$message.warning('请先在左侧勾选') return } this.$confirm('确定要领取吗？', '提示', { @@ -1222,7 +1222,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -1241,10 +1241,10 @@ layout("/layouts/platform.html"){ id: this.pageForm.projectId }) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } @@ -1274,7 +1274,7 @@ layout("/layouts/platform.html"){ this.$set(row, "editWelfareUnit", false) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, projectOptionChange(val) { @@ -1317,7 +1317,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -1357,9 +1357,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/sendMsgToNotWriteAddressUsers/' + project.value) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, //获取用户选择的数据 diff --git a/src/main/resources/views/platform/welfare/member/Adjustment.html b/src/main/resources/views/platform/welfare/member/Adjustment.html index 814998d..483071a 100644 --- a/src/main/resources/views/platform/welfare/member/Adjustment.html +++ b/src/main/resources/views/platform/welfare/member/Adjustment.html @@ -703,7 +703,7 @@ layout("/layouts/platform.html"){ }, async doBatchJoinMember() { if (!this.selectUsers.length) { - this.notifyWarning("请先勾选需要设置为福利会员的用户") + this.$message.warning("请先勾选需要设置为福利会员的用户") return } @@ -715,16 +715,16 @@ layout("/layouts/platform.html"){ this.$refs.userSelect.init() this.selectUserVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doUnitMove() { if (this.unitMoveFormData.unitId === '') { - this.notifyWarning('请选择新单位！') + this.$message.warning('请选择新单位！') return } if (this.unitMoveFormData.threeUnitId === '') { - this.notifyWarning('请选择新科室！') + this.$message.warning('请选择新科室！') return } @@ -740,7 +740,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.unitMoveVisibile = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async threeUnitChange(val) { @@ -842,7 +842,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.batchEditVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, handleClose(done) { @@ -868,7 +868,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -907,7 +907,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/welfare/member/AuditSchool.html b/src/main/resources/views/platform/welfare/member/AuditSchool.html index 1580625..dd04865 100644 --- a/src/main/resources/views/platform/welfare/member/AuditSchool.html +++ b/src/main/resources/views/platform/welfare/member/AuditSchool.html @@ -239,7 +239,7 @@ layout("/layouts/platform.html"){ this.dialogVisible = false this.$refs.table.clearSelection(); }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, dropdownCommand(command) { diff --git a/src/main/resources/views/platform/welfare/member/MemberMange.html b/src/main/resources/views/platform/welfare/member/MemberMange.html index 779337f..64cdd4b 100644 --- a/src/main/resources/views/platform/welfare/member/MemberMange.html +++ b/src/main/resources/views/platform/welfare/member/MemberMange.html @@ -613,7 +613,7 @@ layout("/layouts/platform.html"){ }, doImportCheck() { if (this.importData.fileList.length === 0) { - this.notifyWarning("请选择文件！") + this.$message.warning("请选择文件！") return } const data = new FormData(); @@ -633,16 +633,16 @@ layout("/layouts/platform.html"){ this.importLoading = false if (data.code === 0) { this.pageData(); - this.notifySuccess("核对成功") + this.$message.success("核对成功") this.errorInfoData = data.data // this.importCheckVisible = false } else { - this.notifyWarning("核对失败") + this.$message.warning("核对失败") } this.errorInfoData = data.data }, error: (data) => { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.importLoading = false } }); @@ -666,10 +666,10 @@ layout("/layouts/platform.html"){ this.addMemberLoading = true const resp = await $.post(loc() + "/addMember", this.pageForm) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.addMemberDialogVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.addMemberLoading = false }).catch(() => { @@ -678,7 +678,7 @@ layout("/layouts/platform.html"){ }, async doBatchJoinMember() { if (!this.selectUsers.length) { - this.notifyWarning("请先勾选需要设置为福利会员的用户") + this.$message.warning("请先勾选需要设置为福利会员的用户") return } @@ -690,7 +690,7 @@ layout("/layouts/platform.html"){ this.$refs.userSelect.init() this.selectUserVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, pushDropdownCommand({type}) { @@ -719,7 +719,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -738,7 +738,7 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.batchEditVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openBatchEdit() { @@ -770,13 +770,13 @@ layout("/layouts/platform.html"){ this.$set(row, "editCampus", false) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, doImport() { if (this.importData.fileList.length === 0) { - this.notifyWarning("请选择文件！") + this.$message.warning("请选择文件！") return } const data = new FormData(); @@ -798,11 +798,11 @@ layout("/layouts/platform.html"){ this.pageData(); this.importVisible = false } else { - this.notifyWarning(data.msg) + this.$message.warning(data.msg) } }, error: (data) => { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.importLoading = false } }); @@ -828,7 +828,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/welfare/member/change/audit/Layout.html b/src/main/resources/views/platform/welfare/member/change/audit/Layout.html index ea6ee1d..c01e977 100644 --- a/src/main/resources/views/platform/welfare/member/change/audit/Layout.html +++ b/src/main/resources/views/platform/welfare/member/change/audit/Layout.html @@ -281,7 +281,7 @@ this.pageData() this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async openAudit(row, audit) { @@ -314,7 +314,7 @@ auditTime: moment().format('YYYY-MM-DD'), } }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, }, @@ -328,4 +328,4 @@ this.changeOrigin = await member.getChangeOrigin() } }) - \ No newline at end of file + diff --git a/src/main/resources/views/platform/welfare/member/check/personal.html b/src/main/resources/views/platform/welfare/member/check/personal.html index a28a0f6..a876cab 100644 --- a/src/main/resources/views/platform/welfare/member/check/personal.html +++ b/src/main/resources/views/platform/welfare/member/check/personal.html @@ -199,7 +199,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.finishNum = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doExport() { diff --git a/src/main/resources/views/platform/welfare/member/check/school.html b/src/main/resources/views/platform/welfare/member/check/school.html index 1c752ef..956261f 100644 --- a/src/main/resources/views/platform/welfare/member/check/school.html +++ b/src/main/resources/views/platform/welfare/member/check/school.html @@ -590,7 +590,7 @@ layout("/layouts/platform.html"){ exportChangeUser() { const {taskId} = this.pageForm if (!taskId) { - this.notifyWarning('请先选择核对任务') + this.$message.warning('请先选择核对任务') return } window.open(loc() + '/exportChangeUser?taskId=' + taskId) @@ -667,7 +667,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.tableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async tableColumnExpandChange(row, expandedRows) { @@ -704,7 +704,7 @@ layout("/layouts/platform.html"){ // auditTime: moment().format('YYYY-MM-DD'), // } // } else { - // this.notifyWarning(resp.msg) + // this.$message.warning(resp.msg) // } // }, // async doAudit(pass) { @@ -721,7 +721,7 @@ layout("/layouts/platform.html"){ // this.pageData() // this.$refs.guava.index() // } else { -// this.notifyWarning(resp.msg) +// this.$message.warning(resp.msg) // } // }, async unitChange(v) { diff --git a/src/main/resources/views/platform/welfare/member/check/task.html b/src/main/resources/views/platform/welfare/member/check/task.html index 2f1f5b4..07a6c0e 100644 --- a/src/main/resources/views/platform/welfare/member/check/task.html +++ b/src/main/resources/views/platform/welfare/member/check/task.html @@ -175,10 +175,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + methodName, this.formData) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.dialogVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async doDelete(id) { @@ -191,9 +191,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doDelete', {id}) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }, diff --git a/src/main/resources/views/platform/welfare/member/check/union.html b/src/main/resources/views/platform/welfare/member/check/union.html index 189f84d..a6aeb2d 100644 --- a/src/main/resources/views/platform/welfare/member/check/union.html +++ b/src/main/resources/views/platform/welfare/member/check/union.html @@ -575,7 +575,7 @@ layout("/layouts/platform.html"){ }, async doUnitMove() { if (this.unitMoveFormData.unitId === '') { - this.notifyWarning('请选择新单位！') + this.$message.warning('请选择新单位！') return } @@ -591,13 +591,13 @@ layout("/layouts/platform.html"){ this.$refs.table.clearSelection(); this.unitMoveVisibile = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, doWelfareMemberExport() { const {welfareUnit, unit, unionGroupId, threeUnitId} = this.pageForm // if (!welfareUnit) { - // this.notifyWarning("请先选择工会小组后在导出") + // this.$message.warning("请先选择工会小组后在导出") // return // } window.open(loc() + "/doWelfareMemberExport?welfareUnit=" + welfareUnit @@ -629,7 +629,7 @@ layout("/layouts/platform.html"){ }, async doBatchJoinMember() { if (!this.selectUsers.length) { - this.notifyWarning("请先勾选需要设置为福利会员的用户") + this.$message.warning("请先勾选需要设置为福利会员的用户") return } let aa = false @@ -651,7 +651,7 @@ layout("/layouts/platform.html"){ this.$refs.userSelect.init() this.selectUserVisible = false } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) .catch(_ => { @@ -678,7 +678,7 @@ layout("/layouts/platform.html"){ }, pushDropdownCommand({type}) { // if (!this.pageForm.unionGroupId) { - // this.notifyWarning("请选择需要核对的工会小组！") + // this.$message.warning("请选择需要核对的工会小组！") // return // } if (type == 'select') { @@ -720,7 +720,7 @@ layout("/layouts/platform.html"){ */ async submitCheck() { if (!this.pageForm.welfareUnit) { - this.notifyWarning("请选择需要核对的工会！") + this.$message.warning("请选择需要核对的工会！") return } const confirm = await this.$confirm('此操作会提交至校工会确认，请确认核对完成了吗?', '提示', { @@ -732,10 +732,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/submitCheck', this.pageForm) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.getUnionTaskStatus() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, @@ -774,7 +774,7 @@ layout("/layouts/platform.html"){ }, async checkAgain() { if (!this.pageForm.welfareUnit) { - this.notifyWarning("请选择需要重新核对的工会！") + this.$message.warning("请选择需要重新核对的工会！") return } const confirm = await this.$confirm('您确定要重新核对吗?', '提示', { diff --git a/src/main/resources/views/platform/welfare/project/ProjectMange.html b/src/main/resources/views/platform/welfare/project/ProjectMange.html index c6ddbd7..3adda2a 100644 --- a/src/main/resources/views/platform/welfare/project/ProjectMange.html +++ b/src/main/resources/views/platform/welfare/project/ProjectMange.html @@ -600,7 +600,7 @@ layout("/layouts/platform.html"){ if (confirm === "confirm") { // this.pageForm.sendMsgValue = this.sendMsgValue // if (!this.sendMsgValue) { - // this.notifyWarning("请填写发送内容") + // this.$message.warning("请填写发送内容") // return // } const resp = await $.post(loc() + '/sendMsgToNotWelfareUsers', { @@ -611,9 +611,9 @@ layout("/layouts/platform.html"){ }) if (resp.code === 0) { this.sendMsgDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } @@ -723,15 +723,15 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.$refs.guava.index() this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } catch (e) { loading.close() this.submitLoading = false console.log(e) - this.notifyWarning(e.status) + this.$message.warning(e.status) } } @@ -793,9 +793,9 @@ layout("/layouts/platform.html"){ this.submitLoading = false if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -817,9 +817,9 @@ layout("/layouts/platform.html"){ this.submitLoading = false if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -837,9 +837,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/delete", {id}); if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.submitLoading = false } @@ -907,7 +907,7 @@ layout("/layouts/platform.html"){ this.formData = data this.$refs.guava.edit() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openView() { diff --git a/src/main/resources/views/platform/welfare/statistics/single.html b/src/main/resources/views/platform/welfare/statistics/single.html index 64683e2..6800b93 100644 --- a/src/main/resources/views/platform/welfare/statistics/single.html +++ b/src/main/resources/views/platform/welfare/statistics/single.html @@ -489,7 +489,7 @@ layout("/layouts/platform.html"){ const selectNums = this.welfareOptions.map(v => v.selectNum) const sum = selectNums.reduce((accumulator, currentValue) => accumulator + currentValue, 0) if (sum === 0) { - this.notifyWarning('请选择福利') + this.$message.warning('请选择福利') return } @@ -507,9 +507,9 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() this.selectByAdminDialogVisible = false - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) diff --git a/src/main/resources/views/platform/workersCongress/Delegate.html b/src/main/resources/views/platform/workersCongress/Delegate.html index 0998333..69c2b4d 100644 --- a/src/main/resources/views/platform/workersCongress/Delegate.html +++ b/src/main/resources/views/platform/workersCongress/Delegate.html @@ -433,11 +433,11 @@ layout("/layouts/platform.html"){ gdh_id: this.pageForm.gdh_id }) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs.multipleTable.clearSelection(); this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -459,10 +459,10 @@ layout("/layouts/platform.html"){ if ("confirm" == a) { const resp = await $.post(loc() + "/userDoDelete", data) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -488,7 +488,7 @@ layout("/layouts/platform.html"){ this.pageData() this.addDialogVisible = false }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/workersCongress/Delegation.html b/src/main/resources/views/platform/workersCongress/Delegation.html index c9a6ec3..75c070c 100644 --- a/src/main/resources/views/platform/workersCongress/Delegation.html +++ b/src/main/resources/views/platform/workersCongress/Delegation.html @@ -392,7 +392,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.getTzList() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -437,7 +437,7 @@ layout("/layouts/platform.html"){ this.addDialogVisible = false this.delegations = await getGdhDbt(this.pageForm.gdh_id) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } @@ -456,7 +456,7 @@ layout("/layouts/platform.html"){ this.pageData() this.delegations = await getGdhDbt(this.pageForm.gdh_id) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -540,10 +540,10 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doAddTz", this.userFormData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.getTzList() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } this.userList = [] this.userFormData.userid = '' @@ -557,7 +557,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.tzTableData = resp.data } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, }, diff --git a/src/main/resources/views/platform/workersCongress/Organization.html b/src/main/resources/views/platform/workersCongress/Organization.html index ea85470..37ff014 100644 --- a/src/main/resources/views/platform/workersCongress/Organization.html +++ b/src/main/resources/views/platform/workersCongress/Organization.html @@ -336,10 +336,10 @@ layout("/layouts/platform.html"){ user_id: row.user_id }) if(resp.code===0){ - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async loadTree() { @@ -375,7 +375,7 @@ layout("/layouts/platform.html"){ this.addDialogVisible = false this.formData = {} } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, async openAdd() { diff --git a/src/main/resources/views/platform/workersCongress/SessionCon.html b/src/main/resources/views/platform/workersCongress/SessionCon.html index 8d2b9bc..ff9cda6 100644 --- a/src/main/resources/views/platform/workersCongress/SessionCon.html +++ b/src/main/resources/views/platform/workersCongress/SessionCon.html @@ -280,7 +280,7 @@ layout("/layouts/platform.html"){ this.pageData() this.addDialogVisible = false }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openAdd() { diff --git a/src/main/resources/views/platform/xhkh/xghsh.html b/src/main/resources/views/platform/xhkh/xghsh.html index 9e0220e..41cf3e7 100644 --- a/src/main/resources/views/platform/xhkh/xghsh.html +++ b/src/main/resources/views/platform/xhkh/xghsh.html @@ -396,11 +396,11 @@ layout("/layouts/platform.html"){ clubId: this.formData.club_id }) if (code === 0) { - this.notifySuccess(msg) + this.$message.success(msg) this.$refs.guava.index() this.pageData() } else { - this.notifyWarning(msg) + this.$message.warning(msg) } } }) diff --git a/src/main/resources/views/platform/zcgl/zclb.html b/src/main/resources/views/platform/zcgl/zclb.html index a1abb28..1dc1416 100644 --- a/src/main/resources/views/platform/zcgl/zclb.html +++ b/src/main/resources/views/platform/zcgl/zclb.html @@ -161,7 +161,7 @@ layout("/layouts/platform.html"){ } resp = await $.post(loc() + "/doEdit", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.dialogVisible = false } else { @@ -176,7 +176,7 @@ layout("/layouts/platform.html"){ if (valid) { const resp = await $.post(loc() + "/doAdd", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.doSearch() this.dialogVisible = false } else { @@ -197,4 +197,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/zgfw/condolence/ecr.html b/src/main/resources/views/platform/zgfw/condolence/ecr.html index ffe969c..1ecefd8 100644 --- a/src/main/resources/views/platform/zgfw/condolence/ecr.html +++ b/src/main/resources/views/platform/zgfw/condolence/ecr.html @@ -242,7 +242,7 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/zgfw/condolence/fr.html b/src/main/resources/views/platform/zgfw/condolence/fr.html index 3079080..b3b4719 100644 --- a/src/main/resources/views/platform/zgfw/condolence/fr.html +++ b/src/main/resources/views/platform/zgfw/condolence/fr.html @@ -306,7 +306,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/zgfw/condolence/index.html b/src/main/resources/views/platform/zgfw/condolence/index.html index c1db320..3fd17d9 100644 --- a/src/main/resources/views/platform/zgfw/condolence/index.html +++ b/src/main/resources/views/platform/zgfw/condolence/index.html @@ -576,7 +576,7 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); @@ -609,7 +609,7 @@ layout("/layouts/platform.html"){ } this.$refs.guava.edit() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) }*/ const {id} = row sublime.jumpPagePjax('/platform/fw/condolence/applyWrite?id=' + id) @@ -629,7 +629,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -658,7 +658,7 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }); diff --git a/src/main/resources/views/platform/zgfw/condolence/ucr.html b/src/main/resources/views/platform/zgfw/condolence/ucr.html index 3b52b8c..33b0af7 100644 --- a/src/main/resources/views/platform/zgfw/condolence/ucr.html +++ b/src/main/resources/views/platform/zgfw/condolence/ucr.html @@ -272,7 +272,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -299,7 +299,7 @@ layout("/layouts/platform.html"){ this.formData.pass = flag const resp = await $.post(loc() + "/doReview", this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() } else { diff --git a/src/main/resources/views/platform/zgfw/difficulty/applylist.html b/src/main/resources/views/platform/zgfw/difficulty/applylist.html index 89e67f6..c446ea1 100644 --- a/src/main/resources/views/platform/zgfw/difficulty/applylist.html +++ b/src/main/resources/views/platform/zgfw/difficulty/applylist.html @@ -178,7 +178,7 @@ layout("/layouts/platform.html"){ this.$message.success(resp.msg) this.pageData() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } diff --git a/src/main/resources/views/platform/zgfw/difficulty/branchUnionAudit.html b/src/main/resources/views/platform/zgfw/difficulty/branchUnionAudit.html index fbb788a..3c894cb 100644 --- a/src/main/resources/views/platform/zgfw/difficulty/branchUnionAudit.html +++ b/src/main/resources/views/platform/zgfw/difficulty/branchUnionAudit.html @@ -216,7 +216,7 @@ layout("/layouts/platform.html"){ this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }); @@ -248,7 +248,7 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/zgfw/difficulty/schoolUnionFinalAudit.html b/src/main/resources/views/platform/zgfw/difficulty/schoolUnionFinalAudit.html index 7ff372d..460b9f3 100644 --- a/src/main/resources/views/platform/zgfw/difficulty/schoolUnionFinalAudit.html +++ b/src/main/resources/views/platform/zgfw/difficulty/schoolUnionFinalAudit.html @@ -216,7 +216,7 @@ layout("/layouts/platform.html"){ this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }); @@ -248,7 +248,7 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/zgfw/difficulty/schoolUnionInitialAudit.html b/src/main/resources/views/platform/zgfw/difficulty/schoolUnionInitialAudit.html index 975bb85..c73f51a 100644 --- a/src/main/resources/views/platform/zgfw/difficulty/schoolUnionInitialAudit.html +++ b/src/main/resources/views/platform/zgfw/difficulty/schoolUnionInitialAudit.html @@ -225,7 +225,7 @@ layout("/layouts/platform.html"){ this.$message.success(resp.msg) this.doSearch() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }) }); @@ -257,7 +257,7 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/zgfw/difficulty/schoolvicechairman.html b/src/main/resources/views/platform/zgfw/difficulty/schoolvicechairman.html index 333b7a8..f2cfab2 100644 --- a/src/main/resources/views/platform/zgfw/difficulty/schoolvicechairman.html +++ b/src/main/resources/views/platform/zgfw/difficulty/schoolvicechairman.html @@ -242,7 +242,7 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/zgfw/rxdj/beian.html b/src/main/resources/views/platform/zgfw/rxdj/beian.html index 1ee0e1a..688ce10 100644 --- a/src/main/resources/views/platform/zgfw/rxdj/beian.html +++ b/src/main/resources/views/platform/zgfw/rxdj/beian.html @@ -238,7 +238,7 @@ layout("/layouts/platform.html"){ if (confirm === "confirm") { const resp = await $.post(loc() + '/doHandle', this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs.guava.index() this.pageData() } @@ -258,4 +258,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/zgfw/rxdj/xghsh.html b/src/main/resources/views/platform/zgfw/rxdj/xghsh.html index 2a57f09..438381b 100644 --- a/src/main/resources/views/platform/zgfw/rxdj/xghsh.html +++ b/src/main/resources/views/platform/zgfw/rxdj/xghsh.html @@ -312,7 +312,7 @@ layout("/layouts/platform.html"){ doImport() { const {year, djlx} = this.pageForm if (this.importData.fileList.length === 0) { - this.notifyWarning("请选择文件！") + this.$message.warning("请选择文件！") return } const data = new FormData(); @@ -332,15 +332,15 @@ layout("/layouts/platform.html"){ this.importLoading = false if (data.code === 0 && data.data === null) { this.pageData(); - this.notifySuccess("导入成功") + this.$message.success("导入成功") this.importVisible = false } else { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.errorInfoData = data.data } }, error: (data) => { - this.notifyWarning("导入失败") + this.$message.warning("导入失败") this.importLoading = false } }); @@ -441,7 +441,7 @@ layout("/layouts/platform.html"){ this.formData.dj_sqzt = s const resp = await $.post('/platform/zgfw/rxdj/sh/doxghSh', this.formData) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.$refs.guava.index() this.pageData() } diff --git a/src/main/resources/views/platform/zgfw/singleChild/report.html b/src/main/resources/views/platform/zgfw/singleChild/report.html index 82633c8..49c6a26 100644 --- a/src/main/resources/views/platform/zgfw/singleChild/report.html +++ b/src/main/resources/views/platform/zgfw/singleChild/report.html @@ -315,7 +315,7 @@ layout("/layouts/platform.html"){ this.pageData(); this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) @@ -334,7 +334,7 @@ layout("/layouts/platform.html"){ this.formData = data this.$refs.guava.edit() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, doDelete(row) { @@ -352,7 +352,7 @@ layout("/layouts/platform.html"){ this.pageData(); this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } } @@ -401,4 +401,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/zgfw/singleChild/school.html b/src/main/resources/views/platform/zgfw/singleChild/school.html index 0c1ebd7..5632676 100644 --- a/src/main/resources/views/platform/zgfw/singleChild/school.html +++ b/src/main/resources/views/platform/zgfw/singleChild/school.html @@ -252,9 +252,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/batchPass', {ids: JSON.stringify(ids)}) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, selectionChange(val) { @@ -269,11 +269,11 @@ layout("/layouts/platform.html"){ } const resp = await $.post(loc() + "/doReview", params) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, dropdownCommand(command) { @@ -296,9 +296,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + '/doRollBack/' + id) if (resp.code === 0) { this.doSearch() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, openView(id) { diff --git a/src/main/resources/views/platform/zgfw/singleChild/sub.html b/src/main/resources/views/platform/zgfw/singleChild/sub.html index 048e086..3d4cf50 100644 --- a/src/main/resources/views/platform/zgfw/singleChild/sub.html +++ b/src/main/resources/views/platform/zgfw/singleChild/sub.html @@ -236,11 +236,11 @@ layout("/layouts/platform.html"){ } const resp = await $.post(loc() + "/doReview", params) if (resp.code === 0) { - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) this.pageData() this.$refs.guava.index() } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } }, dropdownCommand(command) { @@ -283,7 +283,7 @@ layout("/layouts/platform.html"){ this.pageData() this.$refs.guava.index() }else{ - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } } }) diff --git a/src/main/resources/views/platform/zgfw/znxx/apply.html b/src/main/resources/views/platform/zgfw/znxx/apply.html index 3f99946..eb1dedd 100644 --- a/src/main/resources/views/platform/zgfw/znxx/apply.html +++ b/src/main/resources/views/platform/zgfw/znxx/apply.html @@ -175,7 +175,7 @@ layout("/layouts/platform.html"){ if (resp.code === 0) { if (this.$refs["addForm"]) this.$refs["addForm"].resetFields(); - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) sublime.jumpPagePjax("/platform/zgfw/znxx/manage") } else { this.notifyError(resp.msg) @@ -222,4 +222,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/zgfw/znxx/manage.html b/src/main/resources/views/platform/zgfw/znxx/manage.html index fa9c376..70d81b4 100644 --- a/src/main/resources/views/platform/zgfw/znxx/manage.html +++ b/src/main/resources/views/platform/zgfw/znxx/manage.html @@ -151,9 +151,9 @@ layout("/layouts/platform.html"){ const resp = await $.post(loc() + "/doDelete", {id: row.dj_id}) if (resp.code === 0) { this.pageData() - this.notifySuccess(resp.msg) + this.$message.success(resp.msg) } else { - this.notifyWarning(resp.msg) + this.$message.warning(resp.msg) } row.loading = false } @@ -170,4 +170,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#--> diff --git a/src/main/resources/views/platform/zgfw/znxx/statistics.html b/src/main/resources/views/platform/zgfw/znxx/statistics.html index 122533f..7163755 100644 --- a/src/main/resources/views/platform/zgfw/znxx/statistics.html +++ b/src/main/resources/views/platform/zgfw/znxx/statistics.html @@ -269,7 +269,7 @@ layout("/layouts/platform.html"){ }, async doZf(row) { if (!this.zfnr) { - this.notifyWarning("必填") + this.$message.warning("必填") return } const confirm = await this.$confirm('您确定要发送祝福吗?', '提示', { @@ -286,9 +286,9 @@ layout("/layouts/platform.html"){ }) if (refs.code === 0) { this.zfnrDialog = false - this.notifySuccess(refs.msg); + this.$message.success(refs.msg); } else { - this.notifyWarning(refs.msg) + this.$message.warning(refs.msg) } this.loading = false } @@ -338,4 +338,4 @@ layout("/layouts/platform.html"){ \ No newline at end of file +#-->