预约列表&工作台

src/store/followup/planManage.js

@@ -123,7 +123,7 @@ export default {
         context.commit('GET_PLAN_OPTION', data);
       });
     },
-   changePlan(context, payload) {
+    changePlan(context, payload) {
       changePlan({
 
       }).then(({data}) => {
@@ -132,7 +132,7 @@ export default {
     },
     getTimeNodeList(context, payload){
       context.commit('SET_TIME_NODE_LIST', payload);
-  },
+    },
     async getPlanList(context, payload) {
       await getPlanList({
         ...payload

src/store/followup/reservationManage.js

@@ -17,7 +17,7 @@ export default {
   },
   mutations: {
     GET_RESERVATION_LIST(state, payload) {
-      state.reservationList = payload.data.enteringDtos
+      state.reservationList = payload;
     },
     GET_CHECK_RESERVATION(state, payload) {
       state.checkRevervationData = payload

src/store/followup/workbench.js

@@ -9,22 +9,11 @@ export default  {
   },
   mutations: {
     GET_TODAY_PLAN_LIST(state, payload) {
-     // state.todayPlansList = payload.data
-      state.todayPlansList = [
-        {
-          patientName: 'wewe',
-          status: 1,
-          appointTime: '2019-03-05'
-        }
-      ]
+      console.log('返回数据', payload)
+      state.todayPlansList = payload
     },
     GET_TODAY_APPOINTS_LIST(state, payload) {
-      state.todayAppointsList = [
-        {
-          planName: 'wewe',
-          appointTime: '2019-03-05'
-        }
-      ]
+      state.todayAppointsList = payload
     },
     GET_TODAY_OVERVIEW(state, payload) {
       state.todayOverview = payload

src/utils/fetch.js

@@ -14,7 +14,7 @@ service.interceptors.request.use(config => {
   if( config.headers['sysCode']==undefined) {
     config.headers['sysCode'] = 12
   }
-  config.headers['token'] = 'B19ABBCB6B7A4B6F887A1ED6BCB69FD6'
+  config.headers['token'] = 'D74A6C7C61564EB1B3DC83251F33D173'
   //config.headers['token'] = localStorage.getItem('storageToken')
   config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
   // if (config.data && config.data.setEntry) {

src/utils/followup/followapis.js

@@ -7,9 +7,9 @@ import utils from './followupUtils';
 
 
 
-const headers = null /*{
+const headers = {
   sysCode: 45
-}*/
+} /**/
 /*工作台*/
 export const getTodayAppointsList = (params) => {
   return fetch({

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

@@ -48,7 +48,7 @@
         </el-form-item>
       </el-form>
       <div class="edit-plan-content">
-        <set-time-node ></set-time-node>
+        <set-time-node :setTimeNodeList="setTimeNodeList" @setTimeNodeListOnCom="setTimeNodeListOnCom"></set-time-node>
       </div>
     </div>
     <select-patient
@@ -106,6 +106,7 @@
         isShowSelectPatient: false, //显示居民选择框
         isShowSelectedDialog: false, //显示已选居民
         hasSelectedList: [], //已选居民
+        nodeListModify: [], //修改node列表
         showFollowTime: false,  //是否展示全部时间
       }
     },
@@ -123,11 +124,12 @@
         planDetail: state => state.planDetail,
         nodeTimeList: state => state.nodeTimeList,
         residentList: state => state.residentList,
-        remarkOption: state => state.remarkOption
+        remarkOption: state => state.remarkOption,
+        setTimeNodeList: state => state.setTimeNodeList
       })
     },
     methods: {
-      ...mapActions('planManage', ['getPlanDetail', 'getNodeTimeList', 'getResidentList', 'getRemarkOption']),
+      ...mapActions('planManage', ['getPlanDetail', 'getNodeTimeList', 'getResidentList', 'getRemarkOption', 'getTimeNodeList']),
       selectPatientHandler() {
         this.isShowSelectPatient = true;
       },
@@ -185,7 +187,16 @@
       closeFollowTime(isShow) {
         this.showFollowTime = isShow
       },
+      setTimeNodeListOnCom(val){
+        this.getTimeNodeList(val)
+      },
     },
+    watch: {
+      planDetail(val) {
+       // this.setTimeNodeList = val.fPlanTimeDtoList
+        this.setTimeNodeListOnCom(val.fPlanTimeDtoList)
+      }
+    }
   }
 </script>
 

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

@@ -9,11 +9,11 @@
       <div class="search-div">
         <div class="search-input">
           <el-form :model="searchData" ref="searchData" :inline="true" :label-width="labelWidth">
-            <el-form-item label="随访计划名称：" prop="name">
-              <el-input v-model="searchData.name" size="small" placeholder="请输入随访计划名称" clearable></el-input>
+            <el-form-item label="随访计划名称：" prop="planName">
+              <el-input v-model="searchData.planName" size="small" placeholder="请输入随访计划名称" clearable></el-input>
             </el-form-item>
-            <el-form-item label="姓名：" prop="nickName">
-              <el-input v-model="searchData.nickName" size="small" placeholder="请输入姓名" clearable></el-input>
+            <el-form-item label="姓名：" prop="nickname">
+              <el-input v-model="searchData.nickname" size="small" placeholder="请输入姓名" clearable></el-input>
             </el-form-item>
             <el-form-item label="手机号：" prop="mobilePhone">
               <el-input v-model="searchData.mobilePhone" size="small" placeholder="请输入手机号" clearable></el-input>
@@ -50,15 +50,15 @@
       </div>
       <div class="reservation-table table-content">
         <el-radio-group v-model="status" size="small">
-          <el-radio-button label="0">全部({{reservationList.total}})</el-radio-button>
-          <el-radio-button label="1">未发送({{reservationList.notCount}})</el-radio-button>
-          <el-radio-button label="2">待确认({{reservationList.handCount}})</el-radio-button>
-          <el-radio-button label="3">已接受({{reservationList.yesCount}})</el-radio-button>
-          <el-radio-button label="4">已拒绝({{reservationList.refuseCount }})</el-radio-button>
+          <el-radio-button label="0">全部({{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>
+          <el-radio-button label="4">已拒绝({{reservationList.refusedCount }})</el-radio-button>
         </el-radio-group>
         <el-button class="button-green" type="primary" size="small" @click="sendReservation">发送预约</el-button>
         <el-table
-          :data="reservationList.fuPlanInfoList"
+          :data="reservationList.enteringDtos"
           center
           style="width: 100%;margin-top: 20px;"
           @selection-change="handleSelectionChange">
@@ -67,11 +67,11 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="nickName"
+            prop="nickname"
             label="姓名"
             align="center">
             <template slot-scope="scope">
-              <el-button type="text" @click="goPatientDetail(scope.row)" >{{scope.row.nickName}}</el-button>
+              <el-button type="text" @click="goPatientDetail(scope.row)" >{{scope.row.nickname}}</el-button>
             </template>
           </el-table-column>
           <el-table-column
@@ -253,8 +253,8 @@
             mobilePhone,
             timeStatus,
             nickName,
-            planFromTime: this.searchData.planTimes[0],
-            planToTime: this.searchData.planTimes[1],
+            beginTime: this.searchData.planTimes[0],
+            endTime: this.searchData.planTimes[1],
             status: this.status
           }
         } else {

src/views/home.vue

@@ -6,7 +6,7 @@
                 <el-col class="visitor screenSet" :span="24">
                     <div class="visitor-title">
                         <div class="title">今日随访：
-                          <span style="color:#449284;margin-right: 10px">10人</span>
+                          <span style="color:#449284;margin-right: 10px">{{todayPlansList.length}}人</span>
                           <span class="type-button" :style="{background:(planBtn?'rgba(68,146,132,0.06)':'#ffffff')}" @click="changeTodayPlansList(0)">未完成</span>
                           <span class="type-button" :style="{background:(!planBtn?'rgba(68,146,132,0.06)':'#ffffff')}" @click="changeTodayPlansList(1)">已过期</span>
                         </div>
@@ -16,10 +16,10 @@
                         <el-table
                             :data="todayPlansList"
                             style="width: 100%">
-                            <el-table-column prop="patientName" label="姓名"></el-table-column>
-                            <el-table-column prop="appointTime" label="预约时间"></el-table-column>
-                            <el-table-column prop="style" label="随访方式"></el-table-column>
-                            <el-table-column prop="content" label="操作">
+                            <el-table-column prop="patientName" label="姓名" align="center"></el-table-column>
+                            <el-table-column prop="appointTime" label="预约时间" align="center"></el-table-column>
+                            <el-table-column prop="fuTypeStr" label="随访方式" align="center"></el-table-column>
+                            <el-table-column prop="content" label="操作" align="center">
                               <template slot-scope="scope">
                                 <span class="text-btn">随访录入</span> | <span class="text-btn" @click="changeFollowStatus(scope.row)">变更随访状态</span>
                               </template>
@@ -39,11 +39,11 @@
                     <el-table
                       :data="todayAppointsList"
                       style="width: 100%">
-                      <el-table-column prop="planName" label="随访计划名称"></el-table-column>
-                      <el-table-column prop="appointTime" label="随访计划时间"></el-table-column>
-                      <el-table-column prop="appointedCount" label="已经预约"></el-table-column>
-                      <el-table-column prop="notAppointedCount" label="未预约"></el-table-column>
-                      <el-table-column prop="content" label="操作">
+                      <el-table-column prop="planName" label="随访计划名称" align="center"></el-table-column>
+                      <el-table-column prop="appointTime" label="随访计划时间" align="center"></el-table-column>
+                      <el-table-column prop="hasAppointed" label="已经预约" align="center"></el-table-column>
+                      <el-table-column prop="notAppointedCount" label="未预约" align="center"></el-table-column>
+                      <el-table-column prop="content" label="操作" align="center">
                         <template slot-scope="scope">
                           <span class="text-btn" @click="goToReservation(scope.row.planName, scope.row.appointTime)">去预约</span>
                         </template>