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/patient-scale/diabetes.vue

@@ -173,15 +173,15 @@
       // 获取量表类型
       initScaleType(){
         this.addComponentsSourceList = [
-          {name: 'diabetesSourseBaseInfo',formObject: {},showModule: true,formName: 'diabetes_001',className: 'obj-form-title',dataSource: diabetesSourseBaseInfo(this), hideTitle: true, title: '基本信息'},
-          {name: 'diabetesSourseSymptom',formObject: {},showModule: true,formName: 'diabetes_002',className: 'obj-form-title',dataSource: diabetesSourseSymptom(this), hideTitle: false, title: '症状'},
-          {name: 'diabetesSourseSign',formObject: {bmi: 0,nextBmi: 0,},showModule: true,formName: 'diabetes_003',className: 'obj-form-title',dataSource: diabetesSourseSign(this), hideTitle: false, title: '体征'},
-          {name: 'diabetesSourseLifeMode',formObject: {},showModule: true,formName: 'diabetes_004',className: 'obj-form-title',dataSource: diabetesSourseLifeMode(this), hideTitle: false, title: '生活方式指导'},
-          {name: 'diabetesSourseAuxiliary',formObject: {},showModule: true,formName: 'diabetes_005',className: 'obj-form-title',dataSource: diabetesSourseAuxiliary(this), hideTitle: false, title: '辅助检查'},
+          {name: 'diabetesSourseBaseInfo',formObject: {},showModule: true,formName: 'h_s_001',className: 'obj-form-title',dataSource: diabetesSourseBaseInfo(this), hideTitle: true, title: '基本信息'},
+          {name: 'diabetesSourseSymptom',formObject: {},showModule: true,formName: 'diabetes_001',className: 'obj-form-title',dataSource: diabetesSourseSymptom(this), hideTitle: false, title: '症状'},
+          {name: 'diabetesSourseSign',formObject: {bmi: 0,nextBmi: 0,},showModule: true,formName: 'diabetes_002',className: 'obj-form-title',dataSource: diabetesSourseSign(this), hideTitle: false, title: '体征'},
+          {name: 'diabetesSourseLifeMode',formObject: {},showModule: true,formName: 'diabetes_003',className: 'obj-form-title',dataSource: diabetesSourseLifeMode(this), hideTitle: false, title: '生活方式指导'},
+          {name: 'diabetesSourseAuxiliary',formObject: {},showModule: true,formName: 'diabetes_004',className: 'obj-form-title',dataSource: diabetesSourseAuxiliary(this), hideTitle: false, title: '辅助检查'},
           {name: 'diabetesSourseOther',formObject: {},showModule: true,formName: 'diabetes_005',className: 'obj-form-title',dataSource: diabetesSourseOther(this), hideTitle: true, title: '其他'},
-          {name: 'diabetesSourseMedicationUse',formObject: {arrList:this.medication},showModule: true,formName: 'diabetes_005',className: 'obj-form-title',dataSource: diabetesSourseMedicationUse(this), hideTitle: false, title: '用药情况'},
-          {name: 'diabetesSourseReferral',formObject: {},showModule: true,formName: 'diabetes_005',className: 'obj-form-title',dataSource: diabetesSourseReferral(this), hideTitle: false, title: '转诊'},
-          {name: 'diabetesSourseSignature',formObject: {},showModule: true,formName: 'diabetes_005',className: 'obj-form-title',dataSource: diabetesSourseSignature(this), hideTitle: true, title: '签名'},
+          {name: 'diabetesSourseMedicationUse',formObject: {arrList:this.medication},showModule: true,formName: 'h_s_002',className: 'obj-form-title',dataSource: diabetesSourseMedicationUse(this), hideTitle: false, title: '用药情况'},
+          {name: 'diabetesSourseReferral',formObject: {},showModule: true,formName: 'h_s_003',className: 'obj-form-title',dataSource: diabetesSourseReferral(this), hideTitle: false, title: '转诊'},
+          {name: 'diabetesSourseSignature',formObject: {},showModule: true,formName: 'h_s_004',className: 'obj-form-title',dataSource: diabetesSourseSignature(this), hideTitle: true, title: '签名'},
         ]
       },
       // 获取白名单域名
@@ -305,7 +305,7 @@
         this.dialogFormVisible = val;
       },
       setMedication(val){
-        this.medication.push({...val,type:1});
+        this.medication.push({...val,type:'1'});
         console.log('medication=>',this.medication)
       }
     },