From 39e69d80759b3e65ac6116a5779115dec0da5368 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 31 十月 2025 09:20:43 +0800
Subject: [PATCH] feat: 1.3
---
packages/constants/task.ts | 2
apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue | 4
apps/cMiniApp/src/subpackages/task/components/CompanyDesc.vue | 11
apps/bMiniApp/src/constants/app.ts | 3
apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue | 1
apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue | 16
packages/services/apiV2/index.ts | 28 +-
apps/bMiniApp/src/stores/modules/user.ts | 1
apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue | 8
apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue | 41 +++
packages/services/apiV2/typings.d.ts | 350 +++++++++++++++++++++++++++++++
apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue | 6
packages/services/apiV2/enterprise.ts | 86 +++++++
packages/constants/apiEnum.ts | 26 ++
packages/hooks/enterprise.ts | 20 +
apps/cMiniApp/src/pages/mine/index.vue | 19
16 files changed, 583 insertions(+), 39 deletions(-)
diff --git a/apps/bMiniApp/src/constants/app.ts b/apps/bMiniApp/src/constants/app.ts
index ba1edfe..c7ddda3 100644
--- a/apps/bMiniApp/src/constants/app.ts
+++ b/apps/bMiniApp/src/constants/app.ts
@@ -1,6 +1,7 @@
-import { EnumUserType, EnumClientType } from '@12333/constants';
+import { EnumUserType, EnumClientType, EnumEnterpriseType } from '@12333/constants';
export const AppLocalConfig = {
userType: EnumUserType.Enterprise,
clientType: EnumClientType.Wxmp,
+ enterpriseType: EnumEnterpriseType.PartyA,
};
diff --git a/apps/bMiniApp/src/stores/modules/user.ts b/apps/bMiniApp/src/stores/modules/user.ts
index 58c2255..5fc3404 100644
--- a/apps/bMiniApp/src/stores/modules/user.ts
+++ b/apps/bMiniApp/src/stores/modules/user.ts
@@ -144,6 +144,7 @@
// password: md5Encrypt(params.password),
type: AppLocalConfig.userType,
clientType: AppLocalConfig.clientType,
+ enterpriseType: AppLocalConfig.enterpriseType,
},
{ showLoading: false }
);
diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
index 2bde8b9..2130564 100644
--- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue
@@ -44,7 +44,7 @@
@click="goDetail(item)"
>
<template #footerRight>
- <template
+ <!-- <template
v-if="item.enterpriseSignContractStatus === EnumTaskUserSignContractStatus.Pass"
>
<nut-button
@@ -55,7 +55,7 @@
>瑙ｇ害</nut-button
>
<nut-button type="primary" @click.stop="checkContract(item)">鏌ョ湅鍚堢害</nut-button>
- </template>
+ </template> -->
<nut-button
v-if="
item.userSignContractStatus === EnumTaskUserSignContractStatus.Wait ||
@@ -66,12 +66,12 @@
@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>
</template>
diff --git a/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue b/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
index 3031f38..b2a0b09 100644
--- a/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/payrollManage/payrollManageDetail/InnerPage.vue
@@ -70,7 +70,7 @@
</template>
</InfiniteLoading>
<PageFooter v-if="form.auditStatus === EnumTaskSettlementAuditStatus.Wait">
- <PageFooterBtn type="primary" @click="auditTaskSettlement(EnumTaskSettlementAuditStatus.Pass)"
+ <!-- <PageFooterBtn type="primary" @click="auditTaskSettlement(EnumTaskSettlementAuditStatus.Pass)"
>瀹℃牳閫氳繃</PageFooterBtn
>
<PageFooterBtn
@@ -78,7 +78,11 @@
plain
@click="auditTaskSettlement(EnumTaskSettlementAuditStatus.Fail)"
>椹冲洖</PageFooterBtn
+ > -->
+ <PageFooterBtn type="primary" @click="auditTaskSettlement(EnumTaskSettlementAuditStatus.Pass)"
+ >纭</PageFooterBtn
>
+ <PageFooterBtn type="primary" plain @click="goBack">鍙栨秷</PageFooterBtn>
</PageFooter>
</LoadingLayout>
</template>
diff --git a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
index a670bb2..24fa7fa 100644
--- a/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
+++ b/apps/bMiniApp/src/subpackages/task/publishTask/InnerPage.vue
@@ -1,8 +1,39 @@
<template>
<ContentScrollView :paddingH="false">
<nut-form :model-value="form" ref="formRef" :rules="rules">
+ <nut-form-item
+ label="渚涘簲鍟�:"
+ class="bole-form-item"
+ prop="supplierEnterpriseId"
+ label-width="90px"
+ required
+ >
+ <ChooseInputWithPicker
+ v-model="form.supplierEnterpriseId"
+ placeholder="璇烽�夋嫨渚涘簲鍟�"
+ :value-enum="supplierEnterpriseSelect"
+ />
+ </nut-form-item>
<nut-form-item label="浠诲姟鍚嶇О:" class="bole-form-item" prop="name" label-width="90px">
<nut-input v-model="form.name" placeholder="璇疯緭鍏ヤ换鍔″悕绉�"> </nut-input>
+ </nut-form-item>
+ <nut-form-item
+ label="闇�姹備汉鏁�:"
+ class="bole-form-item"
+ prop="needPeopleNumber"
+ label-width="90px"
+ >
+ <div class="bole-form-input-wrapper">
+ <NumberInput
+ v-model.trim="form.needPeopleNumber"
+ class="nut-input-text bole-input-text"
+ placeholder="璇疯緭鍏ラ渶姹備汉鏁�"
+ :min="0"
+ :max="999999999999"
+ type="text"
+ />
+ <div class="form-input-unit">浜�</div>
+ </div>
</nut-form-item>
<nut-form-item
label="鏈嶅姟璐�:"
@@ -313,6 +344,7 @@
useAllAreaList,
useDictionaryDataSelect,
useEnterpriseWalletAccessSelect,
+ useGetSupplierEnterpriseSelect,
} from '@12333/hooks';
import { useQuery } from '@tanstack/vue-query';
import dayjs from 'dayjs';
@@ -324,6 +356,7 @@
const { userDetail } = useUser();
const { findAreaNameFromCode } = useAllAreaList();
const { settlementAccessList } = useEnterpriseWalletAccessSelect();
+const { supplierEnterpriseSelect } = useGetSupplierEnterpriseSelect();
const router = Taro.useRouter();
const taskId = router.params?.id ?? '';
const isEdit = !!taskId;
@@ -356,7 +389,9 @@
});
const form = reactive({
+ supplierEnterpriseId: '',
name: '',
+ needPeopleNumber: '' as any as number,
billingMethod: EnumBillingMethod.Day,
serviceFee: '' as any as number,
settlementCycle: EnumSettlementCycle.Day,
@@ -382,7 +417,9 @@
});
const rules = reactive<FormRules>({
+ supplierEnterpriseId: [{ required: true, message: '璇烽�夋嫨渚涘簲鍟�' }],
name: [{ required: true, message: '璇疯緭鍏ヤ换鍔″悕绉�' }],
+ needPeopleNumber: [{ required: true, message: '璇疯緭鍏ラ渶姹備汉鏁�' }],
genderLimit: [{ required: true, message: '璇烽�夋嫨鎬у埆瑕佹眰' }],
settlementCycleDate: [{ required: true, message: '璇疯缃粨绠楁棩鏈�' }],
settlementAccess: [{ required: true, message: '璇烽�夋嫨缁撶畻鏂瑰紡' }],
@@ -489,7 +526,9 @@
placeholderData: () => ({} as API.GetTaskInfoQueryResult),
enabled: isEdit,
onSuccess(data) {
+ form.supplierEnterpriseId = data.supplierEnterpriseId;
form.name = data.name;
+ form.needPeopleNumber = data.needPeopleNumber;
form.billingMethod = data.billingMethod;
form.serviceFee = data.serviceFee;
form.settlementCycle = data.settlementCycle;
@@ -534,7 +573,9 @@
async function confirm() {
try {
let params: API.SaveTaskInfoCommand = {
+ supplierEnterpriseId: form.supplierEnterpriseId,
name: form.name,
+ needPeopleNumber: form.needPeopleNumber,
billingMethod: form.billingMethod,
serviceFee: form.serviceFee,
settlementCycle: form.settlementCycle,
diff --git a/apps/cMiniApp/src/pages/mine/index.vue b/apps/cMiniApp/src/pages/mine/index.vue
index 7fc1b01..4f9aa71 100644
--- a/apps/cMiniApp/src/pages/mine/index.vue
+++ b/apps/cMiniApp/src/pages/mine/index.vue
@@ -100,21 +100,22 @@
<nut-badge
class="mine-order-list-item"
top="8"
- :value="userDetail?.arrangeCompleteTaskCount ?? 0"
- @click="goMineHire"
- >
- <img :src="IconOrderHire" class="mine-order-list-icon" />
- <div class="mine-order-list-text">宸插畨鎺�</div>
- </nut-badge>
- <nut-badge
- class="mine-order-list-item"
- top="8"
:value="userDetail?.hirePassTaskCount ?? 0"
@click="goMineHired"
>
<img :src="IconOrderHire" class="mine-order-list-icon" />
<div class="mine-order-list-text">宸插綍鐢�</div>
</nut-badge>
+ <nut-badge
+ class="mine-order-list-item"
+ top="8"
+ :value="userDetail?.arrangeCompleteTaskCount ?? 0"
+ @click="goMineHire"
+ >
+ <img :src="IconOrderHire" class="mine-order-list-icon" />
+ <div class="mine-order-list-text">宸插畨鎺�</div>
+ </nut-badge>
+
<!-- <nut-badge
class="mine-order-list-item"
top="8"
diff --git a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
index 4cc1bd6..0e4419c 100644
--- a/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/mine/mineSign/InnerPage.vue
@@ -17,6 +17,10 @@
:title="`寰呯绾"
:pane-key="GetPersonalApplyTaskInfosQueryStatus.WaitSignContract"
></ProTabPane>
+ <ProTabPane
+ :title="`宸茶阿缁漙"
+ :pane-key="GetPersonalApplyTaskInfosQueryStatus.HireRefuse"
+ ></ProTabPane>
</ProTabs>
<InfiniteLoading
scrollViewClassName="common-infinite-scroll-list home-list"
diff --git a/apps/cMiniApp/src/subpackages/task/components/CompanyDesc.vue b/apps/cMiniApp/src/subpackages/task/components/CompanyDesc.vue
index edf01e5..1082f7f 100644
--- a/apps/cMiniApp/src/subpackages/task/components/CompanyDesc.vue
+++ b/apps/cMiniApp/src/subpackages/task/components/CompanyDesc.vue
@@ -10,7 +10,12 @@
</div>
<div class="taskDetail-company-info" v-else>
<div class="taskDetail-company-info-text">
- <span class="danger">鏈璇�</span> | {{ taskCount }}涓矖浣嶅湪鎷�
+ <span v-if="showReal" class="danger">鏈璇�</span> | {{ taskCount }}涓矖浣嶅湪鎷�
+ </div>
+ </div>
+ <div class="taskDetail-company-info">
+ <div class="taskDetail-company-info-text">
+ {{ `璇ュ矖浣嶇敱${supplierEnterpriseName}鍏徃鎵挎徑` }}
</div>
</div>
</div>
@@ -29,6 +34,9 @@
isReal?: boolean;
enterpriseName?: string;
taskCount?: number;
+ supplierEnterpriseName?: string;
+
+ showReal?: boolean;
/**
* TODO 缂哄皯鏄惁宸茶璇�
*/
@@ -37,6 +45,7 @@
const props = withDefaults(defineProps<Props>(), {
showArrow: true,
taskCount: 0,
+ showReal: false,
});
</script>
diff --git a/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue b/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue
index 1e2143c..9ab43c1 100644
--- a/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue
+++ b/apps/cMiniApp/src/subpackages/task/components/CompanyInfo.vue
@@ -1,6 +1,6 @@
<template>
<ContentScrollView style="background-color: transparent">
- <div v-if="enterpriseDetail?.isReal" class="companyInfo-info-wrapper">
+ <div class="companyInfo-info-wrapper">
<div class="companyInfo-info-item">
<div class="companyInfo-info-item-label">浼佷笟鍚嶇О</div>
<div class="companyInfo-info-item-content">{{ enterpriseDetail?.enterpriseName }}</div>
@@ -9,34 +9,34 @@
<div class="companyInfo-info-item-label">缁熶竴绀句細淇＄敤浠ｇ爜</div>
<div class="companyInfo-info-item-content">{{ enterpriseDetail?.societyCreditCode }}</div>
</div>
- <div class="companyInfo-info-item">
+ <div class="companyInfo-info-item" v-if="enterpriseDetail.registeredCapital">
<div class="companyInfo-info-item-label">娉ㄥ唽璧勬湰</div>
<div class="companyInfo-info-item-content">{{ enterpriseDetail?.registeredCapital }}</div>
</div>
- <div class="companyInfo-info-item">
+ <div class="companyInfo-info-item" v-if="enterpriseDetail.enterpriseType">
<div class="companyInfo-info-item-label">浼佷笟绫诲瀷</div>
<div class="companyInfo-info-item-content">{{ enterpriseDetail?.enterpriseType }}</div>
</div>
- <div class="companyInfo-info-item">
+ <div class="companyInfo-info-item" v-if="enterpriseDetail.establishmentDate">
<div class="companyInfo-info-item-label">鎴愮珛鏃ユ湡</div>
<div class="companyInfo-info-item-content">{{ enterpriseDetail?.establishmentDate }}</div>
</div>
- <div class="companyInfo-info-item">
+ <div class="companyInfo-info-item" v-if="enterpriseDetail.address">
<div class="companyInfo-info-item-label">浼佷笟鍦板潃</div>
<div class="companyInfo-info-item-content">{{ enterpriseDetail?.address }}</div>
</div>
- <div class="companyInfo-info-item">
+ <div class="companyInfo-info-item" v-if="enterpriseDetail.mainBusiness">
<div class="companyInfo-info-item-label">缁忚惀鑼冨洿</div>
<div class="companyInfo-info-item-content">
{{ enterpriseDetail?.mainBusiness }}
</div>
</div>
</div>
- <div v-else class="company-info-unCertified-wrapper">
+ <!-- <div v-else class="company-info-unCertified-wrapper">
<img :src="IconNoCertified" class="company-info-unCertified-icon" />
<div class="company-info-unCertified-text">璇ヤ紒涓氬皻鏈璇�</div>
<div class="company-info-unCertified-text">璇疯皑鎱庢牳瀹炴嫑鑱樹俊鎭�</div>
- </div>
+ </div> -->
</ContentScrollView>
</template>
diff --git a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
index 7fd0dd5..ea0fe2c 100644
--- a/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/task/taskDetail/InnerPage.vue
@@ -94,6 +94,7 @@
:enterpriseName="detail?.enterpriseName ?? ''"
:taskCount="detail?.taskCount ?? 0"
:isReal="detail?.isReal ?? false"
+ :supplierEnterpriseName="detail?.supplierEnterpriseName ?? ''"
></CompanyDesc>
</CellChunk>
</Cell>
diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts
index 1f65500..a3105e5 100644
--- a/packages/constants/apiEnum.ts
+++ b/packages/constants/apiEnum.ts
@@ -101,6 +101,22 @@
Face = 20,
}
+/** 绛剧害鐘舵�� */
+export enum EnumEnterpriseCooperationSignStatus {
+ /**鏈绾� */
+ None = 10,
+ /**宸茬绾� */
+ Completed = 20,
+}
+
+/** 浼佷笟鍚堜綔鐘舵�� */
+export enum EnumEnterpriseCooperationStatus {
+ /**鏈悎浣� */
+ None = 10,
+ /**宸插悎浣� */
+ Completed = 20,
+}
+
/** 浼佷笟鐢ㄩ噺鎵ｈ垂鐘舵�� */
export enum EnumEnterpriseCostStatus {
/**鎵ｈ垂鎴愬姛 */
@@ -123,6 +139,14 @@
Identity3 = 10,
/**浼佷笟鍥涜绱� */
Identity4 = 20,
+}
+
+/** 浼佷笟绫诲瀷 */
+export enum EnumEnterpriseType {
+ /**渚涘簲鍟� */
+ Supplier = 0,
+ /**鐢叉柟浼佷笟 */
+ PartyA = 1,
}
/** 浼佷笟閽卞寘閫氶亾 */
@@ -837,6 +861,8 @@
WaitHire = 10,
/**寰呯绾� */
WaitSignContract = 20,
+ /**宸茶阿缁� */
+ HireRefuse = 30,
}
/** 鎴戠殑宸插綍鐢ㄥ垎椤靛垪琛�-鐘舵�� */
diff --git a/packages/constants/task.ts b/packages/constants/task.ts
index 38a16c4..7f9e21e 100644
--- a/packages/constants/task.ts
+++ b/packages/constants/task.ts
@@ -129,11 +129,13 @@
export const GetPersonalApplyTaskInfosQueryStatusText = {
[GetPersonalApplyTaskInfosQueryStatus.WaitHire]: '寰呯‘璁�',
[GetPersonalApplyTaskInfosQueryStatus.WaitSignContract]: '寰呯绾�',
+ [GetPersonalApplyTaskInfosQueryStatus.HireRefuse]: '宸茶阿缁�',
};
export const GetPersonalApplyTaskInfosQueryStatusColor = {
[GetPersonalApplyTaskInfosQueryStatus.WaitHire]: '#FF7D00',
[GetPersonalApplyTaskInfosQueryStatus.WaitSignContract]: '#3A71FF',
+ [GetPersonalApplyTaskInfosQueryStatus.HireRefuse]: '#c45656',
};
export const GetPersonalHireTaskInfosQueryStatusText = {
diff --git a/packages/hooks/enterprise.ts b/packages/hooks/enterprise.ts
index 308786e..d399944 100644
--- a/packages/hooks/enterprise.ts
+++ b/packages/hooks/enterprise.ts
@@ -1,5 +1,6 @@
import { useQuery, useQueryClient } from '@tanstack/vue-query';
import * as taskServices from '@12333/services/apiV2/task';
+import * as enterpriseServices from '@12333/services/apiV2/enterprise';
import { MaybeRef, unref } from 'vue';
type UseEnterpriseDetailOptions = {
@@ -27,3 +28,22 @@
isError,
};
}
+
+export function useGetSupplierEnterpriseSelect() {
+ const queryClient = useQueryClient();
+
+ const { data: supplierEnterpriseSelect } = useQuery({
+ queryKey: ['enterpriseServices/getSupplierEnterpriseSelect'],
+ queryFn: () => {
+ return enterpriseServices.getSupplierEnterpriseSelect(
+ {},
+ {
+ showLoading: false,
+ }
+ );
+ },
+ placeholderData: () => [] as API.SelectOptionGuidGetSupplierEnterpriseSelectQueryOption[],
+ });
+
+ return { supplierEnterpriseSelect };
+}
diff --git a/packages/services/apiV2/enterprise.ts b/packages/services/apiV2/enterprise.ts
index 868563d..1878577 100644
--- a/packages/services/apiV2/enterprise.ts
+++ b/packages/services/apiV2/enterprise.ts
@@ -68,6 +68,77 @@
);
}
+/** 鏌ヨ瀹㈡埛璇︽儏锛堢敳鏂逛紒涓氾級 GET /api/user/enterprise/getPartyAEnterprise */
+export async function getPartyAEnterprise(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetPartyAEnterpriseParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetPartyAEnterpriseQueryResult>('/api/user/enterprise/getPartyAEnterprise', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
+/** 鏌ヨ瀹㈡埛绠＄悊锛堢敳鏂瑰鎴凤級 POST /api/user/enterprise/getPartyAEnterprises */
+export async function getPartyAEnterprises(
+ body: API.GetPartyAEnterprisesQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.PagedListQueryResultGetPartyAEnterprisesQueryResultItem>(
+ '/api/user/enterprise/getPartyAEnterprises',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏌ヨ渚涘簲鍟嗙鐞� POST /api/user/enterprise/getSupplierEnterprises */
+export async function getSupplierEnterprises(
+ body: API.GetSupplierEnterprisesQuery,
+ options?: API.RequestConfig
+) {
+ return request<API.PagedListQueryResultGetSupplierEnterprisesQueryResultItem>(
+ '/api/user/enterprise/getSupplierEnterprises',
+ {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ }
+ );
+}
+
+/** 鏌ヨ渚涘簲鍟嗛�夋嫨鍣ㄦ暟鎹� GET /api/user/enterprise/getSupplierEnterpriseSelect */
+export async function getSupplierEnterpriseSelect(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetSupplierEnterpriseSelectParams,
+ options?: API.RequestConfig
+) {
+ return request<API.SelectOptionGuidGetSupplierEnterpriseSelectQueryOption[]>(
+ '/api/user/enterprise/getSupplierEnterpriseSelect',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ request: undefined,
+ ...params['request'],
+ },
+ ...(options || {}),
+ }
+ );
+}
+
/** 淇濆瓨浼佷笟 POST /api/user/enterprise/saveEnterprise */
export async function saveEnterprise(body: API.SaveEnterpriseCommand, options?: API.RequestConfig) {
return request<string>('/api/user/enterprise/saveEnterprise', {
@@ -95,6 +166,21 @@
});
}
+/** 娣诲姞瀹㈡埛浼佷笟锛堢敳鏂逛紒涓氾級 POST /api/user/enterprise/savePartyAEnterprise */
+export async function savePartyAEnterprise(
+ body: API.SavePartyAEnterpriseCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/enterprise/savePartyAEnterprise', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 璁剧疆浼佷笟鐢靛瓙绛鹃厤缃� PUT /api/user/enterprise/setEnterpriseElectronSignSetting */
export async function setEnterpriseElectronSignSetting(
body: API.SetEnterpriseElectronSignSettingCommand,
diff --git a/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts
index e99bcae..522d40c 100644
--- a/packages/services/apiV2/index.ts
+++ b/packages/services/apiV2/index.ts
@@ -5,46 +5,46 @@
import * as enterpriseEmployee from './enterpriseEmployee';
import * as user from './user';
import * as role from './role';
+import * as task from './task';
import * as enterpriseWallet from './enterpriseWallet';
import * as ocrUtils from './ocrUtils';
-import * as task from './task';
import * as enterprise from './enterprise';
-import * as logRecords from './logRecords';
import * as resource from './resource';
+import * as logRecords from './logRecords';
import * as dictionary from './dictionary';
-import * as codeUrl from './codeUrl';
+import * as taskCheckReceive from './taskCheckReceive';
import * as electronSign from './electronSign';
import * as userResume from './userResume';
import * as auth from './auth';
-import * as taskCheckReceive from './taskCheckReceive';
import * as taskUser from './taskUser';
-import * as sms from './sms';
-import * as settings from './settings';
+import * as codeUrl from './codeUrl';
+import * as syncDatabase from './syncDatabase';
import * as menu from './menu';
+import * as sms from './sms';
import * as userWallet from './userWallet';
import * as fileUtils from './fileUtils';
-import * as syncDatabase from './syncDatabase';
+import * as settings from './settings';
export default {
enterpriseEmployee,
user,
role,
+ task,
enterpriseWallet,
ocrUtils,
- task,
enterprise,
- logRecords,
resource,
+ logRecords,
dictionary,
- codeUrl,
+ taskCheckReceive,
electronSign,
userResume,
auth,
- taskCheckReceive,
taskUser,
- sms,
- settings,
+ codeUrl,
+ syncDatabase,
menu,
+ sms,
userWallet,
fileUtils,
- syncDatabase,
+ settings,
};
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index beb6a74..750820f 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -180,6 +180,11 @@
roleId?: string;
}
+ interface APIgetPartyAEnterpriseParams {
+ /** 鍚堜綔Id */
+ id?: string;
+ }
+
interface APIgetPersonalLoginInfoParams {
/** 鏌ヨ涓汉鐢ㄦ埛鐧诲綍淇℃伅 */
request?: GetPersonalLoginInfoQuery;
@@ -245,6 +250,11 @@
isImport?: boolean;
/** 鎿嶄綔浠ょ墝 */
operatorToken?: string;
+ }
+
+ interface APIgetSupplierEnterpriseSelectParams {
+ /** 鏌ヨ渚涘簲鍟嗛�夋嫨鍣ㄦ暟鎹� */
+ request?: GetSupplierEnterpriseSelectQuery;
}
interface APIgetTaskEnterpriseParams {
@@ -787,6 +797,20 @@
Face = 20,
}
+ enum EnumEnterpriseCooperationSignStatus {
+ /**鏈绾� */
+ None = 10,
+ /**宸茬绾� */
+ Completed = 20,
+ }
+
+ enum EnumEnterpriseCooperationStatus {
+ /**鏈悎浣� */
+ None = 10,
+ /**宸插悎浣� */
+ Completed = 20,
+ }
+
enum EnumEnterpriseCostStatus {
/**鎵ｈ垂鎴愬姛 */
Success = 10,
@@ -806,6 +830,13 @@
Identity3 = 10,
/**浼佷笟鍥涜绱� */
Identity4 = 20,
+ }
+
+ enum EnumEnterpriseType {
+ /**渚涘簲鍟� */
+ Supplier = 0,
+ /**鐢叉柟浼佷笟 */
+ PartyA = 1,
}
enum EnumEnterpriseWalletAccess {
@@ -2212,6 +2243,24 @@
timestamp?: number;
}
+ interface FriendlyResultGetPartyAEnterpriseQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetPartyAEnterpriseQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultGetPersonalApplyTaskInfosQueryResult {
/** 璺熻釜Id */
traceId?: string;
@@ -3200,6 +3249,25 @@
timestamp?: number;
}
+ interface FriendlyResultListSelectOptionGuidGetSupplierEnterpriseSelectQueryOption {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ /** 鏁版嵁 */
+ data?: SelectOptionGuidGetSupplierEnterpriseSelectQueryOption[];
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultListSelectOptionGuidGetTaskSelectQueryOption {
/** 璺熻釜Id */
traceId?: string;
@@ -3365,6 +3433,24 @@
timestamp?: number;
}
+ interface FriendlyResultPagedListQueryResultGetPartyAEnterprisesQueryResultItem {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: PagedListQueryResultGetPartyAEnterprisesQueryResultItem;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
interface FriendlyResultPagedListQueryResultGetRolesQueryResultItem {
/** 璺熻釜Id */
traceId?: string;
@@ -3373,6 +3459,24 @@
/** 閿欒鐮� */
errorCode?: string;
data?: PagedListQueryResultGetRolesQueryResultItem;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultPagedListQueryResultGetSupplierEnterprisesQueryResultItem {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: PagedListQueryResultGetSupplierEnterprisesQueryResultItem;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -3690,6 +3794,10 @@
}
interface GetCheckReceiveTaskQueryResultObjectData {
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name?: string;
/** 浠诲姟鍗曞彿 */
@@ -3741,6 +3849,10 @@
interface GetCheckReceiveTasksQueryResultItem {
/** 浠诲姟Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name?: string;
/** 浠诲姟鍗曞彿 */
@@ -4547,6 +4659,10 @@
identity?: string;
/** 浣欓 */
balance?: number;
+ /** 鍙敤浣欓 */
+ availableBalance?: number;
+ /** 宸插喕缁� */
+ freezeBalance?: number;
}
interface GetEnterpriseWalletExpandindirectOrderQueryResult {
@@ -5132,6 +5248,84 @@
name?: string;
}
+ interface GetPartyAEnterpriseQueryResult {
+ /** 鍚堜綔Id */
+ id?: string;
+ /** 鐢叉柟浼佷笟Id */
+ partyAEnterpriseId?: string;
+ /** 浼佷笟鍚嶇О */
+ enterpriseName?: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 娉曚汉韬唤璇佸彿 */
+ legalIdentity?: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ /** 娉ㄥ唽璧勬湰 */
+ registeredCapital?: string;
+ /** 浼佷笟绫诲瀷 */
+ enterpriseType?: string;
+ /** 鎴愮珛鏃ユ湡 */
+ establishmentDate?: string;
+ /** 鎵�鍦ㄧ渷浠界紪鍙� */
+ provinceCode?: string;
+ /** 鎵�鍦ㄧ渷浠� */
+ provinceContent?: string;
+ /** 鎵�鍦ㄥ煄甯傜紪鍙� */
+ cityCode?: string;
+ /** 鎵�鍦ㄥ煄甯� */
+ cityContent?: string;
+ /** 璇︾粏鍦板潃 */
+ address?: string;
+ /** 缁忚惀鑼冨洿 */
+ mainBusiness?: string;
+ /** 鑱旂郴浜� */
+ contacts?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ /** 鑱旂郴閭 */
+ contactEmail?: string;
+ cooperationStatus?: EnumEnterpriseCooperationStatus;
+ signStatus?: EnumEnterpriseCooperationSignStatus;
+ /** 鍚堜綔鍗忚 */
+ cooperationAgreementUrl?: string;
+ /** 鐢ㄦ埛Id */
+ userId?: string;
+ /** 璐﹀彿 */
+ userName?: string;
+ }
+
+ interface GetPartyAEnterprisesQuery {
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ cooperationStatus?: EnumEnterpriseCooperationStatus;
+ signStatus?: EnumEnterpriseCooperationSignStatus;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetPartyAEnterprisesQueryResultItem {
+ /** 鍚堜綔Id */
+ id?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ /** 瀹㈡埛ID */
+ partyAEnterpriseId?: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 鑱旂郴浜� */
+ contacts?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ /** 鎵�鍦ㄧ渷浠� */
+ provinceContent?: string;
+ /** 鎵�鍦ㄥ煄甯� */
+ cityContent?: string;
+ cooperationStatus?: EnumEnterpriseCooperationStatus;
+ signStatus?: EnumEnterpriseCooperationSignStatus;
+ }
+
interface GetPersonalApplyTaskInfosQuery {
status?: GetPersonalApplyTaskInfosQueryStatus;
pageModel?: PagedListQueryPageModel;
@@ -5146,6 +5340,10 @@
interface GetPersonalApplyTaskInfosQueryResultItem {
/** 浠诲姟Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name?: string;
/** 浠诲姟寮�濮嬫椂闂� */
@@ -5181,6 +5379,8 @@
WaitHire = 10,
/**寰呯绾� */
WaitSignContract = 20,
+ /**宸茶阿缁� */
+ HireRefuse = 30,
}
interface GetPersonalCancelTaskInfosQuery {
@@ -5196,6 +5396,10 @@
interface GetPersonalCancelTaskInfosQueryResultItem {
/** 浠诲姟Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name?: string;
/** 浠诲姟寮�濮嬫椂闂� */
@@ -5241,6 +5445,10 @@
interface GetPersonalHireTaskInfosQueryResultItem {
/** 浠诲姟Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name?: string;
/** 浠诲姟寮�濮嬫椂闂� */
@@ -5789,6 +5997,7 @@
/** 鍚嶇О */
name?: string;
userType?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
clientType?: EnumClientType;
/** 鏈�浣庣骇鍒� */
minLevel?: number;
@@ -5809,6 +6018,7 @@
interface GetRolesQuery {
userType?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
clientType?: EnumClientType;
/** 鍏抽敭瀛� */
keywords?: string;
@@ -5821,6 +6031,7 @@
/** 鍚嶇О */
name?: string;
userType?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
clientType?: EnumClientType;
/** 鏈�浣庣骇鍒� */
minLevel?: number;
@@ -5946,6 +6157,10 @@
interface GetSettlementTaskUsersQueryResultDetail {
/** 缁撶畻璁㈠崟Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 鏍￠獙楠屾敹璧峰鏃ユ湡 */
checkReceiveBeginDate?: string;
/** 鏍￠獙楠屾敹鎴鏃ユ湡 */
@@ -6123,6 +6338,52 @@
signName?: string;
}
+ type GetSupplierEnterpriseSelectQuery = Record<string, any>;
+
+ interface GetSupplierEnterpriseSelectQueryOption {
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ supplierEnterprise?: GetSupplierEnterpriseSelectQueryOptionEnterprise;
+ }
+
+ interface GetSupplierEnterpriseSelectQueryOptionEnterprise {
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ }
+
+ interface GetSupplierEnterprisesQuery {
+ /** 鍏抽敭瀛� */
+ keywords?: string;
+ cooperationStatus?: EnumEnterpriseCooperationStatus;
+ signStatus?: EnumEnterpriseCooperationSignStatus;
+ pageModel?: PagedListQueryPageModel;
+ }
+
+ interface GetSupplierEnterprisesQueryResultItem {
+ /** 鍚堜綔Id */
+ id?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ /** 渚涘簲鍟咺D */
+ supplierEnterpriseId?: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 鑱旂郴浜� */
+ contacts?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ /** 鎵�鍦ㄧ渷浠� */
+ provinceContent?: string;
+ /** 鎵�鍦ㄥ煄甯� */
+ cityContent?: string;
+ /** 鎵�灞炶涓� */
+ industryTypeContent?: string;
+ cooperationStatus?: EnumEnterpriseCooperationStatus;
+ signStatus?: EnumEnterpriseCooperationSignStatus;
+ }
+
interface GetTaskEnterpriseQueryResult {
/** 浼佷笟鍏ㄧО */
enterpriseName?: string;
@@ -6147,6 +6408,12 @@
interface GetTaskInfoQueryResult {
/** Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 渚涘簲鍟� */
+ supplierEnterpriseName?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浼佷笟Id */
enterpriseId?: string;
/** 浼佷笟鍏ㄧО */
@@ -6293,11 +6560,21 @@
interface GetTaskInfosQueryResultItem {
/** Id */
id?: string;
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 渚涘簲鍟� */
+ supplierEnterpriseName?: string;
+ /** 渚涘簲鍟嗚处鍙� */
+ supplierEnterpriseUserName?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name: string;
/** 浠诲姟鍗曞彿 */
code?: string;
- /** 浼佷笟鍏ㄧО */
+ /** 鎵�灞炲鎴稩d */
+ enterpriseId?: string;
+ /** 鎵�灞炲鎴� */
enterpriseName?: string;
/** 鐢ㄦ埛鍚� */
userName?: string;
@@ -7055,10 +7332,22 @@
data?: GetEnterprisesQueryResultItem[];
}
+ interface PagedListQueryResultGetPartyAEnterprisesQueryResultItem {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetPartyAEnterprisesQueryResultItem[];
+ }
+
interface PagedListQueryResultGetRolesQueryResultItem {
pageModel?: PagedListQueryResultPageModel;
/** 鏁版嵁 */
data?: GetRolesQueryResultItem[];
+ }
+
+ interface PagedListQueryResultGetSupplierEnterprisesQueryResultItem {
+ pageModel?: PagedListQueryResultPageModel;
+ /** 鏁版嵁 */
+ data?: GetSupplierEnterprisesQueryResultItem[];
}
interface PagedListQueryResultPageModel {
@@ -7081,6 +7370,7 @@
password: string;
type?: EnumUserType;
clientType?: EnumClientType;
+ enterpriseType?: EnumEnterpriseType;
}
interface PersonalUserElectronSignCommand {
@@ -7490,6 +7780,49 @@
id?: string;
}
+ interface SavePartyAEnterpriseCommand {
+ /** 浼佷笟鍚嶇О */
+ enterpriseName: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 娉曚汉韬唤璇佸彿 */
+ legalIdentity?: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode: string;
+ /** 娉ㄥ唽璧勬湰 */
+ registeredCapital?: string;
+ /** 浼佷笟绫诲瀷 */
+ enterpriseType?: string;
+ /** 鎴愮珛鏃ユ湡 */
+ establishmentDate?: string;
+ /** 鎵�鍦ㄧ渷浠界紪鍙� */
+ provinceCode?: string;
+ /** 鎵�鍦ㄥ煄甯傜紪鍙� */
+ cityCode?: string;
+ /** 璇︾粏鍦板潃 */
+ address?: string;
+ /** 缁忚惀鑼冨洿 */
+ mainBusiness?: string;
+ /** 鑱旂郴浜� */
+ contacts?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ /** 鑱旂郴閭 */
+ contactEmail?: string;
+ cooperationStatus?: EnumEnterpriseCooperationStatus;
+ signStatus?: EnumEnterpriseCooperationSignStatus;
+ /** 鍚堜綔鍗忚 */
+ cooperationAgreementUrl?: string;
+ /** 璐﹀彿 */
+ userName?: string;
+ /** 瀵嗙爜锛堥�夊～ 濉簡灏辨敼涓嶅～灏变笉鏀癸級 */
+ password?: string;
+ /** 鎿嶄綔瀵嗙爜锛堥�夊～ 濉簡灏辨敼涓嶅～灏变笉鏀癸級 */
+ operatorPassword?: string;
+ /** Id */
+ id?: string;
+ }
+
interface SavePersonalUserBankCardCommand {
/** 鐏靛伐Id */
enterpriseEmployeeId?: string;
@@ -7514,6 +7847,7 @@
/** 鍚嶇О */
name?: string;
userType?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
clientType?: EnumClientType;
/** 鏈�浣庣骇鍒� */
minLevel?: number;
@@ -7552,6 +7886,10 @@
}
interface SaveTaskInfoCommand {
+ /** 渚涘簲鍟咺d */
+ supplierEnterpriseId?: string;
+ /** 闇�姹備汉鏁� */
+ needPeopleNumber?: number;
/** 浠诲姟鍚嶇О */
name: string;
billingMethod: EnumBillingMethod;
@@ -7725,6 +8063,14 @@
/** 鏍囩 */
label?: string;
data?: GetEnterpriseWalletAccessSelectQueryOption;
+ }
+
+ interface SelectOptionGuidGetSupplierEnterpriseSelectQueryOption {
+ /** 鍊� */
+ value?: string;
+ /** 鏍囩 */
+ label?: string;
+ data?: GetSupplierEnterpriseSelectQueryOption;
}
interface SelectOptionGuidGetTaskSelectQueryOption {
@@ -7926,6 +8272,7 @@
verifyCode?: string;
type?: EnumUserType;
clientType?: EnumClientType;
+ enterpriseType?: EnumEnterpriseType;
}
interface StopElectronSignCommand {
@@ -8749,5 +9096,6 @@
/** 鐢ㄦ埛鐧诲綍鍑瘉 */
code: string;
type?: EnumUserType;
+ enterpriseType?: EnumEnterpriseType;
}
}
--
Gitblit v1.9.1