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/smsIndex/index.vue | 64 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/src/views/operate/sms/smsIndex/index.vue b/src/views/operate/sms/smsIndex/index.vue
index 5b9e6ed..c8299ee 100644
--- a/src/views/operate/sms/smsIndex/index.vue
+++ b/src/views/operate/sms/smsIndex/index.vue
@@ -3,7 +3,6 @@
<header>
<div class="header-nav">
<span class="nav-left">鏁版嵁绛涢��</span>
- <span class="nav-right">楂樼骇鎼滅储</span>
</div>
<div class="header-content">
<div class="search">
@@ -13,12 +12,12 @@
<div class="message-status">
<span>鐭俊鍥炴墽:</span>
<el-select v-model="messageStatus" placeholder="璇烽�夋嫨">
- <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
+ <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.label">
</el-option>
</el-select>
</div>
<div class="find">
- <el-button type="primary" icon="el-icon-search" @click="handleSearch">鏌ヨ</el-button>
+ <el-button type="primary" icon="el-icon-search" @click="getTableData">鏌ヨ</el-button>
<el-button icon="el-icon-delete-solid" @click="handleReset">閲嶇疆</el-button>
</div>
</div>
@@ -27,7 +26,7 @@
<div class="mainContent">
<div class="main-nav">
<span>鏁版嵁鍒楄〃</span>
- <el-button type="primary" icon="el-icon-plus" @click="isShowDialog = true">娣诲姞</el-button>
+ <el-button class="button-addition" type="primary" icon="el-icon-plus" @click="isShowDialog = true">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
@@ -36,35 +35,32 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column label="ID" min-width="5">
+ <el-table-column label="ID" min-width="5" prop="id">
<template slot-scope="scope">{{ scope.row.id }}</template>
</el-table-column>
<el-table-column prop="head" label="鏍囬" min-width="10">
</el-table-column>
- <el-table-column prop="updateTime" label="鍙戦�佹椂闂�" min-width="10">
- <template slot-scope="scope">
- <span>{{changeTime(scope.row)}}</span>
- </template>
+ <el-table-column prop="createTime" label="鍙戦�佹椂闂�" min-width="10">
</el-table-column>
<el-table-column prop="targetFrom" label="鍙戦�佽处鍙�" min-width="15">
</el-table-column>
<el-table-column prop="status" label="鍙戝竷鐘舵��" min-width="5">
- <template slot-scope="scope">
- {{scope.row.status === 0 ? '鍙戦�佸け璐�' :'鍙戦�佹垚鍔�'}}
- </template>
+ <template slot-scope="scope">
+ <span>{{ statusList.find(item => item.value === scope.row.status).label }}</span>
+ </template>
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="15">
<template slot-scope="scope">
<div class="operation">
<el-link class="leftPx" icon="el-icon-delete-solid" :underline="false"
@click="handleDelete([scope.row.id])">鍒犻櫎</el-link>
- <el-link icon="el-icon-edit" class="leftPx" :underline="false" @click="handleEdit(scope.row)">閲嶆柊鍙戦��</el-link>
+ <el-link icon="el-icon-edit" class="leftPx" :underline="false" @click="resend(scope.row)">閲嶆柊鍙戦��</el-link>
</div>
</template>
</el-table-column>
</el-table>
<!-- 鏂板缓娑堟伅 -->
- <el-dialog title="鏂板缓娑堟伅" :visible.sync="isShowDialog" width="80%"
+ <el-dialog title="鏂板缓娑堟伅" :destroy-on-close="true" :key="dialogType" :visible.sync="isShowDialog" width="80%"
:before-close="handleConfirmClose">
<MyCreate @closeMyDialog="closeDialog" :type="dialogType"></MyCreate>
</el-dialog>
@@ -97,7 +93,7 @@
<script>
import helper from '@/utils/mydate'
import MyCreate from './createSms'
-import { getMessageList, deleteMessage } from "@/api/operate/messageManagement";
+import {getMessageList, deleteMessage, sendMessage} from "@/api/operate/messageManagement";
export default {
components: {
@@ -106,10 +102,8 @@
data() {
return {
tableData: [],
- context: "",
- dialogEdit:false,
+ context: null,
isShowDialog: false,
- dialogView: false,
totalNum: null,
pageSize: 10,
currentPage: 1,
@@ -137,7 +131,7 @@
}
],
tempList: [],
- messageStatus: 2,
+ messageStatus: '鍏ㄩ儴',
messageKind: '00',
statusList: [
{
@@ -178,19 +172,18 @@
this.getTableData();
},
methods: {
- // 鏌ヨ
- handleSearch(){
- this.getTableData();
- },
// 閲嶇疆
handleReset(){
-
+ this.context = null;
+ this.currentPage = 1;
+ this.messageStatus = '鍏ㄩ儴';
+ this.getTableData();
},
// 鍒犻櫎淇℃伅
handleDelete(ids) {
this.$confirm('纭鍒犻櫎?')
.then(() => {
- deleteMessage(ids)
+ deleteMessage({ ids: ids.join(',')})
.then(() => {
this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
this.getTableData();
@@ -200,7 +193,9 @@
},
getTableData() {
- getMessageList()
+ const respondResult = this.messageStatus === '鍏ㄩ儴' ? null : this.messageStatus;
+ getMessageList({ channelCode: '02', current: this.currentPage,
+ respondResult, pageSize: this.pageSize, head: this.context })
.then(({ records, total }) => {
this.tableData = records;
this.totalNum = total;
@@ -209,6 +204,19 @@
this.$message({ type: 'error', message: err });
})
},
+
+ resend(data) {
+ if (data.status === 1) {
+ return;
+ }
+ sendMessage(data)
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.getTableData();
+ })
+ .catch(err => this.$message.error(`${err}`))
+ },
+
// 鎵归噺涓嬫媺妗嗘搷浣�
async selectChange(list) {
if (this.tempList.length !== 0) {
@@ -245,7 +253,7 @@
this.$message({ type: 'error', message: err });
})
})
- .catch(err => { console.log(err) })
+ .catch(err => { })
},
// 琛ㄦ牸鐩戝惉
tableChange(list) {
@@ -280,7 +288,7 @@
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
- this.setTableData();
+ this.getTableData();
},
// 纭鍏抽棴寮圭獥
handleConfirmClose(done) {
--
Gitblit v1.8.0