diff --git a/mayfly_go_web/src/common/Enum.ts b/mayfly_go_web/src/common/Enum.ts
index 609c36d3..19cad5c0 100644
--- a/mayfly_go_web/src/common/Enum.ts
+++ b/mayfly_go_web/src/common/Enum.ts
@@ -32,6 +32,10 @@ export class EnumValue {
return this;
}
+ tagTypeInfo(): EnumValue {
+ return this.setTagType('info');
+ }
+
tagTypeSuccess(): EnumValue {
return this.setTagType('success');
}
diff --git a/mayfly_go_web/src/components/enumtag/EnumTag.vue b/mayfly_go_web/src/components/enumtag/EnumTag.vue
index bf322658..29990c67 100644
--- a/mayfly_go_web/src/components/enumtag/EnumTag.vue
+++ b/mayfly_go_web/src/components/enumtag/EnumTag.vue
@@ -1,5 +1,5 @@
- {{ enumLabel }}
+ {{ enumLabel }}
diff --git a/mayfly_go_web/src/views/ops/tag/TeamList.vue b/mayfly_go_web/src/views/ops/tag/TeamList.vue
index 2f1c6326..69b2a3ac 100755
--- a/mayfly_go_web/src/views/ops/tag/TeamList.vue
+++ b/mayfly_go_web/src/views/ops/tag/TeamList.vue
@@ -89,52 +89,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ dateFormat(scope.row.createTime) }}
-
-
-
-
-
+
+ v-model:page-size="showMemDialog.query.pageSize"
+ v-model:page-num="showMemDialog.query.pageNum"
+ @pageChange="setMemebers()"
+ >
+
+ 添加
+
+
+
+
+
+
@@ -169,7 +142,6 @@ import { ref, toRefs, reactive, onMounted } from 'vue';
import { tagApi } from './api';
import { accountApi } from '../../system/api';
import { ElMessage, ElMessageBox } from 'element-plus';
-import { dateFormat } from '@/common/utils/date';
import { notBlank } from '@/common/assert';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn, TableQuery } from '@/components/pagetable';
@@ -194,15 +166,21 @@ const state = reactive({
TableColumn.new('remark', '备注'),
TableColumn.new('createTime', '创建时间').isTime(),
TableColumn.new('creator', '创建人'),
- TableColumn.new('action', '操作').isSlot().setMinWidth(100).fixedRight().alignCenter(),
+ TableColumn.new('action', '操作').isSlot().setMinWidth(120).fixedRight().alignCenter(),
],
total: 0,
data: [],
selectionData: [],
showMemDialog: {
+ queryConfig: [TableQuery.text('username', '用户名')],
+ columns: [
+ TableColumn.new('name', '姓名'),
+ TableColumn.new('username', '账号'),
+ TableColumn.new('createTime', '加入时间').isTime(),
+ TableColumn.new('creator', '分配者'),
+ TableColumn.new('action', '操作').isSlot().setMinWidth(80).fixedRight().alignCenter(),
+ ],
visible: false,
- chooseId: 0,
- chooseData: null,
query: {
pageSize: 10,
pageNum: 1,
@@ -211,7 +189,7 @@ const state = reactive({
},
members: {
list: [],
- total: null,
+ total: 0,
},
title: '',
addVisible: false,
@@ -304,19 +282,8 @@ const getAccount = (username: any) => {
}
};
-/**
- * 选中成员
- */
-const chooseMember = (item: any) => {
- if (!item) {
- return;
- }
- state.showMemDialog.chooseData = item;
- state.showMemDialog.chooseId = item.id;
-};
-
-const deleteMember = async () => {
- await tagApi.delTeamMem.request(state.showMemDialog.chooseData);
+const deleteMember = async (data: any) => {
+ await tagApi.delTeamMem.request(data);
ElMessage.success('移除成功');
// 重新赋值成员列表
setMemebers();
@@ -349,8 +316,6 @@ const addMember = async () => {
const cancelAddMember = () => {
state.showMemDialog.memForm = {} as any;
state.showMemDialog.addVisible = false;
- state.showMemDialog.chooseData = null;
- state.showMemDialog.chooseId = 0;
};
/********** 标签相关 ***********/
@@ -379,7 +344,7 @@ const saveTags = async () => {
closeTagDialog();
};
-const tagTreeNodeCheck = () => {
+const tagTreeNodeCheck = (data: any) => {
// const node = tagTreeRef.value.getNode(data.id);
// console.log(node);
// // state.showTagDialog.tagTreeTeams = [16]
diff --git a/mayfly_go_web/src/views/system/enums.ts b/mayfly_go_web/src/views/system/enums.ts
index 1d87fd35..1fc7e185 100644
--- a/mayfly_go_web/src/views/system/enums.ts
+++ b/mayfly_go_web/src/views/system/enums.ts
@@ -10,6 +10,11 @@ export const AccountStatusEnum = {
Disable: EnumValue.of(-1, '禁用').tagTypeDanger(),
};
+export const RoleStatusEnum = {
+ Enable: EnumValue.of(1, '正常').tagTypeSuccess(),
+ Disable: EnumValue.of(-1, '禁用').tagTypeDanger(),
+};
+
export const LogTypeEnum = {
Success: EnumValue.of(1, '成功').tagTypeSuccess(),
Error: EnumValue.of(2, '失败').tagTypeDanger(),
diff --git a/mayfly_go_web/src/views/system/role/RoleList.vue b/mayfly_go_web/src/views/system/role/RoleList.vue
index f0ec9e32..fcdf84c7 100755
--- a/mayfly_go_web/src/views/system/role/RoleList.vue
+++ b/mayfly_go_web/src/views/system/role/RoleList.vue
@@ -20,11 +20,6 @@
>
-
- 正常
- 禁用
-
-
菜单&权限
@@ -57,6 +52,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
import PageTable from '@/components/pagetable/PageTable.vue';
import { TableColumn, TableQuery } from '@/components/pagetable';
import { hasPerms } from '@/components/auth/auth';
+import { RoleStatusEnum } from '../enums';
const pageTableRef: any = ref(null);
@@ -72,7 +68,7 @@ const columns = ref([
TableColumn.new('name', '角色名称'),
TableColumn.new('code', '角色code'),
TableColumn.new('remark', '备注'),
- TableColumn.new('status', '状态').isSlot(),
+ TableColumn.new('status', '状态').typeTag(RoleStatusEnum),
TableColumn.new('creator', '创建账号'),
TableColumn.new('createTime', '创建时间').isTime(),
TableColumn.new('modifier', '更新账号'),