From 5a703cfae0dfeda754614ed3a65f9db4ec9316e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 13 Jun 2024 15:34:39 +0800
Subject: [PATCH] xg

---
 src/assets/styles/index.scss                 |  10 +-
 src/assets/styles/sidebar.scss               |   4 +-
 src/assets/styles/xinelu.scss                |   2 +
 src/components/Pagination/index.vue          |  22 +-
 src/layout/index.vue                         |  91 ++-
 src/views/system/agency/index.vue            | 388 +++-------
 src/views/system/department/index.vue        |  84 +--
 src/views/system/departmentDisease/index.vue | 413 +++--------
 src/views/system/menu/index.vue              | 139 +---
 src/views/system/user/index.vue              | 728 +++++--------------
 10 files changed, 499 insertions(+), 1382 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 96095ef..588671a 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -121,9 +121,15 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 20px;
+  height: calc(100vh - 84px);
+  display: flex;
+  flex-wrap: wrap;
+  padding: 20px 0 20px 20px;
+  flex-direction: column;
+  justify-content: space-between;
 }
 
+
 .components-container {
   margin: 30px 50px;
   position: relative;
@@ -188,4 +194,4 @@ aside {
 
 .multiselect--active {
   z-index: 1000 !important;
-}
+}
\ No newline at end of file
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index ed308b8..dd4b6d8 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,7 +1,9 @@
 #app {
 
   .main-container {
-    min-height: 100%;
+    // min-height: 100%;
+    height: 100vh;
+    overflow: hidden;
     transition: margin-left .28s;
     margin-left: $base-sidebar-width;
     position: relative;
diff --git a/src/assets/styles/xinelu.scss b/src/assets/styles/xinelu.scss
index cc48faa..8ebe03a 100644
--- a/src/assets/styles/xinelu.scss
+++ b/src/assets/styles/xinelu.scss
@@ -23,6 +23,8 @@
 	margin-bottom: 5px;
 }
 .mb8 {
+	flex: 1;
+	margin-right: 20px !important;
 	margin-bottom: 8px;
 }
 .ml5 {
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 56f5a6b..0966bdb 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -1,17 +1,8 @@
 <template>
-  <div :class="{'hidden':hidden}" class="pagination-container">
-    <el-pagination
-      :background="background"
-      :current-page.sync="currentPage"
-      :page-size.sync="pageSize"
-      :layout="layout"
-      :page-sizes="pageSizes"
-      :pager-count="pagerCount"
-      :total="total"
-      v-bind="$attrs"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
+  <div :class="{ 'hidden': hidden }" class="pagination-container">
+    <el-pagination :background="background" :current-page.sync="currentPage" :page-size.sync="pageSize" :layout="layout"
+      :page-sizes="pageSizes" :pager-count="pagerCount" :total="total" v-bind="$attrs" @size-change="handleSizeChange"
+      @current-change="handleCurrentChange" />
   </div>
 </template>
 
@@ -106,8 +97,11 @@ export default {
 <style scoped>
 .pagination-container {
   background: #fff;
-  padding: 32px 16px;
+  padding: 20px 0 0 !important;
+  margin: 0 20px 0 0 !important;
+  flex: 1;
 }
+
 .pagination-container.hidden {
   display: none;
 }
diff --git a/src/layout/index.vue b/src/layout/index.vue
index f048657..d2ec797 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
-    <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
+  <div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
+    <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <sidebar v-if="!sidebar.hide" class="sidebar-container" />
-    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
-      <div :class="{'fixed-header':fixedHeader}">
+    <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
+      <div :class="{ 'fixed-header': fixedHeader }">
         <navbar />
         <tags-view v-if="needTagsView" />
       </div>
@@ -63,49 +63,62 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/assets/styles/mixin.scss";
-  @import "~@/assets/styles/variables.scss";
+@import "~@/assets/styles/mixin.scss";
+@import "~@/assets/styles/variables.scss";
 
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
+::v-deep .el-table {
+  overflow-y: scroll;
+  flex: 20;
+}
 
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
+::v-deep .el-table::before {
+  display: none !important;
+}
 
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
+::v-deep .el-form {
+  flex: 1;
+}
 
-  .fixed-header {
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
+
+  &.mobile.openSidebar {
     position: fixed;
     top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$base-sidebar-width});
-    transition: width 0.28s;
   }
+}
 
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px);
-  }
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
 
-  .sidebarHide .fixed-header {
-    width: 100%;
-  }
+.fixed-header {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 9;
+  width: calc(100% - #{$base-sidebar-width});
+  transition: width 0.28s;
+}
 
-  .mobile .fixed-header {
-    width: 100%;
-  }
+.hideSidebar .fixed-header {
+  width: calc(100% - 54px);
+}
+
+.sidebarHide .fixed-header {
+  width: 100%;
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}
 </style>
diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue
index 5dd4f89..94f5923 100644
--- a/src/views/system/agency/index.vue
+++ b/src/views/system/agency/index.vue
@@ -2,37 +2,16 @@
   <div class="app-container">
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:agency:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['system:agency:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-hasPermi="['system:person:importStationPerson']"
-          >导入</el-button
-        >
+        <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+          v-hasPermi="['system:person:importStationPerson']">导入</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          @click="handleUpdate"
-          v-hasPermi="['system:agency:edit']"
-          >编辑</el-button
-        >
+        <el-button type="success" plain icon="el-icon-edit" size="mini" @click="handleUpdate"
+          v-hasPermi="['system:agency:edit']">编辑</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -57,10 +36,7 @@
           >导出</el-button
         >
       </el-col> -->
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <el-row :gutter="20">
       <!--部门数据-->
@@ -76,36 +52,27 @@
           />
         </div> -->
         <div class="head-container">
-          <el-tree
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="true"
-            :filter-node-method="filterNode"
-            ref="tree"
-            highlight-current
-            node-key="id"
-            @node-click="handleNodeClick"
-            :render-content="renderContent"
-          />
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="true"
+            :filter-node-method="filterNode" ref="tree" highlight-current node-key="id" @node-click="handleNodeClick"
+            :render-content="renderContent" />
         </div>
       </el-col>
       <el-col :span="18" :xs="24">
         <el-descriptions title="机构信息">
           <el-descriptions-item label="机构名称">{{
-            agencyList.agencyName
-          }}</el-descriptions-item>
+      agencyList.agencyName
+    }}</el-descriptions-item>
           <el-descriptions-item label="机构简介">{{
-            agencyList.agencyRemark
-          }}</el-descriptions-item>
+        agencyList.agencyRemark
+      }}</el-descriptions-item>
           <el-descriptions-item label="机构状态">
             {{ agencyList.agencyStatus == "ON" ? "启用" : "" }}
             {{
-              agencyList.agencyStatus == "OFF" ? "禁用" : ""
-            }}</el-descriptions-item
-          >
+      agencyList.agencyStatus == "OFF" ? "禁用" : ""
+    }}</el-descriptions-item>
           <el-descriptions-item label="机构代码">{{
-            agencyList.agencyCode
-          }}</el-descriptions-item>
+        agencyList.agencyCode
+      }}</el-descriptions-item>
           <el-descriptions-item label="上级机构">
             {{ agencyList.parentAgencyName }}
           </el-descriptions-item>
