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

@@ -3,7 +3,7 @@ import rangeJson from './rangConfig';
 // 这个方法，是用户在选择随访轮次（6个月，12个月）后续操作
 let checkNeedRule = (val) => {
   const needRule = localStorage.getItem('needRule');
-  if(( (!val||val=='') && (!needRule || needRule=='true') )){
+  if( val!='0' && (!val||val=='') && (!needRule || needRule=='true') ){
     return true;
   }
   return false;

src/views/followup/record-manage/models/stroke/dataSourceBaseInfo.js

@@ -52,10 +52,10 @@ export default ($this) => {
         // console.log(e)
         if(e == '12个月'){
           $this.needRule = false;
-          localStorage.setItem('needRule',false);
+          sessionStorage.setItem('needRule',false);
         }else{
           $this.needRule = true;
-          localStorage.setItem('needRule',true);
+          sessionStorage.setItem('needRule',true);
         }
       }
     },

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

@@ -145,15 +145,6 @@
           }
         })
       },
-      // needRule(val){
-      //   this.addComponents.forEach((item,index)=>{
-      //     let formName = item.formName;
-      //     if(formName==='stroke_006'||formName==='stroke_014'||formName==='stroke_015'){
-      //       this.addComponents[index].ruleNew = val;
-      //       this.setRuleToTrue(index);
-      //     }
-      //   })
-      // }
     },
     created(){
       this.planPatientsTimesId = this.$route.query.planPatientsTimesId
@@ -164,8 +155,6 @@
       this.initScaleType();
       // 获取白名单域名
       this.getWhiteDomain();
-
-      // localStorage.setItem('needRule',this.needRule);
     },
     methods: {
       // 获取量表类型

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

@@ -171,7 +171,7 @@
       // 获取白名单域名
       this.getWhiteDomain();
 
-      localStorage.setItem('needRule',this.needRule);
+      sessionStorage.setItem('needRule',this.needRule);
     },
     methods: {
       // 获取量表类型