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/store/followup/planManage.js

@@ -6,7 +6,8 @@ import {getPlanList,
   getGroupList,
   getResidentDetail,
   getBasicData,
-  changePlan} from '../../utils/followup/followapis'
+  changePlan,
+  createFollowPlan} from '../../utils/followup/followapis'
 
 export default {
   namespaced: true,
@@ -65,6 +66,13 @@ export default {
     },
   },
   actions: {
+    setFollowPlan(context, payload) {
+      createFollowPlan({
+        ...payload
+      }).then(({data})=> {
+       // console.log('成功',data)
+      })
+    },
     getResidentList(context, payload) {
       const { pageSize, pageNum } = context.state.residentList;
       getResidentList({

src/utils/followup/followapis.js

@@ -40,6 +40,15 @@ export const getTodayPlans = (params) => {
 };
 
 /*计划管理*/
+export const createFollowPlan = (data) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/plans`),
+    method: 'post',
+    data: data,
+    description: '新增、修改随访计划',
+  },)
+}
 export const getPlanList = (params) => {
   return fetch({
     headers,
@@ -129,12 +138,12 @@ export const getCheckReservation = (params) => {
     description: '发送预约校验',
   })
 };
-export const getReservationPatients = (params) => {
+export const getReservationPatients = (data) => {
   return fetch({
     headers,
-    url: getFollowUpSC(`/followup/appointmentPatient/accept/`),
-    method: 'get',
-    params: params,
+    url: getFollowUpSC(`/followup/appoint/appointed/count`),
+    method: 'post',
+    data: data,
     description: '查看预约人数',
   })
 };
@@ -185,17 +194,6 @@ export const getEnteringInfo = (patientId, fuPlanPatientTimesId) => {
   },)
 }
 
-//新增随访计划
-export const createFollowPlan = (data) => {
-  return fetch({
-    headers,
-    url: getFollowUpSC(`/followup/plans`),
-    method: 'post',
-    data: data,
-    description: '新增随访计划',
-  },)
-}
-
 //获取新建计划居民列表
 export const getPlanPatientsList = (data) =>{
   data = data || {}

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

@@ -45,12 +45,14 @@
           </div>
         </div>
       </div>
-      <div class="time-nodes">
+      <div class="time-nodes" >
         <p class="title">随访时间节点</p>
-        <el-radio-group v-model="timeNodes" size="small">
-          <el-radio-button :key="item.id" v-for="item in planDetail.fPlanTimeDtoList" :label="item.id">{{item.timeStr}}</el-radio-button>
-        </el-radio-group>
-        <div class="followup-contents">
+        <div class="node-div">
+          <el-radio-group v-model="timeNodes" size="small">
+            <el-radio-button :key="item.id" v-for="item in planDetail.fPlanTimeDtoList" :label="item.id">{{item.timeStr}}</el-radio-button>
+          </el-radio-group>
+        </div>
+        <div class="followup-contents" v-if="nodeContent.length">
           <div class="content-div">
             <div class="c-title">随访方式：</div>
             <div class="c-content">{{nodeContent[0].typeStr}}</div>
@@ -104,7 +106,7 @@
         timeNodes: null,//时间节点
         showFollowTime: false,  //是否展示全部时间
         thisNodeContents: {},
-        nodeContent: {},  //节点详情
+        nodeContent: [],  //节点详情
       }
     },
     created() {
@@ -138,13 +140,15 @@
     },
     watch: {
       planDetail(val) {
-        this.timeNodes = val.fPlanTimeDtoList[0].id
+        if(val.fPlanTimeDtoList.length){
+          this.timeNodes = val.fPlanTimeDtoList[0].id
+        }
+
       },
       timeNodes(val) {
         this.nodeContent =  this.planDetail.fPlanTimeDtoList.filter(function(item){
           return item.id == val;
-        })
-        console.log('this.nodeContent',this.nodeContent[0])
+        });
       }
     }
   }

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

@@ -129,7 +129,14 @@
       })
     },
     methods: {
-      ...mapActions('planManage', ['getPlanDetail', 'getNodeTimeList', 'getResidentList', 'getRemarkOption', 'getTimeNodeList']),
+      ...mapActions('planManage', [
+        'getPlanDetail',
+        'getNodeTimeList',
+        'getResidentList',
+        'getRemarkOption',
+        'getTimeNodeList',
+        'modifyFollowPlan'
+      ]),
       selectPatientHandler() {
         this.isShowSelectPatient = true;
       },
@@ -167,14 +174,15 @@
       saveModify() {
         this.$confirm('是否确认保存修改内容?', '', {
           confirmButtonText: '确定',
-            cancelButtonText: '取消',
+          cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
           //  关闭弹层，继续创建
-          this.$message({
+          this.modifyFollowPlan(this.planDetail)
+          /*this.$message({
             message: '修改成功！',
             type: 'success'
-          });
+          });*/
           this.$router.back(-1)
         }).catch(() => {
           //  确定放弃，跳出当前编辑页面
@@ -195,7 +203,7 @@
       planDetail(val) {
        // this.setTimeNodeList = val.fPlanTimeDtoList
         this.setTimeNodeListOnCom(val.fPlanTimeDtoList)
-      }
+      },
     }
   }
 </script>

src/views/followup/reservation-manage/dialog/change-reservation.vue

@@ -14,7 +14,7 @@
         label-suffix=":"
         label-width="120px">
         <el-form-item label="变更居民">
-          <span>{{reservationForm.nickName}}</span>
+          <span>{{reservationForm.nickname}}</span>
         </el-form-item>
         <el-form-item label="预约状态" required prop="appointStatus">
           <el-radio-group v-model="reservationForm.appointStatus">

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

@@ -50,7 +50,7 @@
       </div>
       <div class="reservation-table table-content">
         <el-radio-group v-model="status" size="small">
-          <el-radio-button label="0">全部({{reservationList.count}})</el-radio-button>
+          <el-radio-button label="">全部({{reservationList.count}})</el-radio-button>
           <el-radio-button label="1">未发送({{reservationList.unSendCount}})</el-radio-button>
           <el-radio-button label="2">待确认({{reservationList.waitAcceptCount}})</el-radio-button>
           <el-radio-button label="3">已接受({{reservationList.acceptedCount}})</el-radio-button>
@@ -159,7 +159,7 @@
           planName: '',
           planTimes: ''
         }, //查询数据
-        status: 0, //列表筛选条件
+        status: '', //列表筛选条件
         statusOptions: [
           {
             value: 1,
@@ -313,7 +313,7 @@
       changeReserveClick(row){
         // this.needPara = row;
         this.needPara = {
-          nickName: row.nickName,
+          nickname: row.nickname,
           appointmentDate: '',
           appointmentRange: '',
           planId: row.planId,

src/views/home.vue

@@ -179,7 +179,7 @@ export default {
         },
         changeFollowStatus(row) {
           this.statusForm = {
-            fuPlanPatientTimesId: row.fuPlanPatientTimesId,
+            fuPlanPatientTimesId: row.planPatientTimesId,
             patientId: row.patientId,
             nickname: row.patientName,
             status: row.status,