@@ -124,38 +91,36 @@
             {{ agencyList.nodeType == "PHARNAGY" ? "药店" : "" }} -->
             {{ agencyList.nodeType == "CAMPUS" ? "院区" : "" }}
             {{
-              agencyList.nodeType == "HOSPITAL" ? "医院" : ""
-            }}</el-descriptions-item
-          >
+      agencyList.nodeType == "HOSPITAL" ? "医院" : ""
+    }}</el-descriptions-item>
           <el-descriptions-item label="组织机构代码">{{
-            agencyList.orgAgencyCode
-          }}</el-descriptions-item>
+        agencyList.orgAgencyCode
+      }}</el-descriptions-item>
           <el-descriptions-item label="卫生机构类别">{{
-            agencyList.agencyCategoryName
-          }}</el-descriptions-item>
+        agencyList.agencyCategoryName
+      }}</el-descriptions-item>
           <el-descriptions-item label="机构分类管理类别">
             {{
-              agencyList.agencyCategoryManageLevel ==
-              "NON_PROFIT_MEDICAL_AGENCY"
-                ? "非营利性医疗机构"
-                : ""
-            }}
+        agencyList.agencyCategoryManageLevel ==
+          "NON_PROFIT_MEDICAL_AGENCY"
+          ? "非营利性医疗机构"
+          : ""
+      }}
             {{
-              agencyList.agencyCategoryManageLevel ==
-              "FOR_PROFIT_MEDICAL_AGENCY"
-                ? "营利性医疗机构"
-                : ""
-            }}
+        agencyList.agencyCategoryManageLevel ==
+          "FOR_PROFIT_MEDICAL_AGENCY"
+          ? "营利性医疗机构"
+          : ""
+      }}
             {{
-              agencyList.agencyCategoryManageLevel == "OTHER_HEALTH_AGENCY"
-                ? "其他卫生机构"
-                : ""
-            }}</el-descriptions-item
-          >
-          <el-descriptions-item label="行政区划" v-if="agencyList.provinceName"
-            >{{ agencyList.provinceName }}-{{ agencyList.cityName }}-{{
-              agencyList.regionName
-            }}-{{ agencyList.streetName }}-{{ agencyList.communityName }}
+        agencyList.agencyCategoryManageLevel == "OTHER_HEALTH_AGENCY"
+          ? "其他卫生机构"
+          : ""
+      }}</el-descriptions-item>
+          <el-descriptions-item label="行政区划" v-if="agencyList.provinceName">{{ agencyList.provinceName }}-{{
+      agencyList.cityName }}-{{
+      agencyList.regionName
+    }}-{{ agencyList.streetName }}-{{ agencyList.communityName }}
           </el-descriptions-item>
           <el-descriptions-item label="行政区划" v-else> </el-descriptions-item>
         </el-descriptions>
@@ -250,89 +215,28 @@
     </el-row>
 
     <!-- 添加或修改机构信息对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="1000px"
-      append-to-body
-    >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="130px"
-        :inline="true"
-      >
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px" :inline="true">
         <el-form-item label="行政区划" prop="areaCode">
-          <el-select
-            v-model="form.provinceName"
-            clearable
-            placeholder="请选择省"
-            style="width: 129px"
-          >
-            <el-option
-              v-for="item in provincelist"
-              :key="item.areaCode"
-              :label="item.areaName"
-              :value="item.areaCode"
-              @click.native="province(item)"
-            ></el-option>
+          <el-select v-model="form.provinceName" clearable placeholder="请选择省" style="width: 129px">
+            <el-option v-for="item in provincelist" :key="item.areaCode" :label="item.areaName" :value="item.areaCode"
+              @click.native="province(item)"></el-option>
           </el-select>
-          <el-select
-            v-model="form.cityName"
-            clearable
-            placeholder="请选择市"
-            style="width: 129px; margin-left: 10px"
-          >
-            <el-option
-              v-for="item in citylist"
-              :key="item.areaCode"
-              :label="item.areaName"
-              :value="item.areaCode"
-              @click.native="clickcity(item)"
-            ></el-option>
+          <el-select v-model="form.cityName" clearable placeholder="请选择市" style="width: 129px; margin-left: 10px">
+            <el-option v-for="item in citylist" :key="item.areaCode" :label="item.areaName" :value="item.areaCode"
+              @click.native="clickcity(item)"></el-option>
           </el-select>
-          <el-select
-            v-model="form.regionName"
-            clearable
-            placeholder="请选择区"
-            style="width: 129px; margin-left: 10px"
-          >
-            <el-option
-              v-for="item in arealist"
-              :key="item.areaCode"
-              :label="item.areaName"
-              :value="item.areaCode"
-              @click.native="clickarea(item)"
-            ></el-option>
+          <el-select v-model="form.regionName" clearable placeholder="请选择区" style="width: 129px; margin-left: 10px">
+            <el-option v-for="item in arealist" :key="item.areaCode" :label="item.areaName" :value="item.areaCode"
+              @click.native="clickarea(item)"></el-option>
           </el-select>
-          <el-select
-            v-model="form.streetName"
-            clearable
-            placeholder="请选择街道"
-            style="width: 129px; margin-left: 10px"
-          >
-            <el-option
-              v-for="item in streetlist"
-              :key="item.areaCode"
-              :label="item.areaName"
-              :value="item.areaCode"
-              @click.native="clickstreet(item)"
-            ></el-option>
+          <el-select v-model="form.streetName" clearable placeholder="请选择街道" style="width: 129px; margin-left: 10px">
+            <el-option v-for="item in streetlist" :key="item.areaCode" :label="item.areaName" :value="item.areaCode"
+              @click.native="clickstreet(item)"></el-option>
           </el-select>
-          <el-select
-            v-model="form.communityCode"
-            clearable
-            placeholder="请选择社区"
-            style="width: 129px; margin-left: 10px"
-          >
-            <el-option
-              v-for="item in streetlists"
-              :key="item.areaCode"
-              :label="item.areaName"
-              :value="item.areaCode"
-              @click.native="clickstreetlist(item)"
-            ></el-option>
+          <el-select v-model="form.communityCode" clearable placeholder="请选择社区" style="width: 129px; margin-left: 10px">
+            <el-option v-for="item in streetlists" :key="item.areaCode" :label="item.areaName" :value="item.areaCode"
+              @click.native="clickstreetlist(item)"></el-option>
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="所属机构类别id" prop="agencyCategoryId">
@@ -360,74 +264,33 @@
           />
         </el-form-item> -->
         <el-form-item label="机构名称" prop="agencyName">
-          <el-input
-            v-model="form.agencyName"
-            maxlength="100"
-            placeholder="请输入机构名称"
-          />
+          <el-input v-model="form.agencyName" maxlength="100" placeholder="请输入机构名称" />
         </el-form-item>
 
         <el-form-item label="机构简称" prop="agencyAbbreviation">
-          <el-input
-            maxlength="100"
-            v-model="form.agencyAbbreviation"
-            placeholder="请输入机构简称"
-          />
+          <el-input maxlength="100" v-model="form.agencyAbbreviation" placeholder="请输入机构简称" />
         </el-form-item>
         <el-form-item label="机构代码" prop="agencyCode" v-if="disabled">
-          <el-input
-            :disabled="disabled"
-            maxlength="20"
-            v-model="form.agencyCode"
-            style="width: 205px"
-            onKeyUp="value=value.replace(/[\W]/g,'')"
-            placeholder="请输入机构代码"
-          />
+          <el-input :disabled="disabled" maxlength="20" v-model="form.agencyCode" style="width: 205px"
+            onKeyUp="value=value.replace(/[\W]/g,'')" placeholder="请输入机构代码" />
         </el-form-item>
         <el-form-item label="上级机构" prop="parentAgencyName">
