From 0c9e6566ac342748632e146fbe78872267c53bb8 Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期五, 25 十一月 2022 15:24:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/operate/message/myIndex/index.vue | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index c9bcf54..5f644da 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -10,19 +10,23 @@
<span>杈撳叆鏌ヨ:</span>
<el-input placeholder="娑堟伅鏍囬" v-model="context"></el-input>
</div>
- <div class="message-status">
+ <div class="search">
<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">
+ <div class="search">
<span>娑堟伅鍒嗙被:</span>
<el-select v-model="messageType" placeholder="璇烽�夋嫨娑堟伅鍒嗙被">
<el-option v-for="item in typeList" :key="item.id" :label="item.columnName" :value="item.id">
</el-option>
</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>
</div>
<div class="find">
<el-button type="primary" icon="el-icon-search" @click="handleSearch">鏌ヨ</el-button>
@@ -52,10 +56,10 @@
</el-table-column>
<el-table-column prop="createUser" label="鍙戝竷浜哄憳" min-width="15">
</el-table-column>
- <el-table-column prop="messageTypeName" label="娑堟伅鍒嗙被" min-width="10">
+ <el-table-column prop="messageTypeName" label="娑堟伅鏍忕洰" min-width="10">
</el-table-column>
<el-table-column prop="status" label="鍙戝竷鐘舵��" min-width="5">
- <template slot-scope="scope">
+ <template v-if="scope.row.status" slot-scope="scope">
{{scope.row.status === 0 ? '鏈彂甯�' :'宸插彂甯�'}}
</template>
</el-table-column>
@@ -72,7 +76,7 @@
</el-table>
<!-- 鏂板缓娑堟伅 -->
<el-dialog :destroy-on-close="true" :key="dialogType" :title="getDialogTitle" :visible.sync="isShowDialog" width="80%">
- <my-edit @closeMyDialog="closeDialog" :type="dialogType" :myDataRow="tableRowData"></my-edit>
+ <my-edit v-if="isShowDialog" @closeMyDialog="closeDialog" :type="dialogType" :myDataRow="tableRowData"></my-edit>
</el-dialog>
<!-- tools -->
<div class="tools">
@@ -144,6 +148,7 @@
unsame: false,
myIdx: 0,
preMyIdx: 0,
+ datetime: null,
options: [
{
value: 0,
@@ -190,11 +195,11 @@
columnName:'绔欏唴淇�',
},
{
- id:'02',
+ id:'03',
columnName:'閭欢',
},
{
- id:'03',
+ id:'02',
columnName:'鐭俊',
}
]
@@ -243,9 +248,11 @@
const messageParam = {
current: this.currentPage,
size: this.pageSize,
- channelCode: this.messageType,
- status: this.messageStatus,
- head: this.context
+ 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 }) => {
@@ -375,11 +382,10 @@
justify-content: space-between;
align-items: center;
- .search,
- .message-status,
- .message-kind {
+ .search {
display: flex;
- justify-content: flex-start;
+ justify-content: space-between;
+ align-items: center;
span {
flex: 1;
@@ -595,5 +601,8 @@
&::v-deep .el-dialog__body {
padding: 0;
}
+ :deep(.el-range-input) {
+ background-color: #09152f;
+ }
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0