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

src/views/followup/record-manage/models/hypertension/hypeDataSourceHelpChecking.js

@@ -36,8 +36,8 @@ export default ($this) => {
     {
       formType: 'radio',
       className: 'float-none',
-      prop: 'medicalSideSffects',
-      model: 'medicalSideSffects',
+      prop: 'medicalSideEffects',
+      model: 'medicalSideEffects',
       spanNum: 24,
       label: '药物不良反应：',
       options: [
@@ -51,7 +51,7 @@ export default ($this) => {
     {
       formType: 'input',
       className: 'float-none',
-      linkageRule: [{name: 'medicalSideSffects',value: ['有']}],
+      linkageRule: [{name: 'medicalSideEffects',value: ['有']}],
       prop: 'adrsMark',
       model: 'adrsMark',
       disabled: false,

src/views/followup/record-manage/models/hypertension/hypeDataSourceLifeMode.js

@@ -13,7 +13,7 @@ export default ($this) => {
       placeholder: '请输入本次日吸烟量',
       spanNum: 6,
       maxlength: 30,
-      type: 'text',
+      type: 'number',
       labmsg: '',
       slots: [{name: '支/日', type: 'append'}],
       rules: [{ required: true, message: '请输入日吸烟量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },]
@@ -28,7 +28,7 @@ export default ($this) => {
       placeholder: '请输入下次随访日吸烟量',
       spanNum: 6,
       maxlength: 30,
-      type: 'text',
+      type: 'number',
       labmsg: '',
       slots: [{name: '支/日', type: 'append'}],
       rules: [{ required: true, message: '请输入下次随访日吸烟量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },]
@@ -45,7 +45,7 @@ export default ($this) => {
       placeholder: '请输入本次日饮酒量',
       spanNum: 6,
       maxlength: 30,
-      type: 'text',
+      type: 'number',
       labmsg: '',
       slots: [{name: '两/日', type: 'append'}],
       rules: [{ required: true, message: '请输入本次日饮酒量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },]
@@ -60,7 +60,7 @@ export default ($this) => {
       placeholder: '请输入下次随访日饮酒量',
       spanNum: 6,
       maxlength: 30,
-      type: 'text',
+      type: 'number',
       labmsg: '',
       slots: [{name: '两/日', type: 'append'}],
       rules: [{ required: true, message: '请输入下次随访日饮酒量', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },]
@@ -76,7 +76,7 @@ export default ($this) => {
       placeholder: '请输入本次运动情况',
       spanNum: 6,
       maxlength: 30,
-      type: 'text',
+      type: 'number',
       labmsg: '',
       slots: [{name: '次/周', type: 'append'}],
       rules: [{ required: true, message: '请输入本次运动情况', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },]
@@ -90,7 +90,7 @@ export default ($this) => {
       placeholder: '请输入本次运动情况',
       spanNum: 6,
       maxlength: 30,
-      type: 'text',
+      type: 'number',
       labmsg: '',
       slots: [{name: '分钟/次', type: 'append'}],
       rules: [{ required: true, message: '请输入本次运动情况', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },]
@@ -106,7 +106,7 @@ export default ($this) => {
       placeholder: '请输入下次随访运动情况',
       spanNum: 6,
       maxlength: 30,
-      type: 'text',
+      type: 'number',
       labmsg: '',
       slots: [{name: '次/周', type: 'append'}],
       rules: [{ required: true, message: '请输入下次随访运动情况', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },]
@@ -120,7 +120,7 @@ export default ($this) => {
       placeholder: '请输入下次随访运动情况',
       spanNum: 6,
       maxlength: 30,
-      type: 'text',
+      type: 'number',
       labmsg: '',
       slots: [{name: '分钟/次', type: 'append'}],
       rules: [{ required: true, message: '请输入下次随访运动情况', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },]

src/views/followup/record-manage/patient-scale/hypertension.vue

@@ -305,6 +305,8 @@
         this.formData.planPatientsTimesId = parseFloat(this.planPatientsTimesId);
         this.formData.scaleNo = this.scaleNo;
         this.formData.isLine = 2;
+        this.formData.h_s_002 = this.medication;
+//        this.formData.hypertension_001.symptom = JSON.stringify(this.formData.hypertension_001.symptom);
         // console.log(JSON.stringify(this.formData))
         postScale(this.domain,this.formData).then(res=>{
           if(res.code=='000000'){
@@ -336,7 +338,7 @@
         this.dialogFormVisible = val;
       },
       setMedication(val){
-        this.medication.push({...val,type:1});
+        this.medication.push({...val,type: '1'});
         console.log('medication=>',this.medication)
       }
     },