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

# Conflicts:
#	src/views/system/departmentDisease/index.vue

src/views/operationInfo/operationInfo/index.vue

@@ -60,8 +60,10 @@
             </el-table-column>
           </el-table>
         </div>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          :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-col>
     </el-row>
     <!-- 添加或修改手术信息对话框 -->
@@ -132,8 +134,10 @@
         <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"
+      <!-- <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
-        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" class="pag"/>
+        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" /> -->
+      <myPagination v-show="totaldepartment > 0" :total="totaldepartment" :pageSize="informationqueryParams.pageSize"
+        :indexFromWrap="informationqueryParams.pageNum" @updateCPage="updateCPagetwo"></myPagination>
     </el-dialog>
   </div>
 </template>
@@ -489,6 +493,16 @@ export default {
         ...this.queryParams
       }, `operationInfo_${new Date().getTime()}.xlsx`)
     },
+    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();
+    },
     // 获取表格最高高度
     getMaxTableHeight() {
       const windowInnerHeight = window.innerHeight // 屏幕可视高度
@@ -516,12 +530,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.pag{
+::v-deep .el-dialog__body {
-  top: 13px;
+  padding-bottom: 60px !important;
-    position: relative;
-    left: 61%;
-  
 }
+
 ::v-deep .el-input-number .el-input__inner {
   text-align: left;
 }

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"
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-      @pagination="getList" />
+      :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) => {

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 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="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
@@ -146,26 +147,26 @@
         <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"
+      <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" />
+      @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>

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"
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-      @pagination="getList" />
+      :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;

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"
+        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize" @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>
     <!-- 导入 -->
@@ -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

src/views/system/departmentDisease/index.vue

@@ -1,23 +1,13 @@
 <template>
   <div class="app-container" ref="layout">
     <el-row :gutter="20">
-      <el-col :span="5" :xs="24" style="height: calc(100vh - 124px)">
+      <el-col :span="5" :xs="24" style="height:calc(100vh - 124px);">
         <div class="left" ref="box">
           <div class="name">科室名称</div>
           <div>
-            <el-input
+            <el-input v-model="name" placeholder="请输入科室名称" clearable @keyup.enter.native="handleQuery" />
-              v-model="name"
-              placeholder="请输入科室名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
           </div>
-          <div
+          <div class="listitem" v-for="(item, index) in DepartmentoList" :key="index" @click="itemdata(item)">
-            class="listitem"
-            v-for="(item, index) in DepartmentoList"
-            :key="index"
-            @click="itemdata(item)"
-          >
             <div :class="itemname == item.id ? 'allactive' : 'all'">
               {{ item.departmentName }}
             </div>
@@ -27,14 +17,8 @@
       </el-col>
       <el-col :span="19" :xs="24">
         <div ref="topform" class="form">
-          <el-form
+          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-            :model="queryParams"
+            label-width="68px">
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="68px"
-          >
             <!-- <el-form-item label="所属科室id" prop="departmentId">
         <el-input
           v-model="queryParams.departmentId"
@@ -52,13 +36,8 @@
         />
       </el-form-item> -->
             <el-form-item label="病种名称" prop="diseaseTypeName">
-              <el-input
+              <el-input maxlength="50" v-model="queryParams.diseaseTypeName" placeholder="请输入病种名称" clearable
-                maxlength="50"
+                @keyup.enter.native="handleQuery" />
-                v-model="queryParams.diseaseTypeName"
-                placeholder="请输入病种名称"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
             </el-form-item>
             <!-- <el-form-item label="病种代码" prop="diseaseTypeCode">
         <el-input
@@ -85,80 +64,35 @@
         />
       </el-form-item> -->
             <el-form-item>
-              <el-button
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                type="primary"
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                icon="el-icon-search"
-                size="mini"
-                @click="handleQuery"
-                >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-              >
             </el-form-item>
           </el-form>
         </div>
         <div ref="mb8" class="mb8">
           <el-row :gutter="10" class="">
             <el-col :span="1.5">
-              <el-button
+              <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                type="primary"
+                v-hasPermi="['system:departmentDisease:add']">新增</el-button>
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['system:departmentDisease:add']"
-                >新增</el-button
-              >
             </el-col>
             <el-col :span="1.5">
-              <el-button
+              <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-                type="success"
+                v-hasPermi="['system:departmentDisease:edit']">修改</el-button>
-                plain
-                icon="el-icon-edit"
-                size="mini"
-                :disabled="single"
-                @click="handleUpdate"
-                v-hasPermi="['system:departmentDisease:edit']"
-                >修改</el-button
-              >
             </el-col>
             <el-col :span="1.5">
-              <el-button
+              <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-                type="danger"
+                @click="handleDelete" v-hasPermi="['system:departmentDisease:remove']">删除</el-button>
-                plain
-                icon="el-icon-delete"
-                size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="['system:departmentDisease:remove']"
-                >删除</el-button
-              >
             </el-col>
             <el-col :span="1.5">
-              <el-button
+              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-                type="warning"
+                v-hasPermi="['system:departmentDisease:export']">导出</el-button>
-                plain
-                icon="el-icon-download"
-                size="mini"
-                @click="handleExport"
-                v-hasPermi="['system:departmentDisease:export']"
-                >导出</el-button
-              >
             </el-col>
-            <right-toolbar
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-              :showSearch.sync="showSearch"
-              @queryTable="getList"
-            ></right-toolbar>
           </el-row>
         </div>
         <div ref="table">
-          <el-table
+          <el-table :max-height="maxTableHeight" v-loading="loading" :data="departmentDiseaseList"
-            :max-height="maxTableHeight"
+            @selection-change="handleSelectionChange">
-            v-loading="loading"
-            :data="departmentDiseaseList"
-            @selection-change="handleSelectionChange"
-          >
             <el-table-column type="selection" width="55" align="center" />
             <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
             <!-- <el-table-column
@@ -166,88 +100,42 @@
             align="center"
             prop="departmentId"
           /> -->
-            <el-table-column
+            <el-table-column label="所属科室名称" align="center" prop="departmentName" />
-              label="所属科室名称"
+            <el-table-column label="病种名称" align="center" prop="diseaseTypeName" />
-              align="center"
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              prop="departmentName"
-            />
-            <el-table-column
-              label="病种名称"
-              align="center"
-              prop="diseaseTypeName"
-            />
-            <el-table-column
-              label="操作"
-              align="center"
-              class-name="small-padding fixed-width"
-            >
               <template slot-scope="scope">
-                <el-button
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                  size="mini"
+                  v-hasPermi="['system:departmentDisease:edit']">修改</el-button>
-                  type="text"
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                  icon="el-icon-edit"
+                  v-hasPermi="['system:departmentDisease:remove']">删除</el-button>
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:departmentDisease:edit']"
-                  >修改</el-button
-                >
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:departmentDisease:remove']"
-                  >删除</el-button
-                >
               </template>
             </el-table-column>
           </el-table>
         </div>
-
+        <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        <pagination
+      @pagination="getList" /> -->
-          v-show="total > 0"
+        <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-          :total="total"
+          :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
       </el-col>
     </el-row>
     <!-- 添加或修改科室病种信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="100px"
-        :inline="true"
-      >
         <el-form-item label="所属科室" prop="departmentId">
-          <el-button
+          <el-button type="" v-if="form.departmentName == '请选择科室'" @click="clickinnerVisible()" style="
-            type=""
-            v-if="form.departmentName == '请选择科室'"
-            @click="clickinnerVisible()"
-            style="
               width: 250px;
               text-align: left;
               height: 36px;
               color: #c0c4cc;
               overflow: hidden;
-            "
+            ">{{ form.departmentName }}</el-button>
-            >{{ form.departmentName }}</el-button
+          <el-button @click="clickinnerVisible()" type="" v-else style="
-          >
-          <el-button
-            @click="clickinnerVisible()"
-            type=""
-            v-else
-            style="
               width: 250px;
               text-align: left;
               height: 36px;
               padding-left: -10px;
               overflow: hidden;
-            "
+            ">{{ form.departmentName }}</el-button>
-            >{{ form.departmentName }}</el-button
-          >
         </el-form-item>
         <!-- <el-form-item label="所属科室" prop="departmentId">
 
@@ -257,32 +145,18 @@
           <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" />
         </el-form-item> -->
         <el-form-item label="病种名称" prop="diseaseTypeName">
-          <el-input
+          <el-input style="width: 250px" v-model="form.diseaseTypeName" placeholder="请输入病种名称" />
-            style="width: 250px"
-            v-model="form.diseaseTypeName"
-            placeholder="请输入病种名称"
-          />
         </el-form-item>
         <!-- <el-form-item label="病种代码" prop="diseaseTypeCode">
           <el-input v-model="form.diseaseTypeCode" placeholder="请输入病种代码" />
         </el-form-item> -->
         <el-form-item label="对应诊断信息" prop="diagnosisInfo">
-          <el-input
+          <el-input type="textarea" maxlength="300" style="width: 610px" v-model="form.diagnosisInfo"
-            type="textarea"
+            placeholder="请输入对应诊断信息" />
-            maxlength="300"
-            style="width: 610px"
-            v-model="form.diagnosisInfo"
-            placeholder="请输入对应诊断信息"
-          />
         </el-form-item>
         <el-form-item label="病种概述" prop="diseaseTypeRemark ">
-          <el-input
+          <el-input type="textarea" maxlength="200" style="width: 610px" v-model="form.diseaseTypeRemark"
-            type="textarea"
+            placeholder="请输入病种概述" />
-            maxlength="200"
-            style="width: 610px"
-            v-model="form.diseaseTypeRemark"
-            placeholder="请输入病种概述"
-          />
         </el-form-item>
 
         <!-- <el-button
@@ -303,24 +177,10 @@
       </div>
     </el-dialog>
     <!-- 导入 -->
-    <el-dialog
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      :title="upload.title"
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url"
-      :visible.sync="upload.open"
+        :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
-      width="400px"
+        :auto-upload="false" drag>
-      append-to-body
-    >
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">
           将文件拖到此处，或
@@ -328,13 +188,8 @@
         </div>
         <div class="el-upload__tip text-center" slot="tip">
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
-            type="primary"
+            @click="importTemplate">下载模板</el-link>
-            :underline="false"
-            style="font-size: 12px; vertical-align: baseline"
-            @click="importTemplate"
-            >下载模板</el-link
-          >
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -343,83 +198,34 @@
       </div>
     </el-dialog>
     <!-- 科室弹框 -->
-    <el-dialog
+    <el-dialog title="" :visible.sync="innerVisibleshow" width="1000px" append-to-body
-      title=""
+      :before-close="innerVisiblecancel">
-      :visible.sync="innerVisibleshow"
+      <el-form ref="queryForm" :model="informationqueryParams" :rules="rules" label-width="80px" :inline="true">
-      width="1000px"
-      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
+          <el-input v-model="informationqueryParams.departmentName" placeholder="请输入科室名称" clearable />
-            v-model="informationqueryParams.departmentName"
-            placeholder="请输入科室名称"
-            clearable
-          />
         </el-form-item>
 
         <el-form-item>
-          <el-button
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="informationInfoinfo">搜索</el-button>
-            type="primary"
+          <el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylist">重置</el-button>
-            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
+      <el-table :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
-        :data="infolist"
+        <el-table-column label="请选择" width="150" align="center">
-        @cell-dblclick="nurseclick"
-        v-loading="loading"
-      >
-        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="primary" style="width: 15px; height: 15px" v-if="form.departmentId == scope.row.id" circle
-              type="primary"
+              @click="nurseclick(scope.row)"></el-button>
-              style="width: 15px; height: 15px"
+            <el-button v-else style="width: 15px; height: 15px" circle @click="nurseclick(scope.row)"></el-button>
-              v-if="form.departmentId == scope.row.id"
-              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
+        <el-table-column property="departmentName" label="科室名称" align="center" :show-overflow-tooltip="true">
-          property="departmentName"
-          label="科室名称"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
         </el-table-column>
       </el-table>
-      <pagination
+      <!-- <pagination v-show="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
-        v-show="totaldepartment > 0"
+        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" /> -->
-        :total="totaldepartment"
+      <myPagination v-show="totaldepartment > 0" :total="totaldepartment" :pageSize="informationqueryParams.pageSize"
-        :page.sync="informationqueryParams.pageNum"
+        :indexFromWrap="informationqueryParams.pageNum" @updateCPage="updateCPagetwo"></myPagination>
-        :limit.sync="informationqueryParams.pageSize"
-        @pagination="informationInfoinfo"
-        class="pag"
-      />
     </el-dialog>
   </div>
 </template>
@@ -767,6 +573,16 @@ export default {
         `科室病种信息_${new Date().getTime()}.xlsx`
       );
     },
+    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();
+    },
     // 获取表格最高高度
     getMaxTableHeight() {
       const windowInnerHeight = window.innerHeight // 屏幕可视高度
@@ -794,11 +610,6 @@ export default {
 };
 </script>
 <style lang="scss">
-.pag {
-  top: 13px;
-  position: relative;
-  left: 61%;
-}
 .left {
   height: calc(100vh - 119px);
   // width: 30%;
@@ -847,7 +658,12 @@ export default {
   top: -11px;
 }
 </style>
+
 <style lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-bottom: 60px !important;
+}
+
 .app-container {
   padding: 20px 0 0 20px !important;
 }
@@ -856,4 +672,3 @@ export default {
   height: 100% !important;
 }
 </style>
-

src/views/system/notice/index.vue

@@ -70,9 +70,10 @@
         </el-table-column>
       </el-table>
     </div>
-
+    <myPagination v-show="total > 0" :total="total" :pageSize="queryParams.pageSize"
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      :indexFromWrap="queryParams.pageNum" @updateCPage="updateCPage"></myPagination>
-      @pagination="getList" />
+    <!-- <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;

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 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="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;