diff --git a/src/views/data/dict/index.vue b/src/views/data/dict/index.vue index 3602fc9..e5a42e4 100644 --- a/src/views/data/dict/index.vue +++ b/src/views/data/dict/index.vue @@ -73,7 +73,6 @@ const fwbHeight = document.body.clientHeight - 395 //新建字典 const addDict = async () => { - dictId.value = 0 await nextTick(); editVisible.value = true }; diff --git a/src/views/system/user/columns.ts b/src/views/system/user/columns.ts index ca88cf2..6071780 100644 --- a/src/views/system/user/columns.ts +++ b/src/views/system/user/columns.ts @@ -37,13 +37,31 @@ export const columns = [ label: '性别', prop: 'gender', render(record) { + let typeText = '' + let color = '' + switch (record.row.gender) { + case 1: + typeText='男' + color='primary' + break; + case 2: + typeText='女' + color='danger' + break; + case 3: + typeText='保密' + color='warning' + break; + default: + break; + } return h( ElTag, { - type: record.row.gender === 1 ? 'success' : 'danger', + type: color, }, { - default: () => (record.row.gender === 1 ? '男' : '女'), + default: () => typeText, }, ); },