From 0615f6c8dddf1cff5368e85ce4bfa92c4deebe02 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期二, 29 十一月 2022 18:36:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/sms/smsTemplate/index.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/views/operate/sms/smsTemplate/index.vue b/src/views/operate/sms/smsTemplate/index.vue
index 1680a06..cd54a9b 100644
--- a/src/views/operate/sms/smsTemplate/index.vue
+++ b/src/views/operate/sms/smsTemplate/index.vue
@@ -26,7 +26,7 @@
<div class="mainContent">
<div class="main-nav">
<span>鏁版嵁鍒楄〃</span>
- <el-button type="primary" icon="el-icon-plus" @click="isShowDialog = true; dialogType = 'create'">娣诲姞</el-button>
+ <el-button class="button-addition" type="primary" icon="el-icon-plus" @click="isShowDialog = true; dialogType = 'create'">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
@@ -64,7 +64,8 @@
<!-- 鏂板缓娑堟伅 -->
<el-dialog :title="dialogType === 'view' ? '鏌ョ湅鐭俊妯℃澘' : '鏇存柊鐭俊妯℃澘'" :visible.sync="isShowDialog" width="80%"
:before-close="handleConfirmClose">
- <MyCreate v-if="isShowDialog" @closeMyDialog="handleConfirmClose" :dialogType="dialogType" :tableRowData="messageTemplateData"></MyCreate>
+ <MyCreate v-if="isShowDialog" @closeMyDialog="handleConfirmClose" @closeDialog="closeDialog"
+ :dialogType="dialogType" :tableRowData="messageTemplateData"></MyCreate>
</el-dialog>
<div class="tools">
<div class="funs">
@@ -181,6 +182,9 @@
},
// 閲嶇疆
handleReset(){
+ this.context="";
+ this.messageStatus=0;
+ this.getMessageList();
},
// 鏌ョ湅
handleView(data){
@@ -210,7 +214,7 @@
},
// 鑾峰彇娑堟伅鏁版嵁
getMessageList() {
- SMS.getSMSTemplateList({ current: this.currentPage, pageSize: this.pageSize, context: this.context, type: this.messageType })
+ SMS.getSMSTemplateList({ current: this.currentPage, pageSize: this.pageSize, title: this.context, type: this.messageStatus })
.then(({ records, total }) => {
this.tableData = records;
this.totalNum = total;
@@ -305,7 +309,10 @@
.then(() => {
done();
})
- }
+ },
+ closeDialog() {
+ this.isShowDialog = false;
+ }
}
}
</script>
@@ -547,7 +554,6 @@
&::v-deep .el-dialog__close {
width: 20px;
height: 20px;
- // color: #fff;
}
&::v-deep .el-dialog__body {
--
Gitblit v1.8.0