-          <el-cascader
-            :props="{ checkStrictly: true }"
-            :options="treeOptions"
-            @change="change($event)"
-            style="width: 205px"
-            v-model="form.parentId"
-            :show-all-levels="false"
-            :placeholder="form.parentAgencyName ? form.parentAgencyName : ''"
-            clearable
-            ref="cascader"
-            :key="isResouceShow"
-          ></el-cascader>
+          <el-cascader :props="{ checkStrictly: true }" :options="treeOptions" @change="change($event)"
+            style="width: 205px" v-model="form.parentId" :show-all-levels="false"
+            :placeholder="form.parentAgencyName ? form.parentAgencyName : ''" clearable ref="cascader"
+            :key="isResouceShow"></el-cascader>
         </el-form-item>
 
         <el-form-item label="卫生机构类别" prop="agencyCategoryId">
-          <el-cascader
-            :props="{ checkStrictly: true }"
-            :options="treeOptionsagencyCategoryId"
-            @change="changeagencyCategoryId($event)"
-            style="width: 205px"
-            :placeholder="
-              form.agencyCategoryName ? form.agencyCategoryName : ''
-            "
-            v-model="form.agencyCategoryId"
-            :show-all-levels="false"
-            ref="cascader"
-            :key="isResouceShows"
-            clearable
-          ></el-cascader>
+          <el-cascader :props="{ checkStrictly: true }" :options="treeOptionsagencyCategoryId"
+            @change="changeagencyCategoryId($event)" style="width: 205px" :placeholder="form.agencyCategoryName ? form.agencyCategoryName : ''
+      " v-model="form.agencyCategoryId" :show-all-levels="false" ref="cascader" :key="isResouceShows"
+            clearable></el-cascader>
         </el-form-item>
         <el-form-item label="节点类型" prop="nodeType">
-          <el-select
-            v-model="form.nodeType"
-            placeholder="请选择"
-            style="width: 205px"
-            clearable
-          >
-            <el-option
-              v-for="item in nodeTypeoptions"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-            >
+          <el-select v-model="form.nodeType" placeholder="请选择" style="width: 205px" clearable>
+            <el-option v-for="item in nodeTypeoptions" :key="item.dictValue" :label="item.dictLabel"
+              :value="item.dictValue">
             </el-option>
           </el-select>
           <!-- <el-input
@@ -436,27 +299,12 @@
           /> -->
         </el-form-item>
         <el-form-item label="组织机构编码" prop="orgAgencyCode">
-          <el-input
-            maxlength="30"
-            onKeyUp="value=value.replace(/[\W]/g,'')"
-            v-model="form.orgAgencyCode"
-            placeholder="请输入组织机构编码"
-            style="width: 205px"
-          />
+          <el-input maxlength="30" onKeyUp="value=value.replace(/[\W]/g,'')" v-model="form.orgAgencyCode"
+            placeholder="请输入组织机构编码" style="width: 205px" />
         </el-form-item>
         <el-form-item label="机构分类管理类别" prop="agencyCategoryManageLevel">
-          <el-select
-            v-model="form.agencyCategoryManageLevel"
-            placeholder="请选择"
-            style="width: 205px"
-            clearable
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-            >
+          <el-select v-model="form.agencyCategoryManageLevel" placeholder="请选择" style="width: 205px" clearable>
+            <el-option v-for="item in options" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
             </el-option>
           </el-select>
           <!-- <el-input
@@ -465,43 +313,21 @@
           /> -->
         </el-form-item>
         <el-form-item label="机构联系人" prop="agencyContacts">
-          <el-input
-            maxlength="20"
-            v-model="form.agencyContacts"
-            placeholder="请输入机构联系人"
-          />
+          <el-input maxlength="20" v-model="form.agencyContacts" placeholder="请输入机构联系人" />
         </el-form-item>
         <el-form-item label="机构联系电话" prop="agencyPhone">
-          <el-input
-            onkeyup="value=value.replace(/[^\-?\d.]/g,'')"
-            maxlength="11"
-            v-model="form.agencyPhone"
-            placeholder="请输入机构联系电话"
-          />
+          <el-input onkeyup="value=value.replace(/[^\-?\d.]/g,'')" maxlength="11" v-model="form.agencyPhone"
+            placeholder="请输入机构联系电话" />
         </el-form-item>
         <el-form-item label="机构详细地址" prop="agencyAddress">
-          <el-input
-            maxlength="200"
-            v-model="form.agencyAddress"
-            placeholder="请输入机构详细地址"
-          />
+          <el-input maxlength="200" v-model="form.agencyAddress" placeholder="请输入机构详细地址" />
         </el-form-item>
         <el-form-item label="机构概述" prop="agencyRemark">
-          <el-input
-            v-model="form.agencyRemark"
-            maxlength="100"
-            placeholder="请输入机构概述"
-          />
+          <el-input v-model="form.agencyRemark" maxlength="100" placeholder="请输入机构概述" />
         </el-form-item>
         <el-form-item label="机构排序" prop="agencySort">
-          <el-input-number
-            v-model="form.agencySort"
-            controls-position="right"
-            :min="0"
-            :max="99999"
-            placeholder="请输入机构排序"
-            style="width: 208px"
-          />
+          <el-input-number v-model="form.agencySort" controls-position="right" :min="0" :max="99999"
+            placeholder="请输入机构排序" style="width: 208px" />
         </el-form-item>
         <el-form-item label="机构状态" prop="agencyStatus">
           <!-- <el-form-item label="是否并发" prop="concurrent"> -->
@@ -520,24 +346,10 @@
       </div>
     </el-dialog>
     <!-- 导入 -->
-    <el-dialog
-      :title="upload.title"
-      :visible.sync="upload.open"
-      width="400px"
-      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
-      >
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" 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">
           将文件拖到此处，或
