Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/store/modules/followup/reservationManage.js

@@ -8,8 +8,8 @@ export default {
       pageSize: 10, //每页数据大小
       total: null,  //总数
     },
-    checkRevervationData: { //发送预约校验
-    },
+    checkRevervationData: {},//发送预约校验
+    constantsData: {},//获取常量
   },
   mutations: {
     GET_RESERVATION_LIST(state, payload) {
@@ -18,6 +18,9 @@ export default {
     GET_CHECK_RESERVATION(state, payload) {
       state.checkRevervationData = payload
     },
+    GET_CONSTANS_DATA(state, payload) {
+      state.constantsData = payload
+    },
   },
   actions: {
     getReservationList(context, payload) {
@@ -37,5 +40,12 @@ export default {
         context.commit('GET_CHECK_RESERVATION', data)
       })
     },
+    getConstantsData(context, payload) {
+      followApi.getBasicData({
+        ...payload
+      }).then(({data}) => {
+        context.commit('GET_CONSTANS_DATA', data)
+      })
+    },
   },
 }

src/utils/envConfig.js

@@ -16,7 +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_login.html',
     followUpApi: '',
-    followUpApiSoSoApi:'http://sosoapi.yunqueyi.com/sosoapi-web/pass/mock/73'
+    followUpApiSoSoApi:'http://sosoapi.yunqueyi.com/sosoapi-web/pass/mock/73',
+    basicDataUrl: 'https://dev-sc.yunqueyi.com/',
   },
   dev: {
     baseUrl: 'https://dev-sc.yunqueyi.com/portal/',
@@ -26,6 +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_login.html',
     followUpApi: '',
+    basicDataUrl: 'https://dev-sc.yunqueyi.com/',
   },
   test: {
     baseUrl: 'https://test1-sc.yunqueyi.com/portal/',
@@ -35,6 +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_login.html',
     followUpApi: '',
+    basicDataUrl: 'https://test1-sc.yunqueyi.com/',
   },
   uat: {
     baseUrl: 'https://uat-sc.yunqueyi.com/portal/',
@@ -44,6 +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_login.html',
     followUpApi: '',
+    basicDataUrl: 'https://uat-sc.yunqueyi.com/',
   },
   pro: {
     baseUrl: 'https://sc.yunqueyi.com/portal/',
@@ -53,5 +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_login.html',
     followUpApi: '',
+    basicDataUrl: 'https://sc.yunqueyi.com/',
   }
 }

src/utils/followup/followapis.js

 import fetch from '../fetch';
-import { getFollowUpApi } from '@/utils/index'
+import { getFollowUpApi, getBasicDataApi } from '@/utils/index'
 
 import utils from './followupUtils';
 
@@ -56,15 +56,38 @@ const reservationManageApi = [
 ]
 
 
+/*常量API*/
+const basicDataApi = [
+  {
+    url: '/basic-data/constants/',
+    method: 'get',
+    params: 'params',
+    name: 'getBasicData',
+    description: '获取常量',
+  },
+]
+
 
 const api = {};
-const apis = [...planManageApi, ...reservationManageApi];
+const apis = [...planManageApi, ...reservationManageApi, ...basicDataApi];
 
 apis.forEach(item => api[item.name] = (params = {}, extraConfig = {}) => {
-  const config = {
+  // const config = {
+  //   url: getFollowUpApi(item.url),
+  //   method: item.method,
+  // };
+let config = {};
+  if(item.name == 'getBasicData'){
+     config = {
+      url: getBasicDataApi(item.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}`;

src/utils/index.js

@@ -171,6 +171,11 @@ export function getFollowUpApi(url) {
   return getConfigByEnvType('followUpApiSoSoApi') + url //当前使用sosoapi mock数据
 }
 
+// 获取常量接口域名地址
+export function getBasicDataApi(url) {
+  return getConfigByEnvType('basicDataUrl') + url
+}
+
 // 根据不同环境，生成URL
 function getConfigByEnvType(urlType) {
   return envConfig[process.env.BUILD_ENV][urlType]

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

@@ -123,6 +123,7 @@
   import BreadCrumb from "@/components/breadcrumb";
   // import customTextarea from "@/components/followup/customTextarea";
   import followupDetail from "./dialog/followupDetail";
+  import { mapState, mapActions } from 'vuex';
   export default {
     components:{
       BreadCrumb,
@@ -184,7 +185,20 @@
         dialogDetailShow: false,
       }
     },
+    computed: {
+      ...mapState('reservationManage',{
+        constantsData: state => state.constantsData,
+      })
+    },
+    created() {
+    },
+    mounted() {
+      this.getConstantsData({
+        numList: 'P216'
+      })
+    },
     methods: {
+      ...mapActions('reservationManage', ['getConstantsData']),
       search(){
         console.log('搜索')
       },