Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin

zhengyiming

9 天以前 a6c44ba04f4f88acb057ea672c8d1d20e86dcd55

 src/views/CPersonManage/CPersonManageList.vue

@@ -5,25 +5,20 @@
        <template #query>
          <QueryFilterItem tip-content="实名状态">
            <FieldRadio
              v-model="extraParamState.realVerifyStatus"
              v-model="extraParamState.isReal"
              :value-enum="[
                {
                  value: false,
                  label: '未实名',
                },
                {
                  value: true,
                  label: '已实名',
                },
                { label: '已实名', value: true },
                { label: '未实名', value: false },
              ]"
              buttonStyle
              showAllBtn
              :all-btn-value="null"
              @change="getList()"
            />
          </QueryFilterItem>
          <QueryFilterItem tip-content="最近录用时间">
            <FieldDatePicker
              v-model="extraParamState.nearlyHireDateTime"
              v-model="extraParamState.createdTime"
              type="daterange"
              range-separator="~"
              start-placeholder="开始时间"
@@ -34,7 +29,7 @@
          </QueryFilterItem>
          <QueryFilterItem tip-content="最近签约时间">
            <FieldDatePicker
              v-model="extraParamState.nearlySignDateTime"
              v-model="extraParamState.signContractTime"
              type="daterange"
              range-separator="~"
              start-placeholder="开始时间"
@@ -82,6 +77,7 @@
import CPersonDetailDialog from './components/CPersonDetailDialog.vue';
import { convertApi2FormUrlOnlyOne, format } from '@/utils';
import { ModelValueType } from 'element-plus';
import * as enterpriseEmployeeServices from '@/services/api/enterpriseEmployee';

defineOptions({
  name: 'CPersonManageList',
@@ -127,33 +123,28 @@
} = useTable(
  async ({ pageIndex, pageSize }, extraParamState) => {
    try {
      let params: API.GetUserClientForBackInput = {
      let params: API.GetEnterpriseEmployeesQuery = {
        pageModel: {
          rows: pageSize,
          page: pageIndex,
          orderInput: extraParamState.orderInput,
        },
        searchKeys: extraParamState.searchKeys,
        nearlyHireDateTimeBegin: format(
          extraParamState.nearlyHireDateTime?.[0] ?? '',
        keywords: extraParamState.searchKeys,
        //TODO 应该是录用时间 还没有
        createdTimeStart: format(extraParamState.createdTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
        createdTimeEnd: format(extraParamState.createdTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
        signContractTimeStart: format(
          extraParamState.signContractTime?.[0] ?? '',
          'YYYY-MM-DD 00:00:00'
        ),
        nearlyHireDateTimeEnd: format(
          extraParamState.nearlyHireDateTime?.[1] ?? '',
        signContractTimeEnd: format(
          extraParamState.signContractTime?.[1] ?? '',
          'YYYY-MM-DD 23:59:59'
        ),
        nearlySignDateTimeBegin: format(
          extraParamState.nearlySignDateTime?.[0] ?? '',
          'YYYY-MM-DD 00:00:00'
        ),
        nearlySignDateTimeEnd: format(
          extraParamState.nearlySignDateTime?.[1] ?? '',
          'YYYY-MM-DD 23:59:59'
        ),
        realVerifyStatus: extraParamState.realVerifyStatus,
        isReal: extraParamState.isReal,
      };

      let res = await flexEnterpriseWokerServices.getUserClientList(params, {
      let res = await enterpriseEmployeeServices.getEnterpriseEmployees(params, {
        showLoading: !state.loading,
      });
      return res;
@@ -164,26 +155,29 @@
  {
    defaultExtraParams: {
      searchKeys: '',
      realVerifyStatus: '' as any as boolean,
      nearlyHireDateTime: [] as unknown as ModelValueType,
      nearlySignDateTime: [] as unknown as ModelValueType,
      orderInput: [{ property: 'userId', order: EnumPagedListOrder.Desc }],
      orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
      createdTime: [] as unknown as ModelValueType,
      signContractTime: [] as unknown as ModelValueType,
      isReal: null as any as boolean,
    },
    queryKey: ['flexEnterpriseWokerServices/getUserClientList'],
    queryKey: ['enterpriseEmployeeServices/getEnterpriseEmployees'],
    columnsRenderProps: {
      realVerifyStatus: {
        type: 'enum',
        valueEnum: [
          { label: '已实名', value: true },
          { label: '未实名', value: false },
        ],
      gender: { type: 'enum', valueEnum: EnumUserGenderTextForPerson },
      hireStatus: { type: 'enum', valueEnum: EnumTaskUserHireStatusText },
      userIsReal: {
        formatter: (row: API.GetEnterpriseEmployeesQueryResultItem) => {
          return row.userIsReal ? '已实名' : '未实名';
        },
      },
      realVerifyTime: { type: 'date' },
      userSignContractStatus: { type: 'enum', valueEnum: EnumTaskUserSignContractStatusText },
      hireTime: { type: 'date' },
      userRealTime: { type: 'date' },
      userSignContractTime: { type: 'date' },
    },
  }
);

async function openDialog(row?: API.GetUserClientForBackOutput) {
async function openDialog(row?: API.GetEnterpriseEmployeesQueryResultItem) {
  const res = await getUserDetailForBack('98ac4c01-3598-ebf3-fa7d-3a189bb6b587');
  handleEdit({
    userId: row.userId ?? '98ac4c01-3598-ebf3-fa7d-3a189bb6b587',
@@ -220,7 +214,7 @@

async function getUserDetailForBack(userId: string) {
  try {
    return await flexEnterpriseWokerServices.getUserDetailForBack({ userId: userId });
    // return await flexEnterpriseWokerServices.getUserDetailForBack({ userId: userId });
  } catch (error) {}
}
</script>