Merge branch 'dev-patients-20190513' into 'release-0612'

Dev patients 20190513



See merge request !29

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

@@ -26,9 +26,11 @@
         :data="searchData.tableData"
         tooltip-effect="dark"
         style="width: 100%"
+        :row-key="getRowKeys"
         @selection-change="handleSelectionChange">
         <el-table-column
           type="selection"
+          :reserve-selection="true"
           width="55">
         </el-table-column>
         <el-table-column
@@ -78,7 +80,7 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :total="searchData.totalRows"
-        :current-page="1"
+        :current-page="searchData.pageNo"
         :page-sizes="[15, 30, 50, 100]"
         :page-size="searchData.pageSize"
         layout="total, sizes, prev, pager, next, jumper">
@@ -192,6 +194,10 @@
         singleDeleteInfo: [],
         multipleSelection: [],
         selectPatientType: 2, //选择居民时需要的type类型
+        getRowKeys(row) {
+          // console.log('>>>> ', row)
+          return row.id;
+        },
       }
     },
     components: {
@@ -228,6 +234,7 @@
           pageNo: this.searchData.pageNo,
           pageSize: this.searchData.pageSize,
         };
+        
         getLabelDetail(labelId, params).then(data => {
           // console.log('获取分组详情>> ', data)
           if(data.data){
@@ -251,7 +258,6 @@
         this.getDetail();
       },
       handleCurrentChange(val){
-        console.log('handleCurrentChange>>>', val)
         // 切换当前页
         this.searchData.pageNo = val;
         this.getDetail();
@@ -395,7 +401,8 @@
               type: 'success'
             });
             this.showDeletePatientsDialog = false;
-            this.getDetail();
+            // 删除后去第一页
+            this.handleCurrentChange(1);
           }else{
             this.$message({
               message: '请求接口失败，请重新再试',