Merge branch 'dev-patients-20190513' of...

Merge branch 'dev-patients-20190513' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513

src/utils/patients/patientsapi.js

@@ -16,6 +16,16 @@ export const getDiseasesList = (params) => {
   })
 };
 
+export const getLabelList = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`healths/labels/`),
+    method: 'get',
+    params: params,
+    description: '获取分组列表',
+  })
+}
+
 // 获取七牛上传token
 export const getQiniuToken = (params) => {
   return fetch({

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

@@ -53,8 +53,9 @@
         </el-table-column>
         <el-table-column
           prop="name"
-          width="120">
-          操作
+          width="120"
+          label="操作"
+          >
         </el-table-column>
       </el-table>
     </div>

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

@@ -8,23 +8,16 @@
           <el-input v-model="labelName" placeholder="请输入分组名称" size="small"></el-input>
         </el-col>
         <el-col :span="6">
-          <el-button type="primary" size="small" class="create-new-label">查询</el-button>
-          <el-button type="default" size="small" class="create-new-label">重置</el-button>
+          <el-button type="primary" size="small" class="create-new-label" @click="getList">查询</el-button>
+          <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>
+          <el-button type="primary" size="small" class="create-new-label" :disabled="labelNameList.length >= 999">新建分组</el-button>
         </el-col>
       </el-row>
-      <p class="total-label">共：75个分组</p>
-      <div class="label-list">
-        <el-tag class="each-label" @click="goToDetail">高新区(34人)</el-tag>
-        <el-tag class="each-label">高血压(64人)</el-tag>
-        <el-tag class="each-label">权力的游戏(34人)</el-tag>
-        <el-tag class="each-label">端到端(34人)</el-tag>
-        <el-tag class="each-label">高新区(34人)</el-tag>
-        <el-tag class="each-label">高血压(64人)</el-tag>
-        <el-tag class="each-label">权力的游戏(34人)</el-tag>
-        <el-tag class="each-label">端到端(34人)</el-tag>
+      <p class="total-label">共：{{labelNameList.length}}个分组</p>
+      <div class="label-list" v-if="labelNameList && labelNameList.length>0">
+        <el-tag class="each-label" @click="goToDetail" v-for="(item, index) in labelNameList" :key="index">{{item.labelName}}({{item.labelPatientNums}}人)</el-tag>
       </div>
     </div>
   </div>
@@ -32,6 +25,8 @@
 <script>
   import BreadCrumb from "@/components/breadcrumb.vue";
   import * as commonUtil from "@/utils/utils";
+  import { getLabelList } from '@/utils/patients/patientsapi'
+
 
   
   export default {
@@ -40,22 +35,42 @@
         curmbFirst: "居民管理",
         curmbSecond: "分组管理",
         labelName: '',
+        labelNameList: [],
       }
     },
     components: {
       BreadCrumb,
     },
     created(){
-      // 获取分组列表
-      this.getLabelList();
+      this.getList();
     },
     // 挂载到Dom完成时
     mounted: function() {
       commonUtil.resizeHeight();
     },    
     methods: {
-      getLabelList(){
-        console.log('获取分组列表...');
+      getList(){
+        // 获取分组列表
+        let num = {
+          type: 1,
+          token : localStorage.getItem("token"),
+        };
+        if(this.labelName){
+          num.labelName = this.labelName;
+        }
+        commonUtil.openLoading(this);
+        getLabelList(num).then(data => {
+          commonUtil.closeLoading(this);
+          // console.log('获取分组列表>> ', data)
+          if(data.data && data.data.labelNameList){
+            this.labelNameList = data.data.labelNameList;
+          }
+        }).catch(err => {
+          console.log('error: ', err)
+        });
+      },
+      resetLabelName(){
+        this.labelName = '';
       },
       goToDetail(){
         this.$router.push({path: '/patients-manage/labels-manage/labels-detail'})
@@ -119,8 +134,9 @@
       /*定义滚动条轨道 内阴影+圆角*/
       &::-webkit-scrollbar-track
       {
-          border-radius: 10px;
-          background-color: rgb(241, 239, 239);
+          // border-radius: 10px;
+          // background-color: rgb(241, 239, 239);
+          // background: #fff;
       }
       /*定义滑块 内阴影+圆角*/
       &::-webkit-scrollbar-thumb