From a5c170fa2abfbd308a2e98afae90f60cd44276e4 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 08 二月 2020 17:05:46 +0800
Subject: [PATCH] 修改同一页面el-upload和Editor时不显示问题。
---
ruoyi-ui/src/views/system/notice/index.vue | 85 ++++++++++++++++++++++++++++++++++--------
1 files changed, 69 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue
index 6aa32bd..404bec3 100644
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
- <el-form :inline="true" label-width="68px">
- <el-form-item label="鍏憡鏍囬">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+ <el-form-item label="鍏憡鏍囬" prop="noticeTitle">
<el-input
v-model="queryParams.noticeTitle"
placeholder="璇疯緭鍏ュ叕鍛婃爣棰�"
@@ -10,7 +10,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎿嶄綔浜哄憳">
+ <el-form-item label="鎿嶄綔浜哄憳" prop="createBy">
<el-input
v-model="queryParams.createBy"
placeholder="璇疯緭鍏ユ搷浣滀汉鍛�"
@@ -19,7 +19,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="绫诲瀷">
+ <el-form-item label="绫诲瀷" prop="noticeType">
<el-select v-model="queryParams.noticeType" placeholder="鍏憡绫诲瀷" clearable size="small">
<el-option
v-for="dict in typeOptions"
@@ -31,11 +31,44 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:notice:add']">鏂板</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
- <el-table v-loading="loading" :data="noticeList">
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['system:notice:add']"
+ >鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="success"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleUpdate"
+ v-hasPermi="['system:notice:edit']"
+ >淇敼</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['system:notice:remove']"
+ >鍒犻櫎</el-button>
+ </el-col>
+ </el-row>
+
+ <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="鍏憡鏍囬"
@@ -60,15 +93,15 @@
<el-table-column label="鍒涘缓鑰�" align="center" prop="createBy" width="100" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="100">
<template slot-scope="scope">
- <span>{{ dateFormat(scope.row.createTime, 'yyyy-MM-dd') }}</span>
+ <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:notice:edit']"
>淇敼</el-button>
@@ -125,7 +158,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="鍐呭">
- <Editor v-model="form.noticeContent"/>
+ <Editor v-model="form.noticeContent" />
</el-form-item>
</el-col>
</el-row>
@@ -139,10 +172,11 @@
</template>
<script>
-import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice";
+import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/system/notice";
import Editor from '@/components/Editor';
export default {
+ name: "Notice",
components: {
Editor
},
@@ -150,6 +184,12 @@
return {
// 閬僵灞�
loading: true,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
// 鎬绘潯鏁�
total: 0,
// 鍏憡琛ㄦ牸鏁版嵁
@@ -231,6 +271,17 @@
this.queryParams.pageNum = 1;
this.getList();
},
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.noticeId)
+ this.single = selection.length!=1
+ this.multiple = !selection.length
+ },
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
@@ -240,7 +291,8 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
- getNotice(row.noticeId).then(response => {
+ const noticeId = row.noticeId || this.ids
+ getNotice(noticeId).then(response => {
this.form = response.data;
this.open = true;
this.title = "淇敼鍏憡";
@@ -276,12 +328,13 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
- this.$confirm('鏄惁纭鍒犻櫎鍏憡鏍囬涓�"' + row.noticeTitle + '"鐨勬暟鎹」?', "璀﹀憡", {
+ const noticeIds = row.noticeId || this.ids
+ this.$confirm('鏄惁纭鍒犻櫎鍏憡缂栧彿涓�"' + noticeIds + '"鐨勬暟鎹」?', "璀﹀憡", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
}).then(function() {
- return delNotice(row.noticeId);
+ return delNotice(noticeIds);
}).then(() => {
this.getList();
this.msgSuccess("鍒犻櫎鎴愬姛");
--
Gitblit v1.9.3