From 2f18d0d7094b10e169b77a0ea741bd101dbbf1f8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期六, 18 九月 2021 16:01:52 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/views/system/config/index.vue | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/ruoyi-ui/src/views/system/config/index.vue b/ruoyi-ui/src/views/system/config/index.vue
index 69d8564..e2cfb1a 100644
--- a/ruoyi-ui/src/views/system/config/index.vue
+++ b/ruoyi-ui/src/views/system/config/index.vue
@@ -24,10 +24,10 @@
<el-form-item label="绯荤粺鍐呯疆" prop="configType">
<el-select v-model="queryParams.configType" placeholder="绯荤粺鍐呯疆" clearable size="small">
<el-option
- v-for="dict in typeOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
@@ -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="dict.type.sys_yes_no" :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">
@@ -162,10 +166,10 @@
<el-form-item label="绯荤粺鍐呯疆" prop="configType">
<el-radio-group v-model="form.configType">
<el-radio
- v-for="dict in typeOptions"
- :key="dict.dictValue"
- :label="dict.dictValue"
- >{{dict.dictLabel}}</el-radio>
+ v-for="dict in dict.type.sys_yes_no"
+ :key="dict.value"
+ :label="dict.value"
+ >{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
@@ -182,10 +186,10 @@
<script>
import { listConfig, getConfig, delConfig, addConfig, updateConfig, refreshCache } from "@/api/system/config";
-import { downLoadExcel } from "@/utils/download";
export default {
name: "Config",
+ dicts: ['sys_yes_no'],
data() {
return {
// 閬僵灞�
@@ -208,8 +212,6 @@
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
- // 绫诲瀷鏁版嵁瀛楀吀
- typeOptions: [],
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏌ヨ鍙傛暟
@@ -238,9 +240,6 @@
},
created() {
this.getList();
- this.getDicts("sys_yes_no").then(response => {
- this.typeOptions = response.data;
- });
},
methods: {
/** 鏌ヨ鍙傛暟鍒楄〃 */
@@ -252,10 +251,6 @@
this.loading = false;
}
);
- },
- // 鍙傛暟绯荤粺鍐呯疆瀛楀吀缈昏瘧
- typeFormat(row, column) {
- return this.selectDictLabel(this.typeOptions, row.configType);
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -343,7 +338,7 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- downLoadExcel('/system/config/export', this.queryParams);
+ this.downLoadExcel('/system/config/export', this.queryParams);
},
/** 鍒锋柊缂撳瓨鎸夐挳鎿嶄綔 */
handleRefreshCache() {
--
Gitblit v1.9.3