From 9dd120cf1a20e9825c0395a4dfa60130f1b02c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Mon, 10 Apr 2023 15:22:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/person/index.vue   | 20 ++++++++++++++++----
 src/views/system/person/personjs.js |  6 +++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index deaa023..880314a 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -6,7 +6,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="70px"
     >
       <el-form-item label="护理站" prop="nurseStationId">
         <el-select
@@ -23,7 +23,7 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="所属科室" prop="departmentName" style="margin-left: 25px">
+      <el-form-item label="所属科室" prop="departmentName">
         <el-input
           v-model="queryParams.departmentName"
           placeholder="请输入所属科室"
@@ -326,7 +326,6 @@
             "
           >{{ nurseStationName }}</el-button>
         </el-form-item>
-
         <el-form-item label="所属科室" prop="departmentName">
           <el-button
             type
@@ -353,6 +352,16 @@
             style="width: 300px"
           />
         </el-form-item>
+        <el-form-item label="出生日期" prop="birthDate">
+          <el-date-picker
+            v-model="form.birthDate"
+            format="yyyy 年 MM 月 dd 日"
+            value-format="yyyy-MM-dd"
+            type="date"
+            placeholder="选择日期"
+            style="width: 300px"
+          ></el-date-picker>
+        </el-form-item>
         <el-form-item label="护理人职称" prop="nursePersonType">
           <el-select
             v-model="form.nursePersonType"
@@ -493,7 +502,10 @@
           <div class="text">{{ form.nursePersonName }}</div>
         </el-form-item>
         <el-form-item label="护理人职称">
-          <div class="text">{{ form.nursePersonType }}</div>
+          <div class="text">
+            {{ form.nursePersonType=='NURSE'?"护士":'' }}
+            {{ form.nursePersonType=='NURSE_TEACHER'?"护理师":'' }}
+          </div>
         </el-form-item>
         <el-form-item label="性别">
           <div class="text">
diff --git a/src/views/system/person/personjs.js b/src/views/system/person/personjs.js
index 9994b03..7b5a417 100644
--- a/src/views/system/person/personjs.js
+++ b/src/views/system/person/personjs.js
@@ -42,7 +42,7 @@ export default {
             //男女选择
             positionalTitleLevellist: [{
                 label: "初级",
-                value: "'PRIMARY_LEVEL",
+                value: "PRIMARY_LEVEL",
             }, {
                 label: "中级",
                 value: "MIDDLE_LEVEL",
@@ -174,6 +174,9 @@ export default {
             idd: 1,
             // 表单校验
             rules: {
+                birthDate: [
+                    { required: true, message: "请选择出生日期", trigger: "blur" },
+                ],
                 positionalTitleLevel: [
                     { required: true, message: "请选择职称级别", trigger: "blur" },
                 ],
@@ -387,6 +390,7 @@ export default {
         // 表单重置
         reset() {
             this.form = {
+                birthDate: null,
                 id: null,
                 nurseStationId: null,
                 departmentCode: null,