From 03fdb1e0005d28b992e9c8dcd31debcf7a15a87d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 20 Jun 2024 11:34:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=99=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/agencyCategory/index.vue | 11 +++++--
 src/views/system/compare/index.vue        | 36 ++++++++++++++++-------
 src/views/system/config/index.vue         | 11 +++++--
 src/views/system/department/index.vue     | 11 +++++--
 src/views/system/notice/index.vue         | 12 ++++++--
 src/views/system/subdivision/index.vue    | 13 +++++---
 6 files changed, 71 insertions(+), 23 deletions(-)

diff --git a/src/views/system/agencyCategory/index.vue b/src/views/system/agencyCategory/index.vue
index 6d57a4a..7932595 100644
--- a/src/views/system/agencyCategory/index.vue
+++ b/src/views/system/agencyCategory/index.vue
@@ -89,8 +89,10 @@
         </el-table-column>
       </el-table>
     </div>
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
+      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
+    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" /> -->
 
     <!-- 添加或修改机构类别对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -221,6 +223,11 @@ export default {
     this.screenChange()
   },
   methods: {
+    updateCPage(index, size) {
+      this.queryParams.pageNum = index
+      this.queryParams.pageSize = size
+      this.getList();
+    },
     // 父级类别
     gettreelistitem() {
       agencyCategoryList().then((res) => {
diff --git a/src/views/system/compare/index.vue b/src/views/system/compare/index.vue
index fede218..5082846 100644
--- a/src/views/system/compare/index.vue
+++ b/src/views/system/compare/index.vue
@@ -90,9 +90,10 @@
         </el-table-column>
       </el-table>
     </div>
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
-
+    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @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="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
@@ -140,32 +141,32 @@
       </div>
     </el-dialog>
     <!-- 科室弹框 -->
-    <el-dialog title="" :visible.sync="innerVisibleshow" width="1000px" append-to-body
+    <el-dialog title="" :visible.sync="innerVisibleshow" width="800px" append-to-body
       :before-close="innerVisiblecancel">
       <el-form ref="queryForm" :model="informationqueryParams" :rules="rules" label-width="80px" :inline="true">
         <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">
+        <el-table-column label="请选择" width="150" align="center">
           <template slot-scope="scope">
             <el-button type="primary" style="width: 15px; height: 15px"
               v-if="form.departmentId == scope.row.departmentCode" circle @click="nurseclick(scope.row)"></el-button>
             <el-button v-else style="width: 15px; height: 15px" circle @click="nurseclick(scope.row)"></el-button>
           </template>
         </el-table-column>
-        <el-table-column property="departmentName" label="科室名称" align="center" :show-overflow-tooltip="true">
+        <el-table-column  property="departmentName" label="科室名称" align="center" :show-overflow-tooltip="true">
         </el-table-column>
       </el-table>
-      <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
-        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" />
+      <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" /> -->
+      <myPagination v-show="totaldepartment > 0" :total="totaldepartment" :pageSize="informationqueryParams.pageSize"
+        :indexFromWrap="informationqueryParams.pageNum" @updateCPage="updateCPagetwo"></myPagination>
     </el-dialog>
   </div>
 </template>
@@ -258,6 +259,16 @@ export default {
       // console.log(this.departmentName, "0000");
       this.innerVisibleshow = false;
     },
+    updateCPage(index, size) {
+      this.queryParams.pageNum = index
+      this.queryParams.pageSize = size
+      this.getList();
+    },
+    updateCPagetwo(index, size) {
+      this.informationqueryParams.pageNum = index
+      this.informationqueryParams.pageSize = size
+      this.informationInfoinfo();
+    },
     // 科室列表
     informationInfoinfo() {
       department(this.informationqueryParams).then((response) => {
@@ -403,3 +414,8 @@ export default {
   }
 };
 </script>
+<style scoped>
+::v-deep .el-dialog__body {
+  padding-bottom: 60px !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 17a696a..8a7989c 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -79,8 +79,10 @@
         </el-table-column>
       </el-table>
     </div>
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
+      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
+    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @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">
@@ -172,6 +174,11 @@ export default {
     this.screenChange()
   },
   methods: {
+    updateCPage(index, size) {
+      this.queryParams.pageNum = index
+      this.queryParams.pageSize = size
+      this.getList();
+    },
     /** 查询参数列表 */
     getList() {
       this.loading = true;
diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue
index 4dc05af..275495a 100644
--- a/src/views/system/department/index.vue
+++ b/src/views/system/department/index.vue
@@ -99,8 +99,10 @@
             </el-table-column>
           </el-table>
         </div>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize" @pagination="getList" />
+        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :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>
     <!-- 导入 -->
@@ -477,6 +479,11 @@ export default {
     this.infocompare();
   },
   methods: {
+    updateCPage(index, size) {
+      this.queryParams.pageNum = index
+      this.queryParams.pageSize = size
+      this.getList();
+    },
     optionsubdivision(e) {
       // this.form.subdivisionCategoryId = this.optionsubdivisionCategory.find(
       //   (e) => e.id == this.form.subdivisionCategoryId
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index b016d71..ef9b962 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -70,9 +70,10 @@
         </el-table-column>
       </el-table>
     </div>
-
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
+      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
+    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" /> -->
 
     <!-- 添加或修改公告对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="780px" append-to-body>
@@ -171,6 +172,11 @@ export default {
     this.screenChange()
   },
   methods: {
+    updateCPage(index, size) {
+      this.queryParams.pageNum = index
+      this.queryParams.pageSize = size
+      this.getList();
+    },
     /** 查询公告列表 */
     getList() {
       this.loading = true;
diff --git a/src/views/system/subdivision/index.vue b/src/views/system/subdivision/index.vue
index d907549..b4f873b 100644
--- a/src/views/system/subdivision/index.vue
+++ b/src/views/system/subdivision/index.vue
@@ -64,10 +64,10 @@
         </el-table-column>
       </el-table>
     </div>
-
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
-
+    <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @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="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
@@ -156,6 +156,11 @@ export default {
     this.getList();
   },
   methods: {
+    updateCPage(index, size) {
+      this.queryParams.pageNum = index
+      this.queryParams.pageSize = size
+      this.getList();
+    },
     /** 查询细分类别信息列表 */
     getList() {
       this.loading = true;