From 6e5d7a6dab441eaa6d4ebca8cb8fc6fb2919d4e2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 14 Nov 2022 11:34:59 +0800
Subject: [PATCH] 升级druid到最新版本1.2.14
---
ruoyi-ui/src/views/system/post/index.vue | 66 +++++++++++++++------------------
1 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/ruoyi-ui/src/views/system/post/index.vue b/ruoyi-ui/src/views/system/post/index.vue
index 061ea61..03a6b56 100644
--- a/ruoyi-ui/src/views/system/post/index.vue
+++ b/ruoyi-ui/src/views/system/post/index.vue
@@ -1,12 +1,11 @@
<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="postCode">
<el-input
v-model="queryParams.postCode"
placeholder="请输入岗位编码"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -15,22 +14,21 @@
v-model="queryParams.postName"
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>
<el-form-item>
- <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@@ -39,6 +37,7 @@
<el-col :span="1.5">
<el-button
type="primary"
+ plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
@@ -48,6 +47,7 @@
<el-col :span="1.5">
<el-button
type="success"
+ plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@@ -58,6 +58,7 @@
<el-col :span="1.5">
<el-button
type="danger"
+ plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@@ -68,6 +69,7 @@
<el-col :span="1.5">
<el-button
type="warning"
+ plain
icon="el-icon-download"
size="mini"
@click="handleExport"
@@ -83,7 +85,11 @@
<el-table-column label="岗位编码" align="center" prop="postCode" />
<el-table-column label="岗位名称" align="center" prop="postName" />
<el-table-column label="岗位排序" align="center" prop="postSort" />
- <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
+ <el-table-column label="状态" align="center" prop="status">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+ </template>
+ </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
@@ -108,7 +114,7 @@
</template>
</el-table-column>
</el-table>
-
+
<pagination
v-show="total>0"
:total="total"
@@ -132,10 +138,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">
@@ -155,6 +161,7 @@
export default {
name: "Post",
+ dicts: ['sys_normal_disable'],
data() {
return {
// 遮罩层
@@ -175,8 +182,6 @@
title: "",
// 是否显示弹出层
open: false,
- // 状态数据字典
- statusOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -203,9 +208,6 @@
},
created() {
this.getList();
- this.getDicts("sys_normal_disable").then(response => {
- this.statusOptions = response.data;
- });
},
methods: {
/** 查询岗位列表 */
@@ -216,10 +218,6 @@
this.total = response.total;
this.loading = false;
});
- },
- // 岗位状态字典翻译
- statusFormat(row, column) {
- return this.selectDictLabel(this.statusOptions, row.status);
},
// 取消按钮
cancel() {
@@ -276,13 +274,13 @@
if (valid) {
if (this.form.postId != undefined) {
updatePost(this.form).then(response => {
- this.msgSuccess("修改成功");
+ this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addPost(this.form).then(response => {
- this.msgSuccess("新增成功");
+ this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
@@ -293,16 +291,12 @@
/** 删除按钮操作 */
handleDelete(row) {
const postIds = row.postId || this.ids;
- this.$confirm('是否确认删除岗位编号为"' + postIds + '"的数据项?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return delPost(postIds);
- }).then(() => {
- this.getList();
- this.msgSuccess("删除成功");
- })
+ this.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？').then(function() {
+ return delPost(postIds);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("删除成功");
+ }).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
--
Gitblit v1.9.3