From 71946de0732b558027023358f4bbfaf5046a33fc Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 31 十月 2025 16:13:26 +0800
Subject: [PATCH] fix: bug
---
apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue | 8 ++++----
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 2 +-
apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue | 6 +++++-
apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue | 2 +-
packages/services/apiV2/electronSign.ts | 2 --
packages/services/apiV2/typings.d.ts | 12 ++++++++----
apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue | 3 ++-
apps/bMiniApp/src/subpackages/flexJobManage/flexJobSign/InnerPage.vue | 2 ++
apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue | 11 +++++++++--
packages/hooks/enterprise.ts | 5 +++--
10 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue
index 40702b5..8ae79f0 100644
--- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue
+++ b/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>
diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
index 2130564..564c6af 100644
--- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
+++ b/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}`,
});
}
diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobSign/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobSign/InnerPage.vue
index b62d29a..aeab091 100644
--- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobSign/InnerPage.vue
+++ b/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, {
diff --git a/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
index 27ae84d..2bc7ca8 100644
--- a/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
+++ b/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';
diff --git a/apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue b/apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue
index 745eb7a..ef1ec20 100644
--- a/apps/cMiniApp/src/subpackages/task/companyDetail/companyDetail.vue
+++ b/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>
diff --git a/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue b/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue
index 9ab43c1..cd952d0 100644
--- a/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue
+++ b/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">
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index ea0fe2c..3f3dfc3 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/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}`,
});
}
});
diff --git a/packages/hooks/enterprise.ts b/packages/hooks/enterprise.ts
index d399944..a4bacd2 100644
--- a/packages/hooks/enterprise.ts
+++ b/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,
}
diff --git a/packages/services/apiV2/electronSign.ts b/packages/services/apiV2/electronSign.ts
index e7d5a93..b462e88 100644
--- a/packages/services/apiV2/electronSign.ts
+++ b/packages/services/apiV2/electronSign.ts
@@ -161,8 +161,6 @@
method: 'GET',
params: {
...params,
- request: undefined,
- ...params['request'],
},
...(options || {}),
}
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index 1e9379a..f31b60d 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/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;
+ /** 渚涘簲鍟咺d */
+ 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;
/** 鏄惁瀹炲悕 */
--
Gitblit v1.9.1