From 207076de7f2c7a73c66ad8c714c3f7d3ac71748d Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 05 Mar 2024 18:07:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/email/emailSendingHistory.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/system/email/emailSendingHistory.vue b/src/views/system/email/emailSendingHistory.vue
index 3ec4274..e269cf7 100644
--- a/src/views/system/email/emailSendingHistory.vue
+++ b/src/views/system/email/emailSendingHistory.vue
@@ -5,16 +5,12 @@
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
- <template slot-scope="{ row, size, index }" slot="menu">
- <el-button :size="size" type="text" icon="el-icon-circle-check" @click.stop="handleEnable(row)">复制
- </el-button>
- </template>
</avue-crud>
</basic-container>
</template>
<script>
-import { getList, getDetail, add, update, remove, enable, sendEmail } from "@/api/system/email"
+import { getMessageUserPage } from "@/api/system/email"
import { mapGetters } from "vuex"
export default {
@@ -38,19 +34,23 @@
border: true,
index: true,
viewBtn: false,
+ addBtn: false,
selection: true,
dialogClickModal: false,
- menuWidth: 350,
+ // menuWidth: 350,
+ menu: false,
column: [
{
- label: "主题",
- prop: "remark",
+ label: "标题",
+ prop: "title",
type: "input",
+ align: 'center'
},
{
label: "正文内容",
- prop: "remark",
+ prop: "content",
type: "input",
+ align: 'center'
},
]
},
@@ -209,7 +209,7 @@
},
onLoad (page, params = {}) {
this.loading = true
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ getMessageUserPage(page.currentPage, page.pageSize, Object.assign(params, {})).then(res => {
const data = res.data.data
this.page.total = data.total
this.data = data.records
--
Gitblit v1.9.3