zhengyiming
2 天以前 f51b20beaeaaade5e3336b5eff749066c6a34b03
fix: 灵工管理
1个文件已添加
8个文件已修改
429 ■■■■ 已修改文件
auto-imports.d.ts 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/constants/apiEnum.ts 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/services/api/enterpriseEmployee.ts 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/services/api/index.ts 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/services/api/taskCheckReceive.ts 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/services/api/taskUser.ts 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/services/api/typings.d.ts 198 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/EmploymentManage/EmploymentSignList.vue 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/FlexJobManage/FlexJobManage.vue 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
auto-imports.d.ts
@@ -418,4 +418,4 @@
    readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']>
    readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']>
  }
}
}
src/constants/apiEnum.ts
@@ -93,22 +93,24 @@
  Task = 1,
  /**任务人员 */
  TaskUser = 2,
  /**任务验收 */
  TaskCheckReceive = 3,
  /**用户认证 */
  Auth = 3,
  Auth = 4,
  /**用户菜单 */
  Menu = 4,
  Menu = 5,
  /**用户资源 */
  Resource = 5,
  Resource = 6,
  /**用户角色 */
  Role = 6,
  Role = 7,
  /**用户信息 */
  User = 7,
  User = 8,
  /**用户简历 */
  UserResume = 8,
  UserResume = 9,
  /**企业信息 */
  Enterprise = 9,
  Enterprise = 10,
  /**灵工信息 */
  EnterpriseEmployee = 10,
  EnterpriseEmployee = 11,
}
/** 资源请求方式 */
src/services/api/enterpriseEmployee.ts
@@ -2,6 +2,24 @@
// @ts-ignore
import { request } from '@/utils/request';
/** 查询灵工详情 GET /api/user/enterpriseEmployee/getEnterpriseEmployee */
export async function getEnterpriseEmployee(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
  params: API.APIgetEnterpriseEmployeeParams,
  options?: API.RequestConfig
) {
  return request<API.GetEnterpriseEmployeeQueryResult>(
    '/api/user/enterpriseEmployee/getEnterpriseEmployee',
    {
      method: 'GET',
      params: {
        ...params,
      },
      ...(options || {}),
    }
  );
}
/** 查询灵工分页列表数据 POST /api/user/enterpriseEmployee/getEnterpriseEmployees */
export async function getEnterpriseEmployees(
  body: API.GetEnterpriseEmployeesQuery,
src/services/api/index.ts
@@ -2,27 +2,29 @@
/* eslint-disable */
// API 更新时间:
// API 唯一标识:
import * as userResume from './userResume';
import * as resource from './resource';
import * as enterpriseEmployee from './enterpriseEmployee';
import * as user from './user';
import * as dictionary from './dictionary';
import * as auth from './auth';
import * as taskUser from './taskUser';
import * as task from './task';
import * as enterprise from './enterprise';
import * as role from './role';
import * as taskCheckReceive from './taskCheckReceive';
import * as enterprise from './enterprise';
import * as task from './task';
import * as dictionary from './dictionary';
import * as user from './user';
import * as userResume from './userResume';
import * as auth from './auth';
import * as resource from './resource';
import * as taskUser from './taskUser';
import * as menu from './menu';
export default {
  userResume,
  resource,
  enterpriseEmployee,
  user,
  dictionary,
  auth,
  taskUser,
  task,
  enterprise,
  role,
  taskCheckReceive,
  enterprise,
  task,
  dictionary,
  user,
  userResume,
  auth,
  resource,
  taskUser,
  menu,
};
src/services/api/taskCheckReceive.ts
New file
@@ -0,0 +1,57 @@
/* eslint-disable */
// @ts-ignore
import { request } from '@/utils/request';
/** 查询验收任务分页列表 POST /api/flexjob/taskCheckReceive/getCheckReceiveTask */
export async function getCheckReceiveTask(
  body: API.GetCheckReceiveTaskQuery,
  options?: API.RequestConfig
) {
  return request<API.GetCheckReceiveTaskQueryResult>(
    '/api/flexjob/taskCheckReceive/getCheckReceiveTask',
    {
      method: 'POST',
      headers: {
        'Content-Type': 'application/json-patch+json',
      },
      data: body,
      ...(options || {}),
    }
  );
}
/** 查询验收分页列表 POST /api/flexjob/taskCheckReceive/getCheckReceiveTaskUser */
export async function getCheckReceiveTaskUser(
  body: API.GetCheckReceiveTaskUserQuery,
  options?: API.RequestConfig
) {
  return request<API.GetCheckReceiveTaskUserQueryResult>(
    '/api/flexjob/taskCheckReceive/getCheckReceiveTaskUser',
    {
      method: 'POST',
      headers: {
        'Content-Type': 'application/json-patch+json',
      },
      data: body,
      ...(options || {}),
    }
  );
}
/** 查询验收详情 POST /api/flexjob/taskCheckReceive/getCheckReceiveTaskUserSubmits */
export async function getCheckReceiveTaskUserSubmits(
  body: API.GetCheckReceiveTaskUserSubmitsQuery,
  options?: API.RequestConfig
) {
  return request<API.GetCheckReceiveTaskUserSubmitsQueryResult>(
    '/api/flexjob/taskCheckReceive/getCheckReceiveTaskUserSubmits',
    {
      method: 'POST',
      headers: {
        'Content-Type': 'application/json-patch+json',
      },
      data: body,
      ...(options || {}),
    }
  );
}
src/services/api/taskUser.ts
@@ -41,24 +41,6 @@
  });
}
/** 查询验收分页列表 POST /api/flexjob/taskUser/getCheckReceiveTaskUserInfos */
export async function getCheckReceiveTaskUserInfos(
  body: API.GetCheckReceiveTaskUserInfosQuery,
  options?: API.RequestConfig
) {
  return request<API.GetCheckReceiveTaskUserInfosQueryResult>(
    '/api/flexjob/taskUser/getCheckReceiveTaskUserInfos',
    {
      method: 'POST',
      headers: {
        'Content-Type': 'application/json-patch+json',
      },
      data: body,
      ...(options || {}),
    }
  );
}
/** B端查询应聘报名分页列表信息 POST /api/flexjob/taskUser/getTaskUsers */
export async function getTaskUsers(body: API.GetTaskUsersQuery, options?: API.RequestConfig) {
  return request<API.GetTaskUsersQueryResult>('/api/flexjob/taskUser/getTaskUsers', {
src/services/api/typings.d.ts
@@ -50,6 +50,13 @@
    id?: string;
  }
  interface APIgetEnterpriseEmployeeParams {
    /** 灵工Id */
    id?: string;
    /** 任务Id */
    taskInfoId?: string;
  }
  interface APIgetEnterpriseParams {
    /** Id */
    id?: string;
@@ -285,22 +292,24 @@
    Task = 1,
    /**任务人员 */
    TaskUser = 2,
    /**任务验收 */
    TaskCheckReceive = 3,
    /**用户认证 */
    Auth = 3,
    Auth = 4,
    /**用户菜单 */
    Menu = 4,
    Menu = 5,
    /**用户资源 */
    Resource = 5,
    Resource = 6,
    /**用户角色 */
    Role = 6,
    Role = 7,
    /**用户信息 */
    User = 7,
    User = 8,
    /**用户简历 */
    UserResume = 8,
    UserResume = 9,
    /**企业信息 */
    Enterprise = 9,
    Enterprise = 10,
    /**灵工信息 */
    EnterpriseEmployee = 10,
    EnterpriseEmployee = 11,
  }
  enum EnumResourceMethod {
@@ -490,14 +499,50 @@
    timestamp?: number;
  }
  interface FriendlyResultGetCheckReceiveTaskUserInfosQueryResult {
  interface FriendlyResultGetCheckReceiveTaskQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetCheckReceiveTaskUserInfosQueryResult;
    data?: GetCheckReceiveTaskQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }
  interface FriendlyResultGetCheckReceiveTaskUserQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetCheckReceiveTaskUserQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }
  interface FriendlyResultGetCheckReceiveTaskUserSubmitsQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetCheckReceiveTaskUserSubmitsQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
@@ -516,6 +561,24 @@
    /** 错误码 */
    errorCode?: string;
    data?: GetEnterpriseElectronSignSettingQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
    msg?: any;
    /** 附加数据 */
    extras?: any;
    /** 时间戳 */
    timestamp?: number;
  }
  interface FriendlyResultGetEnterpriseEmployeeQueryResult {
    /** 跟踪Id */
    traceId?: string;
    /** 状态码 */
    code?: number;
    /** 错误码 */
    errorCode?: string;
    data?: GetEnterpriseEmployeeQueryResult;
    /** 执行成功 */
    success?: boolean;
    /** 错误信息 */
@@ -1263,26 +1326,54 @@
    arrangeStatus?: EnumTaskUserArrangeStatus;
  }
  interface GetCheckReceiveTaskUserInfosQuery {
  interface GetCheckReceiveTaskQuery {
    /** 验收日期-最早时间 */
    dateBegin?: string;
    /** 验收日期-最晚时间 */
    dateEnd?: string;
    checkReceiveStatus?: EnumTaskCheckReceiveStatus;
    pageModel?: PagedListQueryPageModel;
  }
  interface GetCheckReceiveTaskQueryResult {
    pageModel?: PagedListQueryResultPageModel;
    /** 数据 */
    data?: GetCheckReceiveTaskQueryResultItem[];
  }
  interface GetCheckReceiveTaskQueryResultItem {
    /** 任务Id */
    id?: string;
    /** 任务名称 */
    name?: string;
    /** 任务开始时间 */
    beginTime?: string;
    /** 任务结束时间 */
    endTime?: string;
    /** 任务地点名称 */
    addressName?: string;
  }
  interface GetCheckReceiveTaskUserQuery {
    /** 任务Id */
    taskInfoId?: string;
    /** 关键字 */
    keywords?: string;
    /** 验收日期-最早时间 */
    submitTimeBegin?: string;
    dateBegin?: string;
    /** 验收日期-最晚时间 */
    submitTimeEnd?: string;
    dateEnd?: string;
    checkReceiveStatus?: EnumTaskCheckReceiveStatus;
    pageModel?: PagedListQueryPageModel;
  }
  interface GetCheckReceiveTaskUserInfosQueryResult {
  interface GetCheckReceiveTaskUserQueryResult {
    pageModel?: PagedListQueryResultPageModel;
    /** 数据 */
    data?: GetCheckReceiveTaskUserInfosQueryResultItem[];
    data?: GetCheckReceiveTaskUserQueryResultItem[];
  }
  interface GetCheckReceiveTaskUserInfosQueryResultItem {
  interface GetCheckReceiveTaskUserQueryResultItem {
    /** 任务Id */
    id?: string;
    /** 任务名称 */
@@ -1297,8 +1388,7 @@
    name?: string;
    /** 身份证号 */
    identity?: string;
    /** 生日 */
    birthday?: string;
    gender?: EnumUserGender;
    /** 年龄 */
    age?: number;
    /** 手机号 */
@@ -1307,6 +1397,20 @@
    lastSubmitTime?: string;
    checkReceiveStatus?: EnumTaskCheckReceiveStatus;
  }
  interface GetCheckReceiveTaskUserSubmitsQuery {
    /** 任务Id */
    id?: string;
    pageModel?: PagedListQueryPageModel;
  }
  interface GetCheckReceiveTaskUserSubmitsQueryResult {
    pageModel?: PagedListQueryResultPageModel;
    /** 数据 */
    data?: GetCheckReceiveTaskUserSubmitsQueryResultItem[];
  }
  type GetCheckReceiveTaskUserSubmitsQueryResultItem = Record<string, any>;
  type GetCurrentLogierMenusQuery = Record<string, any>;
@@ -1430,6 +1534,34 @@
    mergeSignCost?: number;
  }
  interface GetEnterpriseEmployeeQueryResult {
    /** 灵工Id */
    id?: string;
    /** 姓名 */
    name?: string;
    /** 身份证号 */
    identity?: string;
    /** 手机号 */
    contactPhoneNumber?: string;
    gender?: EnumUserGender;
    /** 年龄 */
    age?: number;
    /** 身份证人像面 */
    identityImg?: string;
    /** 身份证国徽面 */
    identityBackImg?: string;
    /** 报名时间 */
    applyTime?: string;
    /** 实名时间 */
    userRealTime?: string;
    /** 签约时间 */
    userSignContractTime?: string;
    /** 企业签约时间 */
    enterpriseSignContractTime?: string;
    /** 电子合同 */
    contractUrl?: string;
  }
  interface GetEnterpriseEmployeesQuery {
    /** 关键字(姓名/手机/身份证号) */
    keywords?: string;
@@ -1458,6 +1590,8 @@
  interface GetEnterpriseEmployeesQueryResultItem {
    /** 灵工Id */
    id?: string;
    /** 头像 */
    avatar?: string;
    /** 姓名 */
    name?: string;
    /** 身份证号 */
@@ -1467,9 +1601,24 @@
    age?: number;
    /** 手机号 */
    contactPhoneNumber?: string;
    hireStatus?: EnumTaskUserHireStatus;
    /** 实名状态 */
    /** 是否实名 */
    userIsReal?: boolean;
    realMethod?: EnumUserRealMethod;
    /** 身份编号 */
    personalIdentityCode?: string;
    /** 身份 */
    personalIdentityContent?: string;
    /** 学历编号 */
    educationalBackgroundCode?: string;
    /** 学历 */
    educationalBackgroundContent?: string;
    /** 上岗次数 */
    taskCount?: number;
    /** 工作资历 */
    workSeniority?: string;
    /** 工作经验 */
    workExperience?: string;
    hireStatus?: EnumTaskUserHireStatus;
    userSignContractStatus?: EnumTaskUserSignContractStatus;
    /** 录用时间 */
    hireTime?: string;
@@ -2102,6 +2251,9 @@
  interface GetTaskUsersQuery {
    /** 任务Id */
    id?: string;
    /** 关键字 */
    keywords?: string;
    hireStatus?: EnumTaskUserHireStatus;
    pageModel?: PagedListQueryPageModel;
  }
@@ -2114,6 +2266,8 @@
  interface GetTaskUsersQueryResultItem {
    /** 任务人员Id */
    id?: string;
    /** 灵工Id */
    enterpriseEmployeeId?: string;
    /** 头像 */
    avatar?: string;
    /** 姓名 */
@@ -2761,9 +2915,9 @@
    /** 永久证书 */
    isForever?: boolean;
    /** 开始日期 */
    startDate: string;
    startDate?: string;
    /** 结束日期 */
    endDate: string;
    endDate?: string;
    /** 发证单位 */
    issueUnit?: string;
    /** 证书正面照片 */
src/views/EmploymentManage/EmploymentSignList.vue
@@ -55,6 +55,7 @@
import StaffInfoDialog from '@/views/FlexJobManage/components/StaffInfoDialog.vue';
import { convertApi2FormUrlOnlyOne } from '@/utils';
import * as taskUserServices from '@/services/api/taskUser';
import * as enterpriseEmployeeServices from '@/services/api/enterpriseEmployee';
defineOptions({
  name: 'EmploymentSignList',
@@ -127,8 +128,9 @@
          page: pageIndex,
          orderInput: extraParamState.orderInput,
        },
        // searchWord: extraParamState.searchWord,
        id: id,
        keywords: extraParamState.searchWord,
        hireStatus: extraParamState.hireStatus,
      };
      let res = await taskUserServices.getTaskUsers(params, {
@@ -175,24 +177,29 @@
  },
});
function openDialog(row: API.GetTaskUsersQueryResultItem) {
  handleStaffInfoEdit({
    id: row.id,
    name: row.name,
    identity: row.identity,
    contactPhoneNumber: row.contactPhoneNumber,
    gender: row.gender,
    age: row.age ?? null,
    idFrontUrl: convertApi2FormUrlOnlyOne(row.idFrontUrl),
    idBackUrl: convertApi2FormUrlOnlyOne(row.idBackUrl),
    contractUrl: convertApi2FormUrlOnlyOne(row.contractUrl, {
      fileName: row.contractUrl ? row.contractUrl.split('/').pop() : '合同',
    }),
    regiterTime: row.regiterTime ?? '',
    userRealTime: row.userRealTime,
    userSignContractTime: row.userSignContractTime,
    isDetail: true,
  });
async function openDialog(row: API.GetTaskUsersQueryResultItem) {
  try {
    let detail = await enterpriseEmployeeServices.getEnterpriseEmployee({
      id: row.enterpriseEmployeeId,
    });
    handleStaffInfoEdit({
      id: row.id,
      name: row.name,
      identity: row.identity,
      contactPhoneNumber: row.contactPhoneNumber,
      gender: detail.gender,
      age: detail.age ?? null,
      idFrontUrl: convertApi2FormUrlOnlyOne(detail.identityImg),
      idBackUrl: convertApi2FormUrlOnlyOne(detail.identityBackImg),
      contractUrl: convertApi2FormUrlOnlyOne(detail.contractUrl, {
        fileName: detail.contractUrl ? detail.contractUrl.split('/').pop() : '合同',
      }),
      regiterTime: detail.applyTime ?? '',
      userRealTime: detail.userRealTime ?? '',
      userSignContractTime: detail.userSignContractTime ?? '',
      isDetail: true,
    });
  } catch (error) {}
}
async function setTaskUserHire(
src/views/FlexJobManage/FlexJobManage.vue
@@ -322,24 +322,27 @@
  },
});
function openDialog(row: API.GetEnterpriseEmployeesQueryResultItem, isDetail = false) {
  handleStaffInfoEdit({
    id: row.id,
    name: row.name,
    identity: row.identity,
    contactPhoneNumber: row.contactPhoneNumber,
    gender: row.gender,
    age: row.age ?? null,
    idFrontUrl: convertApi2FormUrlOnlyOne(row.idFrontUrl),
    idBackUrl: convertApi2FormUrlOnlyOne(row.idBackUrl),
    contractUrl: convertApi2FormUrlOnlyOne(row.contractUrl, {
      fileName: row.contractUrl ? row.contractUrl.split('/').pop() : '合同',
    }),
    regiterTime: row.regiterTime ?? '',
    userRealTime: row.userRealTime,
    userSignContractTime: row.userSignContractTime,
    isDetail: isDetail,
  });
async function openDialog(row: API.GetEnterpriseEmployeesQueryResultItem, isDetail = false) {
  try {
    let detail = await enterpriseEmployeeServices.getEnterpriseEmployee({ id: row.id });
    handleStaffInfoEdit({
      id: row.id,
      name: row.name,
      identity: row.identity,
      contactPhoneNumber: row.contactPhoneNumber,
      gender: detail.gender,
      age: detail.age ?? null,
      idFrontUrl: convertApi2FormUrlOnlyOne(detail.identityImg),
      idBackUrl: convertApi2FormUrlOnlyOne(detail.identityBackImg),
      contractUrl: convertApi2FormUrlOnlyOne(detail.contractUrl, {
        fileName: detail.contractUrl ? detail.contractUrl.split('/').pop() : '合同',
      }),
      regiterTime: detail.applyTime ?? '',
      userRealTime: row.userRealTime ?? '',
      userSignContractTime: row.userSignContractTime ?? '',
      isDetail: isDetail,
    });
  } catch (error) {}
}
async function handleAddOrEdit() {}