Merge remote-tracking branch 'origin/dev' into dev

src/views/system/internalMessage/index.vue

@@ -3,9 +3,9 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="站内信来源" prop="fromId">-->
-<!--        <el-input v-model="queryParams.fromId" placeholder="请输入站内信来源" clearable @keyup.enter.native="handleQuery"/>-->
-<!--      </el-form-item>-->
+     <el-form-item label="来源" prop="fromId">
+     <el-input v-model="queryParams.fromId" placeholder="请输入站内信来源" clearable @keyup.enter.native="handleQuery"/>
+    </el-form-item>
       <el-form-item label="发送时间">
         <el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
@@ -45,7 +45,7 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="" align="center" prop="id" />
-<!--      <el-table-column label="站内信来源" align="center" prop="fromId" />-->
+      <el-table-column label="来源" align="center" prop="fromId" />
       <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.sendTime) }}</span>
@@ -73,15 +73,15 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
                 @pagination="getList"/>
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-<!--        <el-form-item label="站内信来源ID" prop="fromId">-->
-<!--          <el-input v-model="form.fromId" placeholder="请输入站内信来源" />-->
-<!--        </el-form-item>-->
+        <el-form-item label="来源" prop="fromId">
+         <el-input v-model="form.fromId" placeholder="请输入站内信来源" />
+       </el-form-item>
         <el-form-item label="发送时间" prop="sendTime">
           <el-date-picker clearable v-model="form.sendTime" type="date" value-format="yyyy-MM-dd" placeholder="选择发送时间" />
         </el-form-item>
@@ -135,8 +135,8 @@ export default {
       dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
-        pageNo: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         fromId: null,
         title: null,
         content: null,
@@ -249,8 +249,8 @@ export default {
     handleExport() {
       // 处理查询参数
       let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
+      params.page = undefined;
+      params.rows = undefined;
       this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime');
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出

src/views/system/myInternalMessage/index.vue

@@ -3,7 +3,7 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="站内信来源" prop="fromId">
+      <el-form-item label="来源" prop="fromId">
         <el-input v-model="queryParams.fromId" placeholder="请输入站内信来源" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="发送时间">
@@ -39,7 +39,7 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="" align="center" prop="id" />
-      <el-table-column label="站内信来源" align="center" prop="fromId" />
+      <el-table-column label="来源" align="center" prop="fromId" />
       <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.sendTime) }}</span>