按季导入商户信息 up

This commit is contained in:
zhuangdashia 2025-10-14 20:29:33 +08:00
parent 60611b224b
commit ad1adb9c76
4 changed files with 542 additions and 358 deletions

View File

@ -1,282 +1,285 @@
/** /**
* Namespace Api * Namespace Api
* *
* All backend api type * All backend api type
*/ */
declare namespace Api { 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;
}>;
/** /** import normal merchant search params */
* namespace Original type ImportNormalMerchantSearchParams = CommonType.RecordNullable<
* Pick<
* backend api module: "Original" Api.Original.ImportNormalMerchant,
*/ | 'institutionName'
namespace Original { | 'branchName'
/** import normal merchant */ | 'institutionCode'
type ImportNormalMerchant = Common.CommonRecord<{ | 'merchantId'
/** 主键 */ | 'merchantFullName'
id: CommonType.IdType; | 'merchantShortName'
/** 机构名称 */ | 'parentMerchantName'
institutionName: string; | 'parentMerchantId'
/** 支行名称 */ | 'createDate'
branchName: string; | 'source'
/** 机构编号 */ | 'cancelTime'
institutionCode: string; | 'expandEmployeeId'
/** 商户编号 */ | 'expandEmployeeName'
merchantId: CommonType.IdType; | 'manageEmployeeId'
/** 商户全称 */ | 'manageEmployeeName'
merchantFullName: string; | 'merchantType'
/** 商户简称 */ | 'riskLevel'
merchantShortName: string; | 'businessScope'
/** 所属一级商户 */ | 'businessScopeSecondary'
parentMerchantName: string; | 'disableType'
/** 一级商户号 */ | 'detailedAddress'
parentMerchantId: CommonType.IdType; | 'legalRepresentativeName'
/** 来源 */ | 'legalRepresentativeIdType'
source: string; | 'legalRepresentativeIdNumber'
/** 注销时间 */ | 'merchantIdType'
cancelTime: string; | 'merchantIdNumber'
/** 拓展员工号 */ | 'businessLicenseStartDate'
expandEmployeeId: CommonType.IdType; | 'businessLicenseEndDate'
/** 拓展员工姓名 */ | 'accountOpeningIdType'
expandEmployeeName: string; | 'accountOpeningIdNumber'
/** 管理员工号 */ | 'registeredWebsite'
manageEmployeeId: CommonType.IdType; | 'registeredIp'
/** 管理员工姓名 */ | 'icpLicense'
manageEmployeeName: string; | 'settlementLevel'
/** 商户类型 */ | 'settlementCycle'
merchantType: string; | 'merchantFeeMode'
/** 商户风险等级 */ | 'alipayDebitRate'
riskLevel: string; | 'alipayCreditRate'
/** 经营范围 */ | 'wechatDebitRate'
businessScope: string; | 'wechatCreditRate'
/** 经营范围(二级) */ | 'unionpayDebitRate'
businessScopeSecondary: string; | 'unionpayCreditRate'
/** 禁用类型 */ | 'zhiefuRate'
disableType: string; | 'freeFeeMonths'
/** 详细地址 */ | 'monthlyFreeFeeAmount'
detailedAddress: string; | 'smallAmountFreeFee'
/** 法定代表人姓名 */ | 'monthlyCreditFreeFee'
legalRepresentativeName: string; | 'cashierPaymentType'
/** 法定代表人证件类型 */ | 'staticCodePaymentType'
legalRepresentativeIdType: CommonType.IdType; | 'settlementAccount'
/** 法定代表人证件号码 */ | 'accountName'
legalRepresentativeIdNumber: CommonType.IdType; | 'openingBankCode'
/** 商户证件类型 */ | 'openingBankName'
merchantIdType: CommonType.IdType; | 'alipayAccount'
/** 商户证件号码 */ | 'contactEmail'
merchantIdNumber: CommonType.IdType; | 'contactName'
/** 营业执照起始日期 */ | 'contactPhone'
businessLicenseStartDate: string; | 'quarterlyTransactionCount'
/** 营业执照截止日期 */ | 'quarterlyTransactionAmount'
businessLicenseEndDate: string; | 'dailyAverageQuarterly'
/** 开户证件类型 */ | 'importTime'
accountOpeningIdType: CommonType.IdType; > &
/** 开户证件号码 */ Api.Common.CommonSearchParams
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 */ /** import normal merchant operate params */
type ImportNormalMerchantSearchParams = CommonType.RecordNullable< type ImportNormalMerchantOperateParams = CommonType.RecordNullable<
Pick< Pick<
Api.Original.ImportNormalMerchant, Api.Original.ImportNormalMerchant,
| 'institutionName' | 'id'
| 'branchName' | 'institutionName'
| 'institutionCode' | 'branchName'
| 'merchantId' | 'institutionCode'
| 'merchantFullName' | 'merchantId'
| 'merchantShortName' | 'merchantFullName'
| 'parentMerchantName' | 'merchantShortName'
| 'parentMerchantId' | 'parentMerchantName'
| 'source' | 'parentMerchantId'
| 'cancelTime' | 'source'
| 'expandEmployeeId' | 'cancelTime'
| 'expandEmployeeName' | 'expandEmployeeId'
| 'manageEmployeeId' | 'expandEmployeeName'
| 'manageEmployeeName' | 'manageEmployeeId'
| 'merchantType' | 'manageEmployeeName'
| 'riskLevel' | 'merchantType'
| 'businessScope' | 'riskLevel'
| 'businessScopeSecondary' | 'businessScope'
| 'disableType' | 'businessScopeSecondary'
| 'detailedAddress' | 'disableType'
| 'legalRepresentativeName' | 'detailedAddress'
| 'legalRepresentativeIdType' | 'legalRepresentativeName'
| 'legalRepresentativeIdNumber' | 'legalRepresentativeIdType'
| 'merchantIdType' | 'legalRepresentativeIdNumber'
| 'merchantIdNumber' | 'merchantIdType'
| 'businessLicenseStartDate' | 'merchantIdNumber'
| 'businessLicenseEndDate' | 'businessLicenseStartDate'
| 'accountOpeningIdType' | 'businessLicenseEndDate'
| 'accountOpeningIdNumber' | 'accountOpeningIdType'
| 'registeredWebsite' | 'accountOpeningIdNumber'
| 'registeredIp' | 'registeredWebsite'
| 'icpLicense' | 'registeredIp'
| 'settlementLevel' | 'icpLicense'
| 'settlementCycle' | 'settlementLevel'
| 'merchantFeeMode' | 'settlementCycle'
| 'alipayDebitRate' | 'merchantFeeMode'
| 'alipayCreditRate' | 'alipayDebitRate'
| 'wechatDebitRate' | 'alipayCreditRate'
| 'wechatCreditRate' | 'wechatDebitRate'
| 'unionpayDebitRate' | 'wechatCreditRate'
| 'unionpayCreditRate' | 'unionpayDebitRate'
| 'zhiefuRate' | 'unionpayCreditRate'
| 'freeFeeMonths' | 'zhiefuRate'
| 'monthlyFreeFeeAmount' | 'freeFeeMonths'
| 'smallAmountFreeFee' | 'monthlyFreeFeeAmount'
| 'monthlyCreditFreeFee' | 'smallAmountFreeFee'
| 'cashierPaymentType' | 'monthlyCreditFreeFee'
| 'staticCodePaymentType' | 'cashierPaymentType'
| 'settlementAccount' | 'staticCodePaymentType'
| 'accountName' | 'settlementAccount'
| 'openingBankCode' | 'accountName'
| 'openingBankName' | 'openingBankCode'
| 'alipayAccount' | 'openingBankName'
| 'contactEmail' | 'alipayAccount'
| 'contactName' | 'contactEmail'
| 'contactPhone' | 'contactName'
| 'quarterlyTransactionCount' | 'contactPhone'
| 'quarterlyTransactionAmount' | 'quarterlyTransactionCount'
| 'dailyAverageQuarterly' | 'quarterlyTransactionAmount'
| 'importTime' | 'dailyAverageQuarterly'
> & | 'importTime'
Api.Common.CommonSearchParams >
>; >;
/** import normal merchant operate params */ /** import normal merchant list */
type ImportNormalMerchantOperateParams = CommonType.RecordNullable< type ImportNormalMerchantList = Api.Common.PaginatingQueryRecord<ImportNormalMerchant>;
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<ImportNormalMerchant>;
}
} }

