From adb31b71f8c3490b923c8cb6f12b74be6ca3a02d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 01 九月 2021 09:40:36 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/views/system/config/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue
index 56654c8..04384bb 100644
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@@ -112,7 +112,11 @@
<el-table-column label="鍙傛暟鍚嶇О" align="center" prop="configName" :show-overflow-tooltip="true" />
<el-table-column label="鍙傛暟閿悕" align="center" prop="configKey" :show-overflow-tooltip="true" />
<el-table-column label="鍙傛暟閿��" align="center" prop="configValue" />
- <el-table-column label="绯荤粺鍐呯疆" align="center" prop="configType" :formatter="typeFormat" />
+ <el-table-column label="绯荤粺鍐呯疆" align="center" prop="configType">
+ <template slot-scope="scope">
+ <dict-tag :options="typeOptions" :value="scope.row.configType"/>
+ </template>
+ </el-table-column>
<el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
@@ -251,10 +255,6 @@
this.loading = false;
}
);
- },
- // 鍙傛暟绯荤粺鍐呯疆瀛楀吀缈昏瘧
- typeFormat(row, column) {
- return this.selectDictLabel(this.typeOptions, row.configType);
},
// 鍙栨秷鎸夐挳
cancel() {
--
Gitblit v1.9.3