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

src/views/manage/crowdInfo/index.vue

@@ -118,10 +118,10 @@
         </el-table-column>
       </el-table>
     </div>
-
+    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" /> -->
-      @pagination="getList" />
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-
+      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
     <!-- 添加或修改人群信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="750px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
@@ -289,6 +289,11 @@ export default {
         this.loading = false;
       });
     },
+    updateCPage(index, size) {
+      this.queryParams.pageNum = index
+      this.queryParams.pageSize = size
+      this.getList();
+    },
     // 取消按钮
     cancel() {
       this.open = false;

src/views/manage/script/index.vue

@@ -182,13 +182,11 @@
         <el-form-item label="科室名称" prop="departmentName" label-width="120">
           <el-input v-model="informationqueryParams.departmentName" placeholder="请输入科室名称" clearable />
         </el-form-item>
-
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="informationInfoinfo">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylist">重置</el-button>
         </el-form-item>
       </el-form>
-
       <el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
@@ -209,13 +207,11 @@
         <el-form-item label="病种名称" prop="diseaseTypeName" label-width="120">
           <el-input v-model="querydisease.diseaseTypeName" placeholder="请输入病种名称" clearable />
         </el-form-item>
-
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="infodisease">搜索</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetdisease">重置</el-button>
         </el-form-item>
       </el-form>
-
       <el-table :data="listdisease" @cell-dblclick="nurseclickdisease" v-loading="loading">
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">

src/views/system/bank/index.vue

@@ -112,9 +112,10 @@
             </el-table-column>
           </el-table>
         </div>
-
+        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+      @pagination="getList" /> -->
-          :limit.sync="queryParams.pageSize" @pagination="getList" />
+        <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
+          :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
       </el-col>
     </el-row>
 
@@ -578,6 +579,11 @@ export default {
         `bank_${new Date().getTime()}.xlsx`
       );
     },
+    updateCPage(index, size) {
+      this.queryParams.pageNum = index
+      this.queryParams.pageSize = size
+      this.getList();
+    },
     // 获取表格最高高度
     getMaxTableHeight() {
       const windowInnerHeight = window.innerHeight // 屏幕可视高度