From 8801557b82facd8c7a8d5fb2ec8a3ace8bc557ca Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 13 十月 2025 15:06:21 +0800 Subject: [PATCH] fix: s --- src/utils/common/file.ts | 4 src/components/Form/ProFormPaginationSelect.vue | 31 +++ src/services/api/typings.d.ts | 227 +++++++++++++++++++++++++ src/components/Form/FieldPaginationSelect.vue | 32 +++ src/views/EnterpriseManage/components/WechatConfigureView.vue | 65 +++---- src/views/EnterpriseManage/components/WeChatPayWalletBanksSelect.vue | 65 +++++++ src/services/api/enterpriseWallet.ts | 92 ++++++++++ 7 files changed, 478 insertions(+), 38 deletions(-) diff --git a/src/components/Form/FieldPaginationSelect.vue b/src/components/Form/FieldPaginationSelect.vue new file mode 100644 index 0000000..2703ade --- /dev/null +++ b/src/components/Form/FieldPaginationSelect.vue @@ -0,0 +1,32 @@ +<template> + <div> + <el-select v-model="modelValue" v-bind="{ ...$attrs }"> + <el-option + v-for="item in proTableProps.tableData" + :key="item.bank_alias" + :label="item.bank_alias" + :value="item.bank_alias" + > + </el-option> + <template #footer> + <ProPagination v-bind="proTableProps" layout="total, prev, pager, next"></ProPagination> + </template> + </el-select> + </div> +</template> + +<script setup lang="ts"> +import { ProPagination } from '@bole-core/components'; + +defineOptions({ + name: 'FieldPaginationSelect', +}); + +type Props = { + proTableProps: any; +}; + +const props = withDefaults(defineProps<Props>(), {}); + +const modelValue = defineModel<string>(); +</script> diff --git a/src/components/Form/ProFormPaginationSelect.vue b/src/components/Form/ProFormPaginationSelect.vue new file mode 100644 index 0000000..5e124de --- /dev/null +++ b/src/components/Form/ProFormPaginationSelect.vue @@ -0,0 +1,31 @@ +<template> + <ProFieldCustom> + <FieldPaginationSelect + v-model="modelValue" + :proTableProps="proTableProps" + v-bind="{ ...$attrs }" + /> + </ProFieldCustom> +</template> + +<script setup lang="ts"> +import { ProFieldCustom } from '@bole-core/components'; +import FieldPaginationSelect from './FieldPaginationSelect.vue'; + +defineOptions({ + name: 'ProFormPaginationSelect', +}); + +type Props = { + proTableProps: any; +}; + +const props = withDefaults(defineProps<Props>(), {}); +console.log('props: ', props); + +const modelValue = defineModel<string>(); +</script> + +<style lang="scss" scoped> +@use '@/style/common.scss' as *; +</style> diff --git a/src/services/api/enterpriseWallet.ts b/src/services/api/enterpriseWallet.ts index fc99708..6679ddd 100644 --- a/src/services/api/enterpriseWallet.ts +++ b/src/services/api/enterpriseWallet.ts @@ -313,6 +313,98 @@ ); } +/** 鏌ヨ浼佷笟寰俊閽卞寘鍦板尯 GET /api/user/enterpriseWallet/getEnterpriseWeChatPayWalletAreas */ +export async function getEnterpriseWeChatPayWalletAreas( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseWeChatPayWalletAreasParams, + options?: API.RequestConfig +) { + return request<API.WeChatPayArea[]>( + '/api/user/enterpriseWallet/getEnterpriseWeChatPayWalletAreas', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + +/** 鏌ヨ浼佷笟寰俊鏀粯閽卞寘鏀鍒嗛〉鍒楄〃 POST /api/user/enterpriseWallet/getEnterpriseWeChatPayWalletBankBranches */ +export async function getEnterpriseWeChatPayWalletBankBranches( + body: API.GetEnterpriseWeChatPayWalletBankBranchesQuery, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseWeChatPayWalletBankBranchesQueryResult>( + '/api/user/enterpriseWallet/getEnterpriseWeChatPayWalletBankBranches', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} + +/** 鏌ヨ浼佷笟寰俊鏀粯閽卞寘閾惰鍩庡競鍒楄〃 GET /api/user/enterpriseWallet/getEnterpriseWeChatPayWalletBankCities */ +export async function getEnterpriseWeChatPayWalletBankCities( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseWeChatPayWalletBankCitiesParams, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseWeChatPayWalletBankCitiesQueryItem[]>( + '/api/user/enterpriseWallet/getEnterpriseWeChatPayWalletBankCities', + { + method: 'GET', + params: { + ...params, + }, + ...(options || {}), + } + ); +} + +/** 鏌ヨ浼佷笟寰俊鏀粯閽卞寘閾惰鐪佷唤鍒楄〃 GET /api/user/enterpriseWallet/getEnterpriseWeChatPayWalletBankProvinces */ +export async function getEnterpriseWeChatPayWalletBankProvinces( + // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) + params: API.APIgetEnterpriseWeChatPayWalletBankProvincesParams, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseWeChatPayWalletBankProvincesQueryItem[]>( + '/api/user/enterpriseWallet/getEnterpriseWeChatPayWalletBankProvinces', + { + method: 'GET', + params: { + ...params, + request: undefined, + ...params['request'], + }, + ...(options || {}), + } + ); +} + +/** 鏌ヨ浼佷笟寰俊鏀粯閽卞寘閾惰鍒嗛〉鍒楄〃 POST /api/user/enterpriseWallet/getEnterpriseWeChatPayWalletBanks */ +export async function getEnterpriseWeChatPayWalletBanks( + body: API.GetEnterpriseWeChatPayWalletBanksQuery, + options?: API.RequestConfig +) { + return request<API.GetEnterpriseWeChatPayWalletBanksQueryResult>( + '/api/user/enterpriseWallet/getEnterpriseWeChatPayWalletBanks', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json-patch+json', + }, + data: body, + ...(options || {}), + } + ); +} + /** 寮�閫氫紒涓氶挶鍖� POST /api/user/enterpriseWallet/openEnterpriseWallet */ export async function openEnterpriseWallet( body: API.OpenEnterpriseWalletCommand, diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts index 0b652b8..8592e33 100644 --- a/src/services/api/typings.d.ts +++ b/src/services/api/typings.d.ts @@ -134,6 +134,21 @@ id?: string; } + interface APIgetEnterpriseWeChatPayWalletAreasParams { + /** 鏈�澶ф繁搴� */ + maxDeep?: number; + } + + interface APIgetEnterpriseWeChatPayWalletBankCitiesParams { + /** 鐪佷唤缂栫爜锛屽敮涓�鏍囪瘑涓�涓渷浠斤紝鐢ㄤ簬鏌ヨ璇ョ渷浠戒笅鐨勫煄甯傚垪琛� */ + provinceCode: number; + } + + interface APIgetEnterpriseWeChatPayWalletBankProvincesParams { + /** 鏌ヨ浼佷笟寰俊鏀粯閽卞寘閾惰鐪佷唤鍒楄〃 */ + request?: GetEnterpriseWeChatPayWalletBankProvincesQuery; + } + interface APIgetEnterpriseWeChatPayWalletParams { /** 浼佷笟Id */ enterpriseId?: string; @@ -1675,6 +1690,42 @@ timestamp?: number; } + interface FriendlyResultGetEnterpriseWeChatPayWalletBankBranchesQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetEnterpriseWeChatPayWalletBankBranchesQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultGetEnterpriseWeChatPayWalletBanksQueryResult { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + data?: GetEnterpriseWeChatPayWalletBanksQueryResult; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultGetEnterpriseWeChatPayWalletQueryResult { /** 璺熻釜Id */ traceId?: string; @@ -2526,6 +2577,44 @@ timestamp?: number; } + interface FriendlyResultListGetEnterpriseWeChatPayWalletBankCitiesQueryItem { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + /** 鏁版嵁 */ + data?: GetEnterpriseWeChatPayWalletBankCitiesQueryItem[]; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultListGetEnterpriseWeChatPayWalletBankProvincesQueryItem { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + /** 鏁版嵁 */ + data?: GetEnterpriseWeChatPayWalletBankProvincesQueryItem[]; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + interface FriendlyResultListGetMenusQueryResultItem { /** 璺熻釜Id */ traceId?: string; @@ -2725,6 +2814,25 @@ errorCode?: string; /** 鏁版嵁 */ data?: SelectOptionStringGetDictionaryDataSelectQueryResultOption[]; + /** 鎵ц鎴愬姛 */ + success?: boolean; + /** 閿欒淇℃伅 */ + msg?: any; + /** 闄勫姞鏁版嵁 */ + extras?: any; + /** 鏃堕棿鎴� */ + timestamp?: number; + } + + interface FriendlyResultListWeChatPayArea { + /** 璺熻釜Id */ + traceId?: string; + /** 鐘舵�佺爜 */ + code?: number; + /** 閿欒鐮� */ + errorCode?: string; + /** 鏁版嵁 */ + data?: WeChatPayArea[]; /** 鎵ц鎴愬姛 */ success?: boolean; /** 閿欒淇℃伅 */ @@ -3968,9 +4076,73 @@ transactionStatus?: EnumWalletTransactionStatus; } + interface GetEnterpriseWeChatPayWalletBankBranchesQuery { + /** 閾惰鍒悕缂栫爜 +閾惰鍒悕鐨勭紪鐮侊紝鏌ヨ鏀鎺ュ彛浠呮敮鎸侀渶瑕佸~鍐欐敮琛岀殑閾惰鍒悕缂栫爜 */ + bank_alias_code: string; + /** 鍩庡競缂栫爜锛屽敮涓�鏍囪瘑涓�搴у煄甯傦紝鐢ㄤ簬缁撳悎閾惰鍒悕缂栫爜鏌ヨ鏀鍒楄〃 */ + city_code: number; + pageModel?: PagedListQueryPageModel; + } + + interface GetEnterpriseWeChatPayWalletBankBranchesQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetEnterpriseWeChatPayWalletBankBranchesQueryResultItem[]; + } + + interface GetEnterpriseWeChatPayWalletBankBranchesQueryResultItem { + /** 寮�鎴烽摱琛屾敮琛屽悕绉帮紝鐢ㄤ簬寮�鎴烽摱琛屼负鍏朵粬閾惰鐨勬儏鍐典笅锛屽湪鍏ラ┗銆佷慨鏀圭粨绠楅摱琛屽崱銆佷紒涓氫粯娆剧瓑鍦烘櫙涓嬪~鍐欑粨绠楅摱琛屽崱淇℃伅 */ + bank_branch_name: string; + /** 寮�鎴烽摱琛屾敮琛岀殑鑱旇鍙凤紝鐢ㄤ簬寮�鎴烽摱琛屼负鍏朵粬閾惰鐨勬儏鍐典笅锛屽湪鍏ラ┗銆佷慨鏀圭粨绠楅摱琛屽崱銆佷紒涓氫粯娆剧瓑鍦烘櫙涓嬪~鍐欑粨绠楅摱琛屽崱淇℃伅 */ + bank_branch_id: string; + } + + interface GetEnterpriseWeChatPayWalletBankCitiesQueryItem { + /** 鍩庡競鍚嶇О锛屽繀濉� */ + city_name: string; + /** 鍩庡競缂栫爜锛屽敮涓�鏍囪瘑涓�搴у煄甯傦紝鐢ㄤ簬缁撳悎閾惰鍒悕缂栫爜鏌ヨ鏀鍒楄〃锛屽繀濉� */ + city_code: number; + } + + type GetEnterpriseWeChatPayWalletBankProvincesQuery = Record<string, any>; + + interface GetEnterpriseWeChatPayWalletBankProvincesQueryItem { + /** 鐪佷唤鍚嶇О锛屽繀濉� */ + province_name: string; + /** 鐪佷唤缂栫爜锛屽敮涓�鏍囪瘑涓�涓渷浠斤紝鐢ㄤ簬鏌ヨ璇ョ渷浠戒笅鐨勫煄甯傚垪琛紝蹇呭~ */ + province_code: number; + } + + interface GetEnterpriseWeChatPayWalletBanksQuery { + bank_account_type: EnumWeChatPayApplymentBankAccountType; + pageModel?: PagedListQueryPageModel; + } + + interface GetEnterpriseWeChatPayWalletBanksQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetEnterpriseWeChatPayWalletBanksQueryResultItem[]; + } + + interface GetEnterpriseWeChatPayWalletBanksQueryResultItem { + /** 閾惰鍒悕锛岀敤浜庡湪鍓嶇灞曠ず鍏ㄩ噺閾惰鍚嶇О渚涚敤鎴烽�夋嫨锛屽宸ュ晢閾惰銆佹繁鍦冲墠娴峰井浼楅摱琛岀瓑鍏辫4000澶氬閾惰鐨勫埆鍚嶅悕绉� */ + bankAlias?: string; + /** 閾惰鍒悕缂栫爜锛岀敤浜庡湪鏌ヨ鏀鍒楄〃鎺ュ彛妫�绱㈣幏鍙栨敮琛屽垪琛紙浠呭紑鎴烽摱琛屼负鍏朵粬閾惰鏃堕渶瑕佹煡璇㈡敮琛岋級 */ + bankAliasCode?: string; + /** 寮�鎴烽摱琛屽悕绉帮紝鐢ㄤ簬鍦ㄥ叆椹汇�佷慨鏀圭粨绠楅摱琛屽崱銆佷紒涓氫粯娆剧瓑鍦烘櫙涓~鍐欐墍鐢ㄩ摱琛屽崱瀵瑰簲鐨勫紑鎴烽摱琛岋紝鍏朵腑闈炵洿杩為摱琛岀粺涓�涓哄叾浠栭摱琛� */ + accountBank?: string; + /** 寮�鎴烽摱琛岀紪鐮侊紝鐢ㄤ簬鍦ㄥ叆椹汇�佷慨鏀圭粨绠楅摱琛屽崱銆佷紒涓氫粯娆剧瓑鍦烘櫙涓~鍐欐墍鐢ㄩ摱琛屽崱瀵瑰簲鐨勫紑鎴烽摱琛岋紝鍏朵腑闈炵洿杩為摱琛岀粺涓�涓� 1099 */ + accountBankCode?: number; + /** 鏄惁闇�瑕佸~鍐欐敮琛岋紝璇ュ紑鎴烽摱琛屾槸鍚﹂渶瑕佷紶鍏ュ搴旂殑鏀锛岄渶瑕佽浣跨敤閾惰鍒悕缂栫爜鍜屽煄甯傜紪鐮佹煡璇㈤�夋嫨鍏蜂綋鐨勬敮琛屽苟浼犲叆锛堥粯璁ゅ�间负true锛� +濡傞渶鏌ヨ鍩庡競缂栫爜锛岄渶瑕侀�氳繃鏌ヨ鍩庡競鍒楄〃鎺ュ彛鑾峰彇鐩稿簲鐨勫煄甯傜紪鐮佷俊鎭� */ + needBankBranch?: boolean; + } + interface GetEnterpriseWeChatPayWalletQueryResult { /** 閽卞寘Id */ id?: string; + bank_account_info: GetEnterpriseWeChatPayWalletQueryResultBankAccountInfo; /** 瓒呯骇绠$悊鍛樼绾﹂摼鎺� 1銆佽秴绾х鐞嗗憳鐢ㄥ井淇℃壂鐮侊紝鍏虫敞鈥滃井淇℃敮浠樺晢瀹跺姪鎵嬧�濆叕浼楀彿鍚庯紝鍏紬鍙峰皢鑷姩鍙戦�佺绾︽秷鎭紱瓒呯闇�鐐瑰嚮娑堟伅锛屾牴鎹寚寮曞畬鎴愭牳瀵硅仈绯讳俊鎭�佽处鎴烽獙璇併�佺绾︾瓑鎿嶄綔锛� 2銆佽秴绠″畬鎴愭牳瀵硅仈绯讳俊鎭紝鍚庣画鐢宠鍗曡繘搴﹀彲閫氳繃鍏紬鍙疯嚜鍔ㄩ�氱煡瓒呯骇绠$悊鍛� */ @@ -3991,8 +4163,42 @@ subject_info: WeChatPayApplymentBodyParametersSubjectInfo; business_info: WeChatPayApplymentBodyParametersBusinessInfo; settlement_info: WeChatPayApplymentBodyParametersSettlementInfo; - bank_account_info: WeChatPayApplymentBodyParametersBankAccountInfo; addition_info?: WeChatPayApplymentBodyParametersAdditionInfo; + } + + interface GetEnterpriseWeChatPayWalletQueryResultBankAccountInfo { + /** 閾惰鍒悕缂栫爜 +閾惰鍒悕鐨勭紪鐮侊紝鏌ヨ鏀鎺ュ彛浠呮敮鎸侀渶瑕佸~鍐欐敮琛岀殑閾惰鍒悕缂栫爜 */ + bank_alias_code?: string; + /** 鍩庡競缂栫爜锛屽敮涓�鏍囪瘑涓�搴у煄甯傦紝鐢ㄤ簬缁撳悎閾惰鍒悕缂栫爜鏌ヨ鏀鍒楄〃 */ + city_code?: number; + bank_account_type: EnumWeChatPayApplymentBankAccountType; + /** 寮�鎴峰悕绉� +1銆侀�夋嫨鈥滅粡钀ヨ�呬釜浜洪摱琛屽崱鈥濇椂锛屽紑鎴峰悕绉板繀椤讳笌鈥滅粡钀ヨ�呰瘉浠跺鍚嶁�濅竴鑷达紱 +2銆侀�夋嫨鈥滃鍏摱琛岃处鎴封�濇椂锛屽紑鎴峰悕绉板繀椤讳笌钀ヤ笟鎵х収涓婄殑鈥滃晢鎴峰悕绉扳�濅竴鑷达紱 +3銆佽瀛楁闇�瑕佷娇鐢ㄥ井淇℃敮浠樺叕閽ュ姞瀵嗭紙鎺ㄨ崘锛夛紝璇峰弬鑰冭幏鍙栧井淇℃敮浠樺叕閽D璇存槑浠ュ強寰俊鏀粯鍏挜鍔犲瘑鏁忔劅淇℃伅鎸囧紩锛屼篃鍙互浣跨敤寰俊鏀粯骞冲彴璇佷功鍏挜鍔犲瘑锛屽弬鑰冭幏鍙栧钩鍙拌瘉涔﹀簭鍒楀彿銆佸钩鍙拌瘉涔﹀姞瀵嗘晱鎰熶俊鎭寚寮曘�� */ + account_name: string; + /** 寮�鎴烽摱琛� +瀵圭閾惰璋冪敤锛氭煡璇㈡敮鎸佷釜浜轰笟鍔$殑閾惰鍒楄〃API +瀵瑰叕閾惰璋冪敤锛氭煡璇㈡敮鎸佸鍏笟鍔$殑閾惰鍒楄〃API */ + account_bank: string; + /** 寮�鎴烽摱琛岀渷甯傜紪鐮� +璇ュ瓧娈靛嵆灏嗕笅绾垮鐞嗭紝鏃犻渶浼犲叆 +鑷冲皯绮剧‘鍒板競,璇︾粏鍙傝鐪佸競鍖虹紪鍙峰鐓ц〃 +娉細浠呭綋鐪佸競鍖虹紪鍙峰鐓ц〃涓棤瀵瑰簲鐨勭渷甯傚尯缂栧彿鏃讹紝鍙悜涓婂彇璇ラ摱琛屽搴斿競绾х紪鍙锋垨鐪佺骇缂栧彿銆� */ + bank_address_code?: string; + /** 寮�鎴烽摱琛岄摱琛屽彿 +1銆佹牴鎹紑鎴烽摱琛屾煡璇㈡帴鍙d腑鐨勨�滄槸鍚﹂渶瑕佸~鍐欐敮琛屸�濆垽鏂槸鍚﹂渶瑕佸~鍐欍�傚涓哄叾浠栭摱琛岋紝寮�鎴烽摱琛屽叏绉帮紙鍚敮琛岋級鍜屽紑鎴烽摱琛岃仈琛屽彿浜岄�変竴锛� +2銆佽缁嗛渶璋冪敤鏌ヨ鏀鍒楄〃API鏌ョ湅鏌ヨ缁撴灉銆� */ + bank_branch_id?: string; + /** 寮�鎴烽摱琛屽叏绉帮紙鍚敮琛岋級 +1銆佹牴鎹紑鎴烽摱琛屾煡璇㈡帴鍙d腑鐨勨�滄槸鍚﹂渶瑕佸~鍐欐敮琛屸�濆垽鏂槸鍚﹂渶瑕佸~鍐欍�傚涓哄叾浠栭摱琛岋紝寮�鎴烽摱琛屽叏绉帮紙鍚敮琛岋級鍜屽紑鎴烽摱琛岃仈琛屽彿浜岄�変竴锛� +2銆佽缁嗛渶璋冪敤鏌ヨ鏀鍒楄〃API鏌ョ湅鏌ヨ缁撴灉銆� */ + bank_name?: string; + /** 閾惰璐﹀彿 +1銆佹暟瀛楋紝闀垮害閬靛惊绯荤粺鏀寔鐨勫崱鍙烽暱搴﹁姹傝〃锛� +2銆佽瀛楁闇�瑕佷娇鐢ㄥ井淇℃敮浠樺叕閽ュ姞瀵嗭紙鎺ㄨ崘锛夛紝璇峰弬鑰冭幏鍙栧井淇℃敮浠樺叕閽D璇存槑浠ュ強寰俊鏀粯鍏挜鍔犲瘑鏁忔劅淇℃伅鎸囧紩锛屼篃鍙互浣跨敤寰俊鏀粯骞冲彴璇佷功鍏挜鍔犲瘑锛屽弬鑰冭幏鍙栧钩鍙拌瘉涔﹀簭鍒楀彿銆佸钩鍙拌瘉涔﹀姞瀵嗘晱鎰熶俊鎭寚寮曘�� */ + account_number: string; } interface GetExceptionLogsQuery { @@ -5882,11 +6088,11 @@ 2銆佹湇鍔″晢鑷畾涔夌殑鍞竴缂栧彿锛� 3銆佹瘡涓紪鍙峰搴斾竴涓敵璇峰崟锛屾瘡涓敵璇峰崟瀹℃牳閫氳繃鍚庝細鐢熸垚涓�涓井淇℃敮浠樺晢鎴峰彿銆� */ business_code: string; + bank_account_info: WeChatPayApplymentBodyParametersBankAccountInfo; contact_info: WeChatPayApplymentBodyParametersContactInfo; subject_info: WeChatPayApplymentBodyParametersSubjectInfo; business_info: WeChatPayApplymentBodyParametersBusinessInfo; settlement_info: WeChatPayApplymentBodyParametersSettlementInfo; - bank_account_info: WeChatPayApplymentBodyParametersBankAccountInfo; addition_info?: WeChatPayApplymentBodyParametersAdditionInfo; } @@ -7505,6 +7711,23 @@ ubo_period_end: string; } + interface WeChatPayArea { + /** Id */ + id?: string; + /** 鐪佸競缂栫爜 */ + areaCode?: string; + /** 鍚嶇О */ + areaName?: string; + /** 鍦板尯鍚嶇О */ + fullName?: string; + /** 灞傜骇 */ + leyer?: number; + /** 鐖剁骇鐪佸競缂栫爜 */ + parentCode?: string; + /** 瀛愰泦 */ + children?: WeChatPayArea[]; + } + interface WeChatPayGetApplymentResponseAuditDetail { /** 鎻愪氦鐢宠鍗曠殑璧勬枡椤瑰瓧娈靛悕 */ field: string; diff --git a/src/utils/common/file.ts b/src/utils/common/file.ts index 25cbd9a..a7da7d5 100644 --- a/src/utils/common/file.ts +++ b/src/utils/common/file.ts @@ -25,6 +25,10 @@ return path ? [convertApi2FormUrl(path)] : []; } +export function convertApi2FormUrls(paths: string[]): UploadUserFile[] { + return paths?.length > 0 ? paths.map((x) => convertApi2FormUrl(x)) : []; +} + /** * 鎶妘pload鐨勮矾寰勮浆鎹负涓婁紶鍒癮pi鐨勮矾寰� */ diff --git a/src/views/EnterpriseManage/components/WeChatPayWalletBanksSelect.vue b/src/views/EnterpriseManage/components/WeChatPayWalletBanksSelect.vue new file mode 100644 index 0000000..b0fb08c --- /dev/null +++ b/src/views/EnterpriseManage/components/WeChatPayWalletBanksSelect.vue @@ -0,0 +1,65 @@ +<template> + <ProFormPaginationSelect + v-model="modelValue" + :proTableProps="proTableProps" + @change="handleAccountBankChange" + > + </ProFormPaginationSelect> +</template> + +<script setup lang="ts"> +import { useTable } from '@bole-core/components'; +import * as enterpriseWalletServices from '@/services/api/enterpriseWallet'; + +defineOptions({ + name: 'WeChatPayWalletBanksSelect', +}); + +// type Props = { +// }; + +// const props = withDefaults(defineProps<Props>(), {}); + +const modelValue = defineModel<string>(); + +onMounted(() => { + getList(); +}); + +const { + getDataSource: getList, + proTableProps, + paginationState, + extraParamState, + reset, +} = useTable( + async ({ pageIndex, pageSize }, extraParamState) => { + try { + let params: API.GetEnterpriseWeChatPayWalletBanksQuery = { + pageModel: { + rows: pageSize, + page: pageIndex, + }, + bank_account_type: 0, + }; + + let res = await enterpriseWalletServices.getEnterpriseWeChatPayWalletBanks(params, { + showLoading: true, + }); + return res; + } catch (error) { + console.log('error: ', error); + } + }, + { + defaultExtraParams: { + keywords: '', + }, + queryKey: ['enterpriseWalletServices/getEnterpriseWeChatPayWalletBanks'], + } +); + +function handleAccountBankChange(val: string) { + console.log('val: ', val); +} +</script> diff --git a/src/views/EnterpriseManage/components/WechatConfigureView.vue b/src/views/EnterpriseManage/components/WechatConfigureView.vue index 9c54690..7bd9443 100644 --- a/src/views/EnterpriseManage/components/WechatConfigureView.vue +++ b/src/views/EnterpriseManage/components/WechatConfigureView.vue @@ -889,7 +889,12 @@ prop="account_bank" :checkRules="[{ message: '璇疯緭鍏ュ紑鎴烽摱琛�' }]" > - <ProFormText v-model.trim="form.account_bank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" /> + <!-- <ProFormText v-model.trim="form.account_bank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" /> --> + <WeChatPayWalletBanksSelect + v-model.trim="form.account_bank" + placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" + clearable + /> </ProFormItemV2> <ProFormItemV2 label="寮�鎴烽摱琛岀渷甯傜紪鐮�:" @@ -960,8 +965,15 @@ EnumWeChatPayApplymentSalesScenesTypeText, EnumWeChatPayApplymentBankAccountTypeText, } from '@/constants'; -import { convertApi2FormUrl, convertApi2FormUrlOnlyOne, downloadFileByUrl, format } from '@/utils'; +import { + convertApi2FormUrl, + convertApi2FormUrlOnlyOne, + downloadFileByUrl, + format, + convertApi2FormUrls, +} from '@/utils'; import { Message } from '@bole-core/core'; +import WeChatPayWalletBanksSelect from './WeChatPayWalletBanksSelect.vue'; defineOptions({ name: 'WechatConfigureView', @@ -1183,55 +1195,36 @@ form.biz_address_code = data.business_info?.sales_info?.biz_store_info?.biz_address_code; form.biz_store_address = data.business_info?.sales_info?.biz_store_info?.biz_store_address ?? ''; - form.store_entrance_pic = - data.business_info?.sales_info?.biz_store_info?.store_entrance_pic.length > 0 - ? data.business_info?.sales_info?.biz_store_info?.store_entrance_pic.map((x) => - convertApi2FormUrl(x) - ) - : []; - form.indoor_pic = - data.business_info?.sales_info?.biz_store_info?.indoor_pic.length > 0 - ? data.business_info?.sales_info?.biz_store_info?.indoor_pic.map((x) => - convertApi2FormUrl(x) - ) - : []; + form.store_entrance_pic = convertApi2FormUrls( + data.business_info?.sales_info?.biz_store_info?.store_entrance_pic + ); + form.indoor_pic = convertApi2FormUrls( + data.business_info?.sales_info?.biz_store_info?.indoor_pic + ); form.mp_appid = data.business_info?.sales_info?.mp_info?.mp_appid ?? ''; form.mp_sub_appid = data.business_info?.sales_info?.mp_info?.mp_sub_appid ?? ''; - form.mp_pics = - data.business_info?.sales_info?.mp_info?.mp_pics.length > 0 - ? data.business_info?.sales_info?.mp_info?.mp_pics.map((x) => convertApi2FormUrl(x)) - : []; + form.mp_pics = convertApi2FormUrls(data.business_info?.sales_info?.mp_info?.mp_pics); form.mini_program_appid = data.business_info?.sales_info?.mini_program_info?.mini_program_appid ?? ''; form.mini_program_sub_appid = data.business_info?.sales_info?.mini_program_info?.mini_program_sub_appid ?? ''; - form.mini_program_pics = - data.business_info?.sales_info?.mini_program_info?.mini_program_pics.length > 0 - ? data.business_info?.sales_info?.mini_program_info?.mini_program_pics.map((x) => - convertApi2FormUrl(x) - ) - : []; + form.mini_program_pics = convertApi2FormUrls( + data.business_info?.sales_info?.mini_program_info?.mini_program_pics + ); form.app_appid = data.business_info?.sales_info?.app_info?.app_appid ?? ''; form.app_sub_appid = data.business_info?.sales_info?.app_info?.app_sub_appid ?? ''; - form.app_pics = - data.business_info?.sales_info?.app_info?.app_pics.length > 0 - ? data.business_info?.sales_info?.app_info?.app_pics.map((x) => convertApi2FormUrl(x)) - : []; + form.app_pics = convertApi2FormUrls(data.business_info?.sales_info?.app_info?.app_pics); form.domain = data.business_info?.sales_info?.web_info?.domain ?? ''; form.web_authorisation = convertApi2FormUrlOnlyOne( data.business_info?.sales_info?.web_info?.web_authorisation ?? '' ); form.sub_corp_id = data.business_info?.sales_info?.wework_info?.sub_corp_id ?? ''; - form.wework_pics = - data.business_info?.sales_info?.wework_info?.wework_pics.length > 0 - ? data.business_info?.sales_info?.wework_info?.wework_pics.map((x) => convertApi2FormUrl(x)) - : []; + form.wework_pics = convertApi2FormUrls( + data.business_info?.sales_info?.wework_info?.wework_pics + ); form.settlement_id = data.settlement_info?.settlement_id ?? ''; form.qualification_type = data.settlement_info?.qualification_type ?? ''; - form.qualifications = - data.settlement_info?.qualifications?.length > 0 - ? data.settlement_info?.qualifications.map((x) => convertApi2FormUrl(x)) - : []; + form.qualifications = convertApi2FormUrls(data.settlement_info?.qualifications); form.bank_account_type = data.bank_account_info?.bank_account_type; form.account_name = data.bank_account_info?.account_name ?? ''; form.account_bank = data.bank_account_info?.account_bank ?? ''; -- Gitblit v1.9.1