diff --git a/src/pages/health/activity/addEdit.vue b/src/pages/health/activity/addEdit.vue
index aea6c71..2f26435 100644
--- a/src/pages/health/activity/addEdit.vue
+++ b/src/pages/health/activity/addEdit.vue
@@ -40,6 +40,10 @@
+
+
+
@@ -136,6 +140,8 @@ rules: {
partner: [{ required: true, message: '成员不能为空', trigger: ['change', 'blur'] }],
startTime: [{ required: true, message: '开始时间不能为空', trigger: ['change', 'blur'] }],
endTime: [{ required: true, message: '结束时间不能为空', trigger: ['change', 'blur'] }],
+ exerciseTime: [{ required: true, message: '活动时长不能为空', trigger: ['change', 'blur'] }],
+ activityVolume: [{ required: true, message: '活动量不能为空', trigger: ['change', 'blur'] }],
typeName: [{ required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
}
})
diff --git a/src/pages/health/activity/list.vue b/src/pages/health/activity/list.vue
index 603d6c6..647734e 100644
--- a/src/pages/health/activity/list.vue
+++ b/src/pages/health/activity/list.vue
@@ -14,11 +14,11 @@
- 活动地点:
- {{ item.place }}
+ 活动名称:
+ {{ item.name }}
成员:
@@ -32,10 +32,10 @@
结束时间:
{{ item.endTime }}
-
+
活动量:
{{ item.activityVolume }}
diff --git a/src/pages/health/marRecord/list.vue b/src/pages/health/marRecord/list.vue
index a28339d..4106193 100644
--- a/src/pages/health/marRecord/list.vue
+++ b/src/pages/health/marRecord/list.vue
@@ -77,6 +77,10 @@
+
+ 人员名称:
+ {{ item.personName }}
+
用药时间:
{{ item.dosingTime }}
@@ -85,10 +89,6 @@
用药类型:
{{ dictStr(item.type, typeList) }}
-
- 人员名称:
- {{ item.personName }}
-
健康档案:
{{ item.healthRecordName }}
diff --git a/src/pages/health/person/list.vue b/src/pages/health/person/list.vue
index bc4081a..9bd49f6 100644
--- a/src/pages/health/person/list.vue
+++ b/src/pages/health/person/list.vue
@@ -14,12 +14,12 @@
-
+
类型:
{{ dictStr(item.type,typeList) }}
@@ -28,10 +28,10 @@
生日:
{{ item.birthday }}
-
+
身高(CM):
{{ item.height }}