From 7b6fdb3a893275ff82ba5c868287a1e12dcd75f1 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 27 Apr 2025 11:56:21 +0800
Subject: [PATCH] remove all semicolons
---
ruoyi-ui/src/views/system/dict/data.vue | 171 +++++++++++++++++++++++++++++----------------------------
1 files changed, 87 insertions(+), 84 deletions(-)
diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue
index 6d3fb41..bdc2a78 100644
--- a/ruoyi-ui/src/views/system/dict/data.vue
+++ b/ruoyi-ui/src/views/system/dict/data.vue
@@ -1,8 +1,8 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="字典名称" prop="dictType">
- <el-select v-model="queryParams.dictType" size="small">
+ <el-select v-model="queryParams.dictType">
<el-option
v-for="item in typeOptions"
:key="item.dictId"
@@ -16,17 +16,16 @@
v-model="queryParams.dictLabel"
placeholder="请输入字典标签"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
- <el-select v-model="queryParams.status" placeholder="数据状态" clearable size="small">
+ <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
<el-option
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
@@ -79,6 +78,15 @@
v-hasPermi="['system:dict:export']"
>导出</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-close"
+ size="mini"
+ @click="handleClose"
+ >关闭</el-button>
+ </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -87,15 +95,15 @@
<el-table-column label="字典编码" align="center" prop="dictCode" />
<el-table-column label="字典标签" align="center" prop="dictLabel">
<template slot-scope="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" />
<el-table-column label="字典排序" align="center" prop="dictSort" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
- <dict-tag :options="statusOptions" :value="scope.row.status"/>
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
@@ -155,7 +163,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>
@@ -163,10 +171,10 @@
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictValue"
- >{{dict.dictLabel}}</el-radio>
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.value"
+ >{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
@@ -182,16 +190,12 @@
</template>
<script>
-import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
-import { listType, getType } from "@/api/system/dict/type";
-// 字典标签组件（使用频繁可在全局挂载）
-import DictTag from '@/components/DictTag'
+import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data"
+import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type"
export default {
name: "Data",
- components: {
- DictTag
- },
+ dicts: ['sys_normal_disable'],
data() {
return {
// 遮罩层
@@ -241,16 +245,14 @@
label: "危险"
}
],
- // 状态数据字典
- statusOptions: [],
// 类型数据字典
typeOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
- dictName: undefined,
dictType: undefined,
+ dictLabel: undefined,
status: undefined
},
// 表单参数
@@ -267,44 +269,41 @@
{ required: true, message: "数据顺序不能为空", trigger: "blur" }
]
}
- };
+ }
},
created() {
- const dictId = this.$route.params && this.$route.params.dictId;
- this.getType(dictId);
- this.getTypeList();
- this.getDicts("sys_normal_disable").then(response => {
- this.statusOptions = response.data;
- });
+ const dictId = this.$route.params && this.$route.params.dictId
+ this.getType(dictId)
+ this.getTypeList()
},
methods: {
/** 查询字典类型详细 */
getType(dictId) {
getType(dictId).then(response => {
- this.queryParams.dictType = response.data.dictType;
- this.defaultDictType = response.data.dictType;
- this.getList();
- });
+ this.queryParams.dictType = response.data.dictType
+ this.defaultDictType = response.data.dictType
+ this.getList()
+ })
},
/** 查询字典类型列表 */
getTypeList() {
- listType().then(response => {
- this.typeOptions = response.rows;
- });
+ getDictOptionselect().then(response => {
+ this.typeOptions = response.data
+ })
},
/** 查询字典数据列表 */
getList() {
- this.loading = true;
+ this.loading = true
listData(this.queryParams).then(response => {
- this.dataList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
+ this.dataList = response.rows
+ this.total = response.total
+ this.loading = false
+ })
},
// 取消按钮
cancel() {
- this.open = false;
- this.reset();
+ this.open = false
+ this.reset()
},
// 表单重置
reset() {
@@ -317,26 +316,31 @@
dictSort: 0,
status: "0",
remark: undefined
- };
- this.resetForm("form");
+ }
+ this.resetForm("form")
},
/** 搜索按钮操作 */
handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
+ this.queryParams.pageNum = 1
+ this.getList()
+ },
+ /** 返回按钮操作 */
+ handleClose() {
+ const obj = { path: "/system/dict" }
+ this.$tab.closeOpenPage(obj)
},
/** 重置按钮操作 */
resetQuery() {
- this.resetForm("queryForm");
- this.queryParams.dictType = this.defaultDictType;
- this.handleQuery();
+ this.resetForm("queryForm")
+ this.queryParams.dictType = this.defaultDictType
+ this.handleQuery()
},
/** 新增按钮操作 */
handleAdd() {
- this.reset();
- this.open = true;
- this.title = "添加字典数据";
- this.form.dictType = this.queryParams.dictType;
+ this.reset()
+ this.open = true
+ this.title = "添加字典数据"
+ this.form.dictType = this.queryParams.dictType
},
// 多选框选中数据
handleSelectionChange(selection) {
@@ -346,13 +350,13 @@
},
/** 修改按钮操作 */
handleUpdate(row) {
- this.reset();
+ this.reset()
const dictCode = row.dictCode || this.ids
getData(dictCode).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "修改字典数据";
- });
+ this.form = response.data
+ this.open = true
+ this.title = "修改字典数据"
+ })
},
/** 提交按钮 */
submitForm: function() {
@@ -360,33 +364,32 @@
if (valid) {
if (this.form.dictCode != undefined) {
updateData(this.form).then(response => {
- this.msgSuccess("修改成功");
- this.open = false;
- this.getList();
- });
+ this.$store.dispatch('dict/removeDict', this.queryParams.dictType)
+ this.$modal.msgSuccess("修改成功")
+ this.open = false
+ this.getList()
+ })
} else {
addData(this.form).then(response => {
- this.msgSuccess("新增成功");
- this.open = false;
- this.getList();
- });
+ this.$store.dispatch('dict/removeDict', this.queryParams.dictType)
+ this.$modal.msgSuccess("新增成功")
+ this.open = false
+ this.getList()
+ })
}
}
- });
+ })
},
/** 删除按钮操作 */
handleDelete(row) {
- const dictCodes = row.dictCode || this.ids;
- this.$confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return delData(dictCodes);
- }).then(() => {
- this.getList();
- this.msgSuccess("删除成功");
- }).catch(() => {});
+ const dictCodes = row.dictCode || this.ids
+ this.$modal.confirm('是否确认删除字典编码为"' + dictCodes + '"的数据项？').then(function() {
+ return delData(dictCodes)
+ }).then(() => {
+ this.getList()
+ this.$modal.msgSuccess("删除成功")
+ this.$store.dispatch('dict/removeDict', this.queryParams.dictType)
+ }).catch(() => {})
},
/** 导出按钮操作 */
handleExport() {
@@ -395,5 +398,5 @@
}, `data_${new Date().getTime()}.xlsx`)
}
}
-};
+}
</script>
\ No newline at end of file
--
Gitblit v1.9.3