From e9f07bb3891d1480c40773320a6a712314a3d57b Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期三, 17 二月 2021 21:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/Informationinput.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 9874124..c1eb49c 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -798,7 +798,7 @@
<el-form-item label="体检医院" prop="hospital">
<el-input v-model="physicalExamForm.hospital" />
</el-form-item>
- <el-form-item label="体检类型">
+ <el-form-item label="体检类型" prop="physicalExamType">
<el-select
v-model="physicalExamForm.physicalExamType"
placeholder="请选择体检类型"
@@ -807,7 +807,7 @@
<el-option label="员工体检" value="2" />
</el-select>
</el-form-item>
- <el-form-item label="转氨酶">
+ <el-form-item label="转氨酶" prop="transaminase">
<el-input v-model="physicalExamForm.transaminase" />
</el-form-item>
</el-col>
@@ -829,11 +829,11 @@
placeholder="选择体检日期"
/>
</el-form-item>
- <el-form-item label="血压">
+ <el-form-item label="血压" prop="bloodPressure">
<el-input v-model="physicalExamForm.bloodPressure" />
</el-form-item>
- <el-form-item label="心电图">
- <el-select v-model="physicalExamForm.name" placeholder="ecg">
+ <el-form-item label="心电图" prop="ecg">
+ <el-select v-model="physicalExamForm.ecg" placeholder="ecg">
<el-option label="正常" value="1" />
<el-option label="异常" value="0" />
</el-select>
@@ -845,14 +845,14 @@
<el-form-item label="体检结论" prop="conclusion">
<el-input v-model="physicalExamForm.conclusion" />
</el-form-item>
- <el-form-item label="复查记录">
+ <el-form-item label="复查记录" prop="reviewRecord">
<el-input v-model="physicalExamForm.reviewRecord" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="备注">
+ <el-form-item label="备注" prop="remark">
<el-input v-model="physicalExamForm.remark" type="textarea" />
</el-form-item>
</el-col>
@@ -1867,9 +1867,9 @@
physicalExamDate: [{ required: true, message: '请选择体检日期', trigger: 'change' }],
hospital: [{ required: true, message: '请输入体检医院', trigger: 'blur' }, { max: 64, message: '长度不超过64个字符', trigger: 'blur' }],
physicalExamType: [{ required: true, message: '请选择体检类型', trigger: 'change' }],
- bloodPressure: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
- transaminase: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
- ecg: [{ max: 16, message: '长度不超过16个字符', trigger: 'blur' }],
+ bloodPressure: [{ required: true, message: '请输入血压', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
+ transaminase: [{ required: true, message: '请输入转氨酶', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
+ ecg: [{ required: true, message: '请选择心电图', trigger: 'change' }, { max: 16, message: '长度不超过16个字符', trigger: 'blur' }],
conclusion: [{ required: true, message: '请输入体检结论', trigger: 'blur' }, { max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
reviewRecord: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
--
Gitblit v1.8.0