居民fixed

src/store/modules/followup/planManage.js

@@ -9,6 +9,7 @@ export default {
       total: null,  //总数
     },
     groupList: [],  //分组列表
+    residentDetail: {}, //居民详情
 
   },
   mutations: {
@@ -17,6 +18,9 @@ export default {
     },
     GET_GROUP_LIST(state, payload) {
       state.groupList = payload.labelDtoList
+    },
+    GET_RESIDENT_DETAIL(state, payload) {
+      state.residentDetail = payload
     }
   },
   actions: {
@@ -34,6 +38,13 @@ export default {
       followApi.getGroupList({}).then(({data}) => {
         context.commit('GET_GROUP_LIST', data);
       });
+    },
+    getResidentDetail(context, payload) {
+      followApi.getResidentDetail({
+        ...payload
+      }).then(({data}) => {
+        context.commit('GET_RESIDENT_DETAIL', data);
+      });
     }
   },
 }

src/utils/followup/followapis.js

@@ -21,6 +21,20 @@ const  planManageApi = [
     name: 'getGroupList',
     description: '获取分组列表',
   },
+  {
+    url: '/followup/planPatient/detail',
+    method: 'get',
+    params: 'params',
+    name: 'getResidentDetail',
+    description: '获取居民详情',
+  },
+  {
+    url: '/followup/planPatient/change',
+    method: 'put',
+    params: 'params',
+    name: 'changePlan',
+    description: '变更计划',
+  },
 ];
 
 /*预约管理API*/

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

@@ -18,56 +18,54 @@
         <div class="resident-info base-content">
           <div class="content-div">
             <div class="c-title">姓名：</div>
-            <div class="c-content">戴佳康</div>
+            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.nickName}}</div>
           </div>
           <div class="content-div ">
             <div class="c-title">性别：</div>
-            <div class="c-content">男</div>
+            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.sexName}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">年龄：</div>
-            <div class="c-content">55岁</div>
+            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.sexName}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">身份证号：</div>
-            <div class="c-content">3101110196011022419</div>
+            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.cardNo}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">联系方式：</div>
-            <div class="c-content">13111111111</div>
+            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.mobile}}</div>
           </div>
         </div>
         <div class="group-info base-content">
           <div class="content-div">
             <div class="c-title">分组：</div>
-            <div class="c-content">2018糖尿病随访；2018糖尿病随访；</div>
+            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.labelName}}</div>
           </div>
         </div>
         <div class="followup-info base-content">
           <div class="content-div">
             <div class="c-title">随访模板：</div>
-            <div class="c-content">糖尿病随访</div>
+            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.planTemplate}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">随访开始时间：</div>
-            <div class="c-content">2019-09-09</div>
+            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.time}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">备注：</div>
-            <div class="c-content">手术随访</div>
+            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.remark}}</div>
           </div>
           <div class="content-div">
             <div class="c-title">随访状态：</div>
-            <div class="c-content">进行中</div>
+            <div class="c-content">{{residentDetail.fPlanPatientDatilDtoList.statusName}}</div>
           </div>
         </div>
       </div>
       <div class="time-nodes">
         <p class="title">随访时间节点</p>
         <el-radio-group v-model="timeNodes">
-          <el-radio-button label="0">开始后1个月</el-radio-button>
-          <el-radio-button label="1">开始后2个月</el-radio-button>
-          <el-radio-button label="2">开始后3个月</el-radio-button>
+          <el-radio-button :key="item.nodeId" v-for="item in residentDetail.fPlanPatientDatilDtoList.timeNodeList" :label="item.nodeId">{{item.timeNodeContent}}</el-radio-button>
         </el-radio-group>
         <div class="followup-contents">
           <div class="content-div">
@@ -109,6 +107,8 @@
   import ChangePlan from '@/views/followup/plan-manage/dialog/change-plan';
   //结束随访dialog
   import FinishFollowup from '@/views/followup/plan-manage/dialog/finish-followup';
+
+  import { mapState, mapActions } from 'vuex'
   export default {
     name: "resident-detail",
     components: {
@@ -129,7 +129,22 @@
         showFinishFollowup: false, //是否展示结束随访
       }
     },
+    created() {
+
+    },
+    mounted() {
+      this.getResidentDetail({
+        patientId: this.$route.query.patientId,
+        planId: this.$route.query.planId
+      }); //获取居民详情
+    },
+    computed: {
+      ...mapState('planManage', {
+        residentDetail: state => state.residentDetail
+      })
+    },
     methods: {
+      ...mapActions('planManage', ['getResidentDetail']),
       changePlan() {
         this.showChangePlan = true;
       },

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

@@ -62,7 +62,7 @@
             label="姓名"
             align="center">
             <template slot-scope="scope">
-              <el-button type="text" @click="goPatientDetail(scope.row.patientId)" >{{scope.row.patientName}}</el-button>
+              <el-button type="text" @click="goPatientDetail(scope.row.patientId,scope.row.planId)" >{{scope.row.patientName}}</el-button>
             </template>
           </el-table-column>
           <el-table-column
@@ -90,8 +90,8 @@
             label="操作"
             align="center">
             <template slot-scope="scope">
-              <el-button class="btn-right-class" type="text" >变更计划</el-button>|
-              <el-button class="btn-right-class" type="text" >结束随访</el-button>
+              <el-button class="btn-right-class" type="text" @click="changePlan" >变更计划</el-button>|
+              <el-button class="btn-right-class" type="text" @click="finishFollowup" >结束随访</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -111,17 +111,25 @@
 
       </div>
     </div>
+    <change-plan :showThisPage="showChangePlan" @closeChangePlan="closeChangePlan"></change-plan>
+    <finish-followup :showThisPage="showFinishFollowup" @closeFinishFollowup="closeFinishFollowup"></finish-followup>
   </div>
 </template>
 
 <script>
   import BreadCrumb from '@/components/breadcrumb'
+  //变更计划dialog
+  import ChangePlan from '@/views/followup/plan-manage/dialog/change-plan';
+  //结束随访dialog
+  import FinishFollowup from '@/views/followup/plan-manage/dialog/finish-followup';
 
   import { mapState, mapActions } from 'vuex'
   export default {
     name: "residentList",
     components: {
-      BreadCrumb
+      BreadCrumb,
+      ChangePlan,
+      FinishFollowup,
     },
     data() {
       return {
@@ -138,6 +146,8 @@
           label: '全部'
         }],
         status: 0, //列表筛选条件
+        showChangePlan: false,//是否展示变更计划
+        showFinishFollowup: false, //是否展示结束随访
       }
     },
     created() {
@@ -169,8 +179,8 @@
           status: this.status
         })
       },
-      goPatientDetail(patientId) { //居民详情页
-        this.$router.push('/followup/plan-manage/resident-detail')
+      goPatientDetail(patientId,planId) { //居民详情页
+        this.$router.push({path: '/followup/plan-manage/resident-detail', query: {patientId: patientId, planId:'1'}})
 
       },
       searchResidentList() { //查询居民列表
@@ -181,7 +191,19 @@
       },
       resetSearchData(formName) {
         this.$refs[formName].resetFields();
-      }
+      },
+      changePlan() {
+        this.showChangePlan = true;
+      },
+      closeChangePlan(isShow) {
+        this.showChangePlan = isShow
+      },
+      finishFollowup() {
+        this.showFinishFollowup = true;
+      },
+      closeFinishFollowup(isShow) {
+        this.showFinishFollowup = isShow
+      },
     },
     watch: {
       status(val) {