merge

src/store/followup/recordManage.js

-import followApi from '../../utils/followup/followapis'
+import {getEnteringList, changeEnteringStatus, getEnteringInfo} from '../../utils/followup/followapis'
 
 export default {
   namespaced: true,
@@ -20,14 +20,14 @@ export default {
   },
   actions: {
     async getRecordList(context, payload) {
-      await followApi.getEnteringList({
+      await getEnteringList({
         ...payload
       }).then(({data}) => {
         context.commit('GET_RECORD_LIST', data);
       });
     },
     async getEnteringInfo(context, payload) {
-      await followApi.getEnteringInfo({}, {
+      await getEnteringInfo({}, {
         ...payload
       }).then(({data}) => {
         context.commit('GET_ENTERING_INFO', data);

src/store/followup/reservationManage.js

-import followApi from '../../utils/followup/followapis'
+import {getReservationList,
+  getCheckReservation,
+  getReservationPatients,
+  getBasicData} from '../../utils/followup/followapis'
 
 export default {
   namespaced: true,
@@ -29,7 +32,7 @@ export default {
   actions: {
     getReservationList(context, payload) {
       const { pageSize, pageNum } = context.state.reservationList;
-      followApi.getReservationList({
+      getReservationList({
         pageSize,
         pageNum,
         ...payload
@@ -38,21 +41,21 @@ export default {
       });
     },
     async getCheckReservation(context, payload) {
-      await followApi.getCheckReservation({
+      await getCheckReservation({
         ...payload
       }).then(({data}) => {
         context.commit('GET_CHECK_RESERVATION', data)
       })
     },
     async getConstantsData(context, payload) {
-      await followApi.getBasicData({
+      await getBasicData({
         ...payload
       }).then(({data}) => {
         context.commit('GET_CONSTANS_DATA', data)
       })
     },
     getReservationPatients(context, payload) {
-      followApi.getReservationPatients({
+      getReservationPatients({
         ...payload
       }).then(({data}) => {
         context.commit('GET_REVERVATION_NUM', data.number)

src/store/followup/workbench.js

-import followApi from '../../utils/followup/followapis'
+import {getTodayAppointsList, getTodayOverview, getTodayPlans} from '@/utils/followup/followapis'
 
 export default  {
   namespaced: true,
@@ -32,21 +32,21 @@ export default  {
   },
   actions: {
     getTodayPlansList(context, payload) {
-      followApi.getTodayPlansSC({
+      getTodayPlans({
         ...payload
       }).then(({data}) => {
         context.commit('GET_TODAY_PLAN_LIST', data);
       });
     },
     getTodayAppointsList(context, payload) {
-      followApi.getTodayAppointsListSC({
+      getTodayAppointsList({
         ...payload
       }).then(({data}) => {
         context.commit('GET_TODAY_APPOINTS_LIST', data);
       });
     },
     getTodayOverview(context, payload) {
-      followApi.getTodayOverviewSC({
+      getTodayOverview({
         ...payload
       }).then(({data}) => {
         context.commit('GET_TODAY_OVERVIEW', data);

src/utils/envConfig.js

@@ -16,9 +16,8 @@ export const envConfig = {
     loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html',
     innerLoginUrl: 'http://localhost:8090/PICA_SSO_FE/html/pica_index.html',
     yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html',
-    followUpApi: '',
-    followUpApiSoSoApi:'http://sosoapi.yunqueyi.com/sosoapi-web/pass/mock/73',
-    followUpSC: 'https://dev-sc.yunqueyi.com/followup'
+    followUpSCSoSo: 'http://sosoapi.yunqueyi.com/sosoapi-web/pass/mock/73',
+    followUpSC: 'https://dev-sc.yunqueyi.com'
   },
   dev: {
     baseUrl: 'https://dev-sc.yunqueyi.com/portal/',
@@ -28,8 +27,7 @@ export const envConfig = {
     loginUrl: 'https://dev-saas.yunqueyi.com/pica-login/work_station.html',
     innerLoginUrl: 'https://dev-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
     yuequeyiIndexUrl: 'https://dev-saas.yunqueyi.com/pica_index.html',
-    followUpApi: '',
-    followUpSC: 'https://dev-sc.yunqueyi.com/followup'
+    followUpSC: 'https://dev-sc.yunqueyi.com'
   },
   test: {
     baseUrl: 'https://test1-sc.yunqueyi.com/portal/',
@@ -39,8 +37,7 @@ export const envConfig = {
     loginUrl: 'https://test1-saas.yunqueyi.com/pica-login/work_station.html',
     innerLoginUrl: 'https://test1-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
     yuequeyiIndexUrl: 'https://test-saas.yunqueyi.com/pica_index.html',
-    followUpApi: '',
-    followUpSC: 'https://test1-sc.yunqueyi.com/followup'
+    followUpSC: 'https://test1-sc.yunqueyi.com'
   },
   uat: {
     baseUrl: 'https://uat-sc.yunqueyi.com/portal/',
@@ -50,8 +47,7 @@ export const envConfig = {
     loginUrl: 'https://uat-saas.yunqueyi.com/pica-login/work_station.html',
     innerLoginUrl: 'https://uat-sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
     yuequeyiIndexUrl: 'https://uat-saas.yunqueyi.com/pica_index.html',
-    followUpApi: '',
-    followUpSC: 'https://uat-sc.yunqueyi.com/followup'
+    followUpSC: 'https://uat-sc.yunqueyi.com'
   },
   pro: {
     baseUrl: 'https://sc.yunqueyi.com/portal/',
@@ -61,7 +57,6 @@ export const envConfig = {
     loginUrl: 'https://saas.yunqueyi.com/pica-login/work_station.html',
     innerLoginUrl: 'https://sso.yunqueyi.com/PICA_SSO_FE/html/pica_index.html',
     yuequeyiIndexUrl: 'https://saas.yunqueyi.com/pica_index.html',
-    followUpApi: '',
-    followUpSC: 'https://sc.yunqueyi.com/followup'
+    followUpSC: 'https://sc.yunqueyi.com'
   }
 }

src/utils/fetch.js

@@ -11,9 +11,12 @@ const service = axios.create({
 
 // request拦截器
 service.interceptors.request.use(config => {
-  config.headers['sysCode'] = 12
-  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.headers['sysCode']==undefined) {
+    config.headers['sysCode'] = 12
+  }*/
+ // config.headers['token'] = '1B27380B2BFE4B8DA432EB149D237AA1'
+ // 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) {
   //   config.headers['sysCode'] = config.data.sysCode || 10
   //   if(config.data.token){

src/utils/followup/followapis.js

@@ -5,95 +5,148 @@ import utils from './followupUtils';
 
 
 
-/*计划管理API*/
-const  planManageApi = [
-  {
-    url: '/followup/plans',
+
+
+const headers = null /*{
+  sysCode: 45
+}*/
+/*工作台*/
+export const getTodayAppointsList = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/overView/todayAppoints`),
     method: 'get',
-    params: 'params',
-    name: 'getPlanList',
+    params: params,
+    description: '获取今日预约列表',
+  })
+};
+export const getTodayOverview = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/overView/todayOverview`),
+    method: 'get',
+    params: params,
+    description: '获取今日随访、预约、随访人数',
+  })
+};
+export const getTodayPlans = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/overView/todayPlans`),
+    method: 'get',
+    params: params,
+    description: '查询今日随访计划',
+  })
+};
+
+/*计划管理*/
+export const getPlanList = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/plans`),
+    method: 'get',
+    params: params,
     description: '获取计划列表',
-  },
-  {
-    url: '/plans/',
+  })
+};
+export const getPlanDetail = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/plans/detail`),
     method: 'get',
-    params: 'params',
-    name: 'getPlanDetail',
+    params: params,
     description: '获取计划详情',
-  },
-  {
-    url: '',
+  })
+};
+export const getNodeTimeList = (planId) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/plans/times/line/${planId}`),
     method: 'get',
-    params: 'params',
-    name: 'getNodeTimeList',
     description: '获取随访时间节点列表',
-  },
-  {
-    url: '/plans/time/',
+  })
+};
+export const getNodeTimeContent = (planTimeId) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/plans/time/${planTimeId}`),
     method: 'get',
-    params: 'params',
-    name: 'getNodeTimeContent',
     description: '获取节点详情',
-  },
-  {
-    url: '/followup/planPatient/',
+  })
+};
+export const getResidentList = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/planPatient/`),
     method: 'get',
-    params: 'params',
-    name: 'getResidentList',
+    params: params,
     description: '获取居民列表',
-  },
-  {
-    url: '/followup/planPatient/group',
+  })
+};
+export const getGroupList = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/planPatient/group`),
     method: 'get',
-    params: 'params',
-    name: 'getGroupList',
+    params: params,
     description: '获取分组列表',
-  },
-  {
-    url: '/followup/planPatient/detail',
+  })
+};
+export const getResidentDetail = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/planPatient/detail`),
     method: 'get',
-    params: 'params',
-    name: 'getResidentDetail',
+    params: params,
     description: '获取居民详情',
-  },
-  {
-    url: '/followup/planPatient/change',
+  })
+};
+export const changePlan = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/planPatient/change`),
     method: 'put',
-    params: 'params',
-    name: 'changePlan',
+    params: params,
     description: '变更计划',
-  },
-];
+  })
+};
 
-/*预约管理API*/
-const reservationManageApi = [
-  {
-    url: '/followup/appointmentPatient/',
+/*预约管理*/
+export const getReservationList = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/appointmentPatient/`),
     method: 'get',
-    params: 'params',
-    name: 'getReservationList',
+    params: params,
     description: '获取预约列表',
-  },
-  {
-    url: '/followup/appointmentPatient/check/',
+  })
+};
+export const getCheckReservation = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/appointmentPatient/check/`),
     method: 'get',
-    params: 'params',
-    name: 'getCheckReservation',
+    params: params,
     description: '发送预约校验',
-  },
-  {
-    url: '/followup/appointmentPatient/accept/',
+  })
+};
+export const getReservationPatients = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/appointmentPatient/accept/`),
     method: 'get',
-    params: 'params',
-    name: 'getReservationPatients',
+    params: params,
     description: '查看预约人数',
-  },
-  {
-    url: '/appoint/status/',
+  })
+};
+export const changeReservationStatus = (params) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/appoint/status/`),
     method: 'post',
     params: 'data',
-    name: 'changeReservationStatus',
     description: '手动变更预约状态',
+<<<<<<< HEAD
   },
   {
     url: '/appoint',
@@ -144,87 +197,47 @@ const basicDataApi = [
 const recordManageApi = [
   {
     url: '/followup/entering/list',
+=======
+  })
+};
+/*录入管理*/
+export const getEnteringList = (data) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/entering/list`),
+>>>>>>> origin/dev-followUp-20190312
     method: 'post',
-    params: 'data',
-    name: 'getEnteringList',
+    data: data,
     description: '录入列表查看',
-  },
-  {
-    url: '/followup/entering/status/change',
+  })
+}
+export const changeEnteringStatus = (data) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/followup/entering/status/change`),
     method: 'post',
-    params: 'data',
-    name: 'changeEnteringStatus',
+    data: 'data',
     description: '变更随访状态',
-  },
-  {
-    url: ``,
+  },)
+}
+export const getEnteringInfo = (patientId, fuPlanPatientTimesId) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`followup/entering/${patientId}/fuInfo/${fuPlanPatientTimesId}`),
     method: 'get',
     params: 'params',
-    name: 'getEnteringInfo',
     description: '随访单条信息查看',
-  },
-]
-
-
-
-const api = {};
-const apis = [...planManageApi, ...reservationManageApi, ...basicDataApi, ...workbenchApi, ...recordManageApi];
-
-apis.forEach(item => api[item.name] = (params = {}, extraConfig = {}) => {
-  // const config = {
-  //   url: getFollowUpApi(item.url),
-  //   method: item.method,
-  // };
-  let config = {};
-  if (item.name == 'getBasicData') {
-     config = {
-      url: getBasicDataApi(item.url),
-      method: item.method,
-    };
-  } else if (item.name == 'getNodeTimeList') {
-    let url = `/plan/${extraConfig.urlSuffix}/time`
-    config = {
-      url: getFollowUpApi(url),
-      method: item.method,
-    };
-  } else if (item.name.indexOf("SC")!=-1) {
-    config = {
-      url: getFollowUpSC(item.url),
-      method: item.method,
-    };
-  } else if (item.name == 'getEnteringInfo') {
-    let url = `/followup/entering/${extraConfig.patientId}/fuInfo/${extraConfig.fuPlanPatientTimesId}`
-    config = {
-      url: getFollowUpApi(url),
-      method: item.method,
-    };
-  } else {
-    config = {
-      url: getFollowUpApi(item.url),
-      method: item.method,
-    };
-  }
+  },)
+}
 
-  if (extraConfig.urlSuffix) { // 需要做URL拼接的情况(比如*.do/2),,,可以根据自己的实际情况进行扩展
-    config.url = `${config.url}${extraConfig.urlSuffix}`;
-    //something else
-  }
-  const filterParams = utils.DC.getParams(params, item.args);
-  if (item.params === 'data') {
-    config.data = filterParams;
-  } else {
-    config.params = filterParams;
-  }
 
-  /*utils.MSG.$emit('axios:begin', item.url);*/
-  return fetch({
-    ...config,
-    ...extraConfig,
-  }).then(res => {
-    return Promise.resolve(res);
-  }).catch(err => {
-    return Promise.resolve(err);
-  });
-});
-
-export default api;
+/*常量*/
+export const getBasicData = (data) => {
+  return fetch({
+    headers,
+    url: getFollowUpSC(`/basic-data/constants/`),
+    method: 'get',
+    params: params,
+    description: '获取常量',
+  })
+};

src/utils/index.js

@@ -171,13 +171,10 @@ export function uploadVideo() {
 export function uploadImg() {
   return getConfigByEnvType('qiniuImgUrl')
 }
-// 获取随访服务器域名地址
-export function getFollowUpApi(url) {
-  return getConfigByEnvType('followUpApiSoSoApi') + url //当前使用sosoapi mock数据
-}
+
 // 获取随访微服务服务器域名地址
 export function getFollowUpSC(url) {
-  return getConfigByEnvType('followUpSC') + url
+  return getConfigByEnvType('followUpSCSoSo') + url
 }
 
 // 获取常量接口域名地址

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

@@ -41,13 +41,7 @@
           <p class="tips">随访计划创建成功后，模板不可更换，请谨慎选择。</p>
         </el-form-item>
         <el-form-item label="随访开始时间" prop="startTime">
-          <el-date-picker
-            v-model="modifyInfo.startTime"
-            type="date"
-            placeholder="请选择随访开始时间"
-            clearable
-            style="width:380px;">
-          </el-date-picker>
+          2018-01-01 <el-button class="btn-text" type="text" @click="goToFollowTime">查看全部></el-button>
         </el-form-item>
         <el-form-item label="备注">
           <el-select
@@ -63,6 +57,9 @@
           </el-select>
         </el-form-item>
       </el-form>
+      <div class="edit-plan-content">
+        <set-time-node></set-time-node>
+      </div>
     </div>
     <select-patient
       :isShowSelectPatient="isShowSelectPatient"
@@ -76,12 +73,14 @@
   import BreadCrumb from '@/components/breadcrumb'
   import SelectPatient from '@/views/followup/plan-manage/dialog/select-patient';
   import HasSelectedPatient from '@/views/followup/plan-manage/dialog/has-selected-patient';
+  import SetTimeNode from '@/views/followup/plan-manage/dialog/set-time-node';
   export default {
     name: "plan-modify",
     components: {
       BreadCrumb,
       SelectPatient,
       HasSelectedPatient,
+      SetTimeNode,
     },
     data() {
       return {
@@ -134,6 +133,21 @@
         this.hasSelectedList = getArguments[1];
         this.modifyInfo.hasSelectedNum = getArguments[1].length;
       },
+      cancelEdit() {
+        this.$confirm('是否放弃本次创建，放弃后数据不能被保存', '', {
+          confirmButtonText: '继续创建',
+          cancelButtonText: '确定放弃',
+          type: 'warning'
+        }).then(() => {
+          //  关闭弹层，继续创建
+        }).catch(() => {
+          //  确定放弃，跳出当前编辑页面
+          this.$router.push({path: '/followup/plan-manage/plan-list'})
+        });
+      },
+      goToFollowTime() {
+
+      }
     },
   }
 </script>
@@ -149,5 +163,49 @@
     border-bottom: $borderBottomStyle;
     margin-bottom: 30px;
   }
+  .edit-plan-content{
+    padding: 30px 0;
 
+    .add-time-content{
+      padding-top: 20px;
+      .time-line-scroll{
+        width: 100%;
+        height: 50px;
+        box-sizing: border-box;
+        background-color: #F0F2F5;
+        padding: 8px 10px;
+        /*display: flex;*/
+        /*align-items: center;*/
+        overflow-x: scroll;
+        overflow-y: hidden;
+        white-space: nowrap;
+        position: relative;
+        cursor: pointer;
+        &::-webkit-scrollbar{
+          height: 6px;
+        }
+        &::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+          border-radius: 10px;
+          -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+          background: rgba(0,0,0,0.1);
+        }
+        span{
+          display: inline-block;
+          background-color: #449284;
+          border-radius: 20px;
+          height: 28px;
+          line-height: 28px;
+          padding: 0 8px;
+          color: #ffffff;
+          font-size: 12px;
+          width: 95px;
+        }
+      }
+      .form-div{
+        padding-top: 30px;
+      }
+    }
+
+
+  }
 </style>

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

@@ -44,11 +44,17 @@
         </div>
       </div>
       <div class="resident-table table-content">
-        <el-radio-group v-model="status">
-          <el-radio-button label="0">未完成({{residentList.notCount}})</el-radio-button>
-          <el-radio-button label="1">进行中({{residentList.handCount}})</el-radio-button>
-          <el-radio-button label="2">已结束({{residentList.yesCount}})</el-radio-button>
-        </el-radio-group>
+        <div class="btn-div">
+          <el-radio-group v-model="status">
+            <el-radio-button label="0">未完成({{residentList.notCount}})</el-radio-button>
+            <el-radio-button label="1">进行中({{residentList.handCount}})</el-radio-button>
+            <el-radio-button label="2">已结束({{residentList.yesCount}})</el-radio-button>
+          </el-radio-group>
+          <div class="btn-left">
+            <el-button class="button-green" type="primary" @click="finishFollowup('all')">结束随访</el-button>
+            <el-button class="button-white" plain @click="selectPatientHandler">添加居民</el-button>
+          </div>
+        </div>
         <el-table
           :data="residentList.fPlanPatientInfoDtoList"
           center
@@ -112,6 +118,11 @@
     </div>
     <change-plan :showThisPage="showChangePlan" :planChangeData="planChangeData"  @closeChangePlan="closeChangePlan"></change-plan>
     <finish-followup :showThisPage="showFinishFollowup" :finishData="finishData" @closeFinishFollowup="closeFinishFollowup"></finish-followup>
+    <select-patient
+      :isShowSelectPatient="isShowSelectPatient"
+      @closeSelectPatient="closeSelectPatient"
+      @sureSelectPatient="sureSelectPatient(arguments)">
+    </select-patient>
   </div>
 </template>
 
@@ -121,6 +132,8 @@
   import ChangePlan from '@/views/followup/plan-manage/dialog/change-plan';
   //结束随访dialog
   import FinishFollowup from '@/views/followup/plan-manage/dialog/finish-followup';
+  //添加居民
+  import SelectPatient from '@/views/followup/plan-manage/dialog/select-patient';
 
   import { mapState, mapActions } from 'vuex'
   export default {
@@ -129,6 +142,7 @@
       BreadCrumb,
       ChangePlan,
       FinishFollowup,
+      SelectPatient
     },
     data() {
       return {
@@ -149,6 +163,8 @@
         planChangeData: {}, //变更计划数据
         showFinishFollowup: false, //是否展示结束随访
         finishData: {}, //结束数据
+        isShowSelectPatient: false, //显示居民选择框
+        hasSelectedList: [], //已选居民
       }
     },
     created() {
@@ -218,6 +234,18 @@
       closeFinishFollowup(isShow) {
         this.showFinishFollowup = isShow
       },
+      selectPatientHandler() {
+        this.isShowSelectPatient = true;
+      },
+      closeSelectPatient(val) {
+        this.isShowSelectPatient = val;
+      },
+      sureSelectPatient() {
+        let getArguments = arguments[0];
+        this.isShowSelectPatient = getArguments[0];
+        this.hasSelectedList = getArguments[1];
+        this.modifyInfo.hasSelectedNum = getArguments[1].length;
+      },
     },
     watch: {
       status(val) {
@@ -234,5 +262,8 @@
 
   @import '../../../style/followup/followup-common';
   @import '../../../style/followup/element-reset.css';
+  .btn-left {
+    float: right;
+  }
 
 </style>