From 71cfadcd79468058c75fd356faf2d1fb52f79deb Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期四, 05 一月 2023 09:13:11 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/message/myIndex/index.vue | 147 ++++++++++++++++++++++++++-----------------------
1 files changed, 78 insertions(+), 69 deletions(-)
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index 87b011c..d74344d 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -24,8 +24,9 @@
</el-select>
</div>
<div class="search">
- <span>鍒涘缓鏃堕棿:</span>
- <el-date-picker style="width: 200px" type="datetimerange" v-model="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+ <span>鍒涘缓鏃堕棿:</span>
+ <el-date-picker style="width: 200px" type="datetimerange" v-model="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</div>
<div class="find">
<el-button type="primary" icon="el-icon-search" @click="handleSearch">鏌ヨ</el-button>
@@ -37,13 +38,13 @@
<div class="mainContent">
<div class="main-nav">
<span>鏁版嵁鍒楄〃</span>
- <el-button class="button-addition" type="primary" icon="el-icon-plus" @click="handleOpera(null, 'create')">娣诲姞</el-button>
+ <el-button class="button-addition" type="primary" icon="el-icon-plus"
+ @click="handleOpera(null, 'create')">娣诲姞</el-button>
</div>
<!-- 鏁版嵁灞曠ず -->
<el-table ref="multipleTable"
- :header-cell-style="{background:'white','font-weight':'650','line-height':'45px'}"
- :data="tableData" style="width: 100%" :row-class-name="tableRowClassName"
- @selection-change="tableChange">
+ :header-cell-style="{ background: 'white', 'font-weight': '650', 'line-height': '45px' }" :data="tableData"
+ style="width: 100%" :row-class-name="tableRowClassName" @selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
<el-table-column label="ID" min-width="5">
@@ -53,20 +54,22 @@
</el-table-column>
<el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="10">
</el-table-column>
- <el-table-column prop="createUser" label="鍙戝竷浜哄憳" min-width="15">
+ <el-table-column prop="targetFrom" label="鍙戝竷浜哄憳" min-width="15">
</el-table-column>
<el-table-column prop="messageTypeName" label="娑堟伅鏍忕洰" min-width="10">
</el-table-column>
<el-table-column prop="status" label="鍙戝竷鐘舵��" min-width="5">
- <template v-if="scope.row.status" slot-scope="scope">
- {{scope.row.status === 0 ? '鏈彂甯�' :'宸插彂甯�'}}
+ <template slot-scope="scope">
+ {{ 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="handleOpera(scope.row, 'view')">鏌ョ湅</el-link>
- <el-link icon="el-icon-edit" class="leftPx" :underline="false" @click="handleOpera(scope.row, 'update')">缂栬緫</el-link>
+ <el-link icon="el-icon-view" :underline="false"
+ @click="handleOpera(scope.row, 'view')">鏌ョ湅</el-link>
+ <el-link icon="el-icon-edit" class="leftPx" :underline="false"
+ @click="handleOpera(scope.row, 'update')">缂栬緫</el-link>
<el-link class="leftPx" icon="el-icon-delete-solid" :underline="false"
@click="handleDelete([scope.row.id])">鍒犻櫎</el-link>
</div>
@@ -74,8 +77,10 @@
</el-table-column>
</el-table>
<!-- 鏂板缓娑堟伅 -->
- <el-dialog :destroy-on-close="true" :key="dialogType" :title="getDialogTitle" :visible.sync="isShowDialog" width="80%">
- <my-edit v-if="isShowDialog" @closeMyDialog="closeDialog" :type="dialogType" :myDataRow="tableRowData"></my-edit>
+ <el-dialog :destroy-on-close="true" :key="dialogType" :title="getDialogTitle"
+ :visible.sync="isShowDialog" width="80%">
+ <my-edit v-if="isShowDialog" @closeMyDialog="closeDialog" :type="dialogType"
+ :myDataRow="tableRowData"></my-edit>
</el-dialog>
<!-- tools -->
<div class="tools">
@@ -112,19 +117,19 @@
export default {
components: { MyView, MyEdit },
computed: {
- getDialogTitle() {
- if (this.dialogType === 'create') {
- return '鍒涘缓';
- }
+ getDialogTitle() {
+ if (this.dialogType === 'create') {
+ return '鍒涘缓';
+ }
- if (this.dialogType === 'update') {
- return '鏇存柊';
- }
+ if (this.dialogType === 'update') {
+ return '鏇存柊';
+ }
- if (this.dialogType === 'view') {
- return '鏌ョ湅';
+ if (this.dialogType === 'view') {
+ return '鏌ョ湅';
+ }
}
- }
},
data() {
return {
@@ -180,44 +185,44 @@
],
typeList: [
{
- id:'00',
- columnName:'鍏ㄩ儴',
+ id: '00',
+ columnName: '鍏ㄩ儴',
},
{
- id:'01',
- columnName:'绔欏唴淇�',
+ id: '01',
+ columnName: '绔欏唴淇�',
},
{
- id:'03',
- columnName:'閭欢',
+ id: '03',
+ columnName: '閭欢',
},
{
- id:'02',
- columnName:'鐭俊',
+ id: '02',
+ columnName: '鐭俊',
}
]
}
},
created() {
- this.getMessageList();
+ this.getMessageList();
},
methods: {
// 鏌ヨ
- handleSearch(){
+ handleSearch() {
this.getMessageList();
},
// 閲嶇疆
- handleReset(){
- this.messageStatus = 2;
- this.messageType = '00';
- this.context = '';
- this.getMessageList();
+ handleReset() {
+ this.messageStatus = 2;
+ this.messageType = '00';
+ this.context = '';
+ this.getMessageList();
},
// 鏌ョ湅
- handleOpera(data, type){
+ handleOpera(data, type) {
this.tableRowData = data;
this.dialogType = type;
this.isShowDialog = true;
@@ -227,36 +232,36 @@
handleDelete(idarr) {
this.$confirm('纭鍒犻櫎?')
.then(() => {
- deleteMessage({ ids: idarr.join(',') })
- .then(() => {
- this.getMessageList();
- this.$message.success('鎿嶄綔鎴愬姛');
- })
- .catch(err => { this.$message({ type: 'error', message: err }) });
+ deleteMessage({ ids: idarr.join(',') })
+ .then(() => {
+ this.getMessageList();
+ this.$message.success('鎿嶄綔鎴愬姛');
+ })
+ .catch(err => { this.$message({ type: 'error', message: err }) });
})
},
// 鑾峰彇娑堟伅鏁版嵁
getMessageList() {
- const messageParam = {
- current: this.currentPage,
- pageSize: this.pageSize,
- channelCode: this.messageType === '00' ? null : this.messageType,
- status: this.messageStatus === 2 ? null : this.messageStatus,
- head: this.context,
- startTime: this.datetime ? this.datetime[0] : null,
- endTime: this.datetime ? this.datetime[1] : null
- }
+ const messageParam = {
+ current: this.currentPage,
+ pageSize: this.pageSize,
+ channelCode: this.messageType === '00' ? null : this.messageType,
+ status: this.messageStatus === 2 ? null : this.messageStatus,
+ head: this.context,
+ startTime: this.datetime ? this.datetime[0] : null,
+ endTime: this.datetime ? this.datetime[1] : null
+ }
- getMessageList(messageParam)
- .then(({ records, total ,size}) => {
- this.tableData = records;
- this.totalNum = total;
- this.pageSize=size;
- })
- .catch(err => {
- this.$message({ type: 'error', message: err });
- });
+ getMessageList(messageParam)
+ .then(({ records, total, size }) => {
+ this.tableData = records;
+ this.totalNum = total;
+ this.pageSize = size;
+ })
+ .catch(err => {
+ this.$message({ type: 'error', message: err });
+ });
},
// 鎵归噺涓嬫媺妗嗘搷浣�
@@ -303,7 +308,7 @@
}
})
})
- .catch(err => { })
+ .catch(err => { })
},
// 琛ㄦ牸鐩戝惉
@@ -343,8 +348,8 @@
// 鑷畾涔夊叧闂脊绐�
closeDialog() {
- this.isShowDialog = false;
- this.getMessageList();
+ this.isShowDialog = false;
+ this.getMessageList();
}
}
}
@@ -377,12 +382,15 @@
display: flex;
justify-content: space-between;
align-items: center;
+
span {
flex: 1;
}
+
.el-input {
flex: 2;
color: #1d3f57;
+
&::v-deep .el-input__inner {
//background-color: #09152f;
//border: 1px solid #17324c;
@@ -588,8 +596,9 @@
&::v-deep .el-dialog__body {
padding: 0;
}
- :deep(.el-range-input) {
- //background-color: #09152f;
- }
+
+ :deep(.el-range-input) {
+ //background-color: #09152f;
+ }
}
</style>
--
Gitblit v1.8.0