From f979c8991929e0e8372f86b34537172d77c3739e Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 14 十二月 2022 14:36:11 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/operate/message/myIndex/index.vue | 76 ++++++++++++++++++--------------------
1 files changed, 36 insertions(+), 40 deletions(-)
diff --git a/src/views/operate/message/myIndex/index.vue b/src/views/operate/message/myIndex/index.vue
index d5b811c..9663276 100644
--- a/src/views/operate/message/myIndex/index.vue
+++ b/src/views/operate/message/myIndex/index.vue
@@ -3,26 +3,29 @@
<header>
<div class="header-nav">
<span class="nav-left">鏁版嵁绛涢��</span>
- <span class="nav-right" @click="showMoreParamsDialog">楂樼骇鎼滅储</span>
</div>
<div class="header-content">
<div class="search">
<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>
@@ -34,7 +37,7 @@
<div class="mainContent">
<div class="main-nav">
<span>鏁版嵁鍒楄〃</span>
- <el-button 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"
@@ -48,14 +51,14 @@
</el-table-column>
<el-table-column prop="head" label="鏍囬" min-width="10">
</el-table-column>
- <el-table-column prop="createTime" label="淇敼鏃堕棿" min-width="10">
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="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>
@@ -98,12 +101,6 @@
</div>
</div>
</div>
-
- <el-dialog
- title="楂樼骇鍙傛暟"
- :visible.sync="isShowMoreParams"
- width="30%">
- </el-dialog>
</main>
</div>
</template>
@@ -144,20 +141,21 @@
unsame: false,
myIdx: 0,
preMyIdx: 0,
+ datetime: null,
options: [
{
value: 0,
label: '鎵归噺鎿嶄綔',
disabled: true,
},
- {
- value: 1,
- label: '鎵归噺鍚敤',
- },
- {
- value: 2,
- label: '鎵归噺绂佺敤',
- },
+ // {
+ // value: 1,
+ // label: '鎵归噺鍚敤',
+ // },
+ // {
+ // value: 2,
+ // label: '鎵归噺绂佺敤',
+ // },
{
value: 3,
label: '鎵归噺鍒犻櫎',
@@ -190,11 +188,11 @@
columnName:'绔欏唴淇�',
},
{
- id:'02',
+ id:'03',
columnName:'閭欢',
},
{
- id:'03',
+ id:'02',
columnName:'鐭俊',
}
]
@@ -242,15 +240,19 @@
getMessageList() {
const messageParam = {
current: this.currentPage,
- size: this.pageSize,
- channelCode: this.messageType,
- status: this.messageStatus,
- head: this.context
+ 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 }) => {
+ .then(({ records, total ,size}) => {
this.tableData = records;
this.totalNum = total;
+ this.pageSize=size;
})
.catch(err => {
this.$message({ type: 'error', message: err });
@@ -339,10 +341,6 @@
this.getMessageList();
},
- showMoreParamsDialog() {
- this.isShowMoreParams = true;
- },
-
// 鑷畾涔夊叧闂脊绐�
closeDialog() {
this.isShowDialog = false;
@@ -375,20 +373,16 @@
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;
}
-
.el-input {
flex: 2;
color: #1d3f57;
-
&::v-deep .el-input__inner {
background-color: #09152f;
border: 1px solid #17324c;
@@ -589,11 +583,13 @@
&::v-deep .el-dialog__close {
width: 20px;
height: 20px;
- // color: #fff;
}
&::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