Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

zhanghua

2022-12-14 f979c8991929e0e8372f86b34537172d77c3739e

 src/views/operate/message/myIndex/index.vue

@@ -3,7 +3,6 @@
        <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">
@@ -25,7 +24,7 @@
                    </el-select>
                </div>
                <div class="search">
                  <span>修改时间:</span>
                  <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">
@@ -38,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"
@@ -52,7 +51,7 @@
                    </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>
@@ -102,12 +101,6 @@
                    </div>
                </div>
            </div>

            <el-dialog
                title="高级参数"
                :visible.sync="isShowMoreParams"
                width="30%">
            </el-dialog>
        </main>
    </div>
</template>
@@ -155,14 +148,14 @@
                    label: '批量操作',
                    disabled: true,
                },
                {
                    value: 1,
                    label: '批量启用',
                },
                {
                    value: 2,
                    label: '批量禁用',
                },
                // {
                //     value: 1,
                //     label: '批量启用',
                // },
                // {
                //     value: 2,
                //     label: '批量禁用',
                // },
                {
                    value: 3,
                    label: '批量删除',
@@ -247,17 +240,19 @@
        getMessageList() {
          const messageParam = {
            current: this.currentPage,
            size: this.pageSize,
            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 });
@@ -346,10 +341,6 @@
            this.getMessageList();
        },

        showMoreParamsDialog() {
          this.isShowMoreParams = true;
        },

        // 自定义关闭弹窗
        closeDialog() {
          this.isShowDialog = false;
@@ -386,15 +377,12 @@
                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;
@@ -595,7 +583,6 @@
    &::v-deep .el-dialog__close {
        width: 20px;
        height: 20px;
        // color: #fff;
    }

    &::v-deep .el-dialog__body {