提交 971ea86a 编写于 作者: Yuanzhao.dai's avatar Yuanzhao.dai

Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312
......@@ -3,15 +3,58 @@ import rangeJson from '@/utils/followup/followupUtils/range';
// 校验范围通用方法
export const checkRange = (rule, value, callback) => {
let min,max;
rangeJson.forEach((item,index)=>{
if(item.field==rule.field){
let val = Number(value);
rangeJson.forEach((item)=>{
if(item.field == rule.field){
min = item.min;
max = item.max;
}
if((value >= min) && (value <= max)){
callback()
}else{
callback(new Error(`输入范围${min}~${max}`))
}
})
if((val >= min) && (val <= max)){
callback()
}else{
callback(new Error(`输入范围${min}~${max}`))
}
}
// 校验手机号
export const checkMobile = (rule, value, callback) => {
var reg = /^1[3|4|5|7|8][0-9]{9}$/; //验证规则
const flag = reg.test(value);
if(flag){
callback()
}else{
callback(new Error(`请输入正确的手机号码`))
}
}
// 校验是否是整数
export const checkIsInteger = (rule, value, callback) => {
const num = Number.isInteger(parseFloat(value));
if(num){
callback()
}else{
callback(new Error(`输入整数`))
}
}
// 校验是否是一位小数
export const checkNumberIsToFixed = (rule, value, callback) => {
const isNum = /^(([1-9][0-9]*)|(([0]\.\d{1,1}|[1-9][0-9]*\.\d{1,1})))$/;
if(isNum.test(Number(value))){
callback()
}else{
callback(new Error(`最多输入1位小数`))
}
}
// 大于0的正整数
export const checkNormalInt = (rule, value, callback) => {
const isInteger = Number.isInteger(parseFloat(value));
const num = parseFloat(value);
if(isInteger && num > 0){
callback()
}else{
callback(new Error(`请输入大于0的正整数`))
}
}
......@@ -11,7 +11,7 @@
<el-col :span="20">心脑血管病危险因素
社区、乡镇人群随访表
</el-col>
<el-col :span="4" v-if="showBtn">
<el-col :span="4" v-if="showBtn==1">
<el-button class="button-white" size="small" plain @click="formSubmit(2)">暂存</el-button>
<el-button type="primary" size="small" @click="formSubmit(1)">提交</el-button>
</el-col>
......@@ -32,7 +32,7 @@
<div class="form-container">
<!--脑卒中-->
<stroke v-if="resourceId=='SCALE0003'" :checkStart="checkStart" @checkEnd="checkEnd" :showBtn="showBtn" :saveWay="saveWay" />
<stroke v-if="resourceId=='SCALE0003'" :checkStart="checkStart" @checkEnd="checkEnd" :saveWay="saveWay" />
</div>
......@@ -50,7 +50,7 @@
data(){
return {
checkStart: false,
showBtn: true,
showBtn: 1,
resourceId: '',
saveWay: 1
}
......@@ -73,20 +73,10 @@
// console.log(this.$route.query);
this.resourceId = this.$route.query.resourceId;
this.resourceId = 'SCALE0003'
if(this.$route.query.showBtn=='0'){
this.showBtn = this.$route.query.showBtn;
}
// 0003 脑卒中、0002 糖尿病、0001 高血压
// axios({
// method: 'get',
// url: 'https://dev-sc.yunqueyi.com/scale/1/SCALE0003/info',
// data: JSON.stringify(this.formData),
// }).then(res=>{
// console.log(res)
// this.formData = res.data.data
// res.data.code='111'
// if( res.data.code=='111'){
// this.showBtn = false;
// }
// })
}
}
</script>
......@@ -98,6 +88,8 @@
.form-template{
.form-header{
/*position: fixed;*/
/*z-index:100000;*/
line-height: 60px;
height: 60px;
border-bottom: 1px solid #e1e1e1;
......
......@@ -17,6 +17,7 @@ export default ($this) => {
disabled: false,
placeholder: '请输入姓名',
spanNum: 12,
maxlength: 30,
type: 'text',
labmsg: '次',
rules: [{required: true, message: '请输入姓名', trigger: 'submit'}],
......@@ -30,6 +31,7 @@ export default ($this) => {
disabled: false,
placeholder: '请输入身份证',
spanNum: 12,
maxlength: 30,
type: 'text',
labmsg: '次',
rules: [{required: true, message: '请输入身份证', trigger: 'submit'},{ validator: checkCardNum , trigger: 'submit' }],
......
import { checkMobile } from '@/utils/followup/followupUtils/checkField';
export default ($this) => {
return [
{
......@@ -9,6 +11,7 @@ export default ($this) => {
disabled: false,
placeholder: '请输入随访单位名称',
spanNum: 12,
maxlength: 30,
type: 'text',
labmsg: '次',
rules: [{required: true, message: '请输入随访单位名称', trigger: 'submit'}],
......@@ -22,6 +25,7 @@ export default ($this) => {
disabled: false,
placeholder: '请输入随访人员姓名',
spanNum: 12,
maxlength: 30,
type: 'text',
labmsg: '次',
rules: [{required: true, message: '请输入随访人员姓名', trigger: 'submit'}],
......@@ -35,9 +39,10 @@ export default ($this) => {
disabled: false,
placeholder: '请输入随访人员联系电话',
spanNum: 12,
maxlength: 11,
type: 'tel',
labmsg: '次',
rules: [{required: true, message: '请输入随访人员联系电话', trigger: 'submit'}],
rules: [{required: true, message: '请输入随访人员联系电话', trigger: 'submit'},{ validator: checkMobile , trigger: 'submit' }],
},
{
formType: 'date-picker',
......
......@@ -77,12 +77,13 @@ export default ($this) => {
{
formType: 'input',
className: 'obj-form-title4 margin-left-80',
linkageRule: [{name: 'relationshipRemark',value: ['其他']}],
linkageRule: [{name: 'relationship',value: ['其他']}],
prop: 'relationshipRemark',
model: 'relationshipRemark',
disabled: false,
placeholder: '请输入其他关系',
spanNum: 12,
maxlength: 30,
type: 'text',
labmsg: '',
rules: [{ required: true, message: '请输入其他关系', trigger: 'submit' }]
......@@ -112,6 +113,7 @@ export default ($this) => {
disabled: false,
placeholder: '请输入其他失访原因',
spanNum: 12,
maxlength: 30,
type: 'text',
labmsg: '',
rules: [{ required: true, message: '请输入其他失访原因', trigger: 'submit' }]
......@@ -180,6 +182,7 @@ export default ($this) => {
disabled: false,
placeholder: '请输入其他死亡原因',
spanNum: 12,
maxlength: 30,
type: 'text',
labmsg: '',
rules: [{ required: true, message: '请输入其他死亡原因', trigger: 'submit' }]
......
import { checkRange, checkIsInteger, checkNumberIsToFixed } from '@/utils/followup/followupUtils/checkField';
export default ($this) => {
return [
{
......@@ -31,9 +33,8 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: 'cm', type: 'append'}],
rules: [{required: true, message: '请输入身高', trigger: 'submit'}],
rules: [{required: true, message: '请输入身高', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' }, {validator: checkNumberIsToFixed , trigger: 'submit'}],
changeFun: (val)=>{
console.log(val)
$this.addComponents.forEach((item,index)=>{
if(item.formName == 'stroke_014'){
$this.addComponents[index].formObject.stature = val
......@@ -43,17 +44,13 @@ export default ($this) => {
blurFunc: (val)=>{
$this.addComponents.forEach((item,index)=>{
if(item.formName == 'stroke_014'){
console.log($this.addComponents[index].formObject)
let weight = $this.addComponents[index].formObject.weight
let stature = $this.addComponents[index].formObject.stature
if(weight && stature){
weight = parseFloat(weight);
stature = parseFloat(stature);
$this.addComponents[index].formObject.bmi = weight / Math.pow((stature/100),2);
$this.addComponents[13].formObject.bmi = weight / Math.pow((stature/100),2);
console.log($this.addComponents[index].formObject.bmi)
$this.bmi = $this.addComponents[index].formObject.bmi
item.formObject.bmi = weight / Math.pow((stature/100),2);
let bmi = (weight / Math.pow((stature/100),2)).toFixed(1);
$this.addComponents[index].formObject.bmi = bmi;
}
}
})
......@@ -72,9 +69,8 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: 'kg', type: 'append'}],
rules: [{required: true, message: '请输入体重', trigger: 'submit'}],
rules: [{required: true, message: '请输入体重', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' }, {validator: checkNumberIsToFixed , trigger: 'submit'}],
changeFun: (val)=>{
console.log(val)
$this.addComponents.forEach((item,index)=>{
if(item.formName == 'stroke_014'){
$this.addComponents[index].formObject.weight = val
......@@ -84,16 +80,13 @@ export default ($this) => {
blurFunc: (val)=>{
$this.addComponents.forEach((item,index)=>{
if(item.formName == 'stroke_014'){
console.log($this.addComponents[index].formObject)
let weight = $this.addComponents[index].formObject.weight
let stature = $this.addComponents[index].formObject.stature
if(weight && stature){
weight = parseFloat(weight);
stature = parseFloat(stature);
$this.addComponents[index].formObject.bmi = weight / Math.pow((stature/100),2);
console.log($this.addComponents[index].formObject.bmi)
$this.bmi = $this.addComponents[index].formObject.bmi
item.formObject.bmi = weight / Math.pow((stature/100),2);
let bmi = (weight / Math.pow((stature/100),2)).toFixed(1);
$this.addComponents[index].formObject.bmi = bmi;
}
}
})
......@@ -105,7 +98,7 @@ export default ($this) => {
prop: 'bmi',
model: 'bmi',
label: 'BMI(系统自动生成):',
disabled: false,
disabled: true,
placeholder: '(这里是自动计算所得)',
spanNum: 6,
type: 'number',
......@@ -125,7 +118,7 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: 'cm', type: 'append'}],
rules: [{required: true, message: '请输入腰围', trigger: 'submit'}],
rules: [{required: true, message: '请输入腰围', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' }, {validator: checkNumberIsToFixed , trigger: 'submit'}],
},
......@@ -165,7 +158,7 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: 'mmHg', type: 'append'}],
rules: [{required: true, message: '请输入收缩压SBP', trigger: 'submit'}],
rules: [{required: true, message: '请输入收缩压SBP', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' },{ validator: checkIsInteger , trigger: 'submit' }],
},
{
formType: 'input',
......@@ -179,7 +172,7 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: 'mmHg', type: 'append'}],
rules: [{required: true, message: '请输入舒张压DBP', trigger: 'submit'}],
rules: [{required: true, message: '请输入舒张压DBP', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' },{ validator: checkIsInteger , trigger: 'submit' }],
},
{
formType: 'input',
......@@ -193,7 +186,7 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: '次/分', type: 'append'}],
rules: [{required: true, message: '请输入脉搏', trigger: 'submit'}],
rules: [{required: true, message: '请输入脉搏', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' },{ validator: checkIsInteger , trigger: 'submit' }],
},
{
......@@ -213,7 +206,7 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: 'mmHg', type: 'append'}],
rules: [{required: true, message: '请输入收缩压SBP', trigger: 'submit'}],
rules: [{required: true, message: '请输入收缩压SBP', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' },{ validator: checkIsInteger , trigger: 'submit' }],
},
{
formType: 'input',
......@@ -227,7 +220,7 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: 'mmHg', type: 'append'}],
rules: [{required: true, message: '请输入舒张压DBP', trigger: 'submit'}],
rules: [{required: true, message: '请输入舒张压DBP', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' },{ validator: checkIsInteger , trigger: 'submit' }],
},
{
formType: 'input',
......@@ -241,7 +234,7 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: '次/分', type: 'append'}],
rules: [{required: true, message: '请输入脉搏', trigger: 'submit'}],
rules: [{required: true, message: '请输入脉搏', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' },{ validator: checkIsInteger , trigger: 'submit' }],
},
......
......@@ -68,7 +68,7 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: 'mmol/L', type: 'append'}],
rules: [{required: true, message: '请输入甘油三酯', trigger: 'submit'}],
rules: [{required: true, message: '请输入甘油三酯', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' }],
},
{
formType: 'input',
......@@ -82,7 +82,7 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: 'mmol/L', type: 'append'}],
rules: [{required: true, message: '请输入胆固醇', trigger: 'submit'}],
rules: [{required: true, message: '请输入胆固醇', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' }],
},
{
formType: 'input',
......@@ -96,7 +96,7 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: 'mmol/L', type: 'append'}],
rules: [{required: true, message: '请输入低密度脂蛋白胆固醇', trigger: 'submit'}],
rules: [{required: true, message: '请输入低密度脂蛋白胆固醇', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' }],
},
{
formType: 'input',
......@@ -110,7 +110,7 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{name: 'mmol/L', type: 'append'}],
rules: [{required: true, message: '请输入高密度脂蛋白胆固醇', trigger: 'submit'}],
rules: [{required: true, message: '请输入高密度脂蛋白胆固醇', trigger: 'submit'},{ validator: checkRange , trigger: 'submit' }],
},
]
}
import { checkNormalInt } from '@/utils/followup/followupUtils/checkField';
export default ($this) => {
return [
{
......@@ -32,7 +34,7 @@ export default ($this) => {
type: 'number',
labmsg: '次',
slots: [{ name: '次', type: 'append' }],
rules: [{ required: true, message: '请输入发病次数', trigger: 'submit' }]
rules: [{ required: true, message: '请输入发病次数', trigger: 'submit' }, { validator: checkNormalInt , trigger: 'submit' }]
},
{
formType: 'date-picker',
......
......@@ -72,12 +72,13 @@ export default ($this) => {
{
formType: 'input',
className: 'obj-form-title4',
linkageRule: [{name: 'relationshipRemark',value: ['其他']}],
linkageRule: [{name: 'type',value: ['其他']}],
prop: 'remark',
model: 'remark',
disabled: false,
placeholder: '请输入其他心脏病类型',
spanNum: 12,
maxlength: 30,
type: 'text',
labmsg: '',
rules: [{ required: true, message: '请输入其他心脏病类型', trigger: 'submit' }]
......
......@@ -90,6 +90,7 @@ export default ($this) => {
disabled: false,
placeholder: '请输入其他降糖药',
spanNum: 12,
maxlength: 30,
type: 'text',
labmsg: '',
rules: [{ required: true, message: '请输入其他降糖药', trigger: 'submit' }]
......
......@@ -30,6 +30,7 @@ export default ($this) => {
disabled: false,
placeholder: '请输入治疗方式',
spanNum: 6,
maxlength: 30,
type: 'text',
labmsg: '次',
// slots: [{name: 'cm', type: 'append'}],
......
......@@ -52,7 +52,6 @@
data(){
return {
canRender: true,
bmi: 0,
planPatientsTimesId: '',
scaleNo: '',
doctorId: '',
......@@ -70,7 +69,7 @@
{name: 'TreatmentSituation',formObject: {},formName: 'stroke_011',className: 'obj-form-title',dataSource: dataSourceTreatmentSituation(this), title: '四、本次随访期间血管病变的外科手术或介入治疗情况-颈动脉'},
{name: 'TreatmentSituation2',formObject: {},formName: 'stroke_012',className: 'obj-form-title',dataSource: dataSourceTreatmentSituation2(this), hideTitle: true, title: '四、本次随访期间血管病变的外科手术或介入治疗情况-冠状动脉'},
{name: 'TreatmentSituation3',formObject: {},formName: 'stroke_013',className: 'obj-form-title',dataSource: dataSourceTreatmentSituation3(this), hideTitle: true, title: '四、本次随访期间血管病变的外科手术或介入治疗情况-出血性卒中外科治疗'},
{name: 'CheckBody',formObject: {},formName: 'stroke_014',className: 'obj-form-title',dataSource: dataSourceCheckBody(this), title: '五、体格检查(高危人群12个月随访必做)'},
{name: 'CheckBody',formObject: {bmi: 0,},formName: 'stroke_014',className: 'obj-form-title',dataSource: dataSourceCheckBody(this), title: '五、体格检查(高危人群12个月随访必做)'},
{name: 'CheckLab',formObject: {},formName: 'stroke_015',className: 'obj-form-title',dataSource: dataSourceCheckLab(this), title: '六、实验室检查(高危人群12个月随访必填)'},
],
formData: {},//整个表单对象
......@@ -81,7 +80,6 @@
FormScale,
},
props: {
showBtn: Boolean,
checkStart: Boolean,
saveWay: Number
},
......@@ -112,10 +110,11 @@
});
}
console.log(this.formData)
this.formData.doctorId = parseFloat(this.doctorId)
this.formData.saveWay = parseFloat(this.saveWay)
this.formData.planPatientsTimesId = parseFloat(this.planPatientsTimesId)
this.formData.scaleNo = this.scaleNo
this.formData.doctorId = parseFloat(this.doctorId);
this.formData.saveWay = parseFloat(this.saveWay);
this.formData.planPatientsTimesId = parseFloat(this.planPatientsTimesId);
this.formData.scaleNo = this.scaleNo;
this.formData.isLine = 2;
console.log(JSON.stringify(this.formData))
if(this.valid){
......@@ -140,27 +139,20 @@
this.$emit('checkEnd',false);
}
},
bmi(val){
if(val>0){
this.addComponents.forEach((item,index)=>{
if(item.formName == 'stroke_014'){
console.log('watch==>>',val)
this.addComponents[index].formObject.bmi = val
item.formObject.bmi = val
this.$forceUpdate()
}
})
}
addComponents(val){
console.log(val)
},
formObject(val){
console.log(val)
}
},
created(){
// /scale/{patientTimesId}/{scaleNo}/info
this.planPatientsTimesId = this.$route.query.planPatientsTimesId
this.scaleNo = this.$route.query.scaleNo
this.doctorId = this.$route.query.doctorId
axios({
method: 'get',
url: getFollowUpSC(`/scale/${this.planPatientsTimesId}/${this.scaleNo}/info?type=2`),
url: getFollowUpSC(`/scale/${this.planPatientsTimesId}/${this.scaleNo}/info?type=2&isLine=2`),
data: JSON.stringify(this.formData),
}).then(res=>{
this.formData = res.data.data
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册