From c9a84fe7206bc5fd77c2267427f7696dca1d197d Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 22 八月 2025 14:00:32 +0800
Subject: [PATCH] fix: bug
---
src/services/api/index.ts | 8 +-
src/views/EnterpriseManage/components/ConfigureDialog.vue | 56 ++----------------
src/services/api/electronSign.ts | 30 ++++++++++
src/services/api/typings.d.ts | 56 +++++++++++-------
src/views/EnterpriseManage/EnterpriseManageList.vue | 19 +-----
5 files changed, 77 insertions(+), 92 deletions(-)
diff --git a/src/services/api/electronSign.ts b/src/services/api/electronSign.ts
index 7e0325b..cfc6b4c 100644
--- a/src/services/api/electronSign.ts
+++ b/src/services/api/electronSign.ts
@@ -2,6 +2,21 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 鏍￠獙鐢靛瓙绛鹃�氶亾鏄惁鍚敤 POST /api/user/electronSign/checkElectronSignAccessEnableds */
+export async function checkElectronSignAccessEnableds(
+ body: API.CheckElectronSignAccessEnabledsCommand,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/user/electronSign/checkElectronSignAccessEnableds', {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json-patch+json',
+ },
+ data: body,
+ ...(options || {}),
+ });
+}
+
/** 鐢靛瓙绛惧洖浼� POST /api/user/electronSign/electronSignCallback */
export async function electronSignCallback(
body: API.ElectronSignCallbackCommand,
@@ -195,3 +210,18 @@
...(options || {}),
});
}
+
+/** 鍚屾鐢靛瓙绛鹃厤缃� POST /api/user/electronSign/syncElectronSignSettings */
+export async function syncElectronSignSettings(
+ body: API.SyncElectronSignSettingsCommand,
+ options?: API.RequestConfig
+) {
+ return request<boolean>('/api/user/electronSign/syncElectronSignSettings', {
+ 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 2973753..7c7dd5e 100644
--- a/src/services/api/index.ts
+++ b/src/services/api/index.ts
@@ -5,16 +5,16 @@
import * as enterpriseEmployee from './enterpriseEmployee';
import * as user from './user';
import * as role from './role';
+import * as ocrUtils from './ocrUtils';
import * as enterprise from './enterprise';
-import * as electronSign from './electronSign';
import * as resource from './resource';
import * as task from './task';
import * as dictionary from './dictionary';
+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 ocrUtils from './ocrUtils';
import * as menu from './menu';
import * as logRecords from './logRecords';
import * as fileUtils from './fileUtils';
@@ -22,16 +22,16 @@
enterpriseEmployee,
user,
role,
+ ocrUtils,
enterprise,
- electronSign,
resource,
task,
dictionary,
+ electronSign,
userResume,
auth,
taskCheckReceive,
taskUser,
- ocrUtils,
menu,
logRecords,
fileUtils,
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index b17cf14..68dbba3 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -278,6 +278,11 @@
verifyCode: string;
}
+ interface CheckElectronSignAccessEnabledsCommand {
+ /** 閫氶亾 */
+ accesses?: EnumElectronSignAccess[];
+ }
+
type CheckHealthQuery = Record<string, any>;
interface CheckReceiveTaskCommand {
@@ -2435,13 +2440,8 @@
interface GetEnterpriseElectronSignSettingQueryResult {
/** Id */
id?: string;
- realAccess?: EnumRealAccess;
- /** 瀹炲悕璐圭敤 */
- realVerifyCost?: number;
- /** 绛剧害璐圭敤 */
- signCost?: number;
- /** 涓�鍙ｄ环 */
- mergeSignCost?: number;
+ /** 鐢靛瓙绛鹃�氶亾 */
+ electronSignAccesses?: EnumElectronSignAccess[];
}
interface GetEnterpriseEmployeeQueryResult {
@@ -4404,13 +4404,8 @@
interface SetEnterpriseElectronSignSettingCommand {
/** Id */
id?: string;
- realAccess?: EnumRealAccess;
- /** 瀹炲悕璐圭敤 */
- realVerifyCost?: number;
- /** 绛剧害璐圭敤 */
- signCost?: number;
- /** 涓�鍙ｄ环 */
- mergeSignCost?: number;
+ /** 鐢靛瓙绛鹃�氶亾 */
+ electronSignAccesses?: EnumElectronSignAccess[];
}
interface SetEnterpriseSmsSettingCommand {
@@ -4505,6 +4500,23 @@
files?: string[];
}
+ interface SyncElectronSignSettingsCommand {
+ /** 椤� */
+ items?: SyncElectronSignSettingsCommandItem[];
+ }
+
+ interface SyncElectronSignSettingsCommandItem {
+ access?: EnumElectronSignAccess;
+ /** 鏄惁绂佺敤 */
+ isDisabled?: boolean;
+ /** 瀹炲悕璐圭敤 */
+ realVerifyCost?: number;
+ /** 绛剧害璐圭敤 */
+ signCost?: number;
+ /** 涓�鍙ｄ环 */
+ mergeSignCost?: number;
+ }
+
interface SyncEnterpriseUserCommand {
dataSource?: EnumDataSource;
/** 鏁版嵁鏉ユ簮Id */
@@ -4553,13 +4565,9 @@
bankCard?: string;
/** 鏄惁宸叉牎楠岄摱琛岃处鎴� */
isCheckedBankCard?: boolean;
+ /** 鐢靛瓙绛鹃�氶亾 */
+ electronSignAccesses?: EnumElectronSignAccess[];
realAccess?: EnumRealAccess;
- /** 瀹炲悕璐圭敤 */
- realVerifyCost?: number;
- /** 绛剧害璐圭敤 */
- signCost?: number;
- /** 涓�鍙ｄ环 */
- mergeSignCost?: number;
/** 鏄惁瀹炲悕 */
isReal?: boolean;
enterpriseAuth?: SyncEnterpriseUserCommandEnterpriseAuth;
@@ -4568,6 +4576,10 @@
interface SyncEnterpriseUserCommandEnterpriseAuth {
enterpriseRealMethod?: EnumEnterpriseRealMethod;
personalRealMethod?: EnumPersonalRealMethod;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 娉曚汉韬唤璇佸彿 */
+ legalIdentity?: string;
/** 娉曚汉鎴栫粡鍔炰汉濮撳悕 */
name?: string;
/** 娉曚汉鎴栫粡鍔炰汉韬唤璇佸彿 */
@@ -4586,8 +4598,8 @@
proxy?: boolean;
/** 浼佷笟鎺堟潈涔� */
proxyPowerAttorneyUrl?: string;
- /** 瀹炲悕Id */
- realId?: string;
+ /** 绗笁鏂瑰疄鍚嶉�氶亾璐﹀彿 */
+ certAccount?: string;
}
type SyncHumanResourcesAreaDictionaryDataCommand = Record<string, any>;
diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue
index bcf9029..6fbeabb 100644
--- a/src/views/EnterpriseManage/EnterpriseManageList.vue
+++ b/src/views/EnterpriseManage/EnterpriseManageList.vue
@@ -156,19 +156,13 @@
handleEdit({
id: row.id,
enterpriseConfigureType: EnterpriseConfigureType.Electronic,
- realAccess: electronSignSetting.realAccess,
- realVerifyCost: electronSignSetting.realVerifyCost,
- signCost: electronSignSetting.signCost,
- mergeSignCost: electronSignSetting.mergeSignCost,
-
+ electronSignAccesses: electronSignSetting.electronSignAccesses,
smsAccess: smsSetting.smsAccess,
- chargeType: ChargeTypeEnum.Group,
smsCost: smsSetting.smsCost,
});
} else {
handleAdd({
enterpriseConfigureType: EnterpriseConfigureType.Electronic,
- chargeType: ChargeTypeEnum.Group,
});
}
}
@@ -178,11 +172,7 @@
defaultFormParams: {
id: '',
enterpriseConfigureType: EnterpriseConfigureType.Electronic,
- realAccess: '' as any as EnumRealAccess,
- realVerifyCost: 0,
- signCost: 0,
- mergeSignCost: 0,
- chargeType: ChargeTypeEnum.Group,
+ electronSignAccesses: [] as any as EnumElectronSignAccess[],
smsAccess: '' as any as EnumSmsAccess,
smsCost: 0,
},
@@ -225,10 +215,7 @@
try {
let params: API.SetEnterpriseElectronSignSettingCommand = {
id: editForm.id,
- realAccess: editForm.realAccess,
- realVerifyCost: editForm.realVerifyCost,
- signCost: editForm.signCost,
- mergeSignCost: editForm.mergeSignCost,
+ electronSignAccesses: editForm.electronSignAccesses,
};
return await enterpriseServices.setEnterpriseElectronSignSetting(params);
} catch (error) {}
diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue
index 5a8a232..16d84e1 100644
--- a/src/views/EnterpriseManage/components/ConfigureDialog.vue
+++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue
@@ -44,56 +44,17 @@
<div class="configure-dialog-form-title">閫氶亾閰嶇疆</div>
<ProFormItemV2
label="鍚嶇О:"
- prop="realAccess"
+ prop="electronSignAccesses"
:checkRules="[{ message: '璇烽�夋嫨鐢靛瓙绛鹃�氶亾' }]"
>
<ProFormSelect
- v-model="form.realAccess"
- :valueEnum="EnumRealAccessText"
+ v-model="form.electronSignAccesses"
+ :valueEnum="EnumElectronSignAccessText"
placeholder="璇烽�夋嫨鐢靛瓙绛鹃�氶亾"
+ multiple
>
</ProFormSelect>
</ProFormItemV2>
- <div class="configure-dialog-form-title">璐圭敤閰嶇疆</div>
- <ProFormItemV2
- label="璁¤垂鏂瑰紡:"
- prop="chargeType"
- :checkRules="[{ message: '璇烽�夋嫨璁¤垂鏂瑰紡' }]"
- >
- <ProFormRadio
- :button-style="false"
- v-model="form.chargeType"
- :value-enum="ChargeTypeEnumText"
- />
- </ProFormItemV2>
- <template v-if="form.chargeType === ChargeTypeEnum.Group">
- <ProFormItemV2 label="瀹炲悕璐圭敤:" prop="realVerifyCost">
- <ProFormInputNumber
- :controls="false"
- v-model="form.realVerifyCost"
- placeholder="璇疯緭鍏�"
- unit="鍏�/鏉�"
- />
- </ProFormItemV2>
- <ProFormItemV2 label="绛剧害璐圭敤:" prop="signCost">
- <ProFormInputNumber
- :controls="false"
- v-model="form.signCost"
- placeholder="璇疯緭鍏�"
- unit="鍏�/浠�"
- />
- </ProFormItemV2>
- </template>
- <template v-if="form.chargeType === ChargeTypeEnum.Merge">
- <ProFormItemV2 label="缁熶竴鐢靛瓙绛�:" prop="mergeSignCost">
- <ProFormInputNumber
- :controls="false"
- v-model="form.mergeSignCost"
- placeholder="璇疯緭鍏�"
- unit="鍏�/浠�"
- />
- </ProFormItemV2>
- </template>
</template>
<template v-if="form.enterpriseConfigureType === EnterpriseConfigureType.ShortMessage">
<div class="configure-dialog-form-title">閫氶亾閰嶇疆</div>
@@ -141,8 +102,7 @@
EnterpriseConfigureType,
EnterpriseConfigureTypeText,
ChargeTypeEnum,
- ChargeTypeEnumText,
- EnumRealAccessText,
+ EnumElectronSignAccessText,
EnumSmsAccessText,
EnumRealAccess,
} from '@/constants';
@@ -157,11 +117,7 @@
// openBranchBank: string;
// bankAccount: string;
// verifyStatus: VerifyStatus;
- chargeType: ChargeTypeEnum;
- realAccess: EnumRealAccess;
- realVerifyCost: number;
- signCost: number;
- mergeSignCost: number;
+ electronSignAccesses: EnumElectronSignAccess[];
smsAccess: EnumSmsAccess;
smsCost: number;
};
--
Gitblit v1.9.1