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

@@ -62,6 +62,18 @@ export default ($this) => {
       type: 'date',
       rules: [{required: false, message: '请选择检查日期', trigger: ['submit','change']}],
       spanNum: 12,
+      changeFun: (val)=>{
+        let flag = val ? true : false;
+        $this.addComponents.forEach((item,index)=>{
+          if(item.name == 'diabetesSourseAuxiliary'){
+            $this.addComponents[index].dataSource.forEach((item,index2)=>{
+              if(item.prop == 'glycosylatedHemoglobinPercent'){
+                $this.addComponents[index].dataSource[index2].rules[0].required = flag;
+              }
+            })
+          }
+        })
+      }
     },
   ]
 }

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

@@ -33,13 +33,13 @@ export default ($this) => {
     },
     {
       formType: 'input',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
       linkageRule: [{name: 'medicalSideEffects',value: ['有']}],
       prop: 'remark',
       model: 'remark',
       disabled: false,
       placeholder: '请输入不良反应',
-      spanNum: 24,
+      spanNum: 12,
       maxlength: 30,
       type: 'text',
       labmsg: '',
@@ -62,7 +62,7 @@ export default ($this) => {
     },
     {
       formType: 'radio',
-      className: 'float-none radio-block',
+      className: 'obj-form-title radio-block',
       prop: 'followUpClassification',
       model: 'followUpClassification',
       spanNum: 24,

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

@@ -19,7 +19,9 @@ export default ($this) => {
         $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;
+              }
             })
           }
         })
@@ -28,21 +30,48 @@ export default ($this) => {
     {
       formType: 'input',
       className: 'float-none',
-      prop: 'mechanismDepartment',
-      model: 'mechanismDepartment',
-      label: '机构及科别：',
+      prop: 'mechanism',
+      model: 'mechanism',
+      label: '机构：',
       disabled: false,
-      placeholder: '请输入机构及科别',
+      placeholder: '请输入机构',
       spanNum: 12,
       maxlength: 30,
       type: 'text',
-      rules: [{required: false, message: '请输入机构及科别', trigger: ['submit','change','blur']}],
+      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;
+              }
+            })
+          }
+        })
+      },
+    },
+    {
+      formType: 'input',
+      className: 'float-none',
+      prop: 'department',
+      model: 'department',
+      label: '科室：',
+      disabled: false,
+      placeholder: '请输入科室',
+      spanNum: 12,
+      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;
+              }
             })
           }
         })