From 63f27012358691479719c70ee004ff2ad4f9e21b Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 01 九月 2025 15:14:42 +0800
Subject: [PATCH] feat: 接口对接
---
src/services/api/enterpriseEmployee.ts | 15 +++++++
src/services/api/index.ts | 2 +
src/views/CPersonManage/components/CPersonDetailDialog.vue | 21 ++++++++++
src/services/api/typings.d.ts | 53 ++++++++++++++++++++++++--
src/constants/enterpriseEmployee.ts | 2
src/constants/apiEnum.ts | 8 ++--
src/services/api/enterpriseWallet.ts | 18 +++++++++
7 files changed, 109 insertions(+), 10 deletions(-)
diff --git a/src/constants/apiEnum.ts b/src/constants/apiEnum.ts
index 994828b..0181980 100644
--- a/src/constants/apiEnum.ts
+++ b/src/constants/apiEnum.ts
@@ -227,10 +227,12 @@
UserServerUserResume = 13,
/**浼佷笟淇℃伅 */
UserServerEnterprise = 14,
+ /**浼佷笟閽卞寘 */
+ UserServerEnterpriseWallet = 15,
/**鐏靛伐淇℃伅 */
- UserServerEnterpriseEmployee = 15,
+ UserServerEnterpriseEmployee = 16,
/**鐢靛瓙绛� */
- ElectronSignServerElectronSign = 16,
+ ElectronSignServerElectronSign = 17,
}
/** 璧勬簮璇锋眰鏂瑰紡 */
@@ -347,8 +349,6 @@
Pass = 20,
/**宸叉嫆绛� */
Refuse = 30,
- /**鐢熸晥涓� */
- Effect = 40,
/**宸茬粓姝� */
Stop = 50,
}
diff --git a/src/constants/enterpriseEmployee.ts b/src/constants/enterpriseEmployee.ts
index 5db63ff..d5bbd30 100644
--- a/src/constants/enterpriseEmployee.ts
+++ b/src/constants/enterpriseEmployee.ts
@@ -9,5 +9,5 @@
export const EnumTaskUserSignContractStatusText = {
[EnumTaskUserSignContractStatus.Wait]: '寰呯绾�',
[EnumTaskUserSignContractStatus.Pass]: '宸茬绾�',
- [EnumTaskUserSignContractStatus.Refuse]: '宸茶阿缁�',
+ [EnumTaskUserSignContractStatus.Stop]: '宸茶В绾�',
};
diff --git a/src/services/api/enterpriseEmployee.ts b/src/services/api/enterpriseEmployee.ts
index 20450a5..dbf7f68 100644
--- a/src/services/api/enterpriseEmployee.ts
+++ b/src/services/api/enterpriseEmployee.ts
@@ -157,3 +157,18 @@
}
);
}
+
+/** 鐏靛伐瑙ｇ害 POST /api/user/enterpriseEmployee/stopElectronSign */
+export async function stopElectronSign(
+ body: API.StopElectronSignCommand,
+ options?: API.RequestConfig
+) {
+ return request<string>('/api/user/enterpriseEmployee/stopElectronSign', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts
new file mode 100644
index 0000000..343ba99
--- /dev/null
+++ b/src/services/api/enterpriseWallet.ts
@@ -0,0 +1,18 @@
+/* eslint-disable */
+// @ts-ignore
+import { request } from '@/utils/request';
+
+/** 鏀粯瀹濈敤鎴锋巿鏉冨崗璁绾﹂�氱煡 POST /api/user/enterpriseWallet/alipayUserAgreementPageSignNotify */
+export async function alipayUserAgreementPageSignNotify(
+ body: API.AlipayUserAgreementPageSignNotifyQuery,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/user/enterpriseWallet/alipayUserAgreementPageSignNotify', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
diff --git a/src/services/api/index.ts b/src/services/api/index.ts
index 7c7dd5e..67e0ec6 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -18,6 +18,7 @@
import * as menu from './menu';
import * as logRecords from './logRecords';
import * as fileUtils from './fileUtils';
+import * as enterpriseWallet from './enterpriseWallet';
export default {
enterpriseEmployee,
user,
@@ -35,4 +36,5 @@
menu,
logRecords,
fileUtils,
+ enterpriseWallet,
};
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index b33238a..be6cf1f 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -3,6 +3,35 @@
[key: string]: any;
}
+ interface AlipayUserAgreementPageSignNotifyQuery {
+ /** 鍗忚浜у搧鐮侊紝鍟嗘埛鍜屾敮浠樺疂绛剧害鏃剁‘瀹氾紝涓嶅悓涓氬姟鍦烘櫙瀵瑰簲涓嶅悓鐨勭绾︿骇鍝佺爜銆� */
+ personal_product_code?: string;
+ /** 褰撳墠绛剧害鐨勫崗璁満鏅�� */
+ sign_scene?: string;
+ /** NORMAL 鍗忚褰撳墠鐘舵�� 1. TEMP锛氭殏瀛橈紝鍗忚鏈敓鏁堣繃锛� 2. NORMAL锛氭甯革紱 3. STOP锛氭殏鍋� */
+ status?: string;
+ /** 鐢ㄦ埛绛剧害鐨勬敮浠樺疂璐﹀彿瀵瑰簲鐨勬敮浠樺疂鍞竴鐢ㄦ埛鍙枫�� 浠�2088寮�澶寸殑16浣嶇函鏁板瓧缁勬垚銆� */
+ alipay_user_id?: string;
+ /** 鏀粯瀹濈郴缁熶腑鐢ㄤ互鍞竴鏍囪瘑鐢ㄦ埛绛剧害璁板綍鐨勭紪鍙枫�� */
+ agreement_no?: string;
+ /** 鏀粯瀹濅唬鎵ｅ崗璁殑瀹為檯绛剧害鏃堕棿锛屾牸寮忎负yyyy-MM-dd HH:mm:ss銆� */
+ sign_time?: string;
+ /** 鐢ㄦ埛鍦ㄥ晢鎴风綉绔欑殑鐧诲綍璐﹀彿锛屽鏋滃晢鎴锋帴鍙ｄ腑鏈紶锛屽垯涓嶄細杩斿洖 */
+ external_logon_id?: string;
+ /** 鏀粯瀹濆垎閰嶇粰寮�鍙戣�呯殑搴旂敤Id */
+ app_id?: string;
+ /** 鏀粯瀹濆垎閰嶇粰鍟嗘埛鐨勫簲鐢↖d */
+ auth_app_id?: string;
+ /** 浠ｆ墸鍗忚涓爣绀虹敤鎴风殑鍞竴绛剧害鍙凤紙纭繚鍦ㄥ晢鎴风郴缁熶腑鍞竴锛夈�� */
+ external_agreement_no?: string;
+ /** 鐢ㄦ埛浠ｆ墸鍗忚鐨勫疄闄呯敓鏁堟椂闂达紝鏍煎紡涓簓yyy-MM-dd HH:mm:ss銆� */
+ valid_time?: string;
+ /** 杩斿洖鑴辨晱鐨勬敮浠樺疂璐﹀彿銆� */
+ alipay_logon_id?: string;
+ /** 鐢ㄦ埛绛剧害鎴愬姛閫氱煡绫诲瀷 */
+ notify_type?: string;
+ }
+
interface APIcheckHealthParams {
/** 鍋ュ悍鏍￠獙 */
request?: CheckHealthQuery;
@@ -605,10 +634,12 @@
UserServerUserResume = 13,
/**浼佷笟淇℃伅 */
UserServerEnterprise = 14,
+ /**浼佷笟閽卞寘 */
+ UserServerEnterpriseWallet = 15,
/**鐏靛伐淇℃伅 */
- UserServerEnterpriseEmployee = 15,
+ UserServerEnterpriseEmployee = 16,
/**鐢靛瓙绛� */
- ElectronSignServerElectronSign = 16,
+ ElectronSignServerElectronSign = 17,
}
enum EnumResourceMethod {
@@ -713,8 +744,6 @@
Pass = 20,
/**宸叉嫆绛� */
Refuse = 30,
- /**鐢熸晥涓� */
- Effect = 40,
/**宸茬粓姝� */
Stop = 50,
}
@@ -2244,6 +2273,8 @@
/** 鎻愪氦Id */
id?: string;
enterpriseEmployeeUser?: GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser;
+ /** 楠屾敹鏃堕棿 */
+ date?: string;
/** 鎻愪氦鏃堕棿 */
createdTime?: string;
/** 楠屾敹鐓х墖 */
@@ -2268,6 +2299,8 @@
interface GetCheckReceiveTaskUserSubmitsQueryResultItem {
/** 鎻愪氦Id */
id?: string;
+ /** 楠屾敹鏃堕棿 */
+ date?: string;
/** 鎻愪氦鏃堕棿 */
createdTime?: string;
/** 楠屾敹鐓х墖 */
@@ -2725,6 +2758,8 @@
enterpriseSignContractStatus?: EnumTaskUserSignContractStatus;
/** 浼佷笟绛剧害鏃堕棿 */
enterpriseSignContractTime?: string;
+ /** 鐢靛瓙鍚堝悓 */
+ contractUrl?: string;
}
type GetEnterpriseLoginInfoQuery = Record<string, any>;
@@ -3227,6 +3262,7 @@
interface GetPersonalUserElectronSignQueryResult {
/** 鍚堝悓缂栧彿 */
contractCode?: string;
+ contractTemplateAccess?: EnumElectronSignAccess;
userSignContractStatus?: EnumTaskUserSignContractStatus;
/** 绛剧害鏂逛俊鎭�-鍛樺伐-濮撳悕 */
name?: string;
@@ -3234,6 +3270,8 @@
identityType?: string;
/** 绛剧害鏂逛俊鎭�-鍛樺伐-璇佷欢鍙风爜 */
identity?: string;
+ /** 绛剧害鏂逛俊鎭�-鍛樺伐-鎵嬫満鍙� */
+ contactPhoneNumber?: string;
/** 绛剧害鏂逛俊鎭�-鍛樺伐-绛剧害鏃堕棿 */
userSignContractTime?: string;
/** 绛剧害鏂逛俊鎭�-鍏徃涓讳綋-涓讳綋绫诲瀷 */
@@ -3626,6 +3664,8 @@
status?: EnumTaskStatus;
releaseStatus?: EnumTaskReleaseStatus;
hireStatus?: EnumTaskUserHireStatus;
+ /** 鐏靛伐Id */
+ enterpriseEmployeeId?: string;
applyButton?: GetTaskInfoQueryResultApplyButton;
hireButton?: GetTaskInfoQueryResultHireButton;
}
@@ -4758,6 +4798,11 @@
clientType?: EnumClientType;
}
+ interface StopElectronSignCommand {
+ /** 鐏靛伐Id */
+ id?: string;
+ }
+
interface SubmitCheckReceiveTaskCommand {
/** 浠诲姟Id */
taskInfoId?: string;
diff --git a/src/views/CPersonManage/components/CPersonDetailDialog.vue b/src/views/CPersonManage/components/CPersonDetailDialog.vue
index 0173529..cd5cb06 100644
--- a/src/views/CPersonManage/components/CPersonDetailDialog.vue
+++ b/src/views/CPersonManage/components/CPersonDetailDialog.vue
@@ -32,6 +32,17 @@
<ProTabPane lazy label="绛剧害璇︽儏" name="sign">
<ProDialogTableWrapper :height="400">
<ProTableV2 v-bind="proTableProps" :columns="column" :show-operation-column="false">
+ <template #contractUrl="{ row }">
+ <PreviewBtn
+ v-if="
+ row.userSignContractStatus === EnumTaskUserSignContractStatus.Pass &&
+ row.contractUrl
+ "
+ :show-download-btn="false"
+ :url="setOSSLink(row.contractUrl)"
+ >
+ </PreviewBtn>
+ </template>
</ProTableV2>
</ProDialogTableWrapper>
</ProTabPane>
@@ -60,6 +71,7 @@
ProFormRadio,
ProFormInputNumber,
defineColumns,
+ PreviewBtn,
} from '@bole-core/components';
import _ from 'lodash';
import * as userServices from '@/services/api/user';
@@ -68,7 +80,9 @@
EnumUserGenderTextForPerson,
EnumTaskUserHireStatusText,
EnumTaskUserSignContractStatusText,
+ EnumTaskUserSignContractStatus,
} from '@/constants';
+import { setOSSLink } from '@/utils';
defineOptions({
name: 'CPersonDetailDialog',
@@ -180,7 +194,12 @@
hireStatus: { type: 'enum', valueEnum: EnumTaskUserHireStatusText },
userSignContractStatus: { type: 'enum', valueEnum: EnumTaskUserSignContractStatusText },
enterpriseSignContractStatus: { type: 'enum', valueEnum: EnumTaskUserSignContractStatusText },
- contractUrl: { type: 'url' },
+ // contractUrl: {
+ // type: 'url',
+ // showDownloadBtn: false,
+ // formatter: (row: API.GetPersonalUserInfoSignContractsQueryResultItem) =>
+ // setOSSLink(row.contractUrl),
+ // },
},
}
);
--
Gitblit v1.9.1