From b391b29d3e4e9ac986334e9c1b368381acddf1e5 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 14 Nov 2022 13:54:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E7=90=86=E7=AB=99=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=20=E6=89=80=E5=B1=9E=E6=8A=A4=E7=90=86=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/person/index.vue | 81 ++++++++++++++++++-------------
 1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index d631f51..1506866 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -254,8 +254,8 @@
           <el-form-item
             label="所属科室"
             label-width="120px"
-            :rules="rules.nurseStationPersonList.departmentCode"
-            :prop="`nurseStationPersonList.${index}.departmentCode`"
+            :rules="rules.nurseStationPersonList.departmentName"
+            :prop="`nurseStationPersonList.${index}.departmentName`"
           >
             <el-button
               type=""
@@ -642,7 +642,7 @@
             ></el-button>
           </template>
         </el-table-column>
-         <el-table-column
+        <el-table-column
           property="nurseStationName"
           label="护理站名称"
           align="center"
@@ -741,6 +741,12 @@
             ></el-button>
           </template>
         </el-table-column>
+        <el-table-column
+          property="nurseStationName"
+          label="护理站名称"
+          align="center"
+        >
+        </el-table-column>
         <el-table-column
           property="departmentCode"
           label="科室编码"
@@ -1120,7 +1126,7 @@ export default {
               trigger: "blur",
             },
           ],
-          departmentCode: [
+          departmentName: [
             { required: true, message: "所属科室不能为空", trigger: "blur" },
           ],
           nurseStationId: [
@@ -1155,34 +1161,38 @@ export default {
   methods: {
     // // 新增所属科室按钮
     departclick(item, index) {
-      this.form.nurseStationId
-      if(this.form.nurseStationId == null){
-        this.innerVisible2 = false;
-        this.$message.error('请先选择所属护理站');
-           
-      }else{
+      if (this.form.nurseStationId != null) {
+        this.getList3();
+        console.log(item);
+        this.departid = item.departmentCode;
+        this.innerVisible2 = true;
+        this.index = index;
 
-      this.getList3();
-      console.log(item);
-      this.departid = item.departmentCode;
-      this.innerVisible2 = true;
-      this.index = index;
+      } else {
+        // this.innerVisible2 = false;
+        this.$message.error('请先选择所属护理站');
       }
-     
+
     },
     // // 修改所属科室按钮
     departclick2() {
-      this.getList3();
-      this.departid2 = this.form.departmentCode;
-      this.innerVisiblexg2 = true;
-      // this.index = index;
+      console.log(this.form.nurseStationId)
+      if (this.form.nurseStationId != null) {
+        this.getList3();
+        this.departid2 = this.form.departmentCode;
+        this.innerVisiblexg2 = true;
+
+      } else {
+        // this.innerVisible2 = false;
+        this.$message.error('请先选择所属护理站');
+      }
     },
     //修改护理站按钮
     departclickxg() {
       this.info();
       this.stationid2 = this.form.nurseStationId;
       this.innerVisiblexg = true;
-       this.index = index;
+      // this.index = index;
     },
     // 新增护理站按钮
     clickinnerVisible(item, index) {
@@ -1197,6 +1207,7 @@ export default {
       this.nurseStationName = row.nurseStationName;
       this.stationid2 = row.id;
       this.form.nurseStationId = row.id;
+      this.queryParams3.nurseStationId = row.id;
       this.innerVisiblexg = false;
       this.form.nursename = row.nurseStationName;
     },
@@ -1207,6 +1218,7 @@ export default {
     },
 
     adddisease() {
+      this.form.nurseStationId = null
       var obj = {
         nursePersonCode: "",
         nursePersonCode: "",
@@ -1218,7 +1230,7 @@ export default {
         nurseStationId: "",
         departmentName: "请选择所属科室",
         // departname: "",
-        nurseStationName: "请选择护理站名称",
+        nurseStationName: "请选择所属护理站",
       };
       if (this.form.nurseStationPersonList.length == 5) {
         this.$message.error("最多只能5条");
@@ -1232,6 +1244,7 @@ export default {
       this.nursename = row.nurseStationName;
       this.stationid = row.id;
       this.form.nurseStationId = row.id;
+      this.queryParams3.nurseStationId = row.id;
       console.log(this.form.nurseStationId);
       console.log(this.form);
       this.innerVisible = false;
@@ -1291,6 +1304,7 @@ export default {
         this.departtotal = res.total;
         this.loading = false;
       });
+
     },
     // 取消按钮
     cancel() {
@@ -1365,7 +1379,7 @@ export default {
     departcancel() {
       this.innerVisible2 = false;
       this.innerVisiblexg2 = false;
-      this.resetQuery3();
+      // this.resetQuery3();
     },
     resetQuery2() {
       this.resetForm("queryForm");
@@ -1384,15 +1398,10 @@ export default {
       this.handleQuery4();
     },
     resetQuery3() {
-      this.queryParams3 = {
-        pageNum: 1,
-        pageSize: 10,
-        nurseStationName: null,
-        id: null,
-        departmentCode: null,
-        departmentName: null,
-        nurseStationId: null,
-      };
+      this.queryParams3.pageNum = 1;
+      this.queryParams3.pageSize = 10;
+      this.queryParams3.departmentName = null;
+      this.queryParams3.departmentCode = null;
       this.handleQuery3();
     },
     resetQuery() {
@@ -1429,6 +1438,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.queryParams3.nurseStationId=null
       this.reset();
       this.open2 = true;
       this.title = "添加护理站人员信息";
@@ -1443,6 +1453,7 @@ export default {
         this.departmentName = response.data.departmentName;
         this.nurseStationName = response.data.nurseStationName;
         this.form = response.data;
+        this.queryParams3.nurseStationId=response.data.nurseStationId
         this.open = true;
         this.title = "修改护理站人员信息";
         if (this.departmentName == null && this.departmentName == undefined) {
@@ -1487,7 +1498,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -1515,8 +1526,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 }
       );