Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/frontend_vue/qqxb-self-service

.env.development

@@ -5,5 +5,7 @@ VUE_APP_BASE_URL= http://organization.test.hrs100.cn:18080
 
 
 VUE_APP_USERINFO_URL=http://106.120.107.145:7778/v1/qqxb/user/api
 VUE_APP_USERINFO_URL=http://106.120.107.145:7778/v1/qqxb/user/api
 
 
+VUE_APP_SALARY_URL=http://salary.test-api.qqxb.jinsehuaqin.com:8800
+
 # https开关
 # https开关
 VUE_APP_OPEN_HTTPS=false
 VUE_APP_OPEN_HTTPS=false

src/services/employee/employeeService.ts

@@ -2,6 +2,40 @@
  * 员工相关接口
  * 员工相关接口
  */
  */
 export interface EmployeeInterface {
 export interface EmployeeInterface {
+<<<<<<< HEAD
+    getUserInfo(params: any): Promise<any>;
+    getCityList(params: any): Promise<any>; // 获取城市列表
+    getDispatchList(params: any): Promise<any>; //根据身份证获取用户所属派遣公司列表
+    getDispatchInfo(params: any): Promise<any>; //通过身份证号和派遣公司ID拿到派遣员工的信息(劳务派遣首页数据)
+    getWorkInfoList(params: any): Promise<any>; //获取工作信息列表
+    getWorkInfoDetail(params: any): Promise<any>; //获取工作信息详情
+    updateWorkInfo(params: any): Promise<any>; //修改工作信息
+    addWorkInfo(params: any): Promise<any>; //新增工作信息
+    deleteWorkInfo(params: any): Promise<any>; //新增工作信息
+    getPersonInfo(params: any): Promise<any>; //获取个人信息
+    savePersonInfo(params: any): Promise<any>; //保存个人信息
+    getContactInfo(params: any): Promise<any>; //获取联系信息
+    saveContactInfo(params: any): Promise<any>; //保存联系信息
+    getSocialInfo(params: any): Promise<any>; //获取社保信息
+    saveSocialInfo(params: any): Promise<any>; //保存社保信息
+    getWageCardInfo(params: any): Promise<any>; //获取工资卡信息
+    saveWageCardInfo(params: any): Promise<any>; //保存工资卡信息
+    getEduExperience(params: any): Promise<any>; //获取教育经历
+    getEduExperienceDetial(params: any): Promise<any>; //获取教育信息详情
+    addEduExperience(params: any): Promise<any>; //新增教育信息
+    updateEduExperience(params: any): Promise<any>; //修改教育信息
+    deleteEduExperience(params: any): Promise<any>; //删除教育信息
+    getTechnologyExperience(params: any): Promise<any>; //获取技术特长
+    updateTechnologyExperience(params: any): Promise<any>; //修改技术特长
+    getSalaryInfo(params: any): Promise<any>; //通过身份证号和派遣公司ID拿到派遣员工的工资条信息
+    getFiles(params:any):Promise<any>;// 获取文件
+    setFiles(params:any):Promise<any>;// 设置文件
+    delFiles(params:any):Promise<any>;// 删除文件
+    putFiles(params:any):Promise<any>;// 提交文件
+    tranFiles(params:any):Promise<any>;//上传文件转短连接
+    
+    getAgileWorker(params: any): Promise<any>; //灵活用工
+=======
   getUserInfo(params: any): Promise<any>;
   getUserInfo(params: any): Promise<any>;
   getCityList(params: any): Promise<any>; // 获取城市列表
   getCityList(params: any): Promise<any>; // 获取城市列表
   getDispatchList(params: any): Promise<any>; //根据身份证获取用户所属派遣公司列表
   getDispatchList(params: any): Promise<any>; //根据身份证获取用户所属派遣公司列表
@@ -34,4 +68,5 @@ export interface EmployeeInterface {
   putFiles(params: any): Promise<any>; // 提交文件
   putFiles(params: any): Promise<any>; // 提交文件
 
 
   getAgileWorker(params: any): Promise<any>; //灵活用工
   getAgileWorker(params: any): Promise<any>; //灵活用工
+>>>>>>> 6bd7a7d232d6d1b182fc7cff1cd6136fd5df5b70
 }
 }

src/servicesImpl/employee/employeeImpl.ts

@@ -11,7 +11,7 @@ class EmployeeService implements EmployeeInterface {
    * 请求头信息
    * 请求头信息
    */
    */
   private header: any;
   private header: any;
-
+  private headerUp: any;
   /**
   /**
    * 当前版本
    * 当前版本
    */
    */
@@ -29,6 +29,7 @@ class EmployeeService implements EmployeeInterface {
     // 获取登录token
     // 获取登录token
     store.getters.getAccessToken.then((res: any) => {
     store.getters.getAccessToken.then((res: any) => {
       this.header = { Authorization: `Bearer ${res}` };
       this.header = { Authorization: `Bearer ${res}` };
+      this.headerUp ={ Authorization: `Bearer ${res}`,'Content-Type':'multipart/form-data;charset=UTF-8'}
     });
     });
     // store.getters.getUserInfo.then((res: any) => {
     // store.getters.getUserInfo.then((res: any) => {
     //     // console.log(res);
     //     // console.log(res);
@@ -320,6 +321,16 @@ class EmployeeService implements EmployeeInterface {
 
 
   /**
   /**
    *
    *
+   * base64转短连接
+   * @param params
+   */
+  public tranFiles(params: any): Promise<any> {
+    let url = urls.salaryUrl + `/general/person/upload`;
+    return request.post(url, params, this.headerUp);
+  }
+
+  /**
+   *
    * 提交文件
    * 提交文件
    * @param params
    * @param params
    */
    */

src/utils/urls.ts

@@ -9,10 +9,15 @@ class Urls {
     employeeUrl: String = process.env.VUE_APP_BASE_URL;
     employeeUrl: String = process.env.VUE_APP_BASE_URL;
 
 
     /**
     /**
+     * 
      * 获取用户信息
      * 获取用户信息
      */
      */
     userInfoUrl: String = process.env.VUE_APP_USERINFO_URL;
     userInfoUrl: String = process.env.VUE_APP_USERINFO_URL;
 
 
+    /**
+     * 个人中心
+     */
+    salaryUrl: String = process.env.VUE_APP_SALARY_URL;
 
 
 }
 }