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 | 225 ++++++++++++++++++--------------------------------------
1 files changed, 73 insertions(+), 152 deletions(-)
diff --git a/src/views/operate/sms/smsIndex/index.vue b/src/views/operate/sms/smsIndex/index.vue
index f511252..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,19 +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="message-kind">
- <span>娑堟伅鍒嗙被:</span>
- <el-select v-model="messageKind" placeholder="璇烽�夋嫨娑堟伅鍒嗙被">
- <el-option v-for="item in kindList" :key="item.id" :label="item.columnName" :value="item.id">
- </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>
@@ -34,7 +26,7 @@
<div class="mainContent">
<div class="main-nav">
<span>鏁版嵁鍒楄〃</span>
- <el-button type="primary" icon="el-icon-plus" @click="dialogCreate = true">娣诲姞</el-button>
+ <el-button class="button-addition" type="primary" icon="el-icon-plus" @click="isShowDialog = true">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
@@ -43,49 +35,35 @@
@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="dialogCreate" v-if="dialogCreate" width="80%"
+ <el-dialog title="鏂板缓娑堟伅" :destroy-on-close="true" :key="dialogType" :visible.sync="isShowDialog" width="80%"
:before-close="handleConfirmClose">
- <MyCreate @closeMyDialog="closeDialog"></MyCreate>
- </el-dialog> -->
- <!-- 娑堟伅璇︽儏 -->
- <!-- <el-dialog title="娑堟伅璇︽儏" :visible.sync="dialogView" v-if="dialogView" width="45%"
- :before-close="handleClose">
- <MyView @closeDialog="closeDialog" :myinfo="info">></MyView>
- </el-dialog> -->
- <!-- 缂栬緫椤甸潰 -->
- <!-- <el-dialog title="缂栬緫娑堟伅" :visible.sync="dialogEdit" v-if="dialogEdit" width="80%"
- :before-close="handleClose">
- <MyEdit @closeDialog="closeDialog" :myDataRow="info"></MyEdit>
- </el-dialog> -->
- <!-- tools -->
+ <MyCreate @closeMyDialog="closeDialog" :type="dialogType"></MyCreate>
+ </el-dialog>
<div class="tools">
<div class="funs">
<div class="funsItem funs-sp">
@@ -104,8 +82,7 @@
</div>
<div class="pagination">
<el-pagination background :current-page="currentPage" layout="prev, pager, next"
- :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage"
- >
+ :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
</el-pagination>
</div>
</div>
@@ -115,17 +92,18 @@
</template>
<script>
import helper from '@/utils/mydate'
+import MyCreate from './createSms'
+import {getMessageList, deleteMessage, sendMessage} from "@/api/operate/messageManagement";
+
export default {
components: {
- // MyView, MyCreate,MyEdit
+ MyCreate
},
data() {
return {
tableData: [],
- context: "",
- dialogEdit:false,
- dialogCreate: false,
- dialogView: false,
+ context: null,
+ isShowDialog: false,
totalNum: null,
pageSize: 10,
currentPage: 1,
@@ -153,7 +131,7 @@
}
],
tempList: [],
- messageStatus: 2,
+ messageStatus: '鍏ㄩ儴',
messageKind: '00',
statusList: [
{
@@ -186,93 +164,61 @@
id:'03',
columnName:'鐭俊',
}
- ]
+ ],
+ dialogType: ''
}
},
created() {
- const {setTableData} = this
- setTableData();
+ this.getTableData();
},
methods: {
- // 鏌ヨ
- handleSearch(){
- this.setTableData();
- },
// 閲嶇疆
handleReset(){
-
- },
- // 鏌ョ湅
- handleView(data){
- this.info = data;
- this.dialogView = true;
- },
- // 缂栬緫
- handleEdit(data){
- this.info = data;
- this.dialogEdit = true;
+ this.context = null;
+ this.currentPage = 1;
+ this.messageStatus = '鍏ㄩ儴';
+ this.getTableData();
},
// 鍒犻櫎淇℃伅
- handleDelete(idarr) {
+ handleDelete(ids) {
this.$confirm('纭鍒犻櫎?')
- .then(_ => {
- this.$axios({
- method: 'post',
- url: 'sccg/message/delete?ids=' + idarr,
- })
- .then(res => {
- if (res.code === 200) {
- this.$message({
- type: 'success',
- message: '鍒犻櫎鎴愬姛',
- })
- this.setTableData();
- } else {
- this.$message({
- type: 'error',
- message: res.message
- })
- }
- })
+ .then(() => {
+ deleteMessage({ ids: ids.join(',')})
+ .then(() => {
+ this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
+ this.getTableData();
+ })
+ .catch(err => this.$message({ type: 'error', message: err }));
})
},
- // 璁剧疆琛ㄦ牸鏁版嵁
- async setTableData() {
- const arr = await this.getMessageList();
- this.tableData = arr.records;
- this.totalNum = arr.total
+
+ getTableData() {
+ 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;
+ })
+ .catch(err => {
+ this.$message({ type: 'error', message: err });
+ })
},
- // 鑾峰彇娑堟伅鏁版嵁
- async getMessageList() {
- let arr = [];
- const { currentPage, pageSize,context,messageStatus,messageKind } = this;
- await this.$axios({
- method: 'post',
- url: 'sccg/message/list',
- data: {
- body: "",
- channelCode: '03',
- createUser: '',
- current: currentPage,
- head: context,
- messageType: "",
- pageSize: pageSize,
- randomCode: "",
- remark: "",
- sendTime: "",
- status: messageStatus === 2 ? '':messageStatus,
- targetFrom: "",
- targetTo: ""
- }
- })
- .then(res => {
- arr = res.data;
- })
- return arr;
+
+ resend(data) {
+ if (data.status === 1) {
+ return;
+ }
+ sendMessage(data)
+ .then(() => {
+ this.$message.success('鎿嶄綔鎴愬姛');
+ this.getTableData();
+ })
+ .catch(err => this.$message.error(`${err}`))
},
+
// 鎵归噺涓嬫媺妗嗘搷浣�
async selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
this.preMyIdx = list;
if (list === 3) {
@@ -299,23 +245,15 @@
method: 'post',
url: 'sccg/role/updateStatusBatch?ids=' + idArr + '&status=' + flag,
})
- .then(res => {
- if (res.code === 200) {
- this.$message({
- type: 'success',
- message: '鏇存敼鐢ㄦ埛鐘舵�佹垚鍔�',
- })
- this.getUserList();
- } else {
- this.$message({
- type: 'error',
- message: res.message
- })
- }
- console.log(res);
+ .then(() => {
+ this.getTableData();
+ this.$message({ type: 'success', message: '鎿嶄綔鎴愬姛' });
+ })
+ .catch(err => {
+ this.$message({ type: 'error', message: err });
})
})
- .catch(err => { console.log(err) })
+ .catch(err => { })
},
// 琛ㄦ牸鐩戝惉
tableChange(list) {
@@ -323,11 +261,7 @@
list.forEach(item => {
this.tempList.push(item.id);
})
- if (list.length === this.tableData.length) {
- this.all = true;
- } else {
- this.all = false
- }
+ this.all = list.length === this.tableData.length;
},
// 淇敼鏃堕棿鏍煎紡
changeTime({ updateTime }) {
@@ -345,39 +279,28 @@
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
- if ((rowIndex + 1) % 2 == 0) {
+ if ((rowIndex + 1) % 2 === 0) {
return 'warning-row';
} else {
return 'success-row';
}
- return '';
},
// 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
changeCurrentPage(page) {
this.currentPage = page;
- this.setTableData();
- },
- // 鍏抽棴寮圭獥
- handleClose(done) {
- done();
+ this.getTableData();
},
// 纭鍏抽棴寮圭獥
handleConfirmClose(done) {
this.$confirm('纭鍏抽棴?')
- .then(_ => {
+ .then(()=> {
done();
- })
- .catch(err => {
- console.log(err);
})
},
// 鑷畾涔夊叧闂脊绐�
- closeDialog({ flag, index }) {
- this.dialogCreate = flag;
- this.dialogView = flag;
- if (index === 1) {
- this.setTableData();
- }
+ closeDialog() {
+ this.isShowDialog = false;
+ this.getTableData();
}
}
}
@@ -390,7 +313,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.header-nav {
line-height: 40px;
@@ -448,7 +370,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.el-link {
color: #4b9bb7;
--
Gitblit v1.8.0