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/diabetes/diabetesSourseBaseInfo.js

@@ -16,6 +16,20 @@ export default ($this) => {
       labmsg: '次',
       rules: [{required: true, message: '请输入姓名', trigger: ['submit','change']}],
     },
+    {
+      formType: 'input',
+      className: 'float-none',
+      prop: 'no',
+      model: 'no',
+      label: '编号：',
+      disabled: false,
+      placeholder: '请输入编号',
+      spanNum: 12,
+      maxlength: 30,
+      type: 'text',
+      labmsg: '次',
+      rules: [{required: false, message: '请输入编号', trigger: ['submit','change']}],
+    },
 
     {
       formType: 'date-picker',
@@ -48,21 +62,6 @@ export default ($this) => {
       changeFun: (e)=>{
       }
     },
-
-    {
-      formType: 'input',
-      className: 'float-none',
-      prop: 'no',
-      model: 'no',
-      label: '编号：',
-      disabled: false,
-      placeholder: '请输入编号',
-      spanNum: 12,
-      maxlength: 30,
-      type: 'text',
-      labmsg: '次',
-      rules: [{required: false, message: '请输入编号', trigger: ['submit','change']}],
-    },
   ]
 }
 

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

@@ -324,7 +324,6 @@
       },
       setMedication(val){
         this.medication.push({...val,medicineType:'1'});
-        console.log('medication=>',this.medication)
       }
     },
   }