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/utils/followup/followupUtils/rangConfig/rangeDiabetes.js

@@ -16,19 +16,19 @@ export default [
     field: 'bodyHeight',
     name: '身高',
     min: 100,
-    max: 200
+    max: 250
   },
   {
     field: 'bodyWeight',
     name: '体重',
     min: 35,
-    max: 200
+    max: 250
   },
   {
     field: 'nextBodyWeight',
     name: '体重',
     min: 35,
-    max: 200
+    max: 250
   },
   {
     field: 'fastingBloodSugar',

src/utils/followup/followupUtils/rangConfig/rangeHype.js

@@ -16,19 +16,19 @@ export default [
     field: 'bodyHeight',
     name: '身高',
     min: 100,
-    max: 200
+    max: 250
   },
   {
     field: 'bodyWeight',
     name: '体重',
     min: 35,
-    max: 200
+    max: 250
   },
   {
     field: 'nextBodyWeight',
     name: '下次随访体重',
     min: 35,
-    max: 200
+    max: 250
   },
   {
     field: 'heartRate',

src/views/followup/record-manage/models/diabetes/diabetesSourseAuxiliary.js

@@ -10,21 +10,20 @@ export default ($this) => {
         item.dataSource.forEach((item2,index2)=>{
           if((glycosylatedHemoglobinPercent||glycosylatedHemoglobinDate) && item2.refs){
             $this.addComponents[index].dataSource[index2].rules[0].required = true;
-            $this.$refs['form' + index][0].validateField('glycosylatedHemoglobinPercent');
-            $this.$refs['form' + index][0].validateField('glycosylatedHemoglobinDate');
+            $this.$refs['form' + index][0].validateField(['glycosylatedHemoglobinPercent','glycosylatedHemoglobinDate']);
           }else{
             if(item2.refs){
               if(item2.refs == 'glycosylatedHemoglobinPercent'){
-                $this.addComponents[index].dataSource[index2].rules = [{ required: false, message: '请输入糖化血红蛋白值', trigger: ['submit','change','blur'] }];
+                // $this.addComponents[index].dataSource[index2].rules[0].required = false;
+                $this.addComponents[index].dataSource[index2].rules = [{ required: false, message: '请输入糖化血红蛋白值', trigger: ['submit','change'] }];
               }else{
                 $this.addComponents[index].dataSource[index2].rules[0].required = false;
               }
+              // $this.addComponents[index].dataSource[index2].rules[0].required = false;
               $this.$nextTick(()=>{
                 $this.$refs['form'+index][0].validate((valid) => {
                 });
-                $this.$refs['form' + index][0].clearValidate('fastingBloodSugar');
-                $this.$refs['form' + index][0].clearValidate('glycosylatedHemoglobinPercent');
-                $this.$refs['form' + index][0].clearValidate('glycosylatedHemoglobinDate');
+                $this.$refs['form' + index][0].clearValidate(['fastingBloodSugar','glycosylatedHemoglobinPercent','glycosylatedHemoglobinDate']);
               })
 
             }
@@ -72,9 +71,9 @@ export default ($this) => {
       type: 'number',
       labmsg: '',
       slots: [{name: '%', type: 'append'}],
-      rules: [{ required: false, message: '请输入糖化血红蛋白值', trigger: ['submit','change','blur'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkNumberIsToFixedTwo , trigger: ['submit','change'] }],
+      rules: [{ required: false, message: '请输入糖化血红蛋白值', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkNumberIsToFixedTwo , trigger: ['submit','change'] }],
       changeFun: hanldeValue,
-      blurFunc: hanldeValue
+      // blurFunc: hanldeValue
     },
     {
       formType: 'date-picker',