From 432d336da99a47bb0cf6805cf87c4b1e29cd4fa5 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 15 十月 2025 16:32:41 +0800 Subject: [PATCH] fix: s --- src/services/api/index.ts | 2 src/services/api/ElectronSign.ts | 49 +++++- src/services/api/SmsUtils.ts | 39 ++++ src/services/api/typings.d.ts | 284 ++++++++++++++++++++++++++++++++++- src/views/Reward/RewardApplyTradeCheck.vue | 13 + src/views/Reward/components/RewardApplyTradeCheckDialog.vue | 45 ++++- src/views/Reward/FinancialApproval.vue | 13 + 7 files changed, 415 insertions(+), 30 deletions(-) diff --git a/src/services/api/ElectronSign.ts b/src/services/api/ElectronSign.ts index c89e92e..db7da6f 100644 --- a/src/services/api/ElectronSign.ts +++ b/src/services/api/ElectronSign.ts @@ -2,12 +2,24 @@ // @ts-ignore import { request } from '@/utils/request'; +/** 閾惰鍗CR璇嗗埆 POST /api/ElectronSign/BankOcr */ +export async function bankOcr(body: API.BankOcrInput, options?: API.RequestConfig) { + return request<API.BankOcrOutput>('/api/ElectronSign/BankOcr', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(options || {}), + }); +} + /** 鍒涘缓鎴栨洿鏂版ā鏉� POST /api/ElectronSign/CreateOrUpdateContractTemplate */ export async function createOrUpdateContractTemplate( body: API.CreateOrUpdateContractTemplateInput, options?: API.RequestConfig ) { - return request<any>('/api/ElectronSign/CreateOrUpdateContractTemplate', { + return request<string>('/api/ElectronSign/CreateOrUpdateContractTemplate', { method: 'POST', headers: { 'Content-Type': 'application/json', @@ -32,16 +44,17 @@ }); } -/** 鍒犻櫎妯℃澘 POST /api/ElectronSign/DeleteContractTemplate/${param0} */ -export async function deleteContractTemplateId( - // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄) - params: API.APIdeleteContractTemplateIdParams, +/** 鍒犻櫎妯℃澘 POST /api/ElectronSign/DeleteContractTemplate */ +export async function deleteContractTemplate( + body: API.DeleteContractTemplateInput, options?: API.RequestConfig ) { - const { id: param0, ...queryParams } = params; - return request<any>(`/api/ElectronSign/DeleteContractTemplate/${param0}`, { + return request<any>('/api/ElectronSign/DeleteContractTemplate', { method: 'POST', - params: { ...queryParams }, + headers: { + 'Content-Type': 'application/json', + }, + data: body, ...(options || {}), }); } @@ -162,6 +175,24 @@ }); } +/** 鏍规嵁璇佷功璐﹀彿浼佷笟瀹炲悕 POST /api/ElectronSign/RealEnterpriseByCertAccount */ +export async function realEnterpriseByCertAccount( + body: API.RealEnterpriseInputByCertAccountInput, + options?: API.RequestConfig +) { + return request<API.RealEnterpriseInputByCertAccountOutput>( + '/api/ElectronSign/RealEnterpriseByCertAccount', + { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(options || {}), + } + ); +} + /** 涓汉瀹炲悕 POST /api/ElectronSign/RealPersonal */ export async function realPersonal(body: API.RealPersonalInput, options?: API.RequestConfig) { return request<API.RealPersonalOutput>('/api/ElectronSign/RealPersonal', { @@ -176,7 +207,7 @@ /** 娉ㄥ唽鎴栨洿鏂扮敤鎴蜂俊鎭� POST /api/ElectronSign/RegOrUpdateUser */ export async function regOrUpdateUser(body: API.RegOrUpdateUserInput, options?: API.RequestConfig) { - return request<any>('/api/ElectronSign/RegOrUpdateUser', { + return request<string>('/api/ElectronSign/RegOrUpdateUser', { method: 'POST', headers: { 'Content-Type': 'application/json', diff --git a/src/services/api/SmsUtils.ts b/src/services/api/SmsUtils.ts new file mode 100644 index 0000000..a4b4458 --- /dev/null +++ b/src/services/api/SmsUtils.ts @@ -0,0 +1,39 @@ +/* eslint-disable */ +// @ts-ignore +import { request } from '@/utils/request'; + +/** 鏌ヨ鐭俊鏃ュ織 POST /api/SmsUtils/GetSmsLogs */ +export async function getSmsLogs(body: API.GetSmsLogsQuery, options?: API.RequestConfig) { + return request<API.GetSmsLogsQueryResult>('/api/SmsUtils/GetSmsLogs', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(options || {}), + }); +} + +/** 鏌ヨ鐭俊閰嶇疆 POST /api/SmsUtils/GetSmsSetting */ +export async function getSmsSetting(body: API.GetSmsSettingQuery, options?: API.RequestConfig) { + return request<API.GetSmsSettingQueryResult>('/api/SmsUtils/GetSmsSetting', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(options || {}), + }); +} + +/** 淇濆瓨鐭俊閰嶇疆 POST /api/SmsUtils/SaveSmsSetting */ +export async function saveSmsSetting(body: API.SaveSmsSettingCommand, options?: API.RequestConfig) { + return request<string>('/api/SmsUtils/SaveSmsSetting', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: body, + ...(options || {}), + }); +} diff --git a/src/services/api/index.ts b/src/services/api/index.ts index c79d3c6..e267aca 100644 --- a/src/services/api/index.ts +++ b/src/services/api/index.ts @@ -75,6 +75,7 @@ import * as Resource from './Resource'; import * as SearchSetting from './SearchSetting'; import * as Setting from './Setting'; +import * as SmsUtils from './SmsUtils'; import * as Statistics from './Statistics'; import * as SysOrg from './SysOrg'; import * as SystemNotice from './SystemNotice'; @@ -165,6 +166,7 @@ Resource, SearchSetting, Setting, + SmsUtils, Statistics, SysOrg, SystemNotice, diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts index 841e3a9..ef76c8a 100644 --- a/src/services/api/typings.d.ts +++ b/src/services/api/typings.d.ts @@ -99,6 +99,8 @@ fileSize?: number; /** 鏂囦欢鎵╁睍鍚� */ fileExtension?: string; + /** 瀛楀吀鏂囦欢绫诲瀷Id */ + fileSearchTypeId?: string; } interface AddEnterpriseMaterialInput { @@ -113,6 +115,8 @@ remark?: string; /** 鏂囦欢鍒楄〃 */ addEnterpriseMaterialFileList?: AddEnterpriseMaterialFileInput[]; + /** 鏄惁浣跨敤瀛楀吀閰嶇疆鏉愭枡 */ + useCustomMaterial?: boolean; } interface AddFirstPartyCompanyAuditInput { @@ -1033,10 +1037,6 @@ interface APIdeleteConsultParams { id?: string; - } - - interface APIdeleteContractTemplateIdParams { - id: string; } interface APIdeleteCustomerIdParams { @@ -2382,6 +2382,8 @@ canLoginUserSign?: CanLoginUserSignEnum; /** 鏄惁鍙互鐧诲綍姹熶綉淇� */ canLoginJYB?: boolean; + /** 鏄惁鍙互鐧诲綍鐏垫椿鐢ㄥ伐 */ + canLoginFlexJob?: boolean; /** 澶栭儴绯荤粺ID */ externalSystemCodes?: CanLoginUserSignEnum[]; bussinessCode?: string; @@ -2456,6 +2458,16 @@ 鏁版嵁闀垮害锛�3锛屾槸鍚﹀繀杈擄細Y */ size?: string; list?: BankNoQueryItemOutput[]; + } + + interface BankOcrInput { + /** 閾惰鍗″浘鐗嘦RL */ + bankCardImageUrl?: string; + } + + interface BankOcrOutput { + /** 閾惰鍗″彿 */ + bankcardNumber?: string; } interface BaseAuthorizeDto { @@ -2892,7 +2904,7 @@ walletAccountType?: WalletAccountTypeEnum; } - type CanLoginUserSignEnum = 1 | 2 | 3 | -1; + type CanLoginUserSignEnum = 1 | 2 | 3 | 4 | -1; interface CategoryAllDto { /** 绫诲埆Id */ @@ -4963,6 +4975,8 @@ id?: string; /** 瀹㈡埛Id */ customerId: string; + /** 浼佷笟鐢ㄦ埛Id */ + userId?: string; supplier: EnumElectronSignContractSupplier; /** 妯℃澘鍚嶇О */ name: string; @@ -5169,6 +5183,16 @@ /** 娑堣垂绫诲瀷 */ payRemark?: string; access?: ParkBountyTradeAccessEnum; + /** 杩涜处鍗曚綅 */ + incomeCompanyName?: string; + /** 淇濆崟鍙� */ + insureBillNo?: string; + /** 鏀舵鍗曚綅鍚嶇О */ + incomeBankAccount?: string; + /** 鏀舵鍗曚綅璐﹀彿 */ + incomeBankCardNumber?: string; + /** 寮�鎴疯 */ + incomeBankName?: string; } interface CreateParkOrHRAdvertiseInput { @@ -5735,7 +5759,12 @@ refundDealRemark?: string; } - type DecimalDecimalValueTuple = true; + type DecimalDecimalValueTuple = Record<string, any>; + + interface DeleteContractTemplateInput { + /** Id */ + ids?: string[]; + } interface DeleteMonthApplySingleFileInput { monthApplyId?: string; @@ -6022,7 +6051,11 @@ remark?: string; /** 浜т笟鍥尯鍚嶇О */ industrialParkName?: string; + /** 浜т笟鍥尯id */ + industrialParkId?: string; materialItemOutputList?: EnterpriseMaterialItemOutput[]; + /** 鏄惁浣跨敤瀛楀吀閰嶇疆鏉愭枡 */ + useCustomMaterial?: boolean; } type EnterpriseMaterialFileBusinessTypeEnum = @@ -6040,7 +6073,8 @@ | 200 | 210 | 220 - | 999; + | 999 + | 2000; interface EnterpriseMaterialItemOutput { fileBusinessType?: EnterpriseMaterialFileBusinessTypeEnum; @@ -6048,6 +6082,8 @@ fileCount?: number; /** 鏄惁涓婁紶 */ isUploaded?: boolean; + /** 瀛楀吀鏂囦欢绫诲瀷Id */ + fileSearchTypeId?: string; lastModificationTime?: string; materialFileItemList?: MaterialFileItemOutput[]; lastModifierName?: string; @@ -6206,9 +6242,15 @@ type EnumElectronSignUserType = 10 | 20; + type EnumPagedListOrder = 0 | 1; + type EnumParkBountyTradeDetailAuditStatus = 10 | 20 | 30; type EnumParkRewardStatisticsDetailScene = 1 | 2 | 3 | 4 | 5; + + type EnumSmsAccess = 0 | 10 | 20; + + type EnumSmsStatus = 0 | 10 | 20 | 30; interface ExportBountyApplyData { /** 浼佷笟鍚嶇О */ @@ -6217,7 +6259,7 @@ societyCreditCode: string; /** 璐㈡斂鎷ㄤ粯閲戦 */ financeToAmountStr?: string; - /** 骞冲彴鍏呭�奸噾棰� */ + /** 骞冲彴鎷ㄤ粯閲戦 */ transferToAmountStr?: string; /** 璐㈡斂鎷ㄤ粯閲戦 */ financeToAmount?: number; @@ -9090,6 +9132,17 @@ financeAuditFileUrl?: string; /** 瀹℃牳鍑瘉 */ payAuditFileUrl?: string; + /** 杩涜处鍗曚綅 */ + incomeCompanyName?: string; + /** 淇濆崟鍙� */ + insureBillNo?: string; + /** 鏀舵鍗曚綅鍚嶇О */ + incomeBankAccount?: string; + /** 鏀舵鍗曚綅璐﹀彿 */ + incomeBankCardNumber?: string; + /** 寮�鎴疯 */ + incomeBankName?: string; + creationTime?: string; } interface GetParkBountyTradeDetailOutputPageOutput { @@ -9182,6 +9235,10 @@ remianAmount?: number; /** 鍑瘉 */ payFileUrl?: string; + /** 瀹℃牳鍑瘉 */ + payAuditFileUrl?: string; + /** 瀹℃牳鍑瘉 */ + financeAuditFileUrl?: string; payFileUrls?: string[]; financeType?: FinanceTypeEnum; } @@ -9870,6 +9927,94 @@ data?: GetSignRealNameCostListOutput[]; } + interface GetSmsLogsQuery { + pageModel?: PagedListQueryPageModel; + /** 鍒涘缓鏃堕棿-璧峰 */ + createdTimeBegin?: string; + /** 鍒涘缓鏃堕棿-鎴 */ + createdTimeEnd?: string; + /** 鎿嶄綔浜� */ + createdUser?: string; + /** 娓犻亾鎿嶄綔浜� */ + channelCreatedUserIds?: string[]; + /** 璺熻釜Id */ + traceId?: string; + access?: EnumSmsAccess; + /** 鎵嬫満鍙风爜 */ + phoneNumber?: string; + /** 妯℃澘浠g爜 */ + templateCode?: string; + /** 妯℃澘鍙傛暟 */ + templateParam?: string; + /** 鏄惁浣跨敤 */ + isUsed?: boolean; + status?: EnumSmsStatus; + } + + interface GetSmsLogsQueryResult { + pageModel?: PagedListQueryResultPageModel; + /** 鏁版嵁 */ + data?: GetSmsLogsQueryResultItem[]; + } + + interface GetSmsLogsQueryResultItem { + /** Id */ + id?: string; + /** 璺熻釜Id */ + traceId?: string; + access?: EnumSmsAccess; + /** 鎵嬫満鍙风爜 */ + phoneNumber?: string; + /** 妯℃澘浠g爜 */ + templateCode?: string; + /** 妯℃澘鍙傛暟 */ + templateParam?: string; + /** 鏈夋晥鏈� */ + expiry?: string; + /** 鏄惁浣跨敤 */ + isUsed?: boolean; + status?: EnumSmsStatus; + /** 璇锋眰Id */ + requestId?: string; + /** 鍥炰紶浠g爜 */ + code?: string; + /** 鍥炰紶娑堟伅 */ + message?: string; + /** 娓犻亾鍚嶇О */ + channelName?: string; + /** 娓犻亾鎿嶄綔浜� */ + channelCreatedUserId?: string; + /** 鍒涘缓鏃堕棿 */ + createdTime?: string; + } + + type GetSmsSettingQuery = Record<string, any>; + + interface GetSmsSettingQueryResult { + /** 鏄惁绂佺敤 */ + isDisabled?: boolean; + /** 甯﹀嚭鍙傛暟 */ + withoutParams?: boolean; + /** 姣忓垎閽熸渶澶ф暟閲� */ + minutelyMaxCount?: number; + /** 姣忓皬鏃舵渶澶ф暟閲� */ + hourlyMaxCount?: number; + /** 姣忓ぉ鏈�澶ф暟閲� */ + dailyMaxCount?: number; + /** 閫氶亾閰嶇疆 */ + accesses?: GetSmsSettingQueryResultAccess[]; + } + + interface GetSmsSettingQueryResultAccess { + access?: EnumSmsAccess; + /** 鏄惁绂佺敤 */ + isDisabled?: boolean; + /** 鎺掑簭 */ + sort?: number; + /** 绛惧悕鍚嶇О */ + signName?: string; + } + interface GetTagsInput { /** 绫诲瀷锛�0浜у搧鏍囩锛�1璧勮鏍囩锛�3蹇嵎璇勮鏍囩 */ type?: number; @@ -10049,7 +10194,7 @@ /** 鍚堝悓鐨勫彂閫佹椂闂� 娣诲姞绗竴涓缃茶�呯殑鏃堕棿锛屽綋绗竴涓缃茶�呮坊鍔犳垚鍔熷嵆璁や负鍚堝悓宸插彂閫� */ sendTime?: string; /** 鎬婚〉鏁� */ - signers?: string; + signers?: string[]; /** 寮�鍙戣�呯紪鍙� */ developerId?: string; /** 鍚堝悓缂栧彿 */ @@ -11162,6 +11307,7 @@ applyFileType?: number; /** 鍥尯鏉愭枡 */ fileSearchTypeId?: string; + fileSearchTypeName?: string; } interface IndustrialParkListOutput { @@ -14710,6 +14856,8 @@ fileSize?: number; /** 鏂囦欢鎵╁睍鍚� */ fileExtension?: string; + /** 瀛楀吀鏂囦欢绫诲瀷Id */ + fileSearchTypeId?: string; } type MessageBusinessBehaviorTypeEnum = @@ -14999,6 +15147,11 @@ month?: number; materialType?: EnterpriseMaterialTypeEnum; materialItemList?: SimpleEnterpriseMaterialItemOutput[]; + lastModificationTime?: string; + /** 鏄惁浣跨敤瀛楀吀閰嶇疆鏉愭枡 */ + useCustomMaterial?: boolean; + /** 鏄惁瀹屽杽 */ + isCompleteMaterial?: boolean; } interface MyEnterpriseMaterialListOutputPageOutput { @@ -16084,6 +16237,34 @@ outCheckStatus?: BountyCheckStatusEnum; /** 澶囨敞 */ remark?: string; + } + + interface PagedListQueryPageModel { + /** 琛屾暟 */ + rows?: number; + /** 椤电爜 */ + page?: number; + /** 鎺掑簭 */ + orderInput?: PagedListQueryPageModelOrderInput[]; + } + + interface PagedListQueryPageModelOrderInput { + /** 灞炴�� */ + property?: string; + order?: EnumPagedListOrder; + } + + interface PagedListQueryResultPageModel { + /** 琛屾暟 */ + rows?: number; + /** 椤电爜 */ + page?: number; + /** 鎺掑簭 */ + orderInput?: PagedListQueryPageModelOrderInput[]; + /** 鎬绘暟 */ + totalCount?: number; + /** 椤垫暟 */ + totalPage?: number; } interface PageInput { @@ -17729,6 +17910,8 @@ canLoginUserSign?: CanLoginUserSignEnum; /** 鏄惁鍙互鐧诲綍姹熶綉淇� */ canLoginJYB?: boolean; + /** 鏄惁鍙互鐧诲綍鐏垫椿鐢ㄥ伐 */ + canLoginFlexJob?: boolean; /** 澶栭儴绯荤粺ID */ externalSystemCodes?: CanLoginUserSignEnum[]; bussinessCode?: string; @@ -19110,6 +19293,50 @@ proxyPowerAttorneyUrl?: string; } + interface RealEnterpriseInputByCertAccountInput { + /** 瀹㈡埛Id */ + customerId?: string; + /** 涓婁笂绛捐瘉涔﹁处鍙凤紙閫夊~锛� */ + certAccount: string; + /** 澶栭儴浼佷笟Id */ + outUserId: string; + /** 鏄惁濮旀墭缁忓姙浜� */ + proxy?: boolean; + realMethod: EnumElectronSignPersonalRealMethod; + /** 浼佷笟鍏ㄧО */ + enterpriseName: string; + /** 缁熶竴绀句細淇$敤浠g爜 */ + societyCreditCode: string; + /** 钀ヤ笟鎵х収鏂囦欢鍦板潃 */ + licenseUrl: string; + /** 娉曚汉濮撳悕 */ + legalPerson: string; + /** 娉曚汉鎴栫粡鍔炰汉濮撳悕 */ + name: string; + /** 娉曚汉鎴栫粡鍔炰汉韬唤璇佸彿 */ + identity: string; + /** 韬唤璇佷汉鍍忛潰Url */ + identityImgUrl: string; + /** 韬唤璇佸浗寰介潰Url */ + identityBackImgUrl: string; + /** 娉曚汉鎴栫粡鍔炰汉閾惰鍗″彿 */ + bankCard?: string; + /** 閾惰鍗$収鐗� */ + bankCardImgUrl?: string; + /** 娉曚汉鎴栫粡鍔炰汉鎵嬫満鍙� */ + mobile?: string; + /** 浼佷笟鎺堟潈涔� */ + proxyPowerAttorneyUrl?: string; + } + + interface RealEnterpriseInputByCertAccountOutput { + /** 璁よ瘉娴佹按鍙� */ + id?: string; + status?: EnumElectronSignRealStatus; + /** 涓婁笂绛捐瘉涔﹁处鍙凤紙閫夊~锛� */ + certAccount?: string; + } + interface RealEnterpriseOutput { /** 璁よ瘉娴佹按鍙� */ id?: string; @@ -19357,6 +19584,8 @@ mobile?: string; /** 楠岃瘉鐮� */ vCode?: string; + /** 浜鸿劯璇嗗埆鎴愬姛璋冩暣椤甸潰 */ + faceRealCallbackUrl?: string; } interface RealPersonalOutput { @@ -19466,6 +19695,8 @@ identity?: string; /** 涓汉鎴栨硶浜烘垨缁忓姙浜烘墜鏈哄彿 */ mobile?: string; + /** 涓婁笂绛捐瘉涔﹁处鍙凤紙閫夊~锛� */ + certAccount?: string; } type RelationalTypeEnum = 10 | 20; @@ -19939,6 +20170,31 @@ listFiles?: CustomerUploadMonthApplyFileTypeDto[]; } + interface SaveSmsSettingCommand { + /** 鏄惁绂佺敤 */ + isDisabled?: boolean; + /** 甯﹀嚭鍙傛暟 */ + withoutParams?: boolean; + /** 姣忓垎閽熸渶澶ф暟閲� */ + minutelyMaxCount?: number; + /** 姣忓皬鏃舵渶澶ф暟閲� */ + hourlyMaxCount?: number; + /** 姣忓ぉ鏈�澶ф暟閲� */ + dailyMaxCount?: number; + /** 閫氶亾閰嶇疆 */ + accesses?: SaveSmsSettingCommandAccess[]; + } + + interface SaveSmsSettingCommandAccess { + access?: EnumSmsAccess; + /** 鏄惁绂佺敤 */ + isDisabled?: boolean; + /** 鎺掑簭 */ + sort?: number; + /** 绛惧悕鍚嶇О */ + signName?: string; + } + interface SaveWalletPayChannelFeeSettingInput { /** 閫氶亾id */ walletPayChannelId?: string; @@ -20083,6 +20339,10 @@ values: SendContractInputValue[]; /** 绛剧害鎬讳汉鏁� */ userCount: number; + /** 鏍¢獙绫诲瀷 */ + verifyType?: string[]; + /** 绛剧害瀹屾垚鍚庤皟鏁村湴鍧� */ + returnUrl?: string; } interface SendContractInputValue { @@ -20606,6 +20866,8 @@ fileCount?: number; /** 鏄惁涓婁紶 */ isUploaded?: boolean; + /** 瀛楀吀鏂囦欢绫诲瀷Id */ + fileSearchTypeId?: string; } interface SingleApplicationSuspensionPaymentInput { @@ -21870,6 +22132,8 @@ remark?: string; /** 鏂囦欢鍒楄〃 */ addEnterpriseMaterialFileList?: AddEnterpriseMaterialFileInput[]; + /** 鏄惁浣跨敤瀛楀吀閰嶇疆鏉愭枡 */ + useCustomMaterial?: boolean; id?: string; } @@ -23602,6 +23866,8 @@ canLoginUserSign?: boolean; /** 鏄惁鍙互鐧诲綍姹熶綉淇� */ canLoginJYB?: boolean; + /** 鏄惁鍙互鐧诲綍鐏垫椿鐢ㄥ伐 */ + canLoginFlexJob?: boolean; } interface UserMessageInfo { diff --git a/src/views/Reward/FinancialApproval.vue b/src/views/Reward/FinancialApproval.vue index b43e428..ff9a75e 100644 --- a/src/views/Reward/FinancialApproval.vue +++ b/src/views/Reward/FinancialApproval.vue @@ -216,6 +216,12 @@ payRemark: row.payRemark, payFileUrl: convertApi2FormUrlObjectBySeparator(row.payFileUrl), title: isCheck ? '璇︽儏' : '璐㈠姟瀹℃壒', + incomeCompanyName: row.incomeCompanyName, + insureBillNo: row.insureBillNo, + incomeBankAccount: row.incomeBankAccount, + incomeBankCardNumber: row.incomeBankCardNumber, + incomeBankName: row.incomeBankName, + creationTime: row.creationTime, }); } @@ -241,6 +247,13 @@ payRemark: '', payFileUrl: [] as UploadUserFile[], title: '', + + incomeCompanyName: '', + insureBillNo: '', + incomeBankAccount: '', + incomeBankCardNumber: '', + incomeBankName: '', + creationTime: '', }, }); diff --git a/src/views/Reward/RewardApplyTradeCheck.vue b/src/views/Reward/RewardApplyTradeCheck.vue index 3ab6909..c03ac87 100644 --- a/src/views/Reward/RewardApplyTradeCheck.vue +++ b/src/views/Reward/RewardApplyTradeCheck.vue @@ -212,6 +212,12 @@ payRemark: row.payRemark, payFileUrl: convertApi2FormUrlObjectBySeparator(row.payFileUrl), title: isCheck ? '璇︽儏' : '鍑鸿处瀹℃壒', + incomeCompanyName: row.incomeCompanyName, + insureBillNo: row.insureBillNo, + incomeBankAccount: row.incomeBankAccount, + incomeBankCardNumber: row.incomeBankCardNumber, + incomeBankName: row.incomeBankName, + creationTime: row.creationTime, }); } @@ -237,6 +243,13 @@ payRemark: '', payFileUrl: [] as UploadUserFile[], title: '', + + incomeCompanyName: '', + insureBillNo: '', + incomeBankAccount: '', + incomeBankCardNumber: '', + incomeBankName: '', + creationTime: '', }, }); diff --git a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue index 6c39974..590b36e 100644 --- a/src/views/Reward/components/RewardApplyTradeCheckDialog.vue +++ b/src/views/Reward/components/RewardApplyTradeCheckDialog.vue @@ -119,7 +119,7 @@ UploadUserFile, } from '@bole-core/components'; import { usePortraitTableWithAttachment } from '@/hooks'; -import { copyTextToClipboard } from '@/utils'; +import { copyTextToClipboard, StringUtils } from '@/utils'; import { EnumParkBountyTradeDetailAuditStatus, EnumParkBountyTradeDetailAuditStatusTextForAdudit, @@ -127,7 +127,7 @@ } from '@/constants'; defineOptions({ - name: 'WithdrawalApprovalAuditDialog', + name: 'RewardApplyTradeCheckDialog', }); type Props = { @@ -159,6 +159,13 @@ auditTime: string; payRemark: string; payFileUrl: UploadUserFile[]; + + incomeCompanyName: string; + insureBillNo: string; + incomeBankAccount: string; + incomeBankCardNumber: string; + incomeBankName: string; + creationTime: string; }; const form = defineModel<Form>('form'); @@ -174,23 +181,24 @@ columns: [ { label: '杩涜处鍗曚綅', - key: 'enterpriseName', - formatter: () => '澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�', + key: 'incomeCompanyName', + formatter: (row) => row.incomeCompanyName ?? '澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�', }, { label: '寮�鎴峰悕绉�', - key: 'societyCreditCode', - formatter: () => '澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�', + key: 'incomeBankAccount', + formatter: (row) => row.incomeBankAccount ?? '澶钩璐骇淇濋櫓鏈夐檺鍏徃鎶氬窞涓績鏀叕鍙�', }, { label: '寮�鎴烽摱琛�', - key: 'contactPhone', - formatter: () => '涓浗宸ュ晢閾惰鑲′唤鏈夐檺鍏徃鎶氬窞璧d笢鏀', + key: 'incomeBankName', + formatter: (row) => row.incomeBankName ?? '涓浗宸ュ晢閾惰鑲′唤鏈夐檺鍏徃鎶氬窞璧d笢鏀', }, { label: '寮�鎴疯处鍙�', - key: 'userName', - formatter: () => '1511 2001 2920 0156 069', + key: 'incomeBankCardNumber', + formatter: (row) => + StringUtils.insertSpaces(row.incomeBankCardNumber ?? '1511200129200156069'), }, // { // label: '浼佷笟绫诲瀷', @@ -211,10 +219,23 @@ key: 'payRemark', }, { - label: '鍑鸿处瀹℃牳鏃ユ湡', - key: 'tradeTime', + label: '淇濆崟鍙�', + key: 'insureBillNo', + }, + { + label: '鍑鸿处鐢宠鏃ユ湡', + key: 'creationTime', type: 'date', }, + props.isApplyTrade + ? { + label: '', + } + : { + label: '鍑鸿处瀹℃牳鏃ユ湡', + key: 'auditTime', + type: 'date', + }, { label: '鍑鸿处閲戦', key: 'tradeAmount', -- Gitblit v1.9.1