View File

@ -188,6 +188,14 @@ const {
ellipsis: true, ellipsis: true,
resizable: true resizable: true
}, },
{
key: 'createDate',
title: '创建时间',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
{ {
key: 'source', key: 'source',
title: '来源', title: '来源',

View File

@ -1,6 +1,9 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, reactive, watch } from 'vue'; import { computed, reactive, watch } from 'vue';
import { fetchCreateImportNormalMerchant, fetchUpdateImportNormalMerchant } from '@/service/api/original/import-normal-merchant'; import {
fetchCreateImportNormalMerchant,
fetchUpdateImportNormalMerchant
} from '@/service/api/original/import-normal-merchant';
import { useFormRules, useNaiveForm } from '@/hooks/common/form'; import { useFormRules, useNaiveForm } from '@/hooks/common/form';
import { $t } from '@/locales'; import { $t } from '@/locales';
@ -27,7 +30,6 @@ const visible = defineModel<boolean>('visible', {
default: false default: false
}); });
const { formRef, validate, restoreValidation } = useNaiveForm(); const { formRef, validate, restoreValidation } = useNaiveForm();
const { createRequiredRule } = useFormRules(); const { createRequiredRule } = useFormRules();
@ -45,78 +47,71 @@ const model: Model = reactive(createDefaultModel());
function createDefaultModel(): Model { function createDefaultModel(): Model {
return { return {
institutionName: '', institutionName: '',
branchName: '', branchName: '',
institutionCode: '', institutionCode: '',
merchantId: '', merchantId: '',
merchantFullName: '', merchantFullName: '',
merchantShortName: '', merchantShortName: '',
parentMerchantName: '', parentMerchantName: '',
parentMerchantId: '', parentMerchantId: '',
source: '', createDate: '',
cancelTime: undefined, source: '',
expandEmployeeId: '', cancelTime: '',
expandEmployeeName: '', expandEmployeeId: '',
manageEmployeeId: '', expandEmployeeName: '',
manageEmployeeName: '', manageEmployeeId: '',
merchantType: '', manageEmployeeName: '',
riskLevel: '', merchantType: '',
businessScope: '', riskLevel: '',
businessScopeSecondary: '', businessScope: '',
disableType: '', businessScopeSecondary: '',
detailedAddress: '', disableType: '',
legalRepresentativeName: '', detailedAddress: '',
legalRepresentativeIdType: '', legalRepresentativeName: '',
legalRepresentativeIdNumber: '', legalRepresentativeIdType: '',
merchantIdType: '', legalRepresentativeIdNumber: '',
merchantIdNumber: '', merchantIdType: '',
businessLicenseStartDate: undefined, merchantIdNumber: '',
businessLicenseEndDate: undefined, businessLicenseStartDate: '',
accountOpeningIdType: '', businessLicenseEndDate: '',
accountOpeningIdNumber: '', accountOpeningIdType: '',
registeredWebsite: '', accountOpeningIdNumber: '',
registeredIp: '', registeredWebsite: '',
icpLicense: '', registeredIp: '',
settlementLevel: '', icpLicense: '',
settlementCycle: '', settlementLevel: '',
merchantFeeMode: '', settlementCycle: '',
alipayDebitRate: undefined, merchantFeeMode: '',
alipayCreditRate: undefined, alipayDebitRate: undefined,
wechatDebitRate: undefined, alipayCreditRate: undefined,
wechatCreditRate: undefined, wechatDebitRate: undefined,
unionpayDebitRate: undefined, wechatCreditRate: undefined,
unionpayCreditRate: undefined, unionpayDebitRate: undefined,
zhiefuRate: undefined, unionpayCreditRate: undefined,
freeFeeMonths: undefined, zhiefuRate: undefined,
monthlyFreeFeeAmount: undefined, freeFeeMonths: undefined,
smallAmountFreeFee: undefined, monthlyFreeFeeAmount: undefined,
monthlyCreditFreeFee: undefined, smallAmountFreeFee: undefined,
cashierPaymentType: '', monthlyCreditFreeFee: undefined,
staticCodePaymentType: '', cashierPaymentType: '',
settlementAccount: '', staticCodePaymentType: '',
accountName: '', settlementAccount: '',
openingBankCode: '', accountName: '',
openingBankName: '', openingBankCode: '',
alipayAccount: '', openingBankName: '',
contactEmail: '', alipayAccount: '',
contactName: '', contactEmail: '',
contactPhone: '', contactName: '',
quarterlyTransactionCount: undefined, contactPhone: '',
quarterlyTransactionAmount: undefined, quarterlyTransactionCount: undefined,
dailyAverageQuarterly: undefined, quarterlyTransactionAmount: undefined,
importTime: '', dailyAverageQuarterly: undefined,
importTime: ''
}; };
} }
type RuleKey = Extract< type RuleKey = Extract<keyof Model, 'tenantId' | 'createDept' | 'createBy' | 'createTime' | 'updateBy' | 'updateTime'>;
keyof Model,
| 'tenantId'
| 'createDept'
| 'createBy'
| 'createTime'
| 'updateBy'
| 'updateTime'
>;
const rules: Record<RuleKey, App.Global.FormRule> = { const rules: Record<RuleKey, App.Global.FormRule> = {
tenantId: createRequiredRule('租户编号不能为空'), tenantId: createRequiredRule('租户编号不能为空'),
@ -145,16 +140,201 @@ function closeDrawer() {
async function handleSubmit() { async function handleSubmit() {
await validate(); await validate();
const { 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 } = model; const {
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
} = model;
// request // request
if (props.operateType === 'add') { if (props.operateType === 'add') {
const { error } = await fetchCreateImportNormalMerchant({ 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 }); const { error } = await fetchCreateImportNormalMerchant({
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
});
if (error) return; if (error) return;
} }
if (props.operateType === 'edit') { if (props.operateType === 'edit') {
const { error } = await fetchUpdateImportNormalMerchant({ 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 }); const { error } = await fetchUpdateImportNormalMerchant({
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
});
if (error) return; if (error) return;
} }
@ -199,16 +379,14 @@ watch(visible, () => {
<NFormItem label="一级商户号" path="parentMerchantId"> <NFormItem label="一级商户号" path="parentMerchantId">
<NInput v-model:value="model.parentMerchantId" placeholder="请输入一级商户号" /> <NInput v-model:value="model.parentMerchantId" placeholder="请输入一级商户号" />
</NFormItem> </NFormItem>
<NFormItem label="创建时间" path="createDate">
<NInput v-model:value="model.createDate" placeholder="请输入创建时间" />
</NFormItem>
<NFormItem label="来源" path="source"> <NFormItem label="来源" path="source">
<NInput v-model:value="model.source" placeholder="请输入来源" /> <NInput v-model:value="model.source" placeholder="请输入来源" />
</NFormItem> </NFormItem>
<NFormItem label="注销时间" path="cancelTime"> <NFormItem label="注销时间" path="cancelTime">
<NDatePicker <NInput v-model:value="model.cancelTime" placeholder="请输入创建时间" />
v-model:formatted-value="model.cancelTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
clearable
/>
</NFormItem> </NFormItem>
<NFormItem label="拓展员工号" path="expandEmployeeId"> <NFormItem label="拓展员工号" path="expandEmployeeId">
<NInput v-model:value="model.expandEmployeeId" placeholder="请输入拓展员工号" /> <NInput v-model:value="model.expandEmployeeId" placeholder="请输入拓展员工号" />
@ -238,12 +416,7 @@ watch(visible, () => {
<NInput v-model:value="model.disableType" placeholder="请输入禁用类型" /> <NInput v-model:value="model.disableType" placeholder="请输入禁用类型" />
</NFormItem> </NFormItem>
<NFormItem label="详细地址" path="detailedAddress"> <NFormItem label="详细地址" path="detailedAddress">
<NInput <NInput v-model:value="model.detailedAddress" :rows="3" type="textarea" placeholder="请输入详细地址" />
v-model:value="model.detailedAddress"
:rows="3"
type="textarea"
placeholder="请输入详细地址"
/>
</NFormItem> </NFormItem>
<NFormItem label="法定代表人姓名" path="legalRepresentativeName"> <NFormItem label="法定代表人姓名" path="legalRepresentativeName">
<NInput v-model:value="model.legalRepresentativeName" placeholder="请输入法定代表人姓名" /> <NInput v-model:value="model.legalRepresentativeName" placeholder="请输入法定代表人姓名" />

View File

@ -305,7 +305,7 @@ const {
}, },
{ {
key: 'heatingNo', key: 'heatingNo',
title: '取暖费户号', title: '户号',
align: 'center', align: 'center',
minWidth: 120, minWidth: 120,
ellipsis: true, ellipsis: true,