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

# Conflicts:
#	src/utils/followup/followapis.js

src/store/followup/planManage.js

-import followApi from '../../utils/followup/followapis'
+import {getPlanList,
+  getPlanDetail,
+  getNodeTimeList,
+  getNodeTimeContent,
+  getResidentList,
+  getGroupList,
+  getResidentDetail,
+  changePlan} from '../../utils/followup/followapis'
 
 export default {
   namespaced: true,
@@ -51,7 +58,7 @@ export default {
   actions: {
     getResidentList(context, payload) {
       const { pageSize, pageNum } = context.state.residentList;
-      followApi.getResidentList({
+      getResidentList({
         pageSize,
         pageNum,
         ...payload
@@ -60,47 +67,45 @@ export default {
       });
     },
     getGroupList(context, payload) {
-      followApi.getGroupList({}).then(({data}) => {
+      getGroupList({}).then(({data}) => {
         context.commit('GET_GROUP_LIST', data);
       });
     },
     getResidentDetail(context, payload) {
-      followApi.getResidentDetail({
+      getResidentDetail({
         ...payload
       }).then(({data}) => {
         context.commit('GET_RESIDENT_DETAIL', data);
       });
     },
     getPlanDetail(context, payload) {
-      followApi.getPlanDetail({}, {
+      getPlanDetail({}, {
         urlSuffix:payload
       }).then(({data}) => {
         context.commit('GET_PLAN_DETAIL', data);
       });
     },
     getNodeTimeList(context, payload) {
-      followApi.getNodeTimeList({}, {
-        urlSuffix:payload
-      }).then(({data}) => {
+      getNodeTimeList(payload).then(({data}) => {
         context.commit('GET_NODE_TIME_LIST', data);
       });
     },
     getNodeTimeContent(context, payload) {
-      followApi.getNodeTimeContent({}, {
+      getNodeTimeContent({}, {
         urlSuffix:payload
       }).then(({data}) => {
         context.commit('GET_NODE_CONTENT', data);
       });
     },
     getPlanOptions(context, payload) {
-      followApi.getPlanList({
+      getPlanList({
         pageNum: -1
       }).then(({data}) => {
         context.commit('GET_PLAN_OPTION', data);
       });
     },
    changePlan(context, payload) {
-      followApi.changePlan({
+      changePlan({
 
       }).then(({data}) => {
        // context.commit('GET_PLAN_OPTION', data);

src/utils/followup/followapis.js

@@ -146,58 +146,6 @@ export const changeReservationStatus = (params) => {
     method: 'post',
     params: 'data',
     description: '手动变更预约状态',
-<<<<<<< HEAD
-  },
-  {
-    url: '/appoint',
-    method: 'post',
-    params: 'data',
-    name: 'sendReservation',
-    description: '发送预约',
-  },
-]
-
-/*工作台*/
-const workbenchApi = [
-  {
-    url: '/overView/todayAppoints',
-    method: 'get',
-    params: 'params',
-    name: 'getTodayAppointsListSC',
-    description: '获取今日预约列表',
-  },
-  {
-    url: '/overView/todayOverview',
-    method: 'get',
-    params: 'params',
-    name: 'getTodayOverviewSC',
-    description: '获取今日随访、预约、随访人数',
-  },
-  {
-    url: '/overView/todayPlans',
-    method: 'get',
-    params: 'params',
-    name: 'getTodayPlansSC',
-    description: '查询今日随访计划',
-  },
-]
-
-/*常量API*/
-const basicDataApi = [
-  {
-    url: '/overView/todayAppoints',
-    method: 'get',
-    params: 'params',
-    name: 'getBasicData',
-    description: '获取常量',
-  },
-]
-
-/*录入管理API*/
-const recordManageApi = [
-  {
-    url: '/followup/entering/list',
-=======
   })
 };
 /*录入管理*/
@@ -205,7 +153,6 @@ export const getEnteringList = (data) => {
   return fetch({
     headers,
     url: getFollowUpSC(`/followup/entering/list`),
->>>>>>> origin/dev-followUp-20190312
     method: 'post',
     data: data,
     description: '录入列表查看',