From 1b45f0a1cd3461c827e4018026d2cfd05c1b62bd Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 14 九月 2023 16:54:43 +0800
Subject: [PATCH] 修复自定义字典样式不生效的问题(I81F03)
---
src/views/system/dict/data.vue | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index aa52991..6928bd1 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -1,8 +1,8 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
<el-form-item label="瀛楀吀鍚嶇О" prop="dictType">
- <el-select v-model="queryParams.dictType">
+ <el-select v-model="queryParams.dictType" style="width: 200px">
<el-option
v-for="item in typeOptions"
:key="item.dictId"
@@ -16,11 +16,12 @@
v-model="queryParams.dictLabel"
placeholder="璇疯緭鍏ュ瓧鍏告爣绛�"
clearable
+ style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
- <el-select v-model="queryParams.status" placeholder="鏁版嵁鐘舵��" clearable>
+ <el-select v-model="queryParams.status" placeholder="鏁版嵁鐘舵��" clearable style="width: 200px">
<el-option
v-for="dict in sys_normal_disable"
:key="dict.value"
@@ -90,8 +91,8 @@
<el-table-column label="瀛楀吀缂栫爜" align="center" prop="dictCode" />
<el-table-column label="瀛楀吀鏍囩" align="center" prop="dictLabel">
<template #default="scope">
- <span v-if="scope.row.listClass == '' || scope.row.listClass == 'default'">{{ scope.row.dictLabel }}</span>
- <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass">{{ scope.row.dictLabel }}</el-tag>
+ <span v-if="(scope.row.listClass == '' || scope.row.listClass == 'default') && (scope.row.cssClass == '' || scope.row.cssClass == null)">{{ scope.row.dictLabel }}</span>
+ <el-tag v-else :type="scope.row.listClass == 'primary' ? '' : scope.row.listClass" :class="scope.row.cssClass">{{ scope.row.dictLabel }}</el-tag>
</template>
</el-table-column>
<el-table-column label="瀛楀吀閿��" align="center" prop="dictValue" />
@@ -107,20 +108,10 @@
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="150" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
<template #default="scope">
- <el-button
- type="text"
- icon="Edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:dict:edit']"
- >淇敼</el-button>
- <el-button
- type="text"
- icon="Delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:dict:remove']"
- >鍒犻櫎</el-button>
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">淇敼</el-button>
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -156,7 +147,7 @@
<el-option
v-for="item in listClassOptions"
:key="item.value"
- :label="item.label"
+ :label="item.label + '(' + item.value + ')'"
:value="item.value"
></el-option>
</el-select>
@@ -185,6 +176,7 @@
</template>
<script setup name="Data">
+import useDictStore from '@/store/modules/dict'
import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
@@ -319,12 +311,14 @@
if (valid) {
if (form.value.dictCode != undefined) {
updateData(form.value).then(response => {
+ useDictStore().removeDict(queryParams.value.dictType);
proxy.$modal.msgSuccess("淇敼鎴愬姛");
open.value = false;
getList();
});
} else {
addData(form.value).then(response => {
+ useDictStore().removeDict(queryParams.value.dictType);
proxy.$modal.msgSuccess("鏂板鎴愬姛");
open.value = false;
getList();
@@ -341,6 +335,7 @@
}).then(() => {
getList();
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ useDictStore().removeDict(queryParams.value.dictType);
}).catch(() => {});
}
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3