commit

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"),

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 <T> List<Sys_user> findUserInfoByRoleCode(PFun<T, ?> name, String columnValue, RoleConstant... roleConstant) {
 		String column = LambdaQuery.resolve(name);
 
-		List<String> list = Arrays.stream(roleConstant).map(o -> {
+		List<String> list = Arrays.stream(roleConstant).map(Enum::name).toList();
-			Sys_role role = sysRoleService.getByCode(o.name());
-			return role.getId();
-		}).toList();
-
 		return findUserInfoByRoleCode(column, columnValue, list);
     }
 

src/main/resources/static/components/plugins/sysEnum/EnumTag.vue

@@ -1,17 +1,10 @@
 <template>
     <div>
-        <template v-if="mode === 'pc'" v-for="item in options">
+        <template v-for="item in options">
-            <el-tag :key="item[value_key]" v-if="item[value_key] === value" v-bind="$attrs"
+            <component :key="item[value_key]" v-if="item[value_key] === value" v-bind="$attrs"
-                    :type="item.type"
+                       :is="isMobile ? 'van-tag' : 'el-tag'" :type="item.type"
             >{{ item[label_key] }}
-            </el-tag>
+            </component>
-        </template>
-
-        <template v-if="mode === 'h5'" v-for="item in options">
-            <van-tag :key="item[value_key]" v-if="item[value_key] === value" v-bind="$attrs"
-                     :type="item.type">
-                {{ item[label_key] }}
-            </van-tag>
         </template>
     </div>
 </template>
@@ -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()
     }
 }
 </script>
@@ -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;
 }
 </style>