提交 87a4f62b 编写于 作者: tao.wu's avatar tao.wu

Merge branch 'dev-scaleHype-20190428' of...

Merge branch 'dev-scaleHype-20190428' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-scaleHype-20190428
...@@ -69,3 +69,14 @@ export const checkNormalInt = (rule, value, callback) => { ...@@ -69,3 +69,14 @@ export const checkNormalInt = (rule, value, callback) => {
callback(new Error(`请输入大于0的正整数`)) callback(new Error(`请输入大于0的正整数`))
} }
} }
// 校验是否是两位小数
export const checkNumberIsToFixedTwo = (rule, value, callback) => {
const isNum = /^(-)?(0|[1-9]\d*)(\s|$|\.\d{1,2}\b)/;
const val = Number(value);
if(isNum.test(val) || checkNeedRule(val)){
callback()
}else{
callback(new Error(`最多输入2位小数`))
}
}
import range from './range'; import range from './range';
import rangeHype from './rangeHype'; import rangeHype from './rangeHype';
import rangeDiabetes from './rangeDiabetes';
export default [ export default [
...range, ...range,
...rangeHype ...rangeHype,
...rangeDiabetes
] ]
// 高血压字段校验的配置文件
export default [
{
field: 'systolicBloodPressure',
name: '收缩压SBP',
min: 70,
max: 240
},
{
field: 'diastolicBloodPressure',
name: '舒张压DBP',
min: 50,
max: 130
},
{
field: 'bodyHeight',
name: '身高',
min: 100,
max: 200
},
{
field: 'bodyWeight',
name: '体重',
min: 35,
max: 200
},
{
field: 'fastingBloodSugar',
name: '空腹血糖值',
min: 1,
max: 33.3
},
{
field: 'glycosylatedHemoglobinPercent',
name: '糖化血红蛋白值',
min: 3.00,
max: 20.00
},
]
import { checkRange, checkIsInteger, checkNumberIsToFixed } from '@/utils/followup/followupUtils/checkField'; import { checkRange, checkIsInteger, checkNumberIsToFixed, checkNumberIsToFixedTwo } from '@/utils/followup/followupUtils/checkField';
export default ($this) => { export default ($this) => {
return [ return [
...@@ -15,7 +15,7 @@ export default ($this) => { ...@@ -15,7 +15,7 @@ export default ($this) => {
type: 'text', type: 'text',
labmsg: '', labmsg: '',
slots: [{name: 'mmol/L', type: 'append'}], slots: [{name: 'mmol/L', type: 'append'}],
rules: [{ required: true, message: '请输入空腹血糖值', trigger: ['submit','change'] }] rules: [{ required: true, message: '请输入空腹血糖值', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkNumberIsToFixed , trigger: ['submit','change'] }]
}, },
{ {
formType: 'div', formType: 'div',
...@@ -25,8 +25,8 @@ export default ($this) => { ...@@ -25,8 +25,8 @@ export default ($this) => {
{ {
formType: 'input', formType: 'input',
className: 'float-none', className: 'float-none',
prop: 'fastingBloodSugar', prop: 'glycosylatedHemoglobinPercent',
model: 'fastingBloodSugar', model: 'glycosylatedHemoglobinPercent',
disabled: false, disabled: false,
label: '糖化血红蛋白值:', label: '糖化血红蛋白值:',
placeholder: '请输入糖化血红蛋白值', placeholder: '请输入糖化血红蛋白值',
...@@ -35,7 +35,19 @@ export default ($this) => { ...@@ -35,7 +35,19 @@ export default ($this) => {
type: 'text', type: 'text',
labmsg: '', labmsg: '',
slots: [{name: '%', type: 'append'}], slots: [{name: '%', type: 'append'}],
rules: [{ required: true, message: '请输入糖化血红蛋白值', trigger: ['submit','change'] }] rules: [{ required: false, message: '请输入糖化血红蛋白值', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkNumberIsToFixedTwo , trigger: ['submit','change'] }],
changeFun: (val)=>{
let flag = val ? true : false;
$this.addComponents.forEach((item,index)=>{
if(item.name == 'diabetesSourseAuxiliary'){
$this.addComponents[index].dataSource.forEach((item,index2)=>{
if(item.prop == 'glycosylatedHemoglobinDate'){
$this.addComponents[index].dataSource[index2].rules[0].required = flag;
}
})
}
})
}
}, },
{ {
formType: 'date-picker', formType: 'date-picker',
...@@ -48,7 +60,7 @@ export default ($this) => { ...@@ -48,7 +60,7 @@ export default ($this) => {
valueFormat: 'MM-dd', valueFormat: 'MM-dd',
dateType: 'date', dateType: 'date',
type: 'date', type: 'date',
rules: [{required: true, message: '请选择检查日期', trigger: ['submit','change']}], rules: [{required: false, message: '请选择检查日期', trigger: ['submit','change']}],
spanNum: 12, spanNum: 12,
}, },
] ]
......
...@@ -24,7 +24,7 @@ export default ($this) => { ...@@ -24,7 +24,7 @@ export default ($this) => {
prop: 'nextSmokingAmount', prop: 'nextSmokingAmount',
model: 'nextSmokingAmount', model: 'nextSmokingAmount',
disabled: false, disabled: false,
label: '下次日吸烟量:', label: '下次随访目标日吸烟量:',
placeholder: '请输入下次随访日吸烟量', placeholder: '请输入下次随访日吸烟量',
spanNum: 6, spanNum: 6,
maxlength: 30, maxlength: 30,
...@@ -54,7 +54,7 @@ export default ($this) => { ...@@ -54,7 +54,7 @@ export default ($this) => {
prop: 'nextAlcoholConsumption', prop: 'nextAlcoholConsumption',
model: 'nextAlcoholConsumption', model: 'nextAlcoholConsumption',
disabled: false, disabled: false,
label: '下次随访日饮酒量:', label: '下次随访目标日饮酒量:',
placeholder: '请输入下次随访日饮酒量', placeholder: '请输入下次随访日饮酒量',
spanNum: 6, spanNum: 6,
maxlength: 30, maxlength: 30,
...@@ -100,7 +100,7 @@ export default ($this) => { ...@@ -100,7 +100,7 @@ export default ($this) => {
prop: 'nextWorkoutOfWeek', prop: 'nextWorkoutOfWeek',
model: 'nextWorkoutOfWeek', model: 'nextWorkoutOfWeek',
disabled: false, disabled: false,
label: '下次随访运动情况:', label: '下次随访目标运动情况:',
placeholder: '请输入下次随访运动情况', placeholder: '请输入下次随访运动情况',
spanNum: 6, spanNum: 6,
maxlength: 30, maxlength: 30,
......
...@@ -2,67 +2,53 @@ import { checkRange, checkIsInteger, checkNumberIsToFixed } from '@/utils/follow ...@@ -2,67 +2,53 @@ import { checkRange, checkIsInteger, checkNumberIsToFixed } from '@/utils/follow
export default ($this) => { export default ($this) => {
return [ return [
// { {
// formType: 'input', formType: 'div',
// className: 'float-none', name: '胰岛素',
// prop: 'followUpUser', className: 'sec-title',
// model: 'followUpUser', },
// label: '姓名:', {
// disabled: false, formType: 'input',
// placeholder: '请输入姓名', className: 'float-none',
// spanNum: 12, prop: 'insulinType',
// maxlength: 30, model: 'insulinType',
// type: 'text', label: '种类:',
// labmsg: '次', disabled: false,
// rules: [{required: true, message: '请输入姓名', trigger: ['submit','change']}], placeholder: '请输入胰岛素种类',
// }, spanNum: 12,
// maxlength: 30,
// { type: 'text',
// formType: 'date-picker', labmsg: '次',
// className: 'float-none', rules: [{required: true, message: '请输入胰岛素种类', trigger: ['submit','change']}],
// prop: 'followUpDate', },
// model: 'followUpDate', {
// placeholder: '请选择', formType: 'input',
// label: '随访日期:', className: 'float-none',
// format: 'yyyy-MM-dd', prop: 'insulinMethod',
// valueFormat: 'yyyy-MM-dd', model: 'insulinMethod',
// dateType: 'date', label: '用法:',
// type: 'date', disabled: false,
// rules: [{required: true, message: '请选择随访日期', trigger: ['submit','change']}], placeholder: '请输入胰岛素用法',
// spanNum: 12, spanNum: 12,
// }, maxlength: 30,
// type: 'text',
// { labmsg: '次',
// formType: 'radio', rules: [{required: true, message: '请输入胰岛素用法', trigger: ['submit','change']}],
// className: 'obj-form-title', },
// prop: 'followUpWay', {
// model: 'followUpWay', formType: 'input',
// spanNum: 24, className: 'float-none',
// label: '随访方式:', prop: 'insulinUsage',
// options: [ model: 'insulinUsage',
// { label: '门诊', value: '门诊' }, label: '用量:',
// { label: '家庭', value: '家庭' }, disabled: false,
// { label: '电话', value: '电话' }, placeholder: '请输入胰岛素用量',
// ], spanNum: 12,
// rules: [{ required: true, message: '请选择随访方式', trigger: ['submit','change'] }], maxlength: 30,
// changeFun: (e)=>{ type: 'text',
// } labmsg: '次',
// }, rules: [{required: true, message: '请输入胰岛素用量', trigger: ['submit','change']}],
// },
// {
// formType: 'input',
// className: 'float-none',
// prop: 'followUpNumber',
// model: 'followUpNumber',
// label: '编号:',
// disabled: false,
// placeholder: '请输入编号',
// spanNum: 12,
// maxlength: 30,
// type: 'text',
// labmsg: '次',
// rules: [{required: false, message: '请输入编号', trigger: ['submit','change']}],
// },
] ]
} }
...@@ -13,10 +13,16 @@ export default ($this) => { ...@@ -13,10 +13,16 @@ export default ($this) => {
spanNum: 12, spanNum: 12,
maxlength: 30, maxlength: 30,
type: 'text', type: 'text',
rules: [{required: false, message: '请输入原因', trigger: ['submit','change']}], rules: [{required: false, message: '请输入原因', trigger: ['submit','change','blur']}],
changeFun: (val)=>{ changeFun: (val)=>{
// console.log($this.formData) let flag = val ? true : false;
// console.log(val) $this.addComponents.forEach((item,index)=>{
if(item.name == 'diabetesSourseReferral'){
$this.addComponents[index].dataSource.forEach((item,index2)=>{
$this.addComponents[index].dataSource[index2].rules[0].required = flag;
})
}
})
}, },
}, },
{ {
...@@ -30,8 +36,16 @@ export default ($this) => { ...@@ -30,8 +36,16 @@ export default ($this) => {
spanNum: 12, spanNum: 12,
maxlength: 30, maxlength: 30,
type: 'text', type: 'text',
rules: [{required: false, message: '请输入机构及科别', trigger: ['submit','change']}], rules: [{required: false, message: '请输入机构及科别', trigger: ['submit','change','blur']}],
changeFun: (val)=>{ changeFun: (val)=>{
let flag = val ? true : false;
$this.addComponents.forEach((item,index)=>{
if(item.name == 'diabetesSourseReferral'){
$this.addComponents[index].dataSource.forEach((item,index2)=>{
$this.addComponents[index].dataSource[index2].rules[0].required = flag;
})
}
})
}, },
}, },
] ]
......
...@@ -115,27 +115,12 @@ export default ($this) => { ...@@ -115,27 +115,12 @@ export default ($this) => {
labmsg: '次', labmsg: '次',
slots: [{name: 'kg/m^2', type: 'append'}], slots: [{name: 'kg/m^2', type: 'append'}],
}, },
{
formType: 'input',
className: 'obj-form-title',
linkageRule: [{name: 'symptom',value: ['其他']}],
prop: 'remark',
model: 'remark',
disabled: false,
placeholder: '请输入其他体征',
spanNum: 12,
maxlength: 30,
type: 'text',
labmsg: '',
rules: [{ required: true, message: '请输入其他体征', trigger: ['submit','change'] }]
},
{ {
formType: 'radio', formType: 'radio',
className: 'obj-form-title', className: 'obj-form-title',
prop: 'dorsalisPedisArteryPulsation', prop: 'dorsalisPedisArteryPulsation',
model: 'dorsalisPedisArteryPulsation', model: 'dorsalisPedisArteryPulsation',
label: '足背动脉搏动:', label: '足背动脉搏动:',
// linkageRule: [{ name: 'takeAntithrombotics', value: ['是'] }],
disabled: false, disabled: false,
spanNum: 24, spanNum: 24,
options: [ options: [
...@@ -149,6 +134,20 @@ export default ($this) => { ...@@ -149,6 +134,20 @@ export default ($this) => {
], ],
rules: [{ required: true, message: '请选择足背动脉搏动情况', trigger: ['submit','change'] }] rules: [{ required: true, message: '请选择足背动脉搏动情况', trigger: ['submit','change'] }]
}, },
{
formType: 'input',
className: 'float-none',
prop: 'remark',
model: 'remark',
disabled: false,
label: '其他:',
placeholder: '请输入其他体征',
spanNum: 12,
maxlength: 30,
type: 'text',
labmsg: '',
rules: [{ required: false, message: '请输入其他体征', trigger: ['submit','change'] }]
},
] ]
} }
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
// 量表模块数据模型 // 量表模块数据模型
// 高血压 // 糖尿病
import diabetesSourseBaseInfo from '../models/diabetes/diabetesSourseBaseInfo' import diabetesSourseBaseInfo from '../models/diabetes/diabetesSourseBaseInfo'
import diabetesSourseSymptom from '../models/diabetes/diabetesSourseSymptom' import diabetesSourseSymptom from '../models/diabetes/diabetesSourseSymptom'
import diabetesSourseSign from '../models/diabetes/diabetesSourseSign' import diabetesSourseSign from '../models/diabetes/diabetesSourseSign'
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册