From cfa7283b1d47334b648493270c88d609b956ee11 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期一, 01 九月 2025 15:17:27 +0800 Subject: [PATCH] feat: 签约 --- apps/bMiniApp/src/subpackages/flexJobManage/flexJobManageExtraPage/flexJobManageExtraPage.vue | 17 +++ packages/utils/common.ts | 5 + packages/services/apiV2/enterpriseWallet.ts | 48 +++++++++ apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue | 23 +++ apps/bMiniApp/src/constants/router.ts | 1 packages/services/apiV2/enterpriseEmployee.ts | 4 apps/bMiniApp/src/subpackages/flexJobManage/flexJobSign/InnerPage.vue | 2 apps/cMiniApp/project.private.config.json | 7 + apps/bMiniApp/src/app.config.ts | 1 apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue | 2 apps/bMiniApp/src/subpackages/flexJobManage/flexJobManageExtraPage/flexJobManageExtraPage.config.ts | 3 apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue | 3 packages/services/apiV2/index.ts | 2 packages/utils/message.tsx | 9 + apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue | 13 + packages/services/apiV2/typings.d.ts | 103 +++++++++++++++++++ packages/constants/apiEnum.ts | 6 packages/constants/enterpriseEmployee.ts | 11 ++ 18 files changed, 239 insertions(+), 21 deletions(-) diff --git a/apps/bMiniApp/src/app.config.ts b/apps/bMiniApp/src/app.config.ts index 9c69db0..ca3d062 100644 --- a/apps/bMiniApp/src/app.config.ts +++ b/apps/bMiniApp/src/app.config.ts @@ -117,6 +117,7 @@ 'flexJobManage/flexJobManage', 'flexJobDetailFromManage/flexJobDetailFromManage', 'flexJobSign/flexJobSign', + 'flexJobManageExtraPage/flexJobManageExtraPage', ], }, ], diff --git a/apps/bMiniApp/src/constants/router.ts b/apps/bMiniApp/src/constants/router.ts index 0c429b2..ef72baf 100644 --- a/apps/bMiniApp/src/constants/router.ts +++ b/apps/bMiniApp/src/constants/router.ts @@ -17,6 +17,7 @@ flexJobManage = '/subpackages/flexJobManage/flexJobManage/flexJobManage', flexJobDetailFromManage = '/subpackages/flexJobManage/flexJobDetailFromManage/flexJobDetailFromManage', flexJobSign = '/subpackages/flexJobManage/flexJobSign/flexJobSign', + flexJobManageExtraPage = '/subpackages/flexJobManage/flexJobManageExtraPage/flexJobManageExtraPage', // userInfo = '/subpackages/setting/userInfo/userInfo', // setting = '/subpackages/setting/setting/setting', diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue index d7d339b..062f5b3 100644 --- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobDetailFromManage/InnerPage.vue @@ -80,7 +80,7 @@ try { await Message.confirm({ message: '纭畾瑕佽В绾﹀悧锛�' }); let params: API.StopElectronSignCommand = { - id: enterpriseEmployeeInfo.value?.id, + ids: [enterpriseEmployeeInfo.value?.id], }; let res = await enterpriseEmployeeServices.stopElectronSign(params); if (res) { diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue index d41f2a4..6031f51 100644 --- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManage/InnerPage.vue @@ -44,7 +44,7 @@ @click.stop="handleUnsign(item)" >瑙g害</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=" @@ -72,7 +72,7 @@ } from '@12333/constants'; import * as enterpriseEmployeeServices from '@12333/services/apiV2/enterpriseEmployee'; import Taro from '@tarojs/taro'; -import { Message } from '@12333/utils'; +import { Message, setOSSLink } from '@12333/utils'; defineOptions({ name: 'InnerPage', @@ -103,7 +103,12 @@ } ); -function checkContract() {} +function checkContract(item: API.GetEnterpriseEmployeesQueryResultItem) { + const encodedUrl = encodeURIComponent(setOSSLink(item.contractUrl)); + Taro.navigateTo({ + url: `${RouterPath.flexJobManageExtraPage}?url=${encodedUrl}`, + }); +} function goDetail(item: API.GetEnterpriseEmployeesQueryResultItem) { Taro.navigateTo({ @@ -115,7 +120,7 @@ try { await Message.confirm({ message: '纭畾瑕佽В绾﹀悧锛�' }); let params: API.StopElectronSignCommand = { - id: item.id, + ids: [item.id], }; let res = await enterpriseEmployeeServices.stopElectronSign(params); if (res) { diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManageExtraPage/flexJobManageExtraPage.config.ts b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManageExtraPage/flexJobManageExtraPage.config.ts new file mode 100644 index 0000000..305fdb1 --- /dev/null +++ b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManageExtraPage/flexJobManageExtraPage.config.ts @@ -0,0 +1,3 @@ +export default definePageConfig({ + disableScroll: true, +}); diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManageExtraPage/flexJobManageExtraPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManageExtraPage/flexJobManageExtraPage.vue new file mode 100644 index 0000000..dfc28eb --- /dev/null +++ b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobManageExtraPage/flexJobManageExtraPage.vue @@ -0,0 +1,17 @@ +<template> + <web-view :src="urlLink" /> +</template> + +<script setup lang="ts"> +import Taro from '@tarojs/taro'; + +defineOptions({ + name: 'flexJobManageExtraPage', +}); + +const router = Taro.useRouter(); + +const url = (router.params.url as string) ?? ''; + +const urlLink = computed(() => decodeURIComponent(url)); +</script> diff --git a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobSign/InnerPage.vue b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobSign/InnerPage.vue index 53c37f2..80c9a40 100644 --- a/apps/bMiniApp/src/subpackages/flexJobManage/flexJobSign/InnerPage.vue +++ b/apps/bMiniApp/src/subpackages/flexJobManage/flexJobSign/InnerPage.vue @@ -85,7 +85,7 @@ async function handleInvite() { try { let params: API.InviteElectronSignCommand = { - id: enterpriseEmployeeId, + ids: [enterpriseEmployeeId], contractTemplateId: checkedId.value, }; let res = await enterpriseEmployeeServices.inviteElectronSign(params); diff --git a/apps/cMiniApp/project.private.config.json b/apps/cMiniApp/project.private.config.json index 5c9b9cc..5ba8478 100644 --- a/apps/cMiniApp/project.private.config.json +++ b/apps/cMiniApp/project.private.config.json @@ -85,6 +85,13 @@ "query": "", "launchMode": "default", "scene": null + }, + { + "name": "", + "pathName": "subpackages/mine/mineAgreementSign/mineAgreementSign", + "query": "", + "launchMode": "default", + "scene": null } ] } diff --git a/apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue b/apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue index 277373a..05c6ab2 100644 --- a/apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/authentication/authenticationRealName/InnerPage.vue @@ -107,6 +107,7 @@ name: 'InnerPage', }); +const { userDetail } = useUser(); const router = Taro.useRouter(); const type = router.params?.type ?? ''; @@ -115,7 +116,7 @@ identityBackImg: [] as FileItem[], name: '', identity: '', - phoneNumber: '', + phoneNumber: userDetail.value?.contactPhoneNumber, verifyCode: '', }); diff --git a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue index 829b909..9ba9ed2 100644 --- a/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue +++ b/apps/cMiniApp/src/subpackages/mine/mineAgreementSignDetail/InnerPage.vue @@ -73,10 +73,11 @@ import MineAgreementSignDetailItem from './MineAgreementSignDetailItem.vue'; import * as enterpriseEmployeeServices from '@12333/services/apiV2/enterpriseEmployee'; import { + EnumElectronSignAccess, EnumTaskUserSignContractStatus, EnumTaskUserSignContractStatusText, } from '@12333/constants'; -import { format, Message } from '@12333/utils'; +import { format, hiddenPhone, Message, setOSSLink } from '@12333/utils'; import Taro from '@tarojs/taro'; defineOptions({ @@ -112,16 +113,21 @@ function checkAgreement() { if (detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Wait) { goToSign(); - } else { - const encodedUrl = encodeURIComponent(detail?.value?.contractUrl); + } + if ( + detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Stop || + detail?.value?.userSignContractStatus === EnumTaskUserSignContractStatus.Pass + ) { + const encodedUrl = encodeURIComponent(setOSSLink(detail?.value?.contractUrl)); Taro.navigateTo({ - url: `${RouterPath.mineAgreementSignDetail}?url=${encodedUrl}`, + url: `${RouterPath.mineAgreementSignExtraPage}?url=${encodedUrl}`, }); } } const goToSign = useAccessReal(async () => { try { + // if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.BestSign) { let params: API.PersonalUserElectronSignCommand = { id: id, }; @@ -130,6 +136,15 @@ const encodedUrl = encodeURIComponent(res.signContractLongUrl); Taro.navigateTo({ url: `${RouterPath.mineAgreementSignExtraPage}?url=${encodedUrl}` }); } + // } + // if (detail.value?.contractTemplateAccess === EnumElectronSignAccess.AlipaySign) { + // Message.confirm({ + // message: `绛剧害鐭俊宸插彂閫佽嚦鎮�${hiddenPhone( + // detail.value?.contactPhoneNumber + // )}鐨勬墜鏈猴紝璇峰強鏃舵煡鐪嬪苟绛剧害`, + // showCancelBtn: false, + // }); + // } } catch (error) {} }); Taro.useDidShow(() => { diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts index e4382ec..0181980 100644 --- a/packages/constants/apiEnum.ts +++ b/packages/constants/apiEnum.ts @@ -227,10 +227,12 @@ UserServerUserResume = 13, /**浼佷笟淇℃伅 */ UserServerEnterprise = 14, + /**浼佷笟閽卞寘 */ + UserServerEnterpriseWallet = 15, /**鐏靛伐淇℃伅 */ - UserServerEnterpriseEmployee = 15, + UserServerEnterpriseEmployee = 16, /**鐢靛瓙绛� */ - ElectronSignServerElectronSign = 16, + ElectronSignServerElectronSign = 17, } /** 璧勬簮璇锋眰鏂瑰紡 */ diff --git a/packages/constants/enterpriseEmployee.ts b/packages/constants/enterpriseEmployee.ts index 3e2de51..1b6121f 100644 --- a/packages/constants/enterpriseEmployee.ts +++ b/packages/constants/enterpriseEmployee.ts @@ -1,4 +1,8 @@ -import { EnumTaskUserHireStatus, EnumTaskUserSignContractStatus } from './apiEnum'; +import { + EnumElectronSignAccess, + EnumTaskUserHireStatus, + EnumTaskUserSignContractStatus, +} from './apiEnum'; import { Colors } from './enum'; export const EnumTaskUserHireStatusText = { @@ -25,3 +29,8 @@ [EnumTaskUserSignContractStatus.Refuse]: '宸叉嫆绛�', [EnumTaskUserSignContractStatus.Stop]: '宸茶В绾�', }; + +export const EnumElectronSignAccessText = { + [EnumElectronSignAccess.BestSign]: '涓婁笂绛�', + [EnumElectronSignAccess.AlipaySign]: '鏀粯瀹濅俊浠荤', +}; diff --git a/packages/services/apiV2/enterpriseEmployee.ts b/packages/services/apiV2/enterpriseEmployee.ts index dbf7f68..874d511 100644 --- a/packages/services/apiV2/enterpriseEmployee.ts +++ b/packages/services/apiV2/enterpriseEmployee.ts @@ -130,7 +130,7 @@ body: API.InviteElectronSignCommand, options?: API.RequestConfig ) { - return request<string>('/api/user/enterpriseEmployee/inviteElectronSign', { + return request<number>('/api/user/enterpriseEmployee/inviteElectronSign', { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', @@ -163,7 +163,7 @@ body: API.StopElectronSignCommand, options?: API.RequestConfig ) { - return request<string>('/api/user/enterpriseEmployee/stopElectronSign', { + return request<number>('/api/user/enterpriseEmployee/stopElectronSign', { method: 'POST', headers: { 'Content-Type': 'application/json-patch+json', diff --git a/packages/services/apiV2/enterpriseWallet.ts b/packages/services/apiV2/enterpriseWallet.ts new file mode 100644 index 0000000..3016da8 --- /dev/null +++ b/packages/services/apiV2/enterpriseWallet.ts @@ -0,0 +1,48 @@ +/* eslint-disable */ +// @ts-ignore +import { request } from '@/utils/request'; + +/** 鏀粯瀹濊祫閲戜簩绾у晢鎴稫YB浠h繘浠� POST /api/user/enterpriseWallet/alipayFundExpandindirectCreate */ +export async function alipayFundExpandindirectCreate( + body: API.AlipayFundExpandindirectCreateCommand, + options?: API.RequestConfig +) { + return request<boolean>('/api/user/enterpriseWallet/alipayFundExpandindirectCreate', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + +/** 璧勯噾浜岀骇鍟嗘埛KYB浠h繘浠剁姸鎬侀�氱煡鎺ュ彛 POST /api/user/enterpriseWallet/alipayFundExpandindirectCreateNotify */ +export async function alipayFundExpandindirectCreateNotify( + body: API.AlipayFundExpandindirectCreateNotifyCommand, + options?: API.RequestConfig +) { + return request<boolean>('/api/user/enterpriseWallet/alipayFundExpandindirectCreateNotify', { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + }); +} + +/** 鏀粯瀹濈敤鎴锋巿鏉冨崗璁绾﹂�氱煡 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/packages/services/apiV2/index.ts b/packages/services/apiV2/index.ts index 7c7dd5e..bd3d555 100644 --- a/packages/services/apiV2/index.ts +++ b/packages/services/apiV2/index.ts @@ -11,6 +11,7 @@ import * as task from './task'; import * as dictionary from './dictionary'; import * as electronSign from './electronSign'; +import * as enterpriseWallet from './enterpriseWallet'; import * as userResume from './userResume'; import * as auth from './auth'; import * as taskCheckReceive from './taskCheckReceive'; @@ -28,6 +29,7 @@ task, dictionary, electronSign, + enterpriseWallet, userResume, auth, taskCheckReceive, diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts index c677790..13ceaa8 100644 --- a/packages/services/apiV2/typings.d.ts +++ b/packages/services/apiV2/typings.d.ts @@ -3,6 +3,92 @@ [key: string]: any; } + interface AlipayFundExpandindirectCreateCommand { + /** 浜у搧鐮� */ + productCode?: string; + /** 鍦烘櫙鐮� */ + bizScene?: string; + /** 澶栭儴鍗曞彿 */ + outBizNo?: string; + /** 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑 */ + identity?: string; + /** 浜岀骇鍟嗘埛淇℃伅-鏍囪瘑绫诲瀷 */ + identityType?: string; + /** 浜岀骇鍟嗘埛淇℃伅-濮撳悕 */ + name?: string; + /** 涓氬姟绫诲瀷 */ + bizType?: string; + /** 鍘熻繘浠跺崟id */ + originalOrderId?: string; + /** 璧勯噾璁拌处鏈殑涓氬姟鍦烘櫙 */ + sceneCode?: string; + /** 杞处鍦烘櫙璇存槑 */ + sceneDirections?: string; + /** 杞处鍦烘櫙鎴浘 */ + sceneImage?: string; + /** 鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */ + sceneQualificationImage?: string; + sitesInfo?: AlipayFundExpandindirectCreateCommandSites; + } + + interface AlipayFundExpandindirectCreateCommandSites { + website?: string; + app?: string; + gongzh?: string; + qita?: string; + xchengxU_ZHI?: string; + } + + interface AlipayFundExpandindirectCreateNotifyCommand { + /** 閫氱煡ID */ + notify_id?: string; + /** 娑堟伅鍙戦�佹椂鐨勬湇鍔$鏃堕棿 */ + utc_timestamp?: string; + /** 娑堟伅鎺ュ彛鍚嶇О */ + msg_method?: string; + /** 娑堟伅鎺ュ彈鏂圭殑搴旂敤id */ + app_id?: string; + /** 鐗堟湰鍙�(1.1鐗堟湰涓烘爣鍑嗘秷鎭�) */ + version?: string; + /** 娑堟伅鎶ユ枃 */ + biz_content?: string; + /** 绛惧悕 */ + sign?: string; + /** 绛惧悕绫诲瀷 */ + sign_type?: string; + /** 缂栫爜闆嗭紝璇ュ瓧绗﹂泦涓洪獙绛惧拰瑙e瘑鎵�闇�瑕佺殑瀛楃闆� */ + charset?: string; + } + + 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; + /** 鏀粯瀹濅唬鎵e崗璁殑瀹為檯绛剧害鏃堕棿锛屾牸寮忎负yyyy-MM-dd HH:mm:ss銆� */ + sign_time?: string; + /** 鐢ㄦ埛鍦ㄥ晢鎴风綉绔欑殑鐧诲綍璐﹀彿锛屽鏋滃晢鎴锋帴鍙d腑鏈紶锛屽垯涓嶄細杩斿洖 */ + external_logon_id?: string; + /** 鏀粯瀹濆垎閰嶇粰寮�鍙戣�呯殑搴旂敤Id */ + app_id?: string; + /** 鏀粯瀹濆垎閰嶇粰鍟嗘埛鐨勫簲鐢↖d */ + auth_app_id?: string; + /** 浠f墸鍗忚涓爣绀虹敤鎴风殑鍞竴绛剧害鍙凤紙纭繚鍦ㄥ晢鎴风郴缁熶腑鍞竴锛夈�� */ + external_agreement_no?: string; + /** 鐢ㄦ埛浠f墸鍗忚鐨勫疄闄呯敓鏁堟椂闂达紝鏍煎紡涓簓yyy-MM-dd HH:mm:ss銆� */ + valid_time?: string; + /** 杩斿洖鑴辨晱鐨勬敮浠樺疂璐﹀彿銆� */ + alipay_logon_id?: string; + /** 鐢ㄦ埛绛剧害鎴愬姛閫氱煡绫诲瀷 */ + notify_type?: string; + } + interface APIcheckHealthParams { /** 鍋ュ悍鏍¢獙 */ request?: CheckHealthQuery; @@ -605,10 +691,12 @@ UserServerUserResume = 13, /**浼佷笟淇℃伅 */ UserServerEnterprise = 14, + /**浼佷笟閽卞寘 */ + UserServerEnterpriseWallet = 15, /**鐏靛伐淇℃伅 */ - UserServerEnterpriseEmployee = 15, + UserServerEnterpriseEmployee = 16, /**鐢靛瓙绛� */ - ElectronSignServerElectronSign = 16, + ElectronSignServerElectronSign = 17, } enum EnumResourceMethod { @@ -2727,6 +2815,8 @@ enterpriseSignContractStatus?: EnumTaskUserSignContractStatus; /** 浼佷笟绛剧害鏃堕棿 */ enterpriseSignContractTime?: string; + /** 鐢靛瓙鍚堝悓 */ + contractUrl?: string; } type GetEnterpriseLoginInfoQuery = Record<string, any>; @@ -3215,6 +3305,8 @@ avatar?: string; /** 濮撳悕 */ name?: string; + /** 鎵嬫満鍙� */ + contactPhoneNumber?: string; /** 鏄惁瀹炲悕 */ isReal?: boolean; realMethod?: EnumUserRealMethod; @@ -3229,6 +3321,7 @@ interface GetPersonalUserElectronSignQueryResult { /** 鍚堝悓缂栧彿 */ contractCode?: string; + contractTemplateAccess?: EnumElectronSignAccess; userSignContractStatus?: EnumTaskUserSignContractStatus; /** 绛剧害鏂逛俊鎭�-鍛樺伐-濮撳悕 */ name?: string; @@ -3236,6 +3329,8 @@ identityType?: string; /** 绛剧害鏂逛俊鎭�-鍛樺伐-璇佷欢鍙风爜 */ identity?: string; + /** 绛剧害鏂逛俊鎭�-鍛樺伐-鎵嬫満鍙� */ + contactPhoneNumber?: string; /** 绛剧害鏂逛俊鎭�-鍛樺伐-绛剧害鏃堕棿 */ userSignContractTime?: string; /** 绛剧害鏂逛俊鎭�-鍏徃涓讳綋-涓讳綋绫诲瀷 */ @@ -4128,7 +4223,7 @@ interface InviteElectronSignCommand { /** 鐏靛伐Id */ - id?: string; + ids?: string[]; /** 鍚堝悓妯℃澘Id */ contractTemplateId?: string; } @@ -4764,7 +4859,7 @@ interface StopElectronSignCommand { /** 鐏靛伐Id */ - id?: string; + ids?: string[]; } interface SubmitCheckReceiveTaskCommand { diff --git a/packages/utils/common.ts b/packages/utils/common.ts index cbf1993..13bbb46 100644 --- a/packages/utils/common.ts +++ b/packages/utils/common.ts @@ -135,3 +135,8 @@ if (!realIDNumber) return ''; return realIDNumber.replace(/^(\d+)(.{6})$/, '$1******'); }; + +export const hiddenPhone = (phone: string) => { + if (!phone) return ''; + return phone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2'); +}; diff --git a/packages/utils/message.tsx b/packages/utils/message.tsx index cccb42f..1ddf523 100644 --- a/packages/utils/message.tsx +++ b/packages/utils/message.tsx @@ -25,11 +25,17 @@ title?: string; message?: string | VNode; confirmText?: string; + showCancelBtn?: boolean; }; export class Message { static confirm(options: ConfirmOptions = {}) { - const { title = '鎻愮ず', message = '纭畾瑕佸垹闄よ鏁版嵁鍚�?', confirmText = '纭' } = options; + const { + title = '鎻愮ず', + message = '纭畾瑕佸垹闄よ鏁版嵁鍚�?', + confirmText = '纭', + showCancelBtn = true, + } = options; return new Promise((resolve, reject) => { Portal.add((key) => { return ( @@ -42,6 +48,7 @@ title={title} visible={open.value} content={message} + showCancelBtn={showCancelBtn} onCancel={() => { onClose(); reject(); -- Gitblit v1.9.1