From 2aabdb83ad578b0c9213a18d1fb1257349e2bc3f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 17 二月 2023 10:47:32 +0800
Subject: [PATCH] fix 修复 管理员登出动态租户未清理导致二次无法登录
---
ruoyi-ui/src/views/system/notice/index.vue | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue
index 7b65e9e..9022a91 100644
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -1,26 +1,24 @@
<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="noticeTitle">
<el-input
v-model="queryParams.noticeTitle"
placeholder="璇疯緭鍏ュ叕鍛婃爣棰�"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎿嶄綔浜哄憳" prop="createBy">
+ <el-form-item label="鎿嶄綔浜哄憳" prop="createByName">
<el-input
- v-model="queryParams.createBy"
+ v-model="queryParams.createByName"
placeholder="璇疯緭鍏ユ搷浣滀汉鍛�"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="绫诲瀷" prop="noticeType">
- <el-select v-model="queryParams.noticeType" placeholder="鍏憡绫诲瀷" clearable size="small">
+ <el-select v-model="queryParams.noticeType" placeholder="鍏憡绫诲瀷" clearable>
<el-option
v-for="dict in dict.type.sys_notice_type"
:key="dict.value"
@@ -73,7 +71,7 @@
<el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="搴忓彿" align="center" prop="noticeId" width="100" />
+ <el-table-column label="搴忓彿" align="center" prop="noticeId" width="100" v-if="false" />
<el-table-column
label="鍏憡鏍囬"
align="center"
@@ -90,7 +88,7 @@
<dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
</template>
</el-table-column>
- <el-table-column label="鍒涘缓鑰�" align="center" prop="createBy" width="100" />
+ <el-table-column label="鍒涘缓鑰�" align="center" prop="createByName" width="100" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -135,7 +133,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鍏憡绫诲瀷" prop="noticeType">
- <el-select v-model="form.noticeType" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.noticeType" placeholder="璇烽�夋嫨鍏憡绫诲瀷">
<el-option
v-for="dict in dict.type.sys_notice_type"
:key="dict.value"
@@ -202,7 +200,7 @@
pageNum: 1,
pageSize: 10,
noticeTitle: undefined,
- createBy: undefined,
+ createByName: undefined,
status: undefined
},
// 琛ㄥ崟鍙傛暟
@@ -284,14 +282,15 @@
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.noticeId != undefined) {
+ console.log(this.$refs['form'])
updateNotice(this.form).then(response => {
- this.msgSuccess("淇敼鎴愬姛");
+ this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
addNotice(this.form).then(response => {
- this.msgSuccess("鏂板鎴愬姛");
+ this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
});
@@ -302,17 +301,13 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const noticeIds = row.noticeId || this.ids
- this.$confirm('鏄惁纭鍒犻櫎鍏憡缂栧彿涓�"' + noticeIds + '"鐨勬暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(function() {
- return delNotice(noticeIds);
- }).then(() => {
- this.getList();
- this.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ this.$modal.confirm('鏄惁纭鍒犻櫎鍏憡缂栧彿涓�"' + noticeIds + '"鐨勬暟鎹」锛�').then(function() {
+ return delNotice(noticeIds);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
}
}
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3