zhengyiming
4 天以前 b8ccb337ebb0af43fb541aa7a48f02d29d22291c
fix: 修改bug
1个文件已添加
4个文件已修改
72 ■■■■ 已修改文件
apps/bMiniApp/project.private.config.json 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/components/src/Tabs/ProTabs.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/constants/enterpriseEmployee.ts 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
packages/constants/index.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
apps/bMiniApp/project.private.config.json
@@ -9,6 +9,13 @@
        "miniprogram": {
            "list": [
                {
                    "name": "灵工管理",
                    "pathName": "subpackages/flexJobManage/flexJobManage/flexJobManage",
                    "query": "",
                    "launchMode": "default",
                    "scene": null
                },
                {
                    "name": "应聘管理详情",
                    "pathName": "subpackages/jobApplicationManage/jobApplicationDetail/jobApplicationDetail",
                    "query": "taskId=04c75425-e783-4dbf-0f16-08ddd626b756",
apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
@@ -1,6 +1,6 @@
<template>
  <ProTabs
    v-model="queryState.mineHireType"
    v-model="queryState.userSignContractStatus"
    name="home-tab"
    :showPaneContent="false"
    class="home-tabs"
@@ -8,19 +8,22 @@
    title-gutter="12"
    title-scroll
  >
    <ProTabPane :title="`已签约`" :pane-key="FlexWorkerEleSignEnum.HasSign"></ProTabPane>
    <ProTabPane :title="`待签约`" :pane-key="FlexWorkerEleSignEnum.WaitSign"></ProTabPane>
    <ProTabPane :title="`已解约`" :pane-key="FlexWorkerEleSignEnum.CancelSign"></ProTabPane>
    <ProTabPane :title="`已签约`" :pane-key="EnumTaskUserSignContractStatus.Pass"></ProTabPane>
    <ProTabPane :title="`待签约`" :pane-key="EnumTaskUserSignContractStatus.Wait"></ProTabPane>
    <ProTabPane :title="`已解约`" :pane-key="EnumTaskUserSignContractStatus.Refuse"></ProTabPane>
  </ProTabs>
  <InfiniteLoading
    scrollViewClassName="common-infinite-scroll-list home-list"
    v-bind="infiniteLoadingProps"
    :key="queryState.mineHireType"
    :key="queryState.userSignContractStatus"
  >
    <template #renderItem="{ item }">
      <FlexJobCard :show-done-detail="false" :show-footer-left="false" @click="goDetail(item)">
        <template #footerRight>
          <template v-if="queryState.mineHireType === FlexWorkerEleSignEnum.HasSign">
          <span></span>
          <!-- <template
            v-if="queryState.userSignContractStatus === EnumTaskUserSignContractStatus.Pass"
          >
            <nut-button
              class="flexJobManage-card-plain-button"
              type="default"
@@ -30,7 +33,12 @@
            >
            <nut-button type="primary" @click.stop="checkContract">查看合约</nut-button>
          </template>
          <nut-button v-else type="primary" @click.stop="goSignContract(item)">签约</nut-button>
          <nut-button
            v-else-if="queryState.userSignContractStatus === EnumTaskUserSignContractStatus.Wait"
            type="primary"
            @click.stop="goSignContract(item)"
            >签约</nut-button
          > -->
        </template>
      </FlexJobCard>
    </template>
@@ -41,9 +49,12 @@
import { FlexJobCard, ProTabs, ProTabPane } from '@12333/components';
import { RouterPath } from '@/constants';
import { useInfiniteLoading } from '@12333/hooks';
import { OrderInputType } from '@12333/constants';
import * as flexWorkerServices from '@12333/services/api/FlexWorker';
import { FlexWorkerEleSignEnum } from '@12333/constants/task';
import {
  EnumTaskUserHireStatus,
  EnumTaskUserSignContractStatus,
  EnumPagedListOrder,
} from '@12333/constants';
import * as enterpriseEmployeeServices from '@12333/services/apiV2/enterpriseEmployee';
import Taro from '@tarojs/taro';
defineOptions({
@@ -51,32 +62,33 @@
});
const queryState = reactive({
  mineHireType: FlexWorkerEleSignEnum.HasSign,
  userSignContractStatus: EnumTaskUserSignContractStatus.Pass,
});
const { infiniteLoadingProps } = useInfiniteLoading(
  ({ pageParam }) => {
    let params: API.GetFlexSignWorkerListInput = {
      signStatus: queryState.mineHireType,
    let params: API.GetEnterpriseEmployeesQuery = {
      pageModel: {
        rows: 20,
        page: pageParam,
        orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
        orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
      },
      hireStatus: EnumTaskUserHireStatus.Pass,
      userSignContractStatus: queryState.userSignContractStatus,
    };
    return flexWorkerServices.getFlexSignWorkerList(params, {
    return enterpriseEmployeeServices.getEnterpriseEmployees(params, {
      showLoading: false,
    });
  },
  {
    queryKey: ['flexWorkerServices/getFlexSignWorkerList', queryState],
    queryKey: ['enterpriseEmployeeServices/getEnterpriseEmployees', queryState],
  }
);
function goDetail(item: API.GetNewestWorkerListOutput) {
function goDetail(item: API.GetEnterpriseEmployeesQueryResultItem) {
  Taro.navigateTo({
    url: `${RouterPath.flexJobDetailFromManage}?userId=${item.userId}`,
    url: `${RouterPath.flexJobDetailFromManage}?userId=${item.id}`,
  });
}
packages/components/src/Tabs/ProTabs.vue
@@ -406,10 +406,9 @@
const refRandomId = Math.random().toString(36).slice(-8);
const systemInfo = Taro.getSystemInfoSync();
console.log('systemInfo: ', systemInfo);
const tabsStyle = computed(() => {
  if (systemInfo.platform === 'ios') {
  if (systemInfo.platform.toLowerCase() === 'ios') {
    return { overflow: 'visible' };
  } else {
    return {};
packages/constants/enterpriseEmployee.ts
New file
@@ -0,0 +1,13 @@
import { EnumTaskUserHireStatus, EnumTaskUserSignContractStatus } from './apiEnum';
export const EnumTaskUserHireStatusText = {
  [EnumTaskUserHireStatus.Wait]: '待录用',
  [EnumTaskUserHireStatus.Pass]: '已录用',
  [EnumTaskUserHireStatus.Refuse]: '已谢绝',
};
export const EnumTaskUserSignContractStatusText = {
  [EnumTaskUserSignContractStatus.Wait]: '待签约',
  [EnumTaskUserSignContractStatus.Pass]: '已签约',
  [EnumTaskUserSignContractStatus.Refuse]: '已谢绝',
};
packages/constants/index.ts
@@ -13,3 +13,4 @@
export * from './parkOrHR';
export * from './task';
export * from './apiEnum';
export * from './enterpriseEmployee';