Merge branch 'master' into dev-v1.1

wupengfei

76 分钟以前 7cf04da7eaba7cad9c3b5e5f674d2e038ebcd305

 apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue

@@ -1,6 +1,6 @@
<template>
  <ProTabs
    v-model="queryState.userSignContractStatus"
    v-model="queryState.signContractStatus"
    name="home-tab"
    :showPaneContent="false"
    class="home-tabs"
@@ -8,14 +8,24 @@
    title-gutter="12"
    title-scroll
  >
    <ProTabPane :title="`已签约`" :pane-key="EnumTaskUserSignContractStatus.Pass"></ProTabPane>
    <ProTabPane :title="`待签约`" :pane-key="EnumTaskUserSignContractStatus.Wait"></ProTabPane>
    <ProTabPane :title="`已解约`" :pane-key="EnumTaskUserSignContractStatus.Stop"></ProTabPane>
    <ProTabPane
      :title="`灵工待签约`"
      :pane-key="EnumGetEnterpriseEmployeesQuerySignContractStatus.UserWait"
    ></ProTabPane>
    <ProTabPane
      :title="`企业待签约`"
      :pane-key="EnumGetEnterpriseEmployeesQuerySignContractStatus.EnterpriseWait"
    ></ProTabPane>
    <ProTabPane
      :title="`已签约`"
      :pane-key="EnumGetEnterpriseEmployeesQuerySignContractStatus.Pass"
    ></ProTabPane>
    <!-- <ProTabPane :title="`已解约`" :pane-key="EnumTaskUserSignContractStatus.Stop"></ProTabPane> -->
  </ProTabs>
  <InfiniteLoading
    scrollViewClassName="common-infinite-scroll-list home-list"
    v-bind="infiniteLoadingProps"
    :key="queryState.userSignContractStatus"
    :key="queryState.signContractStatus"
  >
    <template #renderItem="{ item }">
      <FlexJobCard
@@ -35,7 +45,7 @@
      >
        <template #footerRight>
          <template
            v-if="Number(queryState.userSignContractStatus) === EnumTaskUserSignContractStatus.Pass"
            v-if="item.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Pass"
          >
            <nut-button
              class="flexJobManage-card-plain-button"
@@ -44,16 +54,19 @@
              @click.stop="handleUnsign(item)"
              >解约</nut-button
            >
            <nut-button type="primary" @click.stop="checkContract">查看合约</nut-button>
            <nut-button type="primary" @click.stop="checkContract(item)">查看合约</nut-button>
          </template>
          <nut-button
            v-else-if="
              Number(queryState.userSignContractStatus) === EnumTaskUserSignContractStatus.Wait ||
              Number(queryState.userSignContractStatus) === EnumTaskUserSignContractStatus.Stop
            "
            v-if="item.userSignContractStatus === EnumTaskUserSignContractStatus.Wait"
            type="primary"
            @click.stop="goFlexJobSign(item)"
            >签约</nut-button
            >邀请签约</nut-button
          >
          <nut-button
            v-if="item.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Wait"
            type="primary"
            @click.stop="goEnterpriseSign(item)"
            >企业签约</nut-button
          >
        </template>
      </FlexJobCard>
@@ -69,20 +82,21 @@
  EnumTaskUserHireStatus,
  EnumTaskUserSignContractStatus,
  EnumPagedListOrder,
  EnumGetEnterpriseEmployeesQuerySignContractStatus,
} from '@12333/constants';
import * as enterpriseEmployeeServices from '@12333/services/apiV2/enterpriseEmployee';
import Taro from '@tarojs/taro';
import { Message } from '@12333/utils';
import { Message, openDocument, setOSSLink } from '@12333/utils';

defineOptions({
  name: 'InnerPage',
});

const queryState = reactive({
  userSignContractStatus: EnumTaskUserSignContractStatus.Pass,
  signContractStatus: EnumGetEnterpriseEmployeesQuerySignContractStatus.UserWait,
});

const { infiniteLoadingProps } = useInfiniteLoading(
const { infiniteLoadingProps, invalidateQueries } = useInfiniteLoading(
  ({ pageParam }) => {
    let params: API.GetEnterpriseEmployeesQuery = {
      pageModel: {
@@ -91,9 +105,8 @@
        orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
      },
      hireStatus: EnumTaskUserHireStatus.Pass,
      userSignContractStatus: queryState.userSignContractStatus,
      signContractStatus: queryState.signContractStatus,
    };

    return enterpriseEmployeeServices.getEnterpriseEmployees(params, {
      showLoading: false,
    });
@@ -103,7 +116,13 @@
  }
);

function checkContract() {}
function checkContract(item: API.GetEnterpriseEmployeesQueryResultItem) {
  if (!item.contractUrl) {
    Message.warning('协议无法查看，请稍后再试');
    return;
  }
  openDocument(setOSSLink(item.contractUrl));
}

function goDetail(item: API.GetEnterpriseEmployeesQueryResultItem) {
  Taro.navigateTo({
@@ -114,6 +133,14 @@
async function handleUnsign(item: API.GetEnterpriseEmployeesQueryResultItem) {
  try {
    await Message.confirm({ message: '确定要解约吗？' });
    let params: API.StopElectronSignCommand = {
      ids: [item.id],
    };
    let res = await enterpriseEmployeeServices.stopElectronSign(params);
    if (res) {
      Message.success('解约成功');
      invalidateQueries();
    }
  } catch (error) {}
}
function goFlexJobSign(item: API.GetEnterpriseEmployeesQueryResultItem) {
@@ -121,6 +148,16 @@
    url: `${RouterPath.flexJobSign}?enterpriseEmployeeId=${item.id}`,
  });
}

async function goEnterpriseSign(item: API.GetEnterpriseEmployeesQueryResultItem) {
  try {
    let res = await enterpriseEmployeeServices.enterpriseUserElectronSign({ id: item.id });
    if (res) {
      const encodedUrl = encodeURIComponent(res.signContractLongUrl);
      Taro.navigateTo({ url: `${RouterPath.extraPage}?url=${encodedUrl}` });
    }
  } catch (error) {}
}
</script>

<style lang="scss">