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/router/follow.js

@@ -3,6 +3,7 @@ const followUp = r => require.ensure([], () => r(require('../views/followup/layo
 const planManage = r => require.ensure([], () => r(require('../views/followup/plan-manage/layout.vue')), 'planManage');
 const planList = r => require.ensure([], () => r(require('../views/followup/plan-manage/plan-list.vue')), 'planList');
 const residentList = r => require.ensure([], () => r(require('../views/followup/plan-manage/resident-list.vue')), 'residentList');
+const residentDetail = r => require.ensure([], () => r(require('../views/followup/plan-manage/resident-detail.vue')), 'residentDetail');
 
 const reservationManage = r => require.ensure([], () => r(require('../views/followup/reservation-manage/layout.vue')), 'reservationManage');
 const reservationList = r => require.ensure([], () => r(require('../views/followup/reservation-manage/reservation-list.vue')), 'reservationList');
@@ -43,6 +44,15 @@ const followRouters = {
               keepAlive: false  //页面不需要缓存
             },
           },
+          {
+            path: 'resident-detail',
+            component: residentDetail,
+            name: 'residentDetail',
+            meta: {
+              title: '居民详情',
+              keepAlive: false  //页面不需要缓存
+            },
+          },
         ],
         meta: {
           title: '计划管理',

src/style/followup/followup-common.scss

 $borderBottomStyle: 1px solid #efefef;
 $picaGreen: #449284; //主色调
 
+$searchDiv: 160px; 
+
 
 /*列表页布局*/
 .f-main-content {
@@ -17,12 +19,6 @@ $picaGreen: #449284; //主色调
     justify-content: space-between;
     padding: 30px 0 10px 0;
     border-bottom: $borderBottomStyle;
-    .search-input {
-      max-width: $inputDiv; // 根据自己页面设置
-      .el-input {
-        width: $input; // 根据自己页面设置
-      }
-    }
     .search-btn {
       min-width: $searchDiv;  // 根据自己页面设置
 
@@ -38,3 +34,8 @@ $picaGreen: #449284; //主色调
   }
 }
 
+/*详情页布局*/
+.f-detail-content {
+  background: #ffffff;
+  padding: 30px;
+}

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

+<template>
+  <div class="resident-detail">
+    <div class="f-detail-content screenSet">
+dcsdf
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "resident-detail"
+  }
+</script>
+
+<style lang="scss" scoped>
+  @import '../../../style/followup/followup-common';
+  @import '../../../style/followup/element-reset.css';
+</style>

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

@@ -46,9 +46,9 @@
       </div>
       <div class="resident-table table-content">
         <el-radio-group v-model="tableType">
-          <el-radio-button label="1">未完成(200)</el-radio-button>
-          <el-radio-button label="2">进行中(200)</el-radio-button>
-          <el-radio-button label="3">已结束(100)</el-radio-button>
+          <el-radio-button label="0">未完成(200)</el-radio-button>
+          <el-radio-button label="1">进行中(200)</el-radio-button>
+          <el-radio-button label="2">已结束(100)</el-radio-button>
         </el-radio-group>
         <el-table
           :data="residentData"
@@ -59,27 +59,30 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="date"
+            prop="patientName"
             label="姓名"
             align="center">
+            <template slot-scope="scope">
+              <el-button type="text" @click="goPatientDetail(scope.row.patientId)" >{{scope.row.patientName}}</el-button>
+            </template>
           </el-table-column>
           <el-table-column
-            prop="date"
+            prop="sexName"
             label="性别"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="date"
+            prop="mobilePhone"
             label="手机"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="date"
+            prop="time"
             label="随访开始时间"
             align="center">
           </el-table-column>
           <el-table-column
-            prop="date"
+            prop="labelName"
             label="分组"
             align="center">
           </el-table-column>
@@ -93,6 +96,17 @@
             </template>
           </el-table-column>
         </el-table>
+        <el-pagination
+          background
+          v-if="residentData.length"
+          @size-change="handleSizeChangePre"
+          @current-change="handleCurrentChangePre"
+          layout="total, sizes, prev, pager, next, jumper"
+          :current-page="pageNum"
+          :page-sizes="[100, 200, 300, 400]"
+          :page-size="pageSize"
+          :total="total">
+        </el-pagination>
       </div>
     </div>
   </div>
@@ -119,18 +133,42 @@
           value: '全部',
           label: '全部'
         }],
-        tableType: '', //列表筛选条件
-        residentData: [{
-          date:'11'
-        }], //居民列表
+        tableType: 0, //列表筛选条件
+        residentData: [
+          {
+            "patientId": "居民ID",
+            "patientName": "居民姓名",
+            "sex": "性别",
+            "sexName": "性别名字",
+            "time": "随访开始时间",
+            "labelId": "分组ID",
+            "labelName": "分组名字"
+          }
+        ], //居民列表
+        pageNum: 1,
+        pageSize: 15,
+        total: 100,
+
+      }
+    },
+    mounted() {},
+    methods: {
+      handleSizeChangePre() {
+
+      },
+      handleCurrentChangePre() {
+
+      },
+      goPatientDetail(patientId) { //居民详情页
+        alert(1+patientId)
+        this.$router.push('/followup/plan-manage/resident-detail')
+
       }
     }
   }
 </script>
 <style lang="scss" scoped>
-  $inputDiv: 650px; //查询输入框容器宽度
-  $input: 205px; //查询输入框input宽度
-  $searchDiv: 160px; //查询按钮容器宽度
+
   @import '../../../style/followup/followup-common';
   @import '../../../style/followup/element-reset.css';
 

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

@@ -195,9 +195,7 @@
 </script>
 
 <style scoped lang="scss">
-  $inputDiv: 0;
-  $input: 205px;
-  $searchDiv: 160px;
+ 
   @import '../../../style/followup/followup-common';
   @import '../../../style/followup/element-reset.css';
 .record-list-wrapper{