@@ -545,13 +357,8 @@
         </div>
         <div class="el-upload__tip text-center" slot="tip">
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link
-            type="primary"
-            :underline="false"
-            style="font-size: 12px; vertical-align: baseline"
-            @click="importTemplate"
-            >下载模板</el-link
-          >
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -813,7 +620,7 @@ export default {
           // children.splice(index, 1);
           this.gettreelist();
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 机构树
     gettreelist() {
@@ -966,8 +773,8 @@ export default {
       this.$refs.upload.clearFiles();
       this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-          response.msg +
-          "</div>",
+        response.msg +
+        "</div>",
         "导入结果",
         { dangerouslyUseHTMLString: true }
       );
@@ -1174,7 +981,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1193,6 +1000,7 @@ export default {
 ::v-deep .el-cascader .el-input__inner::placeholder {
   color: #686a6d !important;
 }
+
 ::v-deep .el-button--text {
   border-color: transparent;
   color: #1890ff;
@@ -1200,6 +1008,7 @@ export default {
   position: absolute !important;
   right: 10px !important;
 }
+
 ::v-deep.el-descriptions-item__container {
   display: -webkit-box;
   padding: 15px !important;
@@ -1225,4 +1034,7 @@ export default {
   // font-size: 14px;
   // padding-right: 28px;
 }
+.app-container{
+  display: block;
+}
 </style>
diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue
index 5554560..ff6e3a7 100644
--- a/src/views/system/department/index.vue
+++ b/src/views/system/department/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="4" :xs="24">
+      <el-col :span="4" :xs="24" style="height:calc(100vh - 124px);">
         <!-- <div class="head-container">
           <el-input
             v-model="goodsCategoryName"
@@ -12,12 +12,12 @@
             style="margin-bottom: 20px"
           />
         </div>-->
-        <div class="head-container" style="height: 580px; width: 100%">
+        <div class="head-container" style="height:calc(100vh - 124px); width: 100%">
           <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
             :filter-node-method="filterNode" ref="tree" highlight-current @node-click="handleNodeClick" />
         </div>
       </el-col>
-      <el-col :span="20" :xs="24">
+      <el-col :span="20" :xs="24" style="height:calc(100vh - 124px);display: flex;flex-wrap: wrap;flex-direction: column;justify-content: space-between;">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
           label-width="68px">
           <el-form-item label="科室名称" prop="departmentName">
@@ -34,7 +34,6 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
@@ -58,85 +57,31 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
         <el-table v-loading="loading" :data="departmentList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
-          <!-- <el-table-column label="上级科室id" align="center" prop="parentDepartmentId" />
-      <el-table-column label="所属机构id" align="center" prop="hospitalAgencyId" /> -->
-          <!-- <el-table-column label="所属机构名称" align="center" prop="agencyName" /> -->
           <el-table-column label="科室名称" align="center" prop="departmentName" />
           <el-table-column label="科室代码" align="center" prop="departmentCode" />
           <el-table-column label="科室类型" align="center" prop="departmentType">
             <template slot-scope="scope">
-              {{
-      scope.row.departmentType == "ADMINISTRATION_LOGISTICS"
-        ? "行政后勤类"
-        : ""
-    }}
-              {{
-        scope.row.departmentType == "MEDICAL_ASSISTANCE"
-          ? "医疗辅助类"
-          : ""
-      }}
-              {{
-        scope.row.departmentType == "MEDICAL_TECHNOLOGY"
-          ? "医疗技术类"
-          : ""
-      }}
-              {{
-        scope.row.departmentType == "CLINICAL_SERVICES"
-          ? "临床服务类"
-          : ""
-      }}
+              {{ scope.row.departmentType == "ADMINISTRATION_LOGISTICS" ? "行政后勤类" : "" }}
+              {{ scope.row.departmentType == "MEDICAL_ASSISTANCE" ? "医疗辅助类" : "" }}
+              {{ scope.row.departmentType == "MEDICAL_TECHNOLOGY" ? "医疗技术类" : "" }}
+              {{ scope.row.departmentType == "CLINICAL_SERVICES" ? "临床服务类" : "" }}
             </template>
           </el-table-column>
           <el-table-column label="提供服务类别" align="center" prop="provideServiceCategory">
-            <template slot-scope="scope">{{
-        scope.row.provideServiceCategory == "OUTPATIENT_SERVICE"
-          ? "门诊"
-          : ""
-      }}
-              {{
-        scope.row.provideServiceCategory == "EMERGENCY_TREATMENT"
-          ? "急诊"
-          : ""
-      }}
-              {{
-        scope.row.provideServiceCategory == "BE_HOSPITALIZED"
-          ? "住院"
-          : ""
-      }}
-
+            <template slot-scope="scope">{{ scope.row.provideServiceCategory == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
+              {{ scope.row.provideServiceCategory == "EMERGENCY_TREATMENT" ? "急诊" : "" }}
+              {{ scope.row.provideServiceCategory == "BE_HOSPITALIZED" ? "住院" : "" }}
               {{ scope.row.provideServiceCategory == "WARD" ? "病区" : "" }}
-              {{
-      scope.row.provideServiceCategory == "MEDICAL_TECHNOLOGY"
-        ? "医技"
-        : ""
-    }}
-
+              {{ scope.row.provideServiceCategory == "MEDICAL_TECHNOLOGY" ? "医技" : "" }}
               {{ scope.row.provideServiceCategory == "DRUG" ? "药剂" : "" }}
               {{ scope.row.provideServiceCategory == "FINANCE" ? "财务" : "" }}
-              {{
-      scope.row.provideServiceCategory == "ADMINISTRATION"
-        ? "行政"
-        : ""
-    }}
+              {{ scope.row.provideServiceCategory == "ADMINISTRATION" ? "行政" : "" }}
               {{ scope.row.provideServiceCategory == "PHARMACY" ? "药房" : "" }}
-              {{
-      scope.row.provideServiceCategory == "DRUG_STORAGE" ? "药库" : ""
-    }}
-              {{
-        scope.row.provideServiceCategory == "PUBLIC_HEALTH"
-          ? "公卫"
-          : ""
-      }}
+              {{ scope.row.provideServiceCategory == "DRUG_STORAGE" ? "药库" : "" }}
+              {{ scope.row.provideServiceCategory == "PUBLIC_HEALTH" ? "公卫" : "" }}
             </template></el-table-column>
-          <!-- <el-table-column label="细分类别id" align="center" prop="subdivisionCategoryId" />
-      <el-table-column label="细分类别名称" align="center" prop="subdivisionCategoryName" />
-      <el-table-column label="标准科室对照id" align="center" prop="normDepartmentCompareId" />
-      <el-table-column label="标准科室对照名称" align="center" prop="normDepartmentCompareName" />
-      <el-table-column label="编制床位数" align="center" prop="prepareBedsCount" /> -->
           <el-table-column label="科室电话" align="center" prop="departmentPhone" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
@@ -147,7 +92,6 @@
             </template>
           </el-table-column>
         </el-table>
-
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" />
       </el-col>
diff --git a/src/views/system/departmentDisease/index.vue b/src/views/system/departmentDisease/index.vue
index d05f903..488c28d 100644
--- a/src/views/system/departmentDisease/index.vue
+++ b/src/views/system/departmentDisease/index.vue
@@ -1,14 +1,34 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <!-- <el-form-item label="所属科室id" prop="departmentId">
+    <el-row :gutter="20">
+      <el-col :span="5" :xs="24" style="height:calc(100vh - 124px);">
+        <div class="left" ref="box">
+          <div class="name">科室名称</div>
+          <div>
+            <el-input v-model="name" placeholder="请输入科室名称" clearable @keyup.enter.native="handleQuery" />
+          </div>
+          <!-- <div class="listitem">
+            <div
+              :class="itemname == null ? 'allactive' : 'all'"
+              @click="itemdata()"
+            >
+              全部
+            </div>
+            <span class="count">{{ count }}</span>
+          </div> -->
+          <div class="listitem" v-for="(item, index) in DepartmentoList" :key="index" @click="itemdata(item)">
+            <div :class="itemname == item.id ? 'allactive' : 'all'">
+              {{ item.departmentName }}
+            </div>
+            <span class="count">{{ item.countNum }}</span>
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="19" :xs="24"
+        style="height:calc(100vh - 124px);display: flex;flex-wrap: wrap;flex-direction: column;justify-content: space-between;">
+        <el-form :model="queryParams" 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"
           placeholder="请输入所属科室id"
@@ -24,16 +44,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item label="病种名称" prop="diseaseTypeName">
-        <el-input
-          maxlength="50"
-          v-model="queryParams.diseaseTypeName"
-          placeholder="请输入病种名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="病种代码" prop="diseaseTypeCode">
+          <el-form-item label="病种名称" prop="diseaseTypeName">
+            <el-input maxlength="50" v-model="queryParams.diseaseTypeName" placeholder="请输入病种名称" clearable
+              @keyup.enter.native="handleQuery" />
+          </el-form-item>
+          <!-- <el-form-item label="病种代码" prop="diseaseTypeCode">
         <el-input
           v-model="queryParams.diseaseTypeCode"
           placeholder="请输入病种代码"
@@ -57,112 +72,31 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item>
-        <el-button
-          type="primary"
-          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>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          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
-          type="success"
-          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
-          type="danger"
-          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
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:departmentDisease:export']"
-          >导出</el-button
-        >
-      </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :span="5">
-        <div class="left" ref="box">
-          <div class="name">科室名称</div>
-          <div>
-            <el-input
-              v-model="name"
-              placeholder="请输入科室名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </div>
-          <!-- <div class="listitem">
-            <div
-              :class="itemname == null ? 'allactive' : 'all'"
-              @click="itemdata()"
-            >
-              全部
-            </div>
-            <span class="count">{{ count }}</span>
-          </div> -->
-          <div
-            class="listitem"
-            v-for="(item, index) in DepartmentoList"
-            :key="index"
-            @click="itemdata(item)"
-          >
-            <div :class="itemname == item.id ? 'allactive' : 'all'">
-              {{ item.departmentName }}
-            </div>
-            <span class="count">{{ item.countNum }}</span>
-          </div>
-        </div>
-      </el-col>
-      <el-col :span="19">
-        <el-table
-          v-loading="loading"
-          :data="departmentDiseaseList"
-          @selection-change="handleSelectionChange"
-        >
+          <el-form-item>
+            <el-button type="primary" 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>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" 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 type="success" 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 type="danger" 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 type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+              v-hasPermi="['system:departmentDisease:export']">导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-table 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
@@ -170,87 +104,39 @@
             align="center"
             prop="departmentId"
           /> -->
-          <el-table-column
-            label="所属科室名称"
-            align="center"
-            prop="departmentName"
-          />
-          <el-table-column
-            label="病种名称"
-            align="center"
-            prop="diseaseTypeName"
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
+          <el-table-column label="所属科室名称" align="center" 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
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @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
-              >
+              <el-button size="mini" type="text" icon="el-icon-edit" @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>
-        <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" />
       </el-col>
     </el-row>
-
     <!-- 添加或修改科室病种信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="100px"
-        :inline="true"
-      >
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
         <el-form-item label="所属科室" prop="departmentId">
-          <el-button
-            type=""
-            v-if="form.departmentName == '请选择科室'"
-            @click="clickinnerVisible()"
-            style="
+          <el-button type="" v-if="form.departmentName == '请选择科室'" @click="clickinnerVisible()" style="
               width: 250px;
               text-align: left;
               height: 36px;
               color: #c0c4cc;
               overflow: hidden;
-            "
-            >{{ form.departmentName }}</el-button
-          >
-          <el-button
-            @click="clickinnerVisible()"
-            type=""
-            v-else
-            style="
+            ">{{ form.departmentName }}</el-button>
+          <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">
           
@@ -260,32 +146,18 @@
           <el-input v-model="form.departmentName" placeholder="请输入所属科室名称" />
         </el-form-item> -->
         <el-form-item label="病种名称" prop="diseaseTypeName">
-          <el-input
-            style="width: 250px"
-            v-model="form.diseaseTypeName"
-            placeholder="请输入病种名称"
-          />
+          <el-input 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
-            type="textarea"
-            maxlength="300"
-            style="width: 610px"
-            v-model="form.diagnosisInfo"
-            placeholder="请输入对应诊断信息"
-          />
+          <el-input type="textarea" maxlength="300" style="width: 610px" v-model="form.diagnosisInfo"
+            placeholder="请输入对应诊断信息" />
         </el-form-item>
         <el-form-item label="病种概述" prop="diseaseTypeRemark ">
-          <el-input
-            type="textarea"
-            maxlength="200"
-            style="width: 610px"
-            v-model="form.diseaseTypeRemark"
-            placeholder="请输入病种概述"
-          />
+          <el-input type="textarea" maxlength="200" style="width: 610px" v-model="form.diseaseTypeRemark"
+            placeholder="请输入病种概述" />
         </el-form-item>
 
         <!-- <el-button
@@ -306,24 +178,10 @@
       </div>
     </el-dialog>
     <!-- 导入 -->
-    <el-dialog
-      :title="upload.title"
-      :visible.sync="upload.open"
-      width="400px"
-      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
-      >
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" 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">
           将文件拖到此处，或
@@ -331,13 +189,8 @@
         </div>
         <div class="el-upload__tip text-center" slot="tip">
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link
-            type="primary"
-            :underline="false"
-            style="font-size: 12px; vertical-align: baseline"
-            @click="importTemplate"
-            >下载模板</el-link
-          >
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -346,82 +199,32 @@
       </div>
     </el-dialog>
     <!-- 科室弹框 -->
-    <el-dialog
-      title=""
-      :visible.sync="innerVisibleshow"
-      width="1000px"
-      append-to-body
-      :before-close="innerVisiblecancel"
-    >
-      <el-form
-        ref="queryForm"
-        :model="informationqueryParams"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
+    <el-dialog title="" :visible.sync="innerVisibleshow" 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
-            v-model="informationqueryParams.departmentName"
-            placeholder="请输入科室名称"
-            clearable
-          />
+          <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-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 :data="infolist" @cell-dblclick="nurseclick" v-loading="loading">
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              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>
+            <el-button type="primary" style="width: 15px; height: 15px" 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
-          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="totaldepartment > 0" :total="totaldepartment" :page.sync="informationqueryParams.pageNum"
+        :limit.sync="informationqueryParams.pageSize" @pagination="informationInfoinfo" />
     </el-dialog>
   </div>
 </template>
@@ -611,8 +414,8 @@ export default {
       this.$refs.upload.clearFiles();
       this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-          response.msg +
-          "</div>",
+        response.msg +
+        "</div>",
         "导入结果",
         { dangerouslyUseHTMLString: true }
       );
@@ -687,7 +490,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.diseaseTypeName=''
+      this.queryParams.diseaseTypeName = ''
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -725,7 +528,7 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
-              this.departmentName=''
+              this.departmentName = ''
               this.infolists()
             });
           } else {
@@ -733,7 +536,7 @@ export default {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
-              this.departmentName=''
+              this.departmentName = ''
               this.infolists()
 
             });
@@ -751,12 +554,12 @@ export default {
         })
         .then(() => {
           this.getList();
-          this.departmentName=''
+          this.departmentName = ''
           this.infolists()
 
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -773,17 +576,20 @@ export default {
 </script>
 <style lang="scss">
 .left {
+  height: calc(100vh - 124px);
   // width: 30%;
-  height: 500px;
   overflow: auto;
+
   .name {
     font-weight: 700;
     margin-bottom: 10px;
   }
+
   .listitem {
     width: 100%;
     height: 50px;
     border-bottom: 1px solid #dcdfe6;
+
     .count {
       display: inline-block;
       position: relative;
@@ -793,11 +599,13 @@ export default {
       top: -35px;
       font-size: 13px;
     }
+
     .all {
       height: 50px;
       line-height: 50px;
       padding-left: 13px;
     }
+
     .allactive {
       background: #e8f4ff;
       height: 50px;
@@ -807,6 +615,7 @@ export default {
     }
   }
 }
+
 .button {
   display: inline-block;
   position: relative;
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index c30be85..e7e4a2a 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -2,21 +2,12 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="菜单名称" prop="menuName">
-        <el-input
-          v-model="queryParams.menuName"
-          placeholder="请输入菜单名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.menuName" placeholder="请输入菜单名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+          <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -24,38 +15,18 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:menu:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['system:menu:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-sort"
-          size="mini"
-          @click="toggleExpandAll"
-        >展开/折叠</el-button>
+        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="menuList"
-      row-key="menuId"
-      :default-expand-all="isExpandAll"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
+    <el-table v-if="refreshTable" v-loading="loading" :data="menuList" row-key="menuId"
+      :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
       <el-table-column prop="icon" label="图标" align="center" width="100">
         <template slot-scope="scope">
@@ -67,7 +38,7 @@
       <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="status" label="状态" width="80">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime">
@@ -77,44 +48,25 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button 
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:menu:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:menu:add']"
-          >新增</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:menu:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:menu:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
+            v-hasPermi="['system:menu:add']">新增</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['system:menu:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-
+    <el-row :gutter="10" class="mb8">
+    </el-row>
     <!-- 添加或修改菜单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="上级菜单">
-              <treeselect
-                v-model="form.parentId"
-                :options="menuOptions"
-                :normalizer="normalizer"
-                :show-count="true"
-                placeholder="选择上级菜单"
-              />
+              <treeselect v-model="form.parentId" :options="menuOptions" :normalizer="normalizer" :show-count="true"
+                placeholder="选择上级菜单" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -128,21 +80,11 @@
           </el-col>
           <el-col :span="24" v-if="form.menuType != 'F'">
             <el-form-item label="菜单图标" prop="icon">
-              <el-popover
-                placement="bottom-start"
-                width="460"
-                trigger="click"
-                @show="$refs['iconSelect'].reset()"
-              >
+              <el-popover placement="bottom-start" width="460" trigger="click" @show="$refs['iconSelect'].reset()">
                 <IconSelect ref="iconSelect" @selected="selected" />
                 <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
-                  <svg-icon
-                    v-if="form.icon"
-                    slot="prefix"
-                    :icon-class="form.icon"
-                    class="el-input__icon"
-                    style="height: 32px;width: 16px;"
-                  />
+                  <svg-icon v-if="form.icon" slot="prefix" :icon-class="form.icon" class="el-input__icon"
+                    style="height: 32px;width: 16px;" />
                   <i v-else slot="prefix" class="el-icon-search el-input__icon" />
                 </el-input>
               </el-popover>
@@ -162,7 +104,7 @@
             <el-form-item>
               <span slot="label">
                 <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
-                <i class="el-icon-question"></i>
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 是否外链
               </span>
@@ -176,7 +118,7 @@
             <el-form-item prop="path">
               <span slot="label">
                 <el-tooltip content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
-                <i class="el-icon-question"></i>
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 路由地址
               </span>
@@ -187,7 +129,7 @@
             <el-form-item prop="component">
               <span slot="label">
                 <el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
-                <i class="el-icon-question"></i>
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 组件路径
               </span>
@@ -199,7 +141,7 @@
               <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
               <span slot="label">
                 <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
-                <i class="el-icon-question"></i>
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 权限字符
               </span>
@@ -210,7 +152,7 @@
               <el-input v-model="form.query" placeholder="请输入路由参数" maxlength="255" />
               <span slot="label">
                 <el-tooltip content='访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`' placement="top">
-                <i class="el-icon-question"></i>
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 路由参数
               </span>
@@ -220,7 +162,7 @@
             <el-form-item>
               <span slot="label">
                 <el-tooltip content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致" placement="top">
-                <i class="el-icon-question"></i>
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 是否缓存
               </span>
@@ -234,16 +176,13 @@
             <el-form-item>
               <span slot="label">
                 <el-tooltip content="选择隐藏则路由将不会出现在侧边栏，但仍然可以访问" placement="top">
-                <i class="el-icon-question"></i>
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 显示状态
               </span>
               <el-radio-group v-model="form.visible">
-                <el-radio
-                  v-for="dict in dict.type.sys_show_hide"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_show_hide" :key="dict.value" :label="dict.value">{{ dict.label
+                  }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -251,16 +190,14 @@
             <el-form-item>
               <span slot="label">
                 <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
-                <i class="el-icon-question"></i>
+                  <i class="el-icon-question"></i>
                 </el-tooltip>
                 菜单状态
               </span>
               <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
+      dict.label
+    }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -420,7 +357,7 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.menuId != undefined) {
@@ -441,12 +378,12 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项？').then(function () {
         return delMenu(row.menuId);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     }
   }
 };
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 61f7307..6702fcf 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,318 +1,101 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20">
-      <!--部门数据-->
-      <!-- <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input
-            v-model="deptName"
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
-        </div>
-        <div class="head-container">
-          <el-tree
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            default-expand-all
-            highlight-current
-            @node-click="handleNodeClick"
-          />
-        </div>
-      </el-col> -->
-      <!--用户数据-->
-      <!-- <el-col :span="20" :xs="24"> -->
-      <el-form
-        :model="queryParams"
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="68px"
-      >
-        <el-form-item label="用户名称" prop="userName">
-          <el-input
-            v-model="queryParams.userName"
-            placeholder="请输入用户名称"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="手机号码" prop="phonenumber">
-          <el-input
-            v-model="queryParams.phonenumber"
-            placeholder="请输入手机号码"
-            clearable
-            style="width: 240px"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            placeholder="用户状态"
-            clearable
-            style="width: 240px"
-          >
-            <el-option
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建时间">
-          <el-date-picker
-            v-model="dateRange"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            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>
-
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            icon="el-icon-plus"
-            size="mini"
-            @click="handleAdd"
-            v-hasPermi="['system:user:add']"
-            >新增</el-button
-          >
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="success"
-            plain
-            icon="el-icon-edit"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['system:user:edit']"
-            >修改</el-button
-          >
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="danger"
-            plain
-            icon="el-icon-delete"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['system:user:remove']"
-            >删除</el-button
-          >
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="info"
-            plain
-            icon="el-icon-upload2"
-            size="mini"
-            @click="handleImport"
-            v-hasPermi="['system:user:import']"
-            >导入</el-button
-          >
-        </el-col>
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['system:user:export']"
-            >导出</el-button
-          >
-        </el-col>
-        <right-toolbar
-          :showSearch.sync="showSearch"
-          @queryTable="getList"
-          :columns="columns"
-        ></right-toolbar>
-      </el-row>
-
-      <el-table
-        v-loading="loading"
-        :data="userList"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column type="selection" width="50" align="center" />
-        <!-- <el-table-column
-          label="用户编号"
-          align="center"
-          key="userId"
-          prop="userId"
-          v-if="columns[0].visible"
-        /> -->
-        <el-table-column
-          label="姓名"
-          align="center"
-          prop="nickName"
-          v-if="columns[1].visible"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="系统账号"
-          align="center"
-          prop="userName"
-          v-if="columns[1].visible"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="所属机构"
-          align="center"
-          prop="nickName"
-          v-if="columns[2].visible"
-          :show-overflow-tooltip="true"
-        />
-        <!-- <el-table-column
-          label="部门"
-          align="center"
-          key="deptName"
-          prop="dept.deptName"
-          v-if="columns[3].visible"
-          :show-overflow-tooltip="true"
-        /> -->
-        -->
-        <el-table-column
-          label="手机号码"
-          align="center"
-          key="phonenumber"
-          prop="phonenumber"
-          v-if="columns[4].visible"
-          width="120"
-        />
-        <el-table-column
-          label="账号状态"
-          align="center"
-          key="status"
-          v-if="columns[5].visible"
-        >
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.status"
-              active-value="0"
-              inactive-value="1"
-              @change="handleStatusChange(scope.row)"
-            ></el-switch>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="创建时间"
-          align="center"
-          prop="createTime"
-          v-if="columns[6].visible"
-          width="160"
-        >
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="操作"
-          align="center"
-          width="160"
-          class-name="small-padding fixed-width"
-        >
-          <template slot-scope="scope" v-if="scope.row.userId !== 1">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['system:user:edit']"
-              >修改</el-button
-            >
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-mobile"
-              @click="handleinnerVisibleshow(scope.row)"
-              v-hasPermi="['system:user:edit']"
-              >设置机构</el-button
-            >
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-star-on"
-              @click="handleinnerVisibleshowdep(scope.row)"
-              v-hasPermi="['system:user:edit']"
-              >设置科室</el-button
-            >
-
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['system:user:remove']"
-              >删除</el-button
-            >
-            <el-dropdown
-              size="mini"
-              @command="(command) => handleCommand(command, scope.row)"
-              v-hasPermi="['system:user:resetPwd', 'system:user:edit']"
-            >
-              <span class="el-dropdown-link">
-                <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-              </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  command="handleResetPwd"
-                  icon="el-icon-key"
-                  v-hasPermi="['system:user:resetPwd']"
-                  >重置密码</el-dropdown-item
-                >
-                <el-dropdown-item
-                  command="handleAuthRole"
-                  icon="el-icon-circle-check"
-                  v-hasPermi="['system:user:edit']"
-                  >分配角色</el-dropdown-item
-                >
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-      <!-- </el-col> -->
+    <!--用户数据-->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户名称" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="手机号码" prop="phonenumber">
+        <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
+          <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" 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>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['system:user:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['system:user:edit']">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:user:remove']">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+          v-hasPermi="['system:user:import']">导入</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+          v-hasPermi="['system:user:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
-
+    <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="100" align="left" />
+      <el-table-column label="姓名" align="left" prop="nickName" width='150' v-if="columns[1].visible"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="系统账号" align="left" prop="userName" width='150' v-if="columns[1].visible"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="所属机构" align="left" prop="nickName" width='200' v-if="columns[2].visible"
+        :show-overflow-tooltip="true" />
+      <el-table-column label="手机号码" align="left" key="phonenumber" width='200' prop="phonenumber"
+        v-if="columns[4].visible" />
+      <el-table-column label="账号状态" align="left" key="status" width='200' v-if="columns[5].visible">
+        <template slot-scope="scope">
+          <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
+            @change="handleStatusChange(scope.row)"></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="left" prop="createTime" v-if="columns[6].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="left" width="160" class-name="small-padding fixed-width">
+        <template slot-scope="scope" v-if="scope.row.userId !== 1">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:user:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-mobile" @click="handleinnerVisibleshow(scope.row)"
+            v-hasPermi="['system:user:edit']">设置机构</el-button>
+          <el-button size="mini" type="text" icon="el-icon-star-on" @click="handleinnerVisibleshowdep(scope.row)"
+            v-hasPermi="['system:user:edit']">设置科室</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['system:user:remove']">删除</el-button>
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
+            v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+            <span class="el-dropdown-link">
+              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
+                v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
+              <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
+    <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="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -321,71 +104,39 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="姓名" prop="nickName">
-                <el-input
-                  v-model="form.nickName"
-                  placeholder="请输入用户昵称"
-                  maxlength="30"
-                />
+                <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="性别" prop="sex">
                 <el-select v-model="form.sex" placeholder="请选择性别">
-                  <el-option
-                    v-for="dict in dict.type.sys_user_sex"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                  ></el-option>
+                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+                    :value="dict.value"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="出生日期" prop="userBirthDate">
-                <el-date-picker
-                  clearable
-                  v-model="form.userBirthDate"
-                  type="date"
-                  style="width: 250px"
-                  value-format="yyyy-MM-dd"
-                  placeholder="请选择出生日期"
-                >
+                <el-date-picker clearable v-model="form.userBirthDate" type="date" style="width: 250px"
+                  value-format="yyyy-MM-dd" placeholder="请选择出生日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="身份证号" prop="userCardNo">
-                <el-input
-                  style="width: 220px"
-                  v-model="form.userCardNo"
-                  placeholder="请输入身份证号"
-                  maxlength="18"
-                />
+                <el-input style="width: 220px" v-model="form.userCardNo" placeholder="请输入身份证号" maxlength="18" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="手机号码" prop="phonenumber">
-                <el-input
-                  v-model="form.phonenumber"
-                  placeholder="请输入手机号码"
-                  maxlength="11"
-                />
+                <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="岗位名称" prop="postName">
-                <el-select
-                  v-model="form.postName"
-                  placeholder="请选择岗位名称"
-                  style="width: 205px"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in nodeTypeoptions"
-                    :key="item.dictValue"
-                    :label="item.dictLabel"
-                    :value="item.dictValue"
-                  >
+                <el-select v-model="form.postName" placeholder="请选择岗位名称" style="width: 205px" clearable>
+                  <el-option v-for="item in nodeTypeoptions" :key="item.dictValue" :label="item.dictLabel"
+                    :value="item.dictValue">
                   </el-option>
                 </el-select>
                 <!-- <el-select v-model="form.postName" placeholder="请选择岗位名称">
@@ -415,27 +166,14 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="系统账号" prop="userName">
-                <el-input
-                  v-model="form.userName"
-                  placeholder="请输入系统账号"
-                  maxlength="30"
-                />
+                <el-input v-model="form.userName" placeholder="请输入系统账号" maxlength="30" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="角色">
-                <el-select
-                  v-model="form.roleIds"
-                  multiple
-                  placeholder="请选择角色"
-                >
-                  <el-option
-                    v-for="item in roleOptions"
-                    :key="item.roleId"
-                    :label="item.roleName"
-                    :value="item.roleId"
-                    :disabled="item.status == 1"
-                  ></el-option>
+                <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+                  <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
+                    :disabled="item.status == 1"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -497,12 +235,9 @@
           <el-col :span="12">
             <el-form-item label="账号状态">
               <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.value"
-                  >{{ dict.label }}</el-radio
-                >
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{
+      dict.label
+    }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -553,53 +288,20 @@
             <span v-else>可设置机构:0条</span>
           </div>
           <div style="margin-top: 3%">
-            <el-form
-              ref="queryForm"
-              :model="formmat"
-              :rules="rules"
-              label-width="80px"
-              :inline="true"
-            >
-              <el-form-item
-                label="机构名称"
-                prop="agencyName"
-                label-width="120"
-              >
-                <el-input
-                  v-model="formmat.agencyName"
-                  placeholder="请输入机构名称"
-                  clearable
-                />
+            <el-form ref="queryForm" :model="formmat" :rules="rules" label-width="80px" :inline="true">
+              <el-form-item label="机构名称" prop="agencyName" label-width="120">
+                <el-input v-model="formmat.agencyName" placeholder="请输入机构名称" clearable />
               </el-form-item>
 
               <el-form-item>
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  size="mini"
-                  @click="info"
-                  >搜索</el-button
-                >
-                <el-button
-                  icon="el-icon-refresh"
-                  size="mini"
-                  @click="addresetQuerylist"
-                  >重置</el-button
-                >
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="info">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylist">重置</el-button>
               </el-form-item>
             </el-form>
           </div>
           <!-- 穿梭框左边 -->
-          <el-table
-            ref="multipleTable"
-            :data="tableData1"
-            height="300"
-            tooltip-effect="dark"
-            style="width: 100%"
-            @selection-change="handleSelectionChangenleft"
-            class="el-table-dialog"
-            row-key="id"
-          >
+          <el-table ref="multipleTable" :data="tableData1" height="300" tooltip-effect="dark" style="width: 100%"
+            @selection-change="handleSelectionChangenleft" class="el-table-dialog" row-key="id">
             <el-table-column type="selection" width="55" align="center">
             </el-table-column>
             <!-- <el-table-column type="index" label="序号" align="center">
@@ -616,52 +318,24 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination
-            :total="totalag"
-            :page.sync="formmat.pageNum"
-            :limit.sync="formmat.pageSize"
-            @pagination="info"
-          />
+          <pagination :total="totalag" :page.sync="formmat.pageNum" :limit.sync="formmat.pageSize" @pagination="info" />
         </el-col>
         <el-col :span="4" class="el-btn-dialog">
-          <el-button
-            @click="leftcontent"
-            type="primary"
-            :disabled="nowSelectRightData.length ? false : true"
-            icon="el-icon-arrow-left"
-            style="margin-left: 0; margin-top: 10px"
-          ></el-button>
-          <el-button
-            @click="rightcontent()"
-            type="primary"
-            :disabled="nowSelectData.length ? false : true"
-            icon="el-icon-arrow-right"
-          ></el-button>
+          <el-button @click="leftcontent" type="primary" :disabled="nowSelectRightData.length ? false : true"
+            icon="el-icon-arrow-left" style="margin-left: 0; margin-top: 10px"></el-button>
+          <el-button @click="rightcontent()" type="primary" :disabled="nowSelectData.length ? false : true"
+            icon="el-icon-arrow-right"></el-button>
         </el-col>
         <el-col :span="10">
           <div class="table-title">
-            <span v-if="belongAgencyNum != ''"
-              >已设置机构:{{ belongAgencyNum }}条</span
-            >
+            <span v-if="belongAgencyNum != ''">已设置机构:{{ belongAgencyNum }}条</span>
             <span v-else>已设置机构:0条</span>
           </div>
           <!-- 穿梭框右边 -->
           <div style="margin-top: 5%">
-            <el-table
-              ref="multipleTables"
-              :data="tableData2"
-              max-height="300"
-              tooltip-effect="dark"
-              style="width: 100%"
-              @selection-change="handleSelectionChangenright"
-              row-key="id"
-              class="el-table-dialog"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center"
-              ></el-table-column>
+            <el-table ref="multipleTables" :data="tableData2" max-height="300" tooltip-effect="dark" style="width: 100%"
+              @selection-change="handleSelectionChangenright" row-key="id" class="el-table-dialog">
+              <el-table-column type="selection" width="55" align="center"></el-table-column>
               <!-- <el-table-column type="index" label="序号" align="center">
               </el-table-column> -->
 
@@ -696,11 +370,7 @@
   </el-transfer> -->
     </el-dialog>
     <!-- 设置科室 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="innerVisibleshowdep"
-      width="1200px"
-    >
+    <el-dialog :title="title" :visible.sync="innerVisibleshowdep" width="1200px">
       <el-row :gutter="20">
         <el-col :span="10">
           <div class="table-title">
@@ -708,53 +378,20 @@
             <span v-else>可设置科室:0条</span>
           </div>
           <div style="margin-top: 3%">
-            <el-form
-              ref="queryForm"
-              :model="formmatdep"
-              :rules="rules"
-              label-width="80px"
-              :inline="true"
-            >
-              <el-form-item
-                label="科室名称"
-                prop="departmentName"
-                label-width="120"
-              >
-                <el-input
-                  v-model="formmatdep.departmentName"
-                  placeholder="请输入科室名称"
-                  clearable
-                />
+            <el-form ref="queryForm" :model="formmatdep" :rules="rules" label-width="80px" :inline="true">
+              <el-form-item label="科室名称" prop="departmentName" label-width="120">
+                <el-input v-model="formmatdep.departmentName" placeholder="请输入科室名称" clearable />
               </el-form-item>
 
               <el-form-item>
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  size="mini"
-                  @click="infodep"
-                  >搜索</el-button
-                >
-                <el-button
-                  icon="el-icon-refresh"
-                  size="mini"
-                  @click="addresetQuerylistdep"
-                  >重置</el-button
-                >
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="infodep">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="addresetQuerylistdep">重置</el-button>
               </el-form-item>
             </el-form>
           </div>
           <!-- 穿梭框左边 -->
-          <el-table
-            ref="multipleTabledep"
-            :data="tableDatadep1"
-            height="300"
-            tooltip-effect="dark"
-            style="width: 100%"
-            @selection-change="handleSelectionChangendep"
-            class="el-table-dialog"
-            row-key="id"
-          >
+          <el-table ref="multipleTabledep" :data="tableDatadep1" height="300" tooltip-effect="dark" style="width: 100%"
+            @selection-change="handleSelectionChangendep" class="el-table-dialog" row-key="id">
             <el-table-column type="selection" width="55" align="center">
             </el-table-column>
             <!-- <el-table-column type="index" label="序号" align="center">
@@ -771,52 +408,26 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination
-            :total="totalagdep"
-            :page.sync="formmatdep.pageNum"
-            :limit.sync="formmatdep.pageSize"
-            @pagination="infodep"
-          />
+          <pagination :total="totalagdep" :page.sync="formmatdep.pageNum" :limit.sync="formmatdep.pageSize"
+            @pagination="infodep" />
         </el-col>
         <el-col :span="4" class="el-btn-dialog">
-          <el-button
-            @click="leftcontentdep"
-            type="primary"
-            :disabled="nowSelectRightDatadep.length ? false : true"
-            icon="el-icon-arrow-left"
-            style="margin-left: 0; margin-top: 10px"
-          ></el-button>
-          <el-button
-            @click="rightcontentdep()"
-            type="primary"
-            :disabled="nowSelectDatadep.length ? false : true"
-            icon="el-icon-arrow-right"
-          ></el-button>
+          <el-button @click="leftcontentdep" type="primary" :disabled="nowSelectRightDatadep.length ? false : true"
+            icon="el-icon-arrow-left" style="margin-left: 0; margin-top: 10px"></el-button>
+          <el-button @click="rightcontentdep()" type="primary" :disabled="nowSelectDatadep.length ? false : true"
+            icon="el-icon-arrow-right"></el-button>
         </el-col>
         <el-col :span="10">
           <div class="table-title">
-            <span v-if="departmentNums != ''"
-              >已设置科室:{{ departmentNums }}条</span
-            >
+            <span v-if="departmentNums != ''">已设置科室:{{ departmentNums }}条</span>
             <span v-else>已设置科室:0条</span>
           </div>
           <!-- 穿梭框右边 -->
           <div style="margin-top: 5%">
-            <el-table
-              ref="multipleTablesdep"
-              :data="tableDatadep2"
-              max-height="300"
-              tooltip-effect="dark"
-              style="width: 100%"
-              @selection-change="handleSelectionChangenrightdep"
-              row-key="id"
-              class="el-table-dialog"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-                align="center"
-              ></el-table-column>
+            <el-table ref="multipleTablesdep" :data="tableDatadep2" max-height="300" tooltip-effect="dark"
+              style="width: 100%" @selection-change="handleSelectionChangenrightdep" row-key="id"
+              class="el-table-dialog">
+              <el-table-column type="selection" width="55" align="center"></el-table-column>
               <!-- <el-table-column type="index" label="序号" align="center">
               </el-table-column> -->
 
@@ -836,24 +447,10 @@
       </el-row>
     </el-dialog>
     <!-- 用户导入对话框 -->
-    <el-dialog
-      :title="upload.title"
-      :visible.sync="upload.open"
-      width="400px"
-      append-to-body
-    >
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
@@ -862,13 +459,8 @@
             是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link
-            type="primary"
-            :underline="false"
-            style="font-size: 12px; vertical-align: baseline"
-            @click="importTemplate"
-            >下载模板</el-link
-          >
+          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -1468,7 +1060,7 @@ export default {
             this.$modal.msgSuccess("修改成功，新密码是：" + value);
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 分配角色操作 */
     handleAuthRole: function (row) {
@@ -1507,7 +1099,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1543,8 +1135,8 @@ export default {
       this.$refs.upload.clearFiles();
       this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-          response.msg +
-          "</div>",
+        response.msg +
+        "</div>",
         "导入结果",
         { dangerouslyUseHTMLString: true }
       );
@@ -1566,17 +1158,23 @@ export default {
   color: black;
   padding-left: 10px;
 }
+
 .systemcontent {
   margin: 20px 0 0 0;
   // width: 200px;
   // height: 100px;
   // background: red;
 }
+
 .el-table__header-wrapper .el-table__header .el-checkbox {
   display: none;
 }
+
 .table-title {
   font-size: 17px;
   color: black;
 }
+.pagination-container {
+  height: 10vh;
+}
 </style>
\ No newline at end of file