From 8cd39c00bb2206303f855e1d6a561de803af2228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Tue, 8 Nov 2022 15:05:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E7=90=86=E7=AB=99=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/person/index.vue | 176 +++++++++++++-----------------
 1 file changed, 77 insertions(+), 99 deletions(-)

diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index 1b77f61..63307ff 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -8,10 +8,13 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="护理站" prop="nurseStationId"  v-if="nurseStationlist.find((e) => e.isAdmin == '1')">
+      <el-form-item
+        label="护理站"
+        prop="nurseStationId"
+        v-if="nurseStationlist.find((e) => e.isAdmin == '1')"
+      >
         <el-select
           v-model="queryParams.nurseStationId"
-
           placeholder="请选择护理站"
           v-loadmore="loadMore"
           @keyup.enter.native="handleQuery"
@@ -26,7 +29,7 @@
         </el-select>
       </el-form-item>
 
-       <el-form-item label="护理站" prop="nurseStationId" v-else>
+      <el-form-item label="护理站" prop="nurseStationId" v-else>
         <el-select
           v-model="queryParams.nurseStationId"
           placeholder="请选择护理站"
@@ -41,7 +44,11 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="所属科室" prop="departmentName" style="margin-left:25px">
+      <el-form-item
+        label="所属科室"
+        prop="departmentName"
+        style="margin-left: 25px"
+      >
         <el-input
           v-model="queryParams.departmentName"
           placeholder="请输入所属科室"
@@ -159,7 +166,12 @@
       </el-table-column>
 
       <el-table-column label="联系电话" align="center" prop="phone" />
-      <el-table-column label="居住地址" align="center" prop="address" :show-overflow-tooltip="true"/>
+      <el-table-column
+        label="居住地址"
+        align="center"
+        prop="address"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
 
@@ -223,7 +235,6 @@
             :prop="`nurseStationPersonList.${index}.nurseStationId`"
           >
             <el-button
-
               type=""
               @click="clickinnerVisible(item, index)"
               v-if="item.nurseStationName == '请选择护理站名称'"
@@ -237,7 +248,6 @@
               >{{ item.nurseStationName }}</el-button
             >
             <el-button
-
               type=""
               @click="clickinnerVisible(item, index)"
               v-else
@@ -485,11 +495,14 @@
           align="center"
           prop="nurseStationType"
         >
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="looktype(scope.row)"
-            >查看</el-button
-          >
-        </template>
+          <template slot-scope="scope">
+            {{
+              scope.row.nurseStationType == "LX202209140018" ? "生活护理" : ""
+            }}
+            {{
+              scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : ""
+            }}
+          </template>
         </el-table-column>
 
         <el-table-column
@@ -508,7 +521,6 @@
         >
         </el-table-column>
       </el-table>
-      
       <pagination
         v-show="total2 > 0"
         :total="total2"
@@ -516,31 +528,6 @@
         :limit.sync="queryParams2.pageSize"
         @pagination="handleQuery2"
       />
-    </el-dialog>
-       <!-- 查看护理类型 -->
-       <el-dialog
-      title="护理类型"
-      :visible.sync="typeopen"
-      width="700px"
-      append-to-body
-    >
-      <el-table v-loading="loading" :data="typelooks">
-        <el-table-column
-          label="护理类型名称"
-          align="center"
-          prop="nurseTypeName"
-        />
-        <el-table-column
-          label="护理类型编号"
-          align="center"
-          prop="nurseTypeCode"
-        />
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" plain @click="typeopen = false" size="small"
-          >关闭窗口</el-button
-        >
-      </div>
     </el-dialog>
     <!-- 修改护理站名称弹框 -->
     <el-dialog
@@ -722,14 +709,14 @@
           <template slot-scope="scope">
             <el-button
               type="primary"
-              style="width: 15px; height: 15px;overflow: hidden;"
+              style="width: 15px; height: 15px; overflow: hidden"
               v-if="departid == scope.row.departmentCode"
               circle
               @click="StationDepartmentclick(scope.row)"
             ></el-button>
             <el-button
               v-else
-              style="width: 15px; height: 15px;overflow: hidden;"
+              style="width: 15px; height: 15px; overflow: hidden"
               circle
               @click="StationDepartmentclick(scope.row)"
             ></el-button>
@@ -894,7 +881,7 @@
           style="margin-left: -20px"
         >
           <el-button
-          disabled
+            disabled
             type=""
             @click="clickinnerVisible2"
             v-if="nurseStationName == '请选择护理站名称'"
@@ -902,7 +889,7 @@
             >{{ nurseStationName }}</el-button
           >
           <el-button
-           disabled
+            disabled
             type=""
             @click="clickinnerVisible2"
             v-else
@@ -942,6 +929,13 @@
             >{{ departmentName }}</el-button
           >
         </el-form-item>
+        <el-form-item label="姓名" prop="nursePersonName" >
+          <el-input
+            maxlength="15"
+            v-model="form.nursePersonName"
+            placeholder="请输入姓名"
+          />
+        </el-form-item>
         <el-form-item
           label="护理人职称"
           prop="nursePersonType"
@@ -986,7 +980,6 @@
             maxlength="11"
           />
         </el-form-item>
-
         <el-form-item label="居住地址" prop="address">
           <el-input
             v-model="form.address"
