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

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

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

@@ -37,7 +37,6 @@ export default ($this) => {
 
     })
   }
-
   return [
     {
       formType: 'input',
@@ -54,11 +53,11 @@ export default ($this) => {
       slots: [{name: 'mmol/L', type: 'append'}],
       rules: [{ required: true, message: '请输入空腹血糖值', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkNumberIsToFixed , trigger: ['submit','change'] }]
     },
-    {
-      formType: 'div',
-      name: '其他检查',
-      className: 'sec-title',
-    },
+    // {
+    //   formType: 'div',
+    //   name: '其他检查',
+    //   className: 'sec-title',
+    // },
     {
       formType: 'input',
       className: 'float-none',

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

 import { checkRange, checkIsInteger, checkNumberIsToFixed } from '@/utils/followup/followupUtils/checkField';
 
 export default ($this) => {
+  let hanldeValue = () => {
+    $this.addComponents.forEach((item,index)=>{
+      if(item.name == 'diabetesSourseReferral'){
+        const reason = item.formObject.reason
+        const mechanism = item.formObject.mechanism
+        const department = item.formObject.department
+        item.dataSource.forEach((item2,index2)=>{
+          if((reason||mechanism||department) && item2.rules){
+            $this.addComponents[index].dataSource[index2].rules[0].required = true;
+          }else{
+            $this.addComponents[index].dataSource[index2].rules[0].required = false;
+          }
+        })
+      }
+      $this.$refs['form'+index][0].validate((valid) => {
+      });
+    })
+  }
   return [
     {
       formType: 'input',
@@ -14,18 +32,8 @@ export default ($this) => {
       maxlength: 30,
       type: 'text',
       rules: [{required: false, message: '请输入原因', trigger: ['submit','change','blur']}],
-      changeFun: (val)=>{
-        let flag = val ? true : false;
-        $this.addComponents.forEach((item,index)=>{
-          if(item.name == 'diabetesSourseReferral'){
-            $this.addComponents[index].dataSource.forEach((item,index2)=>{
-              if($this.addComponents[index].dataSource[index2].rules){
-                $this.addComponents[index].dataSource[index2].rules[0].required = flag;
-              }
-            })
-          }
-        })
-      },
+      changeFun: hanldeValue,
+      blurFunc: hanldeValue
     },
     {
       formType: 'input',
@@ -39,18 +47,8 @@ export default ($this) => {
       maxlength: 30,
       type: 'text',
       rules: [{required: false, message: '请输入机构', trigger: ['submit','change','blur']}],
-      changeFun: (val)=>{
-        let flag = val ? true : false;
-        $this.addComponents.forEach((item,index)=>{
-          if(item.name == 'diabetesSourseReferral'){
-            $this.addComponents[index].dataSource.forEach((item,index2)=>{
-              if($this.addComponents[index].dataSource[index2].rules){
-                $this.addComponents[index].dataSource[index2].rules[0].required = flag;
-              }
-            })
-          }
-        })
-      },
+      changeFun: hanldeValue,
+      blurFunc: hanldeValue
     },
     {
       formType: 'input',
@@ -64,18 +62,8 @@ export default ($this) => {
       maxlength: 30,
       type: 'text',
       rules: [{required: false, message: '请输入科室', trigger: ['submit','change','blur']}],
-      changeFun: (val)=>{
-        let flag = val ? true : false;
-        $this.addComponents.forEach((item,index)=>{
-          if(item.name == 'diabetesSourseReferral'){
-            $this.addComponents[index].dataSource.forEach((item,index2)=>{
-              if($this.addComponents[index].dataSource[index2].rules){
-                $this.addComponents[index].dataSource[index2].rules[0].required = flag;
-              }
-            })
-          }
-        })
-      },
+      changeFun: hanldeValue,
+      blurFunc: hanldeValue
     },
   ]
 }