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/hypeDataSourceMedicationUse.js

@@ -13,11 +13,14 @@ export default ($this) => {
           }else{
             if(item2.refs){
               $this.addComponents[index].dataSource[index2].rules[0].required = false;
+              $this.$nextTick(()=>{
+                $this.$refs['form' + index][0].clearValidate(['medicinesName','dosageDay','dosageNum']);
+              })
             }
           }
         })
-        $this.$refs['form'+index][0].validate((valid) => {
-        });
+        // $this.$refs['form'+index][0].validate((valid) => {
+        // });
       }
 
     })

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

@@ -12,10 +12,15 @@ export default ($this) => {
             $this.addComponents[index].dataSource[index2].rules[0].required = true;
           }else{
             $this.addComponents[index].dataSource[index2].rules[0].required = false;
+            $this.$nextTick(()=>{
+              $this.$refs['form' + index][0].clearValidate(['reason','mechanism','department']);
+            })
+
           }
         })
-        $this.$refs['form'+index][0].validate((valid) => {
-        });
+
+        // $this.$refs['form'+index][0].validate((valid) => {
+        // });
       }
     })
   }