Merge branch 'dev-followUp-20190312' of...

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

src/router/follow.js

@@ -5,6 +5,8 @@ const planList = r => require.ensure([], () => r(require('../views/followup/plan
 const planDetail = r => require.ensure([], () => r(require('../views/followup/plan-manage/plan-detail.vue')), 'planDetail');
 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 newPlan = r => require.ensure([], () => r(require('../views/followup/plan-manage/new-plan.vue')), 'newPlan');
+
 
 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');
@@ -63,6 +65,15 @@ const followRouters = {
               keepAlive: false  //页面不需要缓存
             },
           },
+          {
+            path: 'new-plan',
+            component: newPlan,
+            name: 'newPlan',
+            meta: {
+              title: '新建随访计划',
+              keepAlive: false  //页面不需要缓存
+            },
+          },
         ],
         meta: {
           title: '计划管理',

src/views/followup/plan-manage/new-plan.vue

+<template>
+  <div class="resident-list">
+    <bread-crumb
+      :curmbFirst="curmbFirst"
+      :curmbSecond="curmbSecond"
+      :curmbThird="curmbThird"
+      :jumPathThird="jumPathThird">
+    </bread-crumb>
+    <div class="new-plan-content f-main-content screenSet">
+      <div class="header">
+        <div class="title">
+          <!--<el-breadcrumb separator-class="el-icon-arrow-right">-->
+            <!--<el-breadcrumb-item>基本信息</el-breadcrumb-item>-->
+            <!--<el-breadcrumb-item>随访时间节点</el-breadcrumb-item>-->
+          <!--</el-breadcrumb>-->
+          <span>基本信息</span>
+          <i class="el-icon-arrow-right" style="color: #C0C4CC"></i>
+          <span style="color: #606266">随访时间节点</span>
+        </div>
+        <div class="plan-btns-group">
+          <el-button class="button-white" plain>取 消</el-button>
+          <el-button type="primary">下一步</el-button>
+        </div>
+      </div>
+      <div class="edit-plan-content">
+        <el-form ref="baseInfo" :model="baseInfo" :rules="rules" label-suffix=":" label-width="140px">
+          <el-form-item label="随访计划名称" prop="name">
+            <el-input v-model="baseInfo.name" maxlength="20" style="width: 30%" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="随访居民" required>
+            <div class="select-patients">
+              <el-button plain icon="el-icon-plus">选择居民</el-button><br>
+              <el-button type="text" class="mt10">已选300人<i class="el-icon-arrow-right"></i></el-button>
+            </div>
+          </el-form-item>
+          <el-form-item label="随访模板" prop="followupTemplate">
+            <el-select v-model="baseInfo.followupTemplate">
+              <option>随访模板一</option>
+              <option>随访模板二</option>
+              <option>随访模板三</option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="随访开始时间" prop="startTime">
+            <el-date-picker
+              v-model="baseInfo.startTime"
+              type="date"
+              placeholder="请选择随访开始时间"
+              clearable
+              style="width:380px;">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-select
+              v-model="baseInfo.followupKind"
+              placeholder="请选择随访种类">
+              <option>随访模板一</option>
+              <option>随访模板二</option>
+              <option>随访模板三</option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import BreadCrumb from '@/components/breadcrumb'
+  import ElButton from "element-ui/packages/button/src/button";
+  //结束随访dialog
+  // import FinishFollowup from '@/views/followup/plan-manage/dialog/finish-followup';
+
+  // import { mapState, mapActions } from 'vuex'
+  export default {
+    name: "addNewPlan",
+    components: {
+      ElButton,
+      BreadCrumb,
+    },
+    data() {
+      return {
+        /*面包屑配置*/
+        curmbFirst: '随访管理',
+        curmbSecond: '计划管理',
+        curmbThird: '新建随访计划',
+        jumPathThird: '/followUp/plan-manage',
+
+        baseInfo: {
+          name: '',
+          followupTemplate: '',
+          startTime: '',
+          followupKind: ''
+        },
+        rules: {
+          name: [{ required: true, message: '请填写随访计划名称', trigger: 'blur' }],
+          followupTemplate: [{ required: true, message: '请选择随访模板', trigger: 'change' }],
+          startTime: [{ required: true, message: '请选择随访开始时间', trigger: 'change' }],
+        },
+      }
+    },
+    created() {
+
+    },
+    mounted() {
+      // this.getResidentList({
+      //   planId: this.$route.query.planId
+      // });
+      // this.getGroupList(); //获取分组列表
+    },
+    computed: {
+      // ...mapState('planManage',{
+      //   residentList: state => state.residentList,
+      //   groupList: state => state.groupList
+      // })
+    },
+    methods: {
+      // ...mapActions('planManage', ['getResidentList', 'getGroupList']),
+    },
+    watch: {
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  @import '../../../style/followup/followup-common';
+  @import '../../../style/followup/element-reset.css';
+
+  .new-plan-content{
+    .header{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding-bottom: 20px;
+      border-bottom: $borderBottomStyle;
+    }
+    .edit-plan-content{
+      padding: 30px 0;
+    }
+    .select-patients{
+      .mt10{
+        margin-top: 10px;
+      }
+    }
+  }
+</style>

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

@@ -27,7 +27,7 @@
         </div>
       </div>
       <div class="table-content">
-        <div class="content-group-btn"><el-button type="primary">新建随访计划</el-button></div>
+        <div class="content-group-btn"><el-button type="primary" @click="addNewPlan">新建随访计划</el-button></div>
         <div>
           <el-table :data="planListData" style="width: 100%;margin-top: 20px;">
             <el-table-column prop="name" label="随访计划名称" min-width="100" align="center" :show-overflow-tooltip="true">
@@ -108,6 +108,9 @@
         this.searchData.name = '';
         this.searchData.timeRange = '';
       },
+      addNewPlan(){
+        this.$router.push({path: '/followup/plan-manage/new-plan'})
+      },
       visitDetail(row){
         this.$router.push({path: '/followup/plan-manage/plan-detail', query: {planId:'1'}})
       },