From 1541647c5dda4aa04ea6b00a691e41d39a76e711 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 07 八月 2025 09:45:07 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/views/EnterpriseManage/components/AddOrEditEnterpriseView.vue | 104 +++++----
src/views/TaskManage/components/SignDetailView.vue | 13 +
src/views/EnterpriseManage/components/ConfigureDialog.vue | 1
src/views/TaskManage/components/TaskDetailView.vue | 24 -
.eslintrc-auto-import.json | 2
src/services/api/typings.d.ts | 247 ++++++++++++---------
auto-imports.d.ts | 4
src/constants/enterprise.ts | 16 -
src/views/EnterpriseManage/EnterpriseManageList.vue | 158 ++++----------
src/services/api/enterprise.ts | 51 ++++
10 files changed, 311 insertions(+), 309 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index b05f1c8..0660ad8 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -46,8 +46,6 @@
"FlexEnterpriseCertificationStatusText": true,
"FlexEnterpriseSettingStatus": true,
"FlexEnterpriseSettingStatusText": true,
- "FlexEnterpriseStatus": true,
- "FlexEnterpriseStatusText": true,
"FlexTaskWorkerHireEnum": true,
"FlexTaskWorkerHireEnumText": true,
"FlexWorkerEleSignEnum": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index f4c6d32..23868fa 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -204,7 +204,7 @@
export type { EditorType, EditorType } from './src/constants/editor'
import('./src/constants/editor')
// @ts-ignore
- export type { EnterpriseConfigureType, FlexEnterpriseSettingStatus, FlexEnterpriseStatus, VerifyStatus, FlexEnterpriseCertificationStatus, MessageChannelEnum, SignChannelEnum, ChargeTypeEnum, EnterpriseConfigureType, FlexEnterpriseSettingStatus, FlexEnterpriseStatus, VerifyStatus, FlexEnterpriseCertificationStatus, MessageChannelEnum, SignChannelEnum, ChargeTypeEnum } from './src/constants/enterprise'
+ export type { EnterpriseConfigureType, FlexEnterpriseSettingStatus, VerifyStatus, FlexEnterpriseCertificationStatus, MessageChannelEnum, SignChannelEnum, ChargeTypeEnum, EnterpriseConfigureType, FlexEnterpriseSettingStatus, VerifyStatus, FlexEnterpriseCertificationStatus, MessageChannelEnum, SignChannelEnum, ChargeTypeEnum } from './src/constants/enterprise'
import('./src/constants/enterprise')
// @ts-ignore
export type { AreaType, AuthorizeType, Gender, AreaType, AuthorizeType, Gender } from './src/constants/enum'
@@ -269,8 +269,6 @@
readonly FlexEnterpriseCertificationStatusText: UnwrapRef<typeof import('./src/constants/enterprise')['FlexEnterpriseCertificationStatusText']>
readonly FlexEnterpriseSettingStatus: UnwrapRef<typeof import('./src/constants/enterprise')['FlexEnterpriseSettingStatus']>
readonly FlexEnterpriseSettingStatusText: UnwrapRef<typeof import('./src/constants/enterprise')['FlexEnterpriseSettingStatusText']>
- readonly FlexEnterpriseStatus: UnwrapRef<typeof import('./src/constants/enterprise')['FlexEnterpriseStatus']>
- readonly FlexEnterpriseStatusText: UnwrapRef<typeof import('./src/constants/enterprise')['FlexEnterpriseStatusText']>
readonly FlexTaskWorkerHireEnum: UnwrapRef<typeof import('./src/constants/cPerson')['FlexTaskWorkerHireEnum']>
readonly FlexTaskWorkerHireEnumText: UnwrapRef<typeof import('./src/constants/cPerson')['FlexTaskWorkerHireEnumText']>
readonly FlexWorkerEleSignEnum: UnwrapRef<typeof import('./src/constants/cPerson')['FlexWorkerEleSignEnum']>
diff --git a/src/constants/enterprise.ts b/src/constants/enterprise.ts
index 2baa33d..d29b9a7 100644
--- a/src/constants/enterprise.ts
+++ b/src/constants/enterprise.ts
@@ -35,22 +35,6 @@
[FlexEnterpriseSettingStatus.IsSetting]: '宸查厤缃�',
};
-export enum FlexEnterpriseStatus {
- /**
- * 鍐荤粨
- */
- Frozen = -10,
- /**
- * 姝ｅ父
- */
- Normal = 10,
-}
-
-export const FlexEnterpriseStatusText = {
- [FlexEnterpriseStatus.Frozen]: '鍐荤粨',
- [FlexEnterpriseStatus.Normal]: '姝ｅ父',
-};
-
export enum VerifyStatus {
/**
* 鏈獙璇�
diff --git a/src/services/api/enterprise.ts b/src/services/api/enterprise.ts
index bfba64e..084e76e 100644
--- a/src/services/api/enterprise.ts
+++ b/src/services/api/enterprise.ts
@@ -2,6 +2,39 @@
// @ts-ignore
import { request } from '@/utils/request';
+/** 鏌ヨ浼佷笟璇︽儏 GET /api/user/enterprise/getEnterprise */
+export async function getEnterprise(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetEnterpriseParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetEnterpriseQueryResult>('/api/user/enterprise/getEnterprise', {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ });
+}
+
+/** 鏌ヨ浼佷笟鐢靛瓙绛鹃厤缃� GET /api/user/enterprise/getEnterpriseElectronSignSetting */
+export async function getEnterpriseElectronSignSetting(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetEnterpriseElectronSignSettingParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetEnterpriseElectronSignSettingQueryResult>(
+ '/api/user/enterprise/getEnterpriseElectronSignSetting',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
/** 鏌ヨ浼佷笟淇℃伅鍒嗛〉鍒楄〃鏁版嵁 POST /api/user/enterprise/getEnterprises */
export async function getEnterprises(body: API.GetEnterprisesQuery, options?: API.RequestConfig) {
return request<API.PagedListQueryResultGetEnterprisesQueryResultItem>(
@@ -17,6 +50,24 @@
);
}
+/** 鏌ヨ浼佷笟鐭俊閰嶇疆 GET /api/user/enterprise/getEnterpriseSmsSetting */
+export async function getEnterpriseSmsSetting(
+ // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+ params: API.APIgetEnterpriseSmsSettingParams,
+ options?: API.RequestConfig
+) {
+ return request<API.GetEnterpriseSmsSettingQueryResult>(
+ '/api/user/enterprise/getEnterpriseSmsSetting',
+ {
+ method: 'GET',
+ params: {
+ ...params,
+ },
+ ...(options || {}),
+ }
+ );
+}
+
/** 淇濆瓨浼佷笟 POST /api/user/enterprise/saveEnterprise */
export async function saveEnterprise(body: API.SaveEnterpriseCommand, options?: API.RequestConfig) {
return request<string>('/api/user/enterprise/saveEnterprise', {
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 6dff9aa..fb57219 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -32,6 +32,21 @@
parentId?: string;
}
+ interface APIgetEnterpriseElectronSignSettingParams {
+ /** Id */
+ id?: string;
+ }
+
+ interface APIgetEnterpriseParams {
+ /** Id */
+ id?: string;
+ }
+
+ interface APIgetEnterpriseSmsSettingParams {
+ /** Id */
+ id?: string;
+ }
+
interface APIgetMenuParams {
/** Id */
id?: string;
@@ -89,77 +104,6 @@
interface DeleteRoleCommand {
ids: string[];
- }
-
- interface DictionaryCategory {
- id?: string;
- createdTime?: string;
- updatedTime?: string;
- /** 鎺掑簭 */
- sort?: number;
- /** 璺熻釜Id */
- traceId?: string;
- /** 鍒涘缓鎿嶄綔浜� */
- createdUserInfoId?: string;
- /** 鏈�鍚庢洿鏂版搷浣滀汉 */
- updatedUserInfoId?: string;
- /** 鏄惁鍒犻櫎 */
- isDeleted?: boolean;
- /** 缂栧彿 */
- code: string;
- /** 鍚嶇О */
- name: string;
- /** 瀛楁鍚嶏紙閫楀彿闅斿紑锛� */
- fieldNames?: string;
- /** 澶囨敞 */
- remark?: string;
- }
-
- interface DictionaryData {
- id?: string;
- createdTime?: string;
- updatedTime?: string;
- /** 鎺掑簭 */
- sort?: number;
- /** 璺熻釜Id */
- traceId?: string;
- /** 鍒涘缓鎿嶄綔浜� */
- createdUserInfoId?: string;
- /** 鏈�鍚庢洿鏂版搷浣滀汉 */
- updatedUserInfoId?: string;
- /** 鏄惁鍒犻櫎 */
- isDeleted?: boolean;
- /** 绫诲埆Id */
- categoryId?: string;
- category?: DictionaryCategory;
- /** 涓婄骇Id */
- parentId?: string;
- parent?: DictionaryData;
- /** 涓嬬骇 */
- children?: DictionaryData[];
- /** 瀛楀吀璺緞 */
- path?: string;
- /** 缂栧彿 */
- code?: string;
- /** 鏄剧ず鍐呭 */
- content: string;
- /** 瀛楁1 */
- field1?: string;
- /** 瀛楁2 */
- field2?: string;
- /** 瀛楁3 */
- field3?: string;
- /** 瀛楁4 */
- field4?: string;
- /** 瀛楁5 */
- field5?: string;
- /** 鏄惁绂佺敤 */
- isDisabled?: boolean;
- }
-
- interface DictionaryDataQueryResult {
- /** 鍐呭 */
- content?: string;
}
enum EnumClientType {
@@ -277,6 +221,60 @@
/** 閿欒鐮� */
errorCode?: string;
data?: GetAliyunOSSAcsQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetEnterpriseElectronSignSettingQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetEnterpriseElectronSignSettingQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetEnterpriseQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetEnterpriseQueryResult;
+ /** 鎵ц鎴愬姛 */
+ success?: boolean;
+ /** 閿欒淇℃伅 */
+ msg?: any;
+ /** 闄勫姞鏁版嵁 */
+ extras?: any;
+ /** 鏃堕棿鎴� */
+ timestamp?: number;
+ }
+
+ interface FriendlyResultGetEnterpriseSmsSettingQueryResult {
+ /** 璺熻釜Id */
+ traceId?: string;
+ /** 鐘舵�佺爜 */
+ code?: number;
+ /** 閿欒鐮� */
+ errorCode?: string;
+ data?: GetEnterpriseSmsSettingQueryResult;
/** 鎵ц鎴愬姛 */
success?: boolean;
/** 閿欒淇℃伅 */
@@ -654,7 +652,6 @@
categoryCode?: string;
/** 绫诲埆鍚嶇О */
categoryName?: string;
- category?: GetDictionaryDatasQueryResultItemCategory;
/** 涓婄骇Id */
parentId?: string;
/** 缂栧彿 */
@@ -677,11 +674,53 @@
isDisabled?: boolean;
}
- interface GetDictionaryDatasQueryResultItemCategory {
- /** 绫诲埆缂栧彿 */
- code?: string;
- /** 鍚嶇О */
- name?: string;
+ interface GetEnterpriseElectronSignSettingQueryResult {
+ /** Id */
+ id?: string;
+ realAccess?: EnumRealAccess;
+ /** 瀹炲悕璐圭敤 */
+ realVerifyCost?: number;
+ /** 绛剧害璐圭敤 */
+ signCost?: number;
+ /** 涓�鍙ｄ环 */
+ mergeSignCost?: number;
+ }
+
+ interface GetEnterpriseQueryResult {
+ /** Id */
+ id?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 娉曚汉韬唤璇佸彿 */
+ legalIdentity?: string;
+ /** 鎵�鍦ㄧ渷浠� */
+ provinceContent?: string;
+ /** 鎵�鍦ㄥ煄甯� */
+ cityContent?: string;
+ /** 鎵�灞炶涓� */
+ industryTypeContent?: string;
+ /** 涓昏惀涓氬姟 */
+ mainBusiness?: string;
+ /** 鑱旂郴浜� */
+ contacts?: string;
+ /** 鑱旂郴鐢佃瘽 */
+ contactPhoneNumber?: string;
+ /** 鑱旂郴閭 */
+ contactEmail?: string;
+ /** 璐﹀彿 */
+ userName?: string;
+ }
+
+ interface GetEnterpriseSmsSettingQueryResult {
+ /** Id */
+ id?: string;
+ smsAccess?: EnumSmsAccess;
+ /** 鐭俊璐圭敤 */
+ smsCost?: number;
}
interface GetEnterprisesQuery {
@@ -695,23 +734,24 @@
interface GetEnterprisesQueryResultItem {
/** Id */
id?: string;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName?: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode?: string;
+ /** 鏄惁瀹炲悕 */
+ isReal?: boolean;
/** 鑱旂郴浜� */
contacts?: string;
/** 鑱旂郴鐢佃瘽 */
- contactNumber?: string;
- /** 鎵�鍦ㄧ渷浠絀d */
- provinceId?: string;
- province?: DictionaryDataQueryResult;
- /** 鎵�鍦ㄥ煄甯侷d */
- cityId?: string;
- city?: DictionaryDataQueryResult;
- /** 鎵�灞炶涓欼d */
- industryTypeId?: string;
- industryType?: DictionaryDataQueryResult;
- /** 鏄惁宸叉牎楠岄摱琛岃处鎴� */
- isCheckedBankCard?: boolean;
- realAccess?: EnumRealAccess;
- smsAccess?: EnumSmsAccess;
+ contactPhoneNumber?: string;
+ /** 鎵�鍦ㄧ渷浠� */
+ provinceContent?: string;
+ /** 鎵�鍦ㄥ煄甯� */
+ cityContent?: string;
+ /** 鎵�灞炶涓� */
+ industryTypeContent?: string;
/** 鏄惁宸查厤缃� */
isConfigured?: boolean;
}
@@ -855,8 +895,6 @@
}
interface GetOperationUserInfosQueryResultItemRole {
- /** 鐢ㄦ埛Id */
- userInfoId?: string;
/** 瑙掕壊Id */
id?: string;
/** 鍚嶇О */
@@ -1084,16 +1122,20 @@
interface SaveEnterpriseCommand {
/** Id */
id?: string;
- enterpriseAuth: SaveEnterpriseCommandAuth;
+ /** 浼佷笟鍏ㄧО */
+ enterpriseName: string;
+ /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
+ societyCreditCode: string;
+ /** 娉曚汉濮撳悕 */
+ legalPerson?: string;
+ /** 娉曚汉韬唤璇佸彿 */
+ legalIdentity?: string;
/** 鎵�鍦ㄧ渷浠絀d */
provinceId?: string;
- province?: DictionaryData;
/** 鎵�鍦ㄥ煄甯侷d */
cityId?: string;
- city?: DictionaryData;
/** 鎵�灞炶涓欼d */
industryTypeId?: string;
- industryType?: DictionaryData;
/** 涓昏惀涓氬姟 */
mainBusiness?: string;
/** 鑱旂郴浜� */
@@ -1106,17 +1148,6 @@
userName?: string;
/** 瀵嗙爜 */
password?: string;
- }
-
- interface SaveEnterpriseCommandAuth {
- /** 浼佷笟鍏ㄧО */
- enterpriseName: string;
- /** 缁熶竴绀句細淇＄敤浠ｇ爜 */
- societyCreditCode: string;
- /** 娉曚汉濮撳悕 */
- legalPerson?: string;
- /** 娉曚汉韬唤璇佸彿 */
- legalIdentity?: string;
}
interface SaveMenuButtonCommand {
diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue
index 0e4796d..1ef6e37 100644
--- a/src/views/EnterpriseManage/EnterpriseManageList.vue
+++ b/src/views/EnterpriseManage/EnterpriseManageList.vue
@@ -5,8 +5,17 @@
<template #query>
<QueryFilterItem tip-content="閰嶇疆鐘舵��">
<FieldRadio
- v-model="extraParamState.flexEnterpriseSettingStatus"
- :value-enum="FlexEnterpriseSettingStatusText"
+ v-model="extraParamState.isConfigured"
+ :value-enum="[
+ {
+ value: true,
+ label: '宸查厤缃�',
+ },
+ {
+ value: false,
+ label: '鏈厤缃�',
+ },
+ ]"
buttonStyle
showAllBtn
@change="getList()"
@@ -14,7 +23,7 @@
</QueryFilterItem>
<QueryFilterItem>
<SearchInput
- v-model="extraParamState.searchWord"
+ v-model="extraParamState.keywords"
style="width: 200px"
placeholder="浼佷笟鍚嶇О/娉曚汉/鑱旂郴浜�"
@on-click-search="getList"
@@ -36,7 +45,7 @@
<ProTableV2 v-bind="proTableProps" :columns="column" :operationBtns="operationBtns">
</ProTableV2>
</AppContainer>
- <ConfigureDialog v-bind="dialogProps" />
+ <!-- <ConfigureDialog v-bind="dialogProps" /> -->
</LoadingLayout>
</template>
@@ -54,21 +63,10 @@
FieldRadio,
} from '@bole-core/components';
import { useAccess, useGlobalEventContext } from '@/hooks';
-import {
- SearchType,
- FlexEnterpriseSettingStatusText,
- FlexEnterpriseSettingStatus,
- FlexEnterpriseCertificationStatusText,
- EnterpriseConfigureType,
- MessageChannelEnum,
- VerifyStatus,
- SignChannelEnum,
- ChargeTypeEnum,
- FlexEnterpriseStatus,
-} from '@/constants';
+import { EnterpriseConfigureType } from '@/constants';
import ConfigureDialog from './components/ConfigureDialog.vue';
-import { OrderInputType, Message } from '@bole-core/core';
-import { useQueryClient } from '@tanstack/vue-query';
+import { Message } from '@bole-core/core';
+import * as enterpriseServices from '@/services/api/enterprise';
defineOptions({
name: 'EnterpriseManageList',
@@ -78,7 +76,6 @@
editBtn: { emits: { onClick: (role) => addOrEditEnterprise(role) } },
detailBtn: { emits: { onClick: (role) => handleDetail(role) } },
configBtn: { emits: { onClick: (role) => openDialog(role) } },
- freezeBtn: { emits: { onClick: (role) => handleSetStatus(role) } },
};
const { checkSubModuleItemShow, column, operationBtns } = useAccess({
@@ -100,8 +97,6 @@
const BaseState = {
loading: true,
};
-const queryClient = useQueryClient();
-const typeList = ref([]);
const state = reactive({ ...BaseState });
@@ -119,17 +114,17 @@
} = useTable(
async ({ pageIndex, pageSize }, extraParamState) => {
try {
- let params: API.GetFlexEnterpriseInput = {
+ let params: API.GetEnterprisesQuery = {
pageModel: {
rows: pageSize,
page: pageIndex,
orderInput: extraParamState.orderInput,
},
- flexEnterpriseSettingStatus: extraParamState.flexEnterpriseSettingStatus,
- searchWord: extraParamState.searchWord,
+ isConfigured: extraParamState.isConfigured,
+ keywords: extraParamState.keywords,
};
- let res = await flexEnterpriseServices.getFlexEnterpriseList(params, {
+ let res = await enterpriseServices.getEnterprises(params, {
showLoading: !state.loading,
});
return res;
@@ -139,40 +134,22 @@
},
{
defaultExtraParams: {
- searchWord: '',
- orderInput: [{ property: 'id', order: OrderInputType.Desc }],
- flexEnterpriseSettingStatus: '' as any as FlexEnterpriseSettingStatus,
+ keywords: '',
+ orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
+ isConfigured: '' as any as boolean,
},
queryKey: ['flexEnterpriseServices/getFlexEnterpriseList'],
- columnsRenderProps: {
- settingStatus: { type: 'enum', valueEnum: FlexEnterpriseSettingStatusText },
- certificationStatus: { type: 'enum', valueEnum: FlexEnterpriseCertificationStatusText },
- },
+ columnsRenderProps: {},
}
);
-function openDialog(row?: API.FlexEnterpriseDto) {
+function openDialog(row?: API.GetEnterprisesQueryResultItem) {
if (row) {
handleEdit({
id: row.id,
- enterpriseConfigureType: EnterpriseConfigureType.Bank,
- flexEnterpirseId: row.id,
- openBank: row.flexEnterpriseBankDto?.openBank,
- openBranchBank: row.flexEnterpriseBankDto?.openBranchBank,
- bankAccount: row.flexEnterpriseBankDto?.bankAccount,
- verifyStatus: row.flexEnterpriseBankDto?.verifyStatus,
- signChannel: row.enterpriseSignSettingDto?.signChannel,
- chargeType: row.enterpriseSignSettingDto?.chargeType,
- realVerifyCost: row.enterpriseSignSettingDto?.realVerifyCost ?? 0,
- signCost: row.enterpriseSignSettingDto?.signCost ?? 0,
- mergeSignCost: row.enterpriseSignSettingDto?.mergeSignCost ?? 0,
- messageCost: row.flexEnterpriseMessageSettingDto?.messageCost ?? 0,
- messageChannel: row.flexEnterpriseMessageSettingDto?.messageChannel,
});
} else {
- handleAdd({
- enterpriseConfigureType: EnterpriseConfigureType.Bank,
- });
+ handleAdd();
}
}
@@ -180,28 +157,15 @@
onConfirm: handleAddOrEdit,
defaultFormParams: {
id: '',
- flexEnterpirseId: '',
- enterpriseConfigureType: '' as any as EnterpriseConfigureType,
- openBank: '',
- openBranchBank: '',
- bankAccount: '',
- verifyStatus: '' as any as VerifyStatus,
- signChannel: '' as any as SignChannelEnum,
- chargeType: '' as any as ChargeTypeEnum,
- realVerifyCost: 0,
- signCost: 0,
- mergeSignCost: 0,
- messageCost: 0,
- messageChannel: '' as any as MessageChannelEnum,
},
});
async function handleAddOrEdit(type: EnterpriseConfigureType) {
try {
let res;
- if (type === EnterpriseConfigureType.Bank) {
- res = await createOrEditFlexEnterpriseBankSetting();
- }
+ // if (type === EnterpriseConfigureType.Bank) {
+ // res = await createOrEditFlexEnterpriseBankSetting();
+ // }
if (type === EnterpriseConfigureType.Electronic) {
res = await createOrEditFlexEnterpriseSignSetting();
}
@@ -216,66 +180,40 @@
} catch (error) {}
}
-async function createOrEditFlexEnterpriseBankSetting() {
- try {
- let params: API.CreateOrEditFlexEnterpriseBankInput = {
- id: editForm.id,
- openBank: editForm.openBank,
- openBranchBank: editForm.openBranchBank,
- bankAccount: editForm.bankAccount,
- verifyStatus: editForm.verifyStatus,
- flexEnterpirseId: editForm.flexEnterpirseId,
- };
- return await flexEnterpriseServices.createOrEditFlexEnterpriseBankSetting(params);
- } catch (error) {}
-}
+// async function createOrEditFlexEnterpriseBankSetting() {
+// try {
+// let params: API.CreateOrEditFlexEnterpriseBankInput = {
+// id: editForm.id,
+// openBank: editForm.openBank,
+// openBranchBank: editForm.openBranchBank,
+// bankAccount: editForm.bankAccount,
+// verifyStatus: editForm.verifyStatus,
+// flexEnterpirseId: editForm.flexEnterpirseId,
+// };
+// return await flexEnterpriseServices.createOrEditFlexEnterpriseBankSetting(params);
+// } catch (error) {}
+// }
async function createOrEditFlexEnterpriseSignSetting() {
try {
- let params: API.CreateOrEditFlexEnterpriseSignSettingInput = {
+ let params: API.SetEnterpriseElectronSignSettingCommand = {
id: editForm.id,
- flexEnterpirseId: editForm.flexEnterpirseId,
- signChannel: editForm.signChannel,
- chargeType: editForm.chargeType,
- realVerifyCost: editForm.realVerifyCost,
- signCost: editForm.signCost,
- mergeSignCost: editForm.mergeSignCost,
};
- return await flexEnterpriseServices.createOrEditFlexEnterpriseSignSetting(params);
+ return await enterpriseServices.setEnterpriseElectronSignSetting(params);
} catch (error) {}
}
async function createOrEditFlexEnterpriseMessageSetting() {
try {
- let params: API.CreateOrEditFlexEnterpriseMessageSettingInput = {
+ let params: API.SetEnterpriseSmsSettingCommand = {
id: editForm.id,
- flexEnterpirseId: editForm.flexEnterpirseId,
- messageChannel: editForm.messageChannel,
- messageCost: editForm.messageCost,
};
- return await flexEnterpriseServices.createOrEditFlexEnterpriseMessageSetting(params);
+ return await enterpriseServices.setEnterpriseSmsSetting(params);
} catch (error) {}
}
-async function handleSetStatus(row: API.FlexEnterpriseDto) {
- try {
- let params: API.SetFlexEnterpriseStatusInput = {
- id: row.id,
- status:
- row.status === FlexEnterpriseStatus.Frozen
- ? FlexEnterpriseStatus.Normal
- : FlexEnterpriseStatus.Frozen,
- };
- let res = await flexEnterpriseServices.setFlexEnterpriseStatus(params);
- if (res) {
- Message.successMessage('鎿嶄綔鎴愬姛');
- getList(paginationState.pageIndex);
- }
- } catch (error) {}
-}
-
-function addOrEditEnterprise(row?: API.FlexEnterpriseDto) {
+function addOrEditEnterprise(row?: API.GetEnterprisesQueryResultItem) {
router.push({ name: 'AddOrEditEnterprise', params: { id: row?.id ?? '' } });
}
-function handleDetail(row: API.FlexEnterpriseDto) {
+function handleDetail(row: API.GetEnterprisesQueryResultItem) {
router.push({ name: 'EnterpriseDetail', params: { id: row?.id ?? '' } });
}
</script>
diff --git a/src/views/EnterpriseManage/components/AddOrEditEnterpriseView.vue b/src/views/EnterpriseManage/components/AddOrEditEnterpriseView.vue
index 84c2d09..1a0be06 100644
--- a/src/views/EnterpriseManage/components/AddOrEditEnterpriseView.vue
+++ b/src/views/EnterpriseManage/components/AddOrEditEnterpriseView.vue
@@ -20,9 +20,9 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="娉曚汉濮撳悕:" prop="legalPersonName">
+ <ProFormItemV2 label="娉曚汉濮撳悕:" prop="legalPerson">
<ProFormText
- v-model.trim="form.legalPersonName"
+ v-model.trim="form.legalPerson"
:maxlength="30"
placeholder="璇疯緭鍏ユ硶浜哄鍚�"
/>
@@ -31,9 +31,9 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="娉曚汉韬唤璇佸彿:" prop="legalPersonIdNumber">
+ <ProFormItemV2 label="娉曚汉韬唤璇佸彿:" prop="legalIdentity">
<ProFormText
- v-model.trim="form.legalPersonIdNumber"
+ v-model.trim="form.legalIdentity"
:maxlength="30"
placeholder="璇疯緭鍏ユ硶浜鸿韩浠借瘉鍙�"
/>
@@ -56,9 +56,9 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="鎵�鍦ㄧ渷浠�:" prop="proviceName">
+ <ProFormItemV2 label="鎵�鍦ㄧ渷浠�:" prop="proviceId">
<ProFormText
- v-model.trim="form.proviceName"
+ v-model.trim="form.proviceId"
:maxlength="30"
placeholder="璇疯緭鍏ユ墍鍦ㄧ渷浠�"
/>
@@ -67,23 +67,23 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="鎵�灞炶涓�:" prop="belongIndustryType">
+ <ProFormItemV2 label="鎵�灞炶涓�:" prop="industryTypeId">
<ProFormSelect
+ v-model="form.industryTypeId"
placeholder="璇烽�夋嫨鎵�灞炶涓�"
:value-enum="typeList"
enum-value-key="id"
enum-label-key="name"
clearable
- v-model="form.belongIndustryType"
></ProFormSelect>
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="鎵�鍦ㄥ煄甯�:" prop="cityName">
+ <ProFormItemV2 label="鎵�鍦ㄥ煄甯�:" prop="cityId">
<ProFormText
- v-model.trim="form.cityName"
+ v-model.trim="form.cityId"
:maxlength="30"
placeholder="璇疯緭鍏ユ墍鍦ㄥ煄甯�"
/>
@@ -92,9 +92,9 @@
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="24">
- <ProFormItemV2 label="涓昏惀涓氬姟:" prop="cityName">
+ <ProFormItemV2 label="涓昏惀涓氬姟:" prop="mainBusiness">
<ProFormTextArea
- v-model="form.cityName"
+ v-model="form.mainBusiness"
maxlength="200"
:rows="6"
show-word-limit
@@ -117,11 +117,11 @@
<ProFormColItem :span="12">
<ProFormItemV2
label="鑱旂郴浜�:"
- prop="contact"
+ prop="contacts"
:check-rules="[{ message: '璇疯緭鍏ヨ仈绯讳汉' }]"
>
<ProFormText
- v-model.trim="form.contact"
+ v-model.trim="form.contacts"
:maxlength="30"
placeholder="璇疯緭鍏ヨ仈绯讳汉"
/>
@@ -132,18 +132,18 @@
<ProFormColItem :span="12">
<ProFormItemV2
label="鑱旂郴鐢佃瘽:"
- prop="contactPhone"
+ prop="contactPhoneNumber"
:check-rules="[{ message: '璇疯緭鍏ヨ仈绯荤數璇�', type: 'phone' }]"
>
- <ProFormText v-model.trim="form.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ <ProFormText v-model.trim="form.contactPhoneNumber" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="閭:" prop="email">
+ <ProFormItemV2 label="閭:" prop="contactEmail">
<ProFormText
- v-model.trim="form.email"
+ v-model.trim="form.contactEmail"
:maxlength="30"
placeholder="璇疯緭鍏ラ偖绠�"
:formatter="filterCN"
@@ -165,10 +165,14 @@
<ProFormColItem :span="12">
<ProFormItemV2
label="璐﹀彿:"
- prop="contact"
+ prop="userName"
:check-rules="[{ message: '璇疯緭鍏ヨ处鍙�' }]"
>
- <ProFormText v-model.trim="form.contact" :maxlength="30" placeholder="璇疯緭鍏ヨ处鍙�" />
+ <ProFormText
+ v-model.trim="form.userName"
+ :maxlength="30"
+ placeholder="璇疯緭鍏ヨ处鍙�"
+ />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
@@ -195,7 +199,7 @@
ProFormColItem,
} from '@bole-core/components';
import { FormRules, FormInstance } from 'element-plus';
-import { SearchType } from '@/constants';
+import * as enterpriseServices from '@/services/api/enterprise';
import { useRouteView, useGlobalEventContext, GlobalEvent } from '@/hooks';
import _ from 'lodash';
import { validateFormList, filterCN } from '@/utils';
@@ -229,29 +233,31 @@
const form = reactive({
id: '',
enterpriseName: '',
- legalPersonName: '',
- legalPersonIdNumber: '',
+ legalPerson: '',
+ legalIdentity: '',
societyCreditCode: '',
- proviceName: '',
- cityName: '',
- belongIndustryType: '',
- contact: '',
- contactPhone: '',
- email: '',
+ industryTypeId: '',
+ mainBusiness: '',
+ proviceId: '',
+ cityId: '',
+ contacts: '',
+ contactPhoneNumber: '',
+ contactEmail: '',
+ userName: '',
});
onMounted(async () => {});
const { isLoading } = useQuery({
- // queryKey: ['insureSupplierService/getInsureSupplierInfoById', props.id],
- // queryFn: async () => {
- // return await insureSupplierService.getInsureSupplierInfoById(
- // { id: props.id },
- // {
- // showLoading: false,
- // }
- // );
- // },
+ queryKey: ['enterpriseServices/getEnterprise', props.id],
+ queryFn: async () => {
+ return await enterpriseServices.getEnterprise(
+ { id: props.id },
+ {
+ showLoading: false,
+ }
+ );
+ },
onSuccess(data) {},
enabled: computed(() => !!props.id),
});
@@ -275,22 +281,24 @@
async function handleCreateOrEditFlexEnterprise() {
try {
- let params: API.CreateOrEditFlexEnterpriseInput = {
+ let params: API.SaveEnterpriseCommand = {
enterpriseName: form.enterpriseName,
- legalPersonName: form.legalPersonName,
- legalPersonIdNumber: form.legalPersonIdNumber,
+ legalPerson: form.legalPerson,
+ legalIdentity: form.legalIdentity,
societyCreditCode: form.societyCreditCode,
- proviceName: form.proviceName,
- cityName: form.cityName,
- belongIndustryType: form.belongIndustryType,
- contact: form.contact,
- contactPhone: form.contactPhone,
- // email: form.email,
+ provinceId: form.proviceId,
+ cityId: form.cityId,
+ industryTypeId: form.industryTypeId,
+ mainBusiness: form.mainBusiness,
+ contacts: form.contacts,
+ contactPhoneNumber: form.contactPhoneNumber,
+ contactEmail: form.contactEmail,
+ userName: form.userName,
};
if (isEdit.value) {
params.id = props.id;
}
- let res = await flexEnterpriseServices.createOrEditFlexEnterprise(params);
+ let res = await enterpriseServices.saveEnterprise(params);
if (res) {
Message.successMessage(isEdit ? '缂栬緫鎴愬姛' : '鍙戝竷鎴愬姛');
eventContext.emit(isEdit ? 'enterprise:edit' : 'enterprise:add');
diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue
index 0224cb3..0870606 100644
--- a/src/views/EnterpriseManage/components/ConfigureDialog.vue
+++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue
@@ -149,7 +149,6 @@
SignChannelEnum,
SignChannelEnumText,
VerifyStatusText,
- VerifyStatusColor,
VerifyStatus,
MessageChannelEnum,
MessageChannelEnumText,
diff --git a/src/views/TaskManage/components/SignDetailView.vue b/src/views/TaskManage/components/SignDetailView.vue
new file mode 100644
index 0000000..ccbb659
--- /dev/null
+++ b/src/views/TaskManage/components/SignDetailView.vue
@@ -0,0 +1,13 @@
+<template>
+ <div>SignDetailView</div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+ name: 'SignDetailView',
+});
+</script>
+
+<style lang="scss" scoped>
+@use '@/style/common.scss' as *;
+</style>
diff --git a/src/views/TaskManage/components/TaskDetailView.vue b/src/views/TaskManage/components/TaskDetailView.vue
index fe82639..02f366f 100644
--- a/src/views/TaskManage/components/TaskDetailView.vue
+++ b/src/views/TaskManage/components/TaskDetailView.vue
@@ -6,31 +6,13 @@
<ProFormCol>
<ProFormColItem :span="12">
<ProFormItemV2 label="浠诲姟鍚嶇О:" prop="name">
- <ProFormText v-model.trim="detail.name" />
+ <ProFormText v-model.trim="detail?.name" />
</ProFormItemV2>
</ProFormColItem>
</ProFormCol>
<ProFormCol>
<ProFormColItem :span="12">
- <ProFormItemV2 label="浠诲姟鍚嶇О:" prop="name">
- <RadioWithExtra
- v-model="detail"
- :value-enum="TrainSalaryTypeTextList"
- enumLabelKey="text"
- enum-value-key="value"
- :showExtra="state.consultForm.salaryType === ConsultSalaryType.Input"
- >
- <template #extra>
- <ProFormInputNumber
- :controls="false"
- :min="0"
- :max="999"
- v-model="state.consultForm.startMonthlySalary"
- placeholder="璇疯緭鍏�"
- ></ProFormInputNumber>
- </template>
- </RadioWithExtra>
- </ProFormItemV2>
+ <ProFormItemV2 label="浠诲姟鍚嶇О:" prop="name"> </ProFormItemV2>
</ProFormColItem>
</ProFormCol>
</ProForm>
@@ -65,7 +47,7 @@
// queryFn: async () => {
// return await customerServices.getParkCustomerManageBaseDetail({ id: id });
// },
- placeholderData: () => ({} as API.GetUserClientForBackOutput),
+ placeholderData: () => ({}),
// enabled: !!id,
});
</script>
--
Gitblit v1.9.1