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/views/followup/plan-manage/resident-list.vue

@@ -50,6 +50,41 @@
           <el-radio-button label="2">进行中(200)</el-radio-button>
           <el-radio-button label="3">已结束(100)</el-radio-button>
         </el-radio-group>
+        <el-table
+          :data="residentData"
+          style="width: 100%;margin-top: 20px;">
+          <el-table-column
+            type="selection">
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="姓名">
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="性别">
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="手机">
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="随访开始时间">
+          </el-table-column>
+          <el-table-column
+            prop="date"
+            label="分组">
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            label="操作">
+            <template slot-scope="scope">
+              <el-button type="text" >变更计划</el-button>|
+              <el-button type="text" >结束随访</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
       </div>
     </div>
   </div>
@@ -76,7 +111,10 @@
           value: '全部',
           label: '全部'
         }],
-        tableType: ''
+        tableType: '', //列表筛选条件
+        residentData: [{
+          date:'11'
+        }], //居民列表
       }
     }
   }