From 1ac7fb3108bc16afad227a3f700a73ec1eb1b3ef Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期三, 16 十一月 2022 17:06:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/sms/smsIndex/index.vue | 201 +++++++++++++------------------------------------
1 files changed, 54 insertions(+), 147 deletions(-)
diff --git a/src/views/operate/sms/smsIndex/index.vue b/src/views/operate/sms/smsIndex/index.vue
index e753649..bce5de8 100644
--- a/src/views/operate/sms/smsIndex/index.vue
+++ b/src/views/operate/sms/smsIndex/index.vue
@@ -11,16 +11,9 @@
<el-input placeholder="娑堟伅鏍囬" v-model="context"></el-input>
</div>
<div class="message-status">
- <span>娑堟伅鐘舵��:</span>
- <el-select v-model="messageStatus" placeholder="璇烽�夋嫨娑堟伅鐘舵��">
+ <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>
- </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>
@@ -34,7 +27,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 type="primary" icon="el-icon-plus" @click="isShowDialog = true">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
@@ -48,51 +41,33 @@
</el-table-column>
<el-table-column prop="head" label="鏍囬" min-width="10">
</el-table-column>
- <el-table-column prop="updateTime" label="淇敼鏃堕棿" min-width="10">
+ <el-table-column prop="updateTime" label="鍙戦�佹椂闂�" min-width="10">
<template slot-scope="scope">
<span>{{changeTime(scope.row)}}</span>
</template>
</el-table-column>
- <el-table-column prop="targetFrom" label="鍙戝竷浜哄憳" min-width="15">
- </el-table-column>
- <el-table-column prop="channelCode" label="娑堟伅鍒嗙被" min-width="10">
- <template slot-scope="scope">
- <span>{{scope.row.channelCode === '01' ? '绔欏唴淇�':scope.row.channelCode
- ==='02'?"閭欢":'鐭俊'}}</span>
- </template>
+ <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 ? '鏈彂甯�' :'宸插彂甯�'}}
+ {{scope.row.status === 0 ? '鍙戦�佸け璐�' :'鍙戦�佹垚鍔�'}}
</template>
</el-table-column>
<el-table-column prop="operation" label="鎿嶄綔" min-width="15">
<template slot-scope="scope">
<div class="operation">
- <el-link icon="el-icon-view" :underline="false" @click="handleView(scope.row)">鏌ョ湅</el-link>
- <el-link icon="el-icon-edit" class="leftPx" :underline="false" @click="handleEdit(scope.row)">缂栬緫</el-link>
<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>
</div>
</template>
</el-table-column>
</el-table>
<!-- 鏂板缓娑堟伅 -->
- <!-- <el-dialog title="鏂板缓娑堟伅" :visible.sync="dialogCreate" v-if="dialogCreate" width="80%"
+ <el-dialog title="鏂板缓娑堟伅" :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">
@@ -111,8 +86,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>
@@ -121,16 +95,20 @@
</div>
</template>
<script>
+import helper from '@/utils/mydate'
+import MyCreate from './createSms'
+import { getMessageList, deleteMessage } from "@/api/operate/messageManagement";
+
export default {
components: {
- // MyView, MyCreate,MyEdit
+ MyCreate
},
data() {
return {
tableData: [],
context: "",
dialogEdit:false,
- dialogCreate: false,
+ isShowDialog: false,
dialogView: false,
totalNum: null,
pageSize: 10,
@@ -167,11 +145,11 @@
value: 2,
},
{
- label: '鏈彂甯�',
+ label: '鍙戦�佸け璐�',
value: 0,
},
{
- label: '宸插彂甯�',
+ label: '鍙戦�佹垚鍔�',
value: 1,
}
],
@@ -192,93 +170,47 @@
id:'03',
columnName:'鐭俊',
}
- ]
+ ],
+ dialogType: ''
}
},
created() {
- const {setTableData} = this
- setTableData();
+ this.getTableData();
},
methods: {
// 鏌ヨ
handleSearch(){
- this.setTableData();
+ this.getTableData();
},
// 閲嶇疆
handleReset(){
},
- // 鏌ョ湅
- handleView(data){
- this.info = data;
- this.dialogView = true;
- },
- // 缂栬緫
- handleEdit(data){
- this.info = data;
- this.dialogEdit = true;
- },
// 鍒犻櫎淇℃伅
- 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)
+ .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
- },
- // 鑾峰彇娑堟伅鏁版嵁
- async getMessageList() {
- let arr = [];
- const { currentPage, pageSize,context,messageStatus,messageKind } = this;
- await this.$axios({
- method: 'post',
- url: 'sccg/message/list',
- data: {
- body: "",
- channelCode: messageKind === '00' ?'':messageKind,
- createUser: '',
- current: currentPage,
- head: context,
- messageType: "",
- pageSize: pageSize,
- randomCode: "",
- remark: "",
- sendTime: "",
- status: messageStatus === 2 ? '':messageStatus,
- targetFrom: "",
- targetTo: ""
- }
- })
- .then(res => {
- arr = res.data;
- })
- return arr;
+
+ getTableData() {
+ getMessageList()
+ .then(({ records, total }) => {
+ this.tableData = records;
+ this.totalNum = total;
+ })
+ .catch(err => {
+ this.$message({ type: 'error', message: err });
+ })
},
// 鎵归噺涓嬫媺妗嗘搷浣�
async selectChange(list) {
- console.log(this.tempList);
if (this.tempList.length !== 0) {
this.preMyIdx = list;
if (list === 3) {
@@ -305,23 +237,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) {
@@ -329,11 +253,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 }) {
@@ -351,39 +271,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();
- },
// 纭鍏抽棴寮圭獥
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();
}
}
}
@@ -396,7 +305,6 @@
header {
background-color: #09152f;
- border: 1pox solid #fff;
.header-nav {
line-height: 40px;
@@ -454,7 +362,6 @@
background-color: #09152f;
margin-top: 20px;
padding-bottom: 50px;
- border: 1pox solid #fff;
.el-link {
color: #4b9bb7;
--
Gitblit v1.8.0