diff --git a/src/main/java/com/budwk/app/flow/enums/ProcessInstanceStateEnum.java b/src/main/java/com/budwk/app/flow/enums/ProcessInstanceStateEnum.java index 79aff22d..327cc16b 100644 --- a/src/main/java/com/budwk/app/flow/enums/ProcessInstanceStateEnum.java +++ b/src/main/java/com/budwk/app/flow/enums/ProcessInstanceStateEnum.java @@ -9,7 +9,7 @@ import lombok.Getter; @Getter @DictEnum(key = "ProcessInstanceStateEnum", name = "流程实例状态") public enum ProcessInstanceStateEnum { - DOING(10, "进行中", null), + DOING(10, "进行中", "primary"), FINISHED(20, "已完成", "success"), WITHDRAW(30, "已撤回", "danger"), INTERRUPT(40, "强行终止", "danger"), diff --git a/src/main/java/com/budwk/app/web/controllers/open/commons/service/impl/CommonServiceImpl.java b/src/main/java/com/budwk/app/web/controllers/open/commons/service/impl/CommonServiceImpl.java index 182aeba8..197ac2c8 100644 --- a/src/main/java/com/budwk/app/web/controllers/open/commons/service/impl/CommonServiceImpl.java +++ b/src/main/java/com/budwk/app/web/controllers/open/commons/service/impl/CommonServiceImpl.java @@ -91,11 +91,7 @@ public class CommonServiceImpl extends BaseServiceImpl implements CommonService public List findUserInfoByRoleCode(PFun name, String columnValue, RoleConstant... roleConstant) { String column = LambdaQuery.resolve(name); - List list = Arrays.stream(roleConstant).map(o -> { - Sys_role role = sysRoleService.getByCode(o.name()); - return role.getId(); - }).toList(); - + List list = Arrays.stream(roleConstant).map(Enum::name).toList(); return findUserInfoByRoleCode(column, columnValue, list); } diff --git a/src/main/resources/static/components/plugins/sysEnum/EnumTag.vue b/src/main/resources/static/components/plugins/sysEnum/EnumTag.vue index 0d48a8b8..0640ace6 100644 --- a/src/main/resources/static/components/plugins/sysEnum/EnumTag.vue +++ b/src/main/resources/static/components/plugins/sysEnum/EnumTag.vue @@ -1,17 +1,10 @@ @@ -34,14 +27,11 @@ module.exports = { type: String, default: "name" }, - mode: { - type: String, - default: "pc" - } }, data() { return { - options: [] + options: [], + isMobile: true, } }, watch: { @@ -53,6 +43,11 @@ module.exports = { } }, methods: { + isMobileDevice() { + return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test( + navigator.userAgent + ); + }, getEnumOptions() { // // 检查数据缓存 // if (enumCache[this.name]) { @@ -86,7 +81,7 @@ module.exports = { } }, created() { - + this.isMobile = this.isMobileDevice() } } @@ -96,6 +91,28 @@ module.exports = { margin-left: 10px; } .van-tag { - padding: 4px 8px; + height: 24px; + padding: 0 8px; + line-height: 22px; +} +.van-tag--success { + background-color: #f0f9eb; + border-color: #e1f3d8; + color: #67c23a; +} +.van-tag--primary { + color: var(--color-primary); + background-color: #ecf5ff; + border-color: #d9ecff; +} +.van-tag--danger{ + background-color: #fef0f0; + border-color: #fde2e2; + color: #f56c6c; +} +.van-tag--warning{ + background-color: #fdf6ec; + border-color: #faecd8; + color: #e6a23c; }