Merge branch 'master' into 'master'

慢特病验证优化

See merge request lighter/vue-intergration-platform!69

src/views/clinic/chronicDisease/ChronicDiseaseRegister.vue

@@ -411,7 +411,7 @@
                             <el-row>
                                 <el-col :span="6">
                                     <el-form-item label="身高" prop="height">
-                                        <el-input v-model="ruleForm.height" maxlength="12" show-word-limit
+                                        <el-input v-model="ruleForm.height" type="number" maxlength="12" show-word-limit
                                             placeholder="请填写身高">
                                             <template #append>cm</template>
                                         </el-input>
@@ -419,7 +419,7 @@
                                 </el-col>
                                 <el-col :span="6">
                                     <el-form-item label="体重" prop="weight">
-                                        <el-input v-model="ruleForm.weight" maxlength="12" show-word-limit
+                                        <el-input v-model="ruleForm.weight" type="number" maxlength="12" show-word-limit
                                             placeholder="请填写体重">
                                             <template #append>kg</template>
                                         </el-input>
@@ -427,8 +427,8 @@
                                 </el-col>
                                 <el-col :span="6">
                                     <el-form-item label="体温" prop="temperature">
-                                        <el-input v-model="ruleForm.temperature" maxlength="12" show-word-limit
-                                            placeholder="请填写体温">
+                                        <el-input v-model="ruleForm.temperature" type="number" maxlength="12"
+                                            show-word-limit placeholder="请填写体温">
                                             <template #append>°C</template>
                                         </el-input>
                                     </el-form-item>
@@ -436,7 +436,7 @@
                                 <el-col :span="6">
                                     <el-form-item label="心率" prop="heartRate">
                                         <el-input v-model="ruleForm.heartRate" maxlength="12" show-word-limit
-                                            placeholder="请填写心率">
+                                            placeholder="请填写心率" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                                             <template #append>次</template>
                                         </el-input>
                                     </el-form-item>
@@ -446,7 +446,7 @@
                                 <el-col :span="6">
                                     <el-form-item label="舒张血压" prop="bloodPressureLow">
                                         <el-input v-model.number="ruleForm.bloodPressureLow" maxlength="12" show-word-limit
-                                            placeholder="请填写舒张血压">
+                                            placeholder="请填写舒张血压" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                                             <template #append>mmHg</template>
                                         </el-input>
                                     </el-form-item>
@@ -454,14 +454,14 @@
                                 <el-col :span="6">
                                     <el-form-item label="收缩血压" prop="bloodPressureHigh">
                                         <el-input v-model.number="ruleForm.bloodPressureHigh" maxlength="12" show-word-limit
-                                            placeholder="请填写收缩血压">
+                                            placeholder="请填写收缩血压" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
                                             <template #append>mmHg</template>
                                         </el-input>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="6">
                                     <el-form-item label="血糖" prop="bloodSugar">
-                                        <el-input v-model="ruleForm.bloodSugar" maxlength="12" show-word-limit
+                                        <el-input v-model="ruleForm.bloodSugar" type="number" maxlength="12" show-word-limit
                                             placeholder="请填写血糖">
                                             <template #append>mmol/L</template>
                                         </el-input>
@@ -695,26 +695,6 @@ const ruleForm = ref<RuleForm>({
     bloodOxygen: '',
 })
 
-const validateInt = (rule: any, value: any, callback: any) => {
-    if (value !== '') {
-        if (Number.isInteger(value)) {
-            callback(new Error('请填写数字'))
-        }
-        if (!ruleFormRef.value) return
-    }
-    callback()
-}
-
-const validateFloat = (rule: any, value: any, callback: any) => {
-    if (value !== '') {
-        if (Number.isNaN(Number.parseFloat(value))) {
-            callback(new Error('请填写数字(可以包含小数点)'))
-        }
-        if (!ruleFormRef.value) return
-    }
-    callback()
-}
-
 const rulesAll = reactive<FormRules<RuleForm>>({
     pName: [
         { required: true, message: '请填写用户名称', trigger: 'blur' },
@@ -768,13 +748,6 @@ const rulesAll = reactive<FormRules<RuleForm>>({
     visitDate: [
         { required: true, message: '请选择下次随访时间', trigger: 'change' },
     ],
-    height: [{ validator: validateFloat, trigger: 'blur' }],
-    weight: [{ validator: validateFloat, trigger: 'blur' }],
-    temperature: [{ validator: validateFloat, trigger: 'blur' }],
-    heartRate: [{ validator: validateInt, trigger: 'blur' }],
-    bloodPressureLow: [{ validator: validateInt, trigger: 'blur' }],
-    bloodPressureHigh: [{ validator: validateInt, trigger: 'blur' }],
-    bloodSugar: [{ validator: validateFloat, trigger: 'blur' }],
 })
 
 const queryCmr = async () => {
@@ -829,8 +802,8 @@ const submitForm = async (formEl: FormInstance | undefined) => {
         } else {
             console.log('error submit!', fields)
             ElMessage({
-                type: "success",
-                message: '未完成必填项或者填写项不符合',
+                type: "info",
+                message: '未完成必填项或者填写项不符合,请检查',
                 duration: 2500,
                 showClose: true,
             });