Merge branch 'release' into 'master'

Release



See merge request !61

src/views/layout/slidebar.vue

@@ -138,7 +138,7 @@
     },
     mounted(){
       if(vm.storageIdType==2){
-//        vm.setFollowSide()
+        vm.setFollowSide()
       }
     },
     watch: {
@@ -155,7 +155,7 @@
       },
       storageIdType(val,ov){
         if(val==2){
-//          vm.setFollowSide()
+          vm.setFollowSide()
         }
       }
     },

src/views/patients/labels-manage/labels-detail.vue

@@ -363,7 +363,7 @@
             this.changeNameTips = '该分组名称已被您使用，请重新输入';
           }else{
             this.$message({
-              message: '请求接口失败，请重新再试',
+              message: data.message,
               type: 'warning'
             });
           }

src/views/patients/labels-manage/labels-list.vue

@@ -176,7 +176,7 @@
             callback();
           }else{
             this.$message({
-              message: '接口返回失败，请重新再试',
+              message: data.message,
               type: 'warning'
             });
             callback();

src/views/patients/new-manage/components/qr-code-import.vue

@@ -161,14 +161,19 @@
                 beginTime,
                 endTime,
                 forever,
-                labels: [],  // ["高血压","糖尿病","脑卒中"]
+//                labels: [],  // ["高血压","糖尿病","脑卒中"]
+                labelList: []
               };
               let idArr = params.labelIds.split(',');  // [1,3,55]
               let checkArr = this.labelNameList;
               for(let i=0; i<idArr.length; i++) {
                 for(let j=0; j<checkArr.length; j++) {
                   if( idArr[i] == checkArr[j].labelId ) {
-                    obj.labels.push( checkArr[j].labelName );
+//                    obj.labels.push( checkArr[j].labelName );
+                    obj.labelList.push({
+                      labelId: checkArr[j].labelId,
+                      labelName: checkArr[j].labelName
+                    })
                   }
                 }
               }