diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index e64b794..3061632 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -496,7 +496,7 @@
     >
       <el-form
         ref="queryForm"
-       :model="StationqueryParams"
+        :model="StationqueryParams"
         :rules="rules"
         label-width="80px"
         :inline="true"
@@ -528,15 +528,15 @@
             type="primary"
             icon="el-icon-search"
             size="mini"
-            @click="handleQuery2"
+            @click="handleQuery4"
             >搜索</el-button
           >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2"
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery4"
             >重置</el-button
           >
         </el-form-item>
       </el-form>
-      <el-table :data="stationLists" @cell-dblclick="nurseclick2">
+      <el-table :data="nurseStationlist" @cell-dblclick="nurseclick2">
         <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
@@ -692,7 +692,6 @@
             v-model="queryParams3.departmentCode"
             placeholder="请输入科室编码"
             clearable
-
           />
         </el-form-item>
         <el-form-item label="科室名称" prop="" label-width="120">
@@ -700,7 +699,6 @@
             v-model="queryParams3.departmentName"
             placeholder="请输入科室名称"
             clearable
-
           />
         </el-form-item>
         <el-form-item>
@@ -777,15 +775,15 @@
           style="margin-left: -20px"
         >
           <el-button
-            disabled
             type=""
+            @click="departclickxg"
             v-if="nurseStationName == '请选择所属护理站'"
             style="width: 362px; text-align: left; height: 36px; color: #c0c4cc"
             >{{ nurseStationName }}</el-button
           >
           <el-button
-            disabled
             type=""
+            @click="departclickxg()"
             v-else
             style="
               width: 362px;
@@ -823,17 +821,14 @@
             >{{ departmentName }}</el-button
           >
         </el-form-item>
-        <el-form-item label="姓名" prop="nursePersonName" >
+        <el-form-item label="姓名" prop="nursePersonName">
           <el-input
             maxlength="15"
             v-model="form.nursePersonName"
             placeholder="请输入姓名"
           />
         </el-form-item>
-        <el-form-item
-          label="护理人职称"
-          prop="nursePersonType"
-        >
+        <el-form-item label="护理人职称" prop="nursePersonType">
           <el-select
             v-model="form.nursePersonType"
             clearable
@@ -1076,8 +1071,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
       },
-      StationqueryParams:{
-         pageNum: 1,
+      StationqueryParams: {
+        pageNum: 1,
         pageSize: 10,
       },
 
@@ -1086,9 +1081,9 @@ export default {
       index: "",
       // 表单校验
       rules: {
-          nurseStationId: [
-            { required: true, message: "请选择所属护理站", trigger: "blur" },
-          ],
+        nurseStationId: [
+          { required: true, message: "请选择所属护理站", trigger: "blur" },
+        ],
         departmentName: [
           { required: true, message: "所属科室不能为空", trigger: "blur" },
         ],
@@ -1163,15 +1158,17 @@ export default {
     // // 修改所属科室按钮
     departclick2() {
       this.getList3();
-      // StationDepartmentList(this.queryParams3).then((res) => {
-      //   this.StationDepartmentLists = res.rows;
-      //   this.departtotal = res.total;
-      //   this.loading = false;
-      // });
       this.departid2 = this.form.departmentCode;
       this.innerVisiblexg2 = true;
       // this.index = index;
     },
+    //修改护理站按钮
+    departclickxg() {
+      this.getList2();
+      this.stationid2 = this.form.nurseStationId;
+      this.innerVisiblexg = true;
+       this.index = index;
+    },
     // 新增护理站按钮
     clickinnerVisible(item, index) {
       this.getList2();
@@ -1179,6 +1176,15 @@ export default {
       this.innerVisible = true;
       this.index = index;
     },
+    // 修改护理站
+    nurseclick2(row) {
+      console.log(row);
+      this.nurseStationName = row.nurseStationName;
+      this.stationid2 = row.id;
+      this.form.nurseStationId = row.id;
+      this.innerVisiblexg = false;
+      this.form.nursename = row.nurseStationName;
+    },
     //删除deldisease
     deldisease(index) {
       this.form.nurseStationPersonList.splice(index, 1);
@@ -1186,8 +1192,6 @@ export default {
     },
 
     adddisease() {
-      //  this.nurseStationName = "请选择护理站名称";
-      // this.departmentName=""
       var obj = {
         nursePersonCode: "",
         nursePersonCode: "",
@@ -1220,15 +1224,7 @@ export default {
         row.nurseStationName;
       this.form.nurseStationPersonList[this.index].nurseStationId = row.id;
     },
-    // 修改护理站
-    nurseclick2(row) {
-      console.log(row);
-      this.nurseStationName = row.nurseStationName;
-      this.stationid2 = row.id;
-      this.form.nurseStationId = row.id;
-      this.innerVisiblexg = false;
-      this.form.nursename = row.nurseStationName;
-    },
+
     // 所属科室
     StationDepartmentclick(row) {
       console.log(row);
@@ -1266,15 +1262,15 @@ export default {
     },
     getList2() {
       this.loading = true;
-        getListByUser(this.StationqueryParams).then((res) => {
+      getListByUser(this.StationqueryParams).then((res) => {
         this.nursetotal = res.total;
         this.nurseStationlist = res.rows;
-         this.loading = false;
+        this.loading = false;
       });
     },
-    getList3(){
-       this.loading = true;
-        StationDepartmentList(this.queryParams3).then((res) => {
+    getList3() {
+      this.loading = true;
+      StationDepartmentList(this.queryParams3).then((res) => {
         this.StationDepartmentLists = res.rows;
         this.departtotal = res.total;
         this.loading = false;
@@ -1327,12 +1323,16 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery2() {
-      this.nurseStationqueryParams.pageNum = 1;
-      this.getList2()
+      this.getList2();
     },
+    // 修改护理站弹框的搜索
+    handleQuery4() {
+      this.getList2();
+    },
+    //修改所属科室
     handleQuery3() {
-      this.queryParams3.pageNum = 1;
-      this.getList3()
+      this.nurseStationqueryParams.pageNum = 1;
+      this.getList3();
     },
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -1343,24 +1343,30 @@ export default {
       this.innerVisible = false;
       this.innerVisiblexg = false;
       this.resetQuery2();
-
     },
-    departcancel(){
-       this.innerVisible2 = false;
-       this.innerVisiblexg2=false;
-       this.resetQuery3();
+    departcancel() {
+      this.innerVisible2 = false;
+      this.innerVisiblexg2 = false;
+      this.resetQuery3();
     },
 
     resetQuery2() {
+      this.resetForm("queryForm");
       this.nurseStationqueryParams = {
         pageNum: 1,
         pageSize: 10,
-        nurseStationName: null,
-        id: null,
-        nurseStationId: null,
+      
       };
       this.handleQuery2();
     },
+    resetQuery4() {
+      this.resetForm("queryForm");
+      this.nurseStationqueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+      };
+      this.handleQuery4();
+    },
     resetQuery3() {
       this.queryParams3 = {
         pageNum: 1,
@@ -1371,7 +1377,7 @@ export default {
         departmentName: null,
         nurseStationId: null,
       };
-       this.handleQuery3()
+      this.handleQuery3();
     },
     resetQuery() {
       if (this.nurseStationlist[0].isAdmin == "1") {