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

@@ -234,7 +234,7 @@
           pageNo: this.searchData.pageNo,
           pageSize: this.searchData.pageSize,
         };
-        
+
         getLabelDetail(labelId, params).then(data => {
           // console.log('获取分组详情>> ', data)
           if(data.data){
@@ -363,7 +363,7 @@
             this.changeNameTips = '该分组名称已被您使用，请重新输入';
           }else{
             this.$message({
-              message: '请求接口失败，请重新再试',
+              message: data.message,
               type: 'warning'
             });
           }

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

@@ -12,8 +12,8 @@
           <el-button type="default" size="small" class="create-new-label" @click="resetLabelName">重置</el-button>
         </el-col>
         <el-col :span="6" class="right">
-          <el-button 
-            type="primary" size="small" class="create-new-label" 
+          <el-button
+            type="primary" size="small" class="create-new-label"
             :disabled="totalListCount >= 999"
             @click="createNewLabel"
             >
@@ -40,9 +40,9 @@
         >
         <el-form>
           <el-form-item :class="addNewLabelClass">
-            <el-input 
-              type="textarea" 
-              v-model="ruleForm.newLabelName" 
+            <el-input
+              type="textarea"
+              v-model="ruleForm.newLabelName"
               placeholder="请填写分组名称，最多15个字符"
               maxlength="15"
               @input="handleNewLabelNameChange"
@@ -94,7 +94,7 @@
     // 挂载到Dom完成时
     mounted() {
       commonUtil.resizeHeight();
-    },    
+    },
     methods: {
       getList() {
         // 获取分组列表
@@ -176,7 +176,7 @@
             callback();
           }else{
             this.$message({
-              message: '接口返回失败，请重新再试',
+              message: data.message,
               type: 'warning'
             });
             callback();
@@ -199,7 +199,7 @@
           }
         })
       }
-    }  
+    }
   }
 </script>
 

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
+                    })
                   }
                 }
               }