fix: bug

wupengfei

4 天以前 71946de0732b558027023358f4bbfaf5046a33fc

fix: bug

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

@@ -26,7 +26,7 @@
      :isCollapse="true"
    >
      <template #footer>
        <PageFooterBtn
        <!-- <PageFooterBtn
          v-if="
            enterpriseEmployeeInfo.userSignContractStatus === EnumTaskUserSignContractStatus.Pass
          "
@@ -34,8 +34,8 @@
          plain
          @click="handleUnsign"
          >解约</PageFooterBtn
        >
        <PageFooterBtn
        > -->
        <!-- <PageFooterBtn
          type="primary"
          @click="goToSign"
          v-if="
@@ -44,7 +44,7 @@
            !enterpriseEmployeeInfo.userSignContractStatus
          "
          >签约</PageFooterBtn
        >
        > -->
      </template>
    </JobDetailContent>
  </LoadingLayout>

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

@@ -149,7 +149,7 @@
}
function goFlexJobSign(item: API.GetEnterpriseEmployeesQueryResultItem) {
  Taro.navigateTo({
    url: `${RouterPath.flexJobSign}?enterpriseEmployeeId=${item.id}`,
    url: `${RouterPath.flexJobSign}?enterpriseEmployeeId=${item.id}&enterpriseId=${item.enterpriseId}`,
  });
}


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

@@ -46,6 +46,7 @@

const router = Taro.useRouter();
const enterpriseEmployeeId = router.params?.enterpriseEmployeeId ?? '';
const enterpriseId = router.params?.enterpriseId ?? '';

const searchValue = ref('');
const queryState = reactive({
@@ -68,6 +69,7 @@
      },
      keywords: queryState.keywords,
      status: EnumContractTemplateStatus.Completed,
      enterpriseId: enterpriseId,
    };

    return electronSignServices.getEnterpriseContractTemplates(params, {

 apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue

@@ -11,7 +11,7 @@
          <div class="payroll-manage-detail-top-content-item">
            <div class="payroll-manage-detail-top-content-item-label">服务费金额：</div>
            <div class="payroll-manage-detail-top-content-item-text">
              {{ `${form.serviceFee ?? 0}${EnumBillingMethodText[form.billingMethod]}` }}
              {{ `${form.serviceFee ?? 0}${BillingMethodEnumUnit[form.billingMethod]}` }}
            </div>
          </div>
          <div class="payroll-manage-detail-top-content-item">
@@ -96,6 +96,7 @@
  EnumBillingMethodText,
  EnumTaskSettlementAuditStatus,
  EnumTaskSettlementStatus,
  BillingMethodEnumUnit,
} from '@12333/constants';
import PayrollManageDetailCard from '../components/PayrollManageDetailCard.vue';
import { Message, paginateList, setOSSLink, toThousand } from '@12333/utils';

 apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue

@@ -25,7 +25,10 @@
            <CompanyTaskList :enterpriseId="enterpriseId" />
          </ProTabPane>
          <ProTabPane :title="`企业信息`" pane-key="2">
            <CompanyInfo :enterpriseId="enterpriseId" />
            <CompanyInfo
              :enterpriseId="enterpriseId"
              :supplierEnterpriseId="supplierEnterpriseId"
            />
          </ProTabPane>
        </ProTabs>
      </div>
@@ -47,8 +50,12 @@

const router = Taro.useRouter();
const enterpriseId = router.params?.id ?? '';
const supplierEnterpriseId = router.params?.supplierEnterpriseId ?? '';

const tab = ref('1');

const { isLoading, isError, enterpriseDetail, refetch } = useEnterpriseDetail({ id: enterpriseId });
const { isLoading, isError, enterpriseDetail, refetch } = useEnterpriseDetail({
  id: enterpriseId,
  supplierEnterpriseId: supplierEnterpriseId,
});
</script>

 apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue

@@ -50,11 +50,15 @@

type Props = {
  enterpriseId?: string;
  supplierEnterpriseId?: string;
};

const props = withDefaults(defineProps<Props>(), {});

const { enterpriseDetail } = useEnterpriseDetail({ id: toRef(props, 'enterpriseId') });
const { enterpriseDetail } = useEnterpriseDetail({
  id: toRef(props, 'enterpriseId'),
  supplierEnterpriseId: toRef(props, 'supplierEnterpriseId'),
});
</script>

<style lang="scss">

 apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue

@@ -243,7 +243,7 @@
const goCompanyDetail = useAccessLogin(() => {
  if (detail.value.enterpriseId) {
    Taro.navigateTo({
      url: `${RouterPath.companyDetail}?id=${detail.value.enterpriseId}`,
      url: `${RouterPath.companyDetail}?id=${detail.value.enterpriseId}&supplierEnterpriseId=${detail.value.supplierEnterpriseId}`,
    });
  }
});

 packages/hooks/enterprise.ts

@@ -5,14 +5,15 @@

type UseEnterpriseDetailOptions = {
  id: MaybeRef<string>;
  supplierEnterpriseId?: MaybeRef<string>;
};

export function useEnterpriseDetail({ id }: UseEnterpriseDetailOptions) {
export function useEnterpriseDetail({ id, supplierEnterpriseId }: UseEnterpriseDetailOptions) {
  const { data, refetch, isLoading, isError } = useQuery({
    queryKey: ['taskServices/getTaskEnterprise', id],
    queryFn: async () => {
      return await taskServices.getTaskEnterprise(
        { id: unref(id) },
        { id: unref(id), supplierEnterpriseId: unref(supplierEnterpriseId) },
        {
          showLoading: false,
        }

 packages/services/apiV2/electronSign.ts

@@ -161,8 +161,6 @@
      method: 'GET',
      params: {
        ...params,
        request: undefined,
        ...params['request'],
      },
      ...(options || {}),
    }

 packages/services/apiV2/typings.d.ts

@@ -86,8 +86,8 @@
  }

  interface APIgetEnterpriseContractTemplateSelectParams {
    /** 查询企业合同模板选择器数据 */
    request?: GetEnterpriseContractTemplateSelectQuery;
    /** 企业Id */
    enterpriseId?: string;
  }

  interface APIgetEnterpriseElectronSignSettingParams {
@@ -265,6 +265,8 @@
  interface APIgetTaskEnterpriseParams {
    /** 企业Id */
    id?: string;
    /** 供应商Id */
    supplierEnterpriseId?: string;
  }

  interface APIgetTaskInfoParams {
@@ -4384,8 +4386,6 @@
    content?: string[];
  }

  type GetEnterpriseContractTemplateSelectQuery = Record<string, any>;

  interface GetEnterpriseContractTemplateSelectQueryOption {
    /** Id */
    id?: string;
@@ -4510,6 +4510,8 @@
  interface GetEnterpriseEmployeesQueryResultItem {
    /** 灵工Id */
    id?: string;
    /** 企业Id */
    enterpriseId?: string;
    /** 头像 */
    avatar?: string;
    /** 姓名 */
@@ -6427,6 +6429,8 @@
  interface GetTaskEnterpriseQueryResult {
    /** 企业全称 */
    enterpriseName?: string;
    /** 供应商名称 */
    supplierEnterpriseName?: string;
    /** 统一社会信用代码 */
    societyCreditCode?: string;
    /** 是否实名 */