@@ -1048,7 +1041,6 @@ import {
   addPerson,
   updatePerson,
   stationList,
-  getInfoLists,
   StationDepartmentList,
 } from "@/api/system/person";
 import { getToken } from "@/utils/auth";
@@ -1078,10 +1070,7 @@ export default {
       cb(new Error("请输入正确的联系电话"));
     };
     return {
-      typeopen: false,
-      typelooks: [],
       //男女选择
-
       sexs: [
         {
           label: "男",
@@ -1203,21 +1192,9 @@ export default {
       index: "",
       // 表单校验
       rules: {
+      
         nursePersonName: [
-          {
-            required: true,
-            message: "护理站人员名称不能为空",
-            trigger: "blur",
-          },
-        ],
-        // departmentName: [
-        //   { required: true, message: "所属科室不能为空", trigger: "blur" },
-        // ],
-        // nurseStationId: [
-        //   { required: true, message: "所属护理站不能为空", trigger: "blur" },
-        // ],
-        nursePersonName: [
-          { required: true, message: "护理人姓名不能为空", trigger: "blur" },
+          { required: true, message: "姓名不能为空", trigger: "blur" },
         ],
         nursePersonType: [
           { required: true, message: "护理人职称不能为空", trigger: "blur" },
@@ -1288,21 +1265,10 @@ export default {
   methods: {
     // // 新增所属科室按钮
     departclick(item, index) {
-
       console.log(item);
       this.departid = item.departmentCode;
       this.innerVisible2 = true;
       this.index = index;
-    },
-      //查看类型
-      looktype(item) {
-      // console.log(item);
-      this.typelooks = [];
-      getInfoLists(item.nurseStationType).then((res) => {
-        console.log(res);
-        this.typelooks = res.data;
-        this.typeopen = true;
-      });
     },
     // // 修改所属科室按钮
     departclick2() {
@@ -1318,7 +1284,6 @@ export default {
     },
     // 新增护理站按钮
     clickinnerVisible(item, index) {
-
       // console.log(item);
       this.stationid = item.nurseStationId;
       this.innerVisible = true;
@@ -1452,8 +1417,8 @@ export default {
     },
     getList2() {
       // 护理站名称
-       this.loading = true;
-       stationList(this.queryParams2).then((res) => {
+      this.loading = true;
+      stationList(this.queryParams2).then((res) => {
         this.stationLists = res.rows;
         this.total2 = res.total;
         this.loading = false;
@@ -1463,7 +1428,6 @@ export default {
         this.total3 = res.total;
         this.loading = false;
       });
-
     },
     // 取消按钮
     cancel() {
@@ -1476,7 +1440,6 @@ export default {
     },
     // 表单重置
     reset() {
-
       this.form = {
         id: null,
         nurseStationId: null,
@@ -1510,7 +1473,6 @@ export default {
         ],
       };
       this.resetForm("form");
-
     },
 
     /** 搜索按钮操作 */
@@ -1580,22 +1542,22 @@ export default {
 
     resetQuery() {
       if (this.nurseStationlist[0].isAdmin == "1") {
-          this.resetForm("queryForm");
-      this.queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        nurseStationId: null,
-        departmentCode: null,
-        userId: null,
-        nursePersonCode: null,
-        nursePersonName: null,
-        nursePersonType: null,
-        phone: null,
-        address: null,
-      };
+        this.resetForm("queryForm");
+        this.queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+          nurseStationId: null,
+          departmentCode: null,
+          userId: null,
+          nursePersonCode: null,
+          nursePersonName: null,
+          nursePersonType: null,
+          phone: null,
+          address: null,
+        };
 
-      this.handleQuery();
-     } else {
+        this.handleQuery();
+      } else {
         console.log(1);
         console.log(this.nurseStationlist);
         this.queryParams.departmentName = null;
@@ -1633,10 +1595,9 @@ export default {
         this.title = "修改护理站人员信息";
         if (this.departmentName == null && this.departmentName == undefined) {
           this.departmentName = "请选择所属科室";
-        } else{
-           this.departmentName = response.data.departmentName;
+        } else {
+          this.departmentName = response.data.departmentName;
         }
-
       });
     },
     /** 提交按钮 */
@@ -1669,7 +1630,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除护理站人员信息的数据项？')
+        .confirm("是否确认删除护理站人员信息的数据项？")
         .then(function () {
           return delPerson(ids);
         })
@@ -1727,7 +1688,7 @@ export default {
         `person_${new Date().getTime()}.xlsx`
       );
     },
-     //权限列表
+    //权限列表
     info() {
       getListByUser(this.nurseStationqueryParams).then((res) => {
         console.log(res);
@@ -1761,7 +1722,24 @@ export default {
         }
       }
     },
-
+    // loadMore() {
+    //   console.log("1");
+    //   var a = Math.ceil(this.total4 / 10);
+    //   console.log(this.nurseStationlist.length);
+    //   if (this.nurseStationlist.length + 1 >= this.total4) {
+    //   } else {
+    //     if (this.nurseStationqueryParams.pageNum >= a) {
+    //     } else {
+    //       this.nurseStationqueryParams.pageNum++;
+    //       stationList(this.nurseStationqueryParams).then((res) => {
+    //         console.log(res);
+    //         res.rows.forEach((e) => {
+    //           this.nurseStationlist.push(e);
+    //         });
+    //       });
+    //     }
+    //   }
+    // },
   },
 };
 </script>