From fd50e489581ec23d33f7a5306755d24cc098d755 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Sun, 22 Dec 2024 19:46:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=81=A5=E5=BA=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=EF=BC=8C=E7=95=8C=E9=9D=A2UI=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/health/activity/index.vue           |  1 +
 src/views/health/doctorRecord/index.vue       |  2 +-
 src/views/health/healthRecord/index.vue       |  9 +++++----
 src/views/health/heightWeightRecord/index.vue |  2 +-
 src/views/health/person/index.vue             | 16 ++++++++--------
 src/views/health/processRecord/index.vue      |  3 ++-
 src/views/health/temperatureRecord/index.vue  |  3 ++-
 7 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/views/health/activity/index.vue b/src/views/health/activity/index.vue
index 2cb585a..65061a5 100644
--- a/src/views/health/activity/index.vue
+++ b/src/views/health/activity/index.vue
@@ -157,6 +157,7 @@ const data = reactive({
   rules: {
     name: [{ required: true, message: '活动名称不能为空', trigger: 'blur' }],
     type: [{ required: true, message: '类型不能为空', trigger: 'change' }],
+    activityVolume: [{ required: true, message: '活动量不能为空', trigger: 'change' }],
     place: [{ required: true, message: '活动地点不能为空', trigger: 'blur' }],
     startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
     endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
diff --git a/src/views/health/doctorRecord/index.vue b/src/views/health/doctorRecord/index.vue
index 976b4a4..112bc73 100644
--- a/src/views/health/doctorRecord/index.vue
+++ b/src/views/health/doctorRecord/index.vue
@@ -769,7 +769,7 @@ function reset() {
     visitingTime: null,
     prescribe: null,
     personId: null,
-    totalCost: null,
+    totalCost: 0,
     partner: null,
     costDetail: null
   }
diff --git a/src/views/health/healthRecord/index.vue b/src/views/health/healthRecord/index.vue
index 0d667b1..6b35adb 100644
--- a/src/views/health/healthRecord/index.vue
+++ b/src/views/health/healthRecord/index.vue
@@ -112,6 +112,10 @@
             <el-option v-for="dict in etiology" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="康复时间" style="width: 792px" prop="rehabilitationTime">
+          <el-date-picker clearable v-model="form.rehabilitationTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择康复时间">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="初期症状" style="width: 792px" prop="initialSymptoms">
           <el-input v-model="form.initialSymptoms" type="textarea" placeholder="请输入初期症状" />
         </el-form-item>
@@ -122,10 +126,7 @@
         <el-form-item label="后期症状" style="width: 792px" prop="laterStageSymptoms">
           <el-input v-model="form.laterStageSymptoms" type="textarea" placeholder="请输入后期症状" />
         </el-form-item>
-        <el-form-item label="康复时间" style="width: 792px" prop="rehabilitationTime">
-          <el-date-picker clearable v-model="form.rehabilitationTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择康复时间">
-          </el-date-picker>
-        </el-form-item>
+
         <el-form-item label="备注" style="width: 792px" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
diff --git a/src/views/health/heightWeightRecord/index.vue b/src/views/health/heightWeightRecord/index.vue
index 09e8e55..13344d0 100644
--- a/src/views/health/heightWeightRecord/index.vue
+++ b/src/views/health/heightWeightRecord/index.vue
@@ -49,7 +49,7 @@
     </div>
     <!-- 添加或修改身高体重记录对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="heightWeightRecordRef" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="heightWeightRecordRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="人员姓名" prop="personId">
           <el-select v-model="form.personId" placeholder="请选择人员姓名" @change="handlePersonChange" clearable>
             <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
diff --git a/src/views/health/person/index.vue b/src/views/health/person/index.vue
index d3406aa..568493b 100644
--- a/src/views/health/person/index.vue
+++ b/src/views/health/person/index.vue
@@ -67,8 +67,8 @@
       </div>
     </div>
     <!-- 添加或修改成员管理对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="personRef" :model="form" :rules="rules" label-width="100px">
+    <el-dialog :title="title" v-model="open" width="860px" append-to-body>
+      <el-form ref="personRef" :model="form" :inline="true" :rules="rules" label-width="100px">
         <el-form-item label="姓名" prop="name">
           <el-input v-model="form.name" placeholder="请输入姓名" />
         </el-form-item>
@@ -83,7 +83,7 @@
         <el-form-item label="生日" prop="birthday">
           <el-date-picker clearable v-model="form.birthday" type="date" value-format="YYYY-MM-DD" placeholder="请选择生日"> </el-date-picker>
         </el-form-item>
-        <el-form-item label="性别">
+        <el-form-item label="性别" prop="sex">
           <el-select v-model="form.sex" placeholder="请选择性别">
             <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
@@ -92,9 +92,6 @@
           <el-input v-model="form.identityCard" placeholder="请输入身份证" />
         </el-form-item>
 
-        <el-form-item label="排序" prop="ranking">
-          <el-input-number v-model="form.ranking" placeholder="排序" />
-        </el-form-item>
         <el-form-item label="身高" prop="height">
           <el-input v-model="form.height" type="number" placeholder="请输入身高">
             <template #suffix>CM</template>
@@ -106,7 +103,10 @@
             <template #suffix>KG</template>
           </el-input>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+        <el-form-item label="排序" style="width: 360px" prop="ranking">
+          <el-input-number style="width: 360px" v-model="form.ranking" placeholder="排序" />
+        </el-form-item>
+        <el-form-item label="备注" style="width: 752px" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
@@ -153,7 +153,7 @@ const data = reactive({
   rules: {
     name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
     type: [{ required: true, message: '类型不能为空', trigger: 'change' }],
-    sex: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+    sex: [{ required: true, message: '性别不能为空', trigger: 'change' }],
     birthday: [{ required: true, message: '生日不能为空', trigger: 'blur' }],
     nickName: [{ required: true, message: '昵称不能为空', trigger: 'blur' }]
   }
diff --git a/src/views/health/processRecord/index.vue b/src/views/health/processRecord/index.vue
index 24d9a3b..359b41b 100644
--- a/src/views/health/processRecord/index.vue
+++ b/src/views/health/processRecord/index.vue
@@ -53,7 +53,7 @@
     </div>
     <!-- 添加或修改档案过程记录对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="processRecordRef" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="processRecordRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="人员姓名" prop="personId">
           <el-select v-model="form.personId" placeholder="请选择人员姓名" @change="handlePersonChange" clearable>
             <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
@@ -133,6 +133,7 @@ const data = reactive({
   },
   rules: {
     personId: [{ required: true, message: '人员姓名不能为空', trigger: 'blur' }],
+    healthRecordId: [{ required: true, message: '健康档案不能为空', trigger: 'change' }],
     recordingTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
     content: [{ required: true, message: '记录内容不能为空', trigger: 'blur' }]
   }
diff --git a/src/views/health/temperatureRecord/index.vue b/src/views/health/temperatureRecord/index.vue
index 5e59371..94e86cb 100644
--- a/src/views/health/temperatureRecord/index.vue
+++ b/src/views/health/temperatureRecord/index.vue
@@ -61,7 +61,7 @@
     </div>
     <!-- 添加或修改体温记录对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="temperatureRecordRef" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="temperatureRecordRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="人员姓名" prop="personId">
           <el-select v-model="form.personId" placeholder="请选择人员姓名" @change="handlePersonChange" clearable>
             <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
@@ -150,6 +150,7 @@ const data = reactive({
   rules: {
     personId: [{ required: true, message: '人员姓名不能为空', trigger: 'blur' }],
     measureTime: [{ required: true, message: '测量时间不能为空', trigger: 'blur' }],
+    healthRecordId: [{ required: true, message: '健康档案不能为空', trigger: 'change' }],
     temperature: [{ required: true, message: '体温不能为空', trigger: 'blur' }]
   }
 })