Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/App.vue

@@ -54,7 +54,7 @@ export default {
 	created() {
 		vm = this
     if(vm.$route.name!='loginPage') {
-      vm.getToken()
+     vm.getToken()
     }
 	},
 	mounted() {
@@ -140,7 +140,12 @@ export default {
 				}
 			})
 		}
-	}
+	},
+  watch: {
+    _token(val) {
+      vm.getUserAuth(val)
+    }
+  }
 }
 </script>
 

src/views/followup/plan-manage/plan-detail.vue

@@ -73,7 +73,7 @@
           <div class="content-div">
             <div class="c-title">随访登记表：</div>
             <div class="c-content more-content">
-              <p  class="click-text" v-for="item in nodeContent[0].followupList" @click="goToShort(item.resourceUrl)">{{item.sendContent}}</p>
+              <p  class="click-text" v-for="item in nodeContent[0].followupList" @click="goToScale(item)">{{item.sendContent}}</p>
             </div>
           </div>
         </div>
@@ -184,6 +184,10 @@
       goToShort(url) {
         window.open(url)
       },
+      goToScale(val) {
+        this.$router.push({path: '/followup/record-manage/form-template',
+          query: {doctorId: val.doctorId, scaleNo: val.resourceId, planPatientsTimesId: val.planPatientsTimesId, showBtn: 0}});
+      }
     },
     watch: {
       planDetail(val) {

src/views/followup/plan-manage/resident-detail.vue

@@ -93,7 +93,7 @@
           <div class="content-div">
             <div class="c-title">随访登记表：</div>
             <div class="c-content more-content">
-              <p  class="click-text" v-for="item in nodeContent.followupList" @click="goToShort(item.resourceUrl)" >{{item.sendContent}}</p>
+              <p  class="click-text" v-for="item in nodeContent.followupList" @click="goToScale(item)" >{{item.sendContent}}</p>
             </div>
           </div>
         </div>
@@ -133,6 +133,7 @@
         planDetails: {}, //计划详情
         status: null,
         residentCrumb: [], //面包屑
+        nodePlanPatientsTimesId: []
       }
     },
     created() {
@@ -196,6 +197,10 @@
       goToShort(url) {
         window.open(url)
       },
+      goToScale(val) {
+        this.$router.push({path: '/followup/record-manage/form-template',
+          query: {doctorId: this.residentDetail.doctorId, scaleNo: val.resourceId, planPatientsTimesId: this.nodePlanPatientsTimesId[0].planPatientsTimesId, showBtn: 1}});
+      }
     },
     watch: {
       timeNodeList(val) {
@@ -205,7 +210,11 @@
         }
       },
       timeNodes(val) {
-        this.getNodeTimeContent(val)
+        this.getNodeTimeContent(val);
+        this.nodePlanPatientsTimesId =  this.timeNodeList.filter(function(item){
+          return item.id == val;
+        });
+        console.log(this.nodePlanPatientsTimesId)
       },
       residentDetail(val) {
         this.planDetails = val.fPlanDto

src/views/followup/record-manage/record-list.vue

@@ -224,7 +224,7 @@
           }
         }else if(this.formList.scalesList.length === 1){
           this.$router.push({path: '/followup/record-manage/form-template',
-            query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.fuPlanPatientTimesId}})
+            query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.fuPlanPatientTimesId, showBtn: 1}})
         }else {
           this.$message.warning('暂不支持录入量表!')
         }
@@ -264,7 +264,7 @@
       goFormView(item) {
         this.selectFormShow = false
         this.$router.push({path: '/followup/record-manage/form-template',
-          query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientsTimesId}});
+          query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientsTimesId, showBtn: 1}});
       },
       closeForm() {
         this.selectFormShow = false;

src/views/home.vue

@@ -206,7 +206,7 @@ export default {
         goFormView(item) {
           this.selectFormShow = false
           this.$router.push({path: '/followup/record-manage/form-template',
-            query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientsTimesId}});
+            query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientsTimesId, showBtn: 1}});
         },
         closeForm() {
           this.selectFormShow = false;
@@ -222,7 +222,7 @@ export default {
             }
           }else if(this.formList.scalesList.length === 1){
             this.$router.push({path: '/followup/record-manage/form-template',
-              query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.planPatientTimesId}})
+              query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.planPatientTimesId, showBtn: 1}})
           }else {
             this.$message.warning('暂不支持录入量表!')
           }

src/views/login.vue

@@ -89,7 +89,9 @@
 </template>
 
 <script>
+  let vm = null
   import { ssoLogin2, getDeviceInfo } from '@/utils/utils';
+  import { mapActions } from 'vuex';
   import md5 from 'js-md5';
 
   export default {
@@ -117,8 +119,13 @@
     },
     created() {
       ssoLogin2() //初始化登录信息
+      vm = this
     },
     methods: {
+      // 修改token
+      ...mapActions([
+        'changeToken',
+      ]),
       checkPhone(val) {
         if(!(/^1[345678]\d{9}$/.test(val))) {
           return false;
@@ -270,6 +277,7 @@
             return;
           }
           localStorage.setItem("token", data.token);
+          vm.changeToken(data.token)
           localStorage.setItem("storageToken", data.token);
           localStorage.setItem('doctorId',data.picapDoctor.id);