From ad1adb9c763b4017e1f7fa6edc6ad0900b019363 Mon Sep 17 00:00:00 2001 From: zhuangdashia Date: Tue, 14 Oct 2025 20:29:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E5=AD=A3=E5=AF=BC=E5=85=A5=E5=95=86?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../original.import-normal-merchant.api.d.ts | 545 +++++++++--------- .../original/import-normal-merchant/index.vue | 8 + .../import-normal-merchant-operate-drawer.vue | 345 ++++++++--- .../src/views/report/detail-entry/index.vue | 2 +- 4 files changed, 542 insertions(+), 358 deletions(-) diff --git a/cds-fontend-2025.V1/src/typings/api/original.import-normal-merchant.api.d.ts b/cds-fontend-2025.V1/src/typings/api/original.import-normal-merchant.api.d.ts index c823b10..0c3e187 100644 --- a/cds-fontend-2025.V1/src/typings/api/original.import-normal-merchant.api.d.ts +++ b/cds-fontend-2025.V1/src/typings/api/original.import-normal-merchant.api.d.ts @@ -1,282 +1,285 @@ + /** * Namespace Api * * All backend api type */ declare namespace Api { + /** + * namespace Original + * + * backend api module: "Original" + */ + namespace Original { + /** import normal merchant */ + type ImportNormalMerchant = Common.CommonRecord<{ + /** 主键 */ + id: CommonType.IdType; + /** 机构名称 */ + institutionName: string; + /** 支行名称 */ + branchName: string; + /** 机构编号 */ + institutionCode: string; + /** 商户编号 */ + merchantId: CommonType.IdType; + /** 商户全称 */ + merchantFullName: string; + /** 商户简称 */ + merchantShortName: string; + /** 所属一级商户 */ + parentMerchantName: string; + /** 一级商户号 */ + parentMerchantId: CommonType.IdType; + /** 创建时间 */ + createDate: string; + /** 来源 */ + source: string; + /** 注销时间 */ + cancelTime: string; + /** 拓展员工号 */ + expandEmployeeId: CommonType.IdType; + /** 拓展员工姓名 */ + expandEmployeeName: string; + /** 管理员工号 */ + manageEmployeeId: CommonType.IdType; + /** 管理员工姓名 */ + manageEmployeeName: string; + /** 商户类型 */ + merchantType: string; + /** 商户风险等级 */ + riskLevel: string; + /** 经营范围 */ + businessScope: string; + /** 经营范围（二级） */ + businessScopeSecondary: string; + /** 禁用类型 */ + disableType: string; + /** 详细地址 */ + detailedAddress: string; + /** 法定代表人姓名 */ + legalRepresentativeName: string; + /** 法定代表人证件类型 */ + legalRepresentativeIdType: CommonType.IdType; + /** 法定代表人证件号码 */ + legalRepresentativeIdNumber: CommonType.IdType; + /** 商户证件类型 */ + merchantIdType: CommonType.IdType; + /** 商户证件号码 */ + merchantIdNumber: CommonType.IdType; + /** 营业执照起始日期 */ + businessLicenseStartDate: string; + /** 营业执照截止日期 */ + businessLicenseEndDate: string; + /** 开户证件类型 */ + accountOpeningIdType: CommonType.IdType; + /** 开户证件号码 */ + accountOpeningIdNumber: CommonType.IdType; + /** 网络商户登记网址 */ + registeredWebsite: string; + /** 网络商户登记IP */ + registeredIp: string; + /** 网络商户ICP备案/许可证号 */ + icpLicense: string; + /** 结算级别 */ + settlementLevel: string; + /** 结算周期 */ + settlementCycle: string; + /** 商户费率模式 */ + merchantFeeMode: string; + /** 支付宝借记卡费率 */ + alipayDebitRate: number; + /** 支付宝贷记卡费率 */ + alipayCreditRate: number; + /** 微信借记卡费率 */ + wechatDebitRate: number; + /** 微信贷记卡费率 */ + wechatCreditRate: number; + /** 云闪付借记卡费率 */ + unionpayDebitRate: number; + /** 云闪付贷记卡费率 */ + unionpayCreditRate: number; + /** 智e付费率 */ + zhiefuRate: number; + /** 新注册商户免手续费月数 */ + freeFeeMonths: number; + /** 每月免手续费交易额(元) */ + monthlyFreeFeeAmount: number; + /** 小额单笔免手续费金额(元) */ + smallAmountFreeFee: number; + /** 每月信用卡免手续费金额(元) */ + monthlyCreditFreeFee: number; + /** 收银台支付类型 */ + cashierPaymentType: string; + /** 静态码支付类型 */ + staticCodePaymentType: string; + /** 结算账号 */ + settlementAccount: string; + /** 账户名称 */ + accountName: string; + /** 开户行机构号 */ + openingBankCode: string; + /** 开户行名称 */ + openingBankName: string; + /** 支付宝账号 */ + alipayAccount: string; + /** 联系人邮箱 */ + contactEmail: string; + /** 联系人姓名 */ + contactName: string; + /** 联系人手机号码 */ + contactPhone: string; + /** 当季度交易笔数 */ + quarterlyTransactionCount: number; + /** 当季度交易金额 */ + quarterlyTransactionAmount: number; + /** 季日均 */ + dailyAverageQuarterly: number; + /** 计价月份 */ + importTime: string; + /** 租户编号 */ + tenantId: CommonType.IdType; + }>; - /** - * namespace Original - * - * backend api module: "Original" - */ - namespace Original { - /** import normal merchant */ - type ImportNormalMerchant = Common.CommonRecord<{ - /** 主键 */ - id: CommonType.IdType; - /** 机构名称 */ - institutionName: string; - /** 支行名称 */ - branchName: string; - /** 机构编号 */ - institutionCode: string; - /** 商户编号 */ - merchantId: CommonType.IdType; - /** 商户全称 */ - merchantFullName: string; - /** 商户简称 */ - merchantShortName: string; - /** 所属一级商户 */ - parentMerchantName: string; - /** 一级商户号 */ - parentMerchantId: CommonType.IdType; - /** 来源 */ - source: string; - /** 注销时间 */ - cancelTime: string; - /** 拓展员工号 */ - expandEmployeeId: CommonType.IdType; - /** 拓展员工姓名 */ - expandEmployeeName: string; - /** 管理员工号 */ - manageEmployeeId: CommonType.IdType; - /** 管理员工姓名 */ - manageEmployeeName: string; - /** 商户类型 */ - merchantType: string; - /** 商户风险等级 */ - riskLevel: string; - /** 经营范围 */ - businessScope: string; - /** 经营范围（二级） */ - businessScopeSecondary: string; - /** 禁用类型 */ - disableType: string; - /** 详细地址 */ - detailedAddress: string; - /** 法定代表人姓名 */ - legalRepresentativeName: string; - /** 法定代表人证件类型 */ - legalRepresentativeIdType: CommonType.IdType; - /** 法定代表人证件号码 */ - legalRepresentativeIdNumber: CommonType.IdType; - /** 商户证件类型 */ - merchantIdType: CommonType.IdType; - /** 商户证件号码 */ - merchantIdNumber: CommonType.IdType; - /** 营业执照起始日期 */ - businessLicenseStartDate: string; - /** 营业执照截止日期 */ - businessLicenseEndDate: string; - /** 开户证件类型 */ - accountOpeningIdType: CommonType.IdType; - /** 开户证件号码 */ - accountOpeningIdNumber: CommonType.IdType; - /** 网络商户登记网址 */ - registeredWebsite: string; - /** 网络商户登记IP */ - registeredIp: string; - /** 网络商户ICP备案/许可证号 */ - icpLicense: string; - /** 结算级别 */ - settlementLevel: string; - /** 结算周期 */ - settlementCycle: string; - /** 商户费率模式 */ - merchantFeeMode: string; - /** 支付宝借记卡费率 */ - alipayDebitRate: number; - /** 支付宝贷记卡费率 */ - alipayCreditRate: number; - /** 微信借记卡费率 */ - wechatDebitRate: number; - /** 微信贷记卡费率 */ - wechatCreditRate: number; - /** 云闪付借记卡费率 */ - unionpayDebitRate: number; - /** 云闪付贷记卡费率 */ - unionpayCreditRate: number; - /** 智e付费率 */ - zhiefuRate: number; - /** 新注册商户免手续费月数 */ - freeFeeMonths: number; - /** 每月免手续费交易额(元) */ - monthlyFreeFeeAmount: number; - /** 小额单笔免手续费金额(元) */ - smallAmountFreeFee: number; - /** 每月信用卡免手续费金额(元) */ - monthlyCreditFreeFee: number; - /** 收银台支付类型 */ - cashierPaymentType: string; - /** 静态码支付类型 */ - staticCodePaymentType: string; - /** 结算账号 */ - settlementAccount: string; - /** 账户名称 */ - accountName: string; - /** 开户行机构号 */ - openingBankCode: string; - /** 开户行名称 */ - openingBankName: string; - /** 支付宝账号 */ - alipayAccount: string; - /** 联系人邮箱 */ - contactEmail: string; - /** 联系人姓名 */ - contactName: string; - /** 联系人手机号码 */ - contactPhone: string; - /** 当季度交易笔数 */ - quarterlyTransactionCount: number; - /** 当季度交易金额 */ - quarterlyTransactionAmount: number; - /** 季日均 */ - dailyAverageQuarterly: number; - /** 计价月份 */ - importTime: string; - /** 租户编号 */ - tenantId: CommonType.IdType; - }>; + /** import normal merchant search params */ + type ImportNormalMerchantSearchParams = CommonType.RecordNullable< + Pick< + Api.Original.ImportNormalMerchant, + | 'institutionName' + | 'branchName' + | 'institutionCode' + | 'merchantId' + | 'merchantFullName' + | 'merchantShortName' + | 'parentMerchantName' + | 'parentMerchantId' + | 'createDate' + | 'source' + | 'cancelTime' + | 'expandEmployeeId' + | 'expandEmployeeName' + | 'manageEmployeeId' + | 'manageEmployeeName' + | 'merchantType' + | 'riskLevel' + | 'businessScope' + | 'businessScopeSecondary' + | 'disableType' + | 'detailedAddress' + | 'legalRepresentativeName' + | 'legalRepresentativeIdType' + | 'legalRepresentativeIdNumber' + | 'merchantIdType' + | 'merchantIdNumber' + | 'businessLicenseStartDate' + | 'businessLicenseEndDate' + | 'accountOpeningIdType' + | 'accountOpeningIdNumber' + | 'registeredWebsite' + | 'registeredIp' + | 'icpLicense' + | 'settlementLevel' + | 'settlementCycle' + | 'merchantFeeMode' + | 'alipayDebitRate' + | 'alipayCreditRate' + | 'wechatDebitRate' + | 'wechatCreditRate' + | 'unionpayDebitRate' + | 'unionpayCreditRate' + | 'zhiefuRate' + | 'freeFeeMonths' + | 'monthlyFreeFeeAmount' + | 'smallAmountFreeFee' + | 'monthlyCreditFreeFee' + | 'cashierPaymentType' + | 'staticCodePaymentType' + | 'settlementAccount' + | 'accountName' + | 'openingBankCode' + | 'openingBankName' + | 'alipayAccount' + | 'contactEmail' + | 'contactName' + | 'contactPhone' + | 'quarterlyTransactionCount' + | 'quarterlyTransactionAmount' + | 'dailyAverageQuarterly' + | 'importTime' + > & + Api.Common.CommonSearchParams + >; - /** import normal merchant search params */ - type ImportNormalMerchantSearchParams = CommonType.RecordNullable< - Pick< - Api.Original.ImportNormalMerchant, - | 'institutionName' - | 'branchName' - | 'institutionCode' - | 'merchantId' - | 'merchantFullName' - | 'merchantShortName' - | 'parentMerchantName' - | 'parentMerchantId' - | 'source' - | 'cancelTime' - | 'expandEmployeeId' - | 'expandEmployeeName' - | 'manageEmployeeId' - | 'manageEmployeeName' - | 'merchantType' - | 'riskLevel' - | 'businessScope' - | 'businessScopeSecondary' - | 'disableType' - | 'detailedAddress' - | 'legalRepresentativeName' - | 'legalRepresentativeIdType' - | 'legalRepresentativeIdNumber' - | 'merchantIdType' - | 'merchantIdNumber' - | 'businessLicenseStartDate' - | 'businessLicenseEndDate' - | 'accountOpeningIdType' - | 'accountOpeningIdNumber' - | 'registeredWebsite' - | 'registeredIp' - | 'icpLicense' - | 'settlementLevel' - | 'settlementCycle' - | 'merchantFeeMode' - | 'alipayDebitRate' - | 'alipayCreditRate' - | 'wechatDebitRate' - | 'wechatCreditRate' - | 'unionpayDebitRate' - | 'unionpayCreditRate' - | 'zhiefuRate' - | 'freeFeeMonths' - | 'monthlyFreeFeeAmount' - | 'smallAmountFreeFee' - | 'monthlyCreditFreeFee' - | 'cashierPaymentType' - | 'staticCodePaymentType' - | 'settlementAccount' - | 'accountName' - | 'openingBankCode' - | 'openingBankName' - | 'alipayAccount' - | 'contactEmail' - | 'contactName' - | 'contactPhone' - | 'quarterlyTransactionCount' - | 'quarterlyTransactionAmount' - | 'dailyAverageQuarterly' - | 'importTime' - > & - Api.Common.CommonSearchParams - >; + /** import normal merchant operate params */ + type ImportNormalMerchantOperateParams = CommonType.RecordNullable< + Pick< + Api.Original.ImportNormalMerchant, + | 'id' + | 'institutionName' + | 'branchName' + | 'institutionCode' + | 'merchantId' + | 'merchantFullName' + | 'merchantShortName' + | 'parentMerchantName' + | 'parentMerchantId' + | 'source' + | 'cancelTime' + | 'expandEmployeeId' + | 'expandEmployeeName' + | 'manageEmployeeId' + | 'manageEmployeeName' + | 'merchantType' + | 'riskLevel' + | 'businessScope' + | 'businessScopeSecondary' + | 'disableType' + | 'detailedAddress' + | 'legalRepresentativeName' + | 'legalRepresentativeIdType' + | 'legalRepresentativeIdNumber' + | 'merchantIdType' + | 'merchantIdNumber' + | 'businessLicenseStartDate' + | 'businessLicenseEndDate' + | 'accountOpeningIdType' + | 'accountOpeningIdNumber' + | 'registeredWebsite' + | 'registeredIp' + | 'icpLicense' + | 'settlementLevel' + | 'settlementCycle' + | 'merchantFeeMode' + | 'alipayDebitRate' + | 'alipayCreditRate' + | 'wechatDebitRate' + | 'wechatCreditRate' + | 'unionpayDebitRate' + | 'unionpayCreditRate' + | 'zhiefuRate' + | 'freeFeeMonths' + | 'monthlyFreeFeeAmount' + | 'smallAmountFreeFee' + | 'monthlyCreditFreeFee' + | 'cashierPaymentType' + | 'staticCodePaymentType' + | 'settlementAccount' + | 'accountName' + | 'openingBankCode' + | 'openingBankName' + | 'alipayAccount' + | 'contactEmail' + | 'contactName' + | 'contactPhone' + | 'quarterlyTransactionCount' + | 'quarterlyTransactionAmount' + | 'dailyAverageQuarterly' + | 'importTime' + > + >; - /** import normal merchant operate params */ - type ImportNormalMerchantOperateParams = CommonType.RecordNullable< - Pick< - Api.Original.ImportNormalMerchant, - | 'id' - | 'institutionName' - | 'branchName' - | 'institutionCode' - | 'merchantId' - | 'merchantFullName' - | 'merchantShortName' - | 'parentMerchantName' - | 'parentMerchantId' - | 'source' - | 'cancelTime' - | 'expandEmployeeId' - | 'expandEmployeeName' - | 'manageEmployeeId' - | 'manageEmployeeName' - | 'merchantType' - | 'riskLevel' - | 'businessScope' - | 'businessScopeSecondary' - | 'disableType' - | 'detailedAddress' - | 'legalRepresentativeName' - | 'legalRepresentativeIdType' - | 'legalRepresentativeIdNumber' - | 'merchantIdType' - | 'merchantIdNumber' - | 'businessLicenseStartDate' - | 'businessLicenseEndDate' - | 'accountOpeningIdType' - | 'accountOpeningIdNumber' - | 'registeredWebsite' - | 'registeredIp' - | 'icpLicense' - | 'settlementLevel' - | 'settlementCycle' - | 'merchantFeeMode' - | 'alipayDebitRate' - | 'alipayCreditRate' - | 'wechatDebitRate' - | 'wechatCreditRate' - | 'unionpayDebitRate' - | 'unionpayCreditRate' - | 'zhiefuRate' - | 'freeFeeMonths' - | 'monthlyFreeFeeAmount' - | 'smallAmountFreeFee' - | 'monthlyCreditFreeFee' - | 'cashierPaymentType' - | 'staticCodePaymentType' - | 'settlementAccount' - | 'accountName' - | 'openingBankCode' - | 'openingBankName' - | 'alipayAccount' - | 'contactEmail' - | 'contactName' - | 'contactPhone' - | 'quarterlyTransactionCount' - | 'quarterlyTransactionAmount' - | 'dailyAverageQuarterly' - | 'importTime' - > - >; - - /** import normal merchant list */ - type ImportNormalMerchantList = Api.Common.PaginatingQueryRecord; - } + /** import normal merchant list */ + type ImportNormalMerchantList = Api.Common.PaginatingQueryRecord; + } } diff --git a/cds-fontend-2025.V1/src/views/original/import-normal-merchant/index.vue b/cds-fontend-2025.V1/src/views/original/import-normal-merchant/index.vue index 88b7a91..0e7d2f6 100644 --- a/cds-fontend-2025.V1/src/views/original/import-normal-merchant/index.vue +++ b/cds-fontend-2025.V1/src/views/original/import-normal-merchant/index.vue @@ -188,6 +188,14 @@ const { ellipsis: true, resizable: true }, + { + key: 'createDate', + title: '创建时间', + align: 'center', + minWidth: 120, + ellipsis: true, + resizable: true + }, { key: 'source', title: '来源', diff --git a/cds-fontend-2025.V1/src/views/original/import-normal-merchant/modules/import-normal-merchant-operate-drawer.vue b/cds-fontend-2025.V1/src/views/original/import-normal-merchant/modules/import-normal-merchant-operate-drawer.vue index 4d48c2b..d75326f 100644 --- a/cds-fontend-2025.V1/src/views/original/import-normal-merchant/modules/import-normal-merchant-operate-drawer.vue +++ b/cds-fontend-2025.V1/src/views/original/import-normal-merchant/modules/import-normal-merchant-operate-drawer.vue @@ -1,6 +1,9 @@