qilincloud168/ERPTurbo_Admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(dealer): 添加返点计算方式及金额字段

Browse Source 
- 新增返点计算方式选项：按净重计算、固定金额、不固定
- 添加返点单价和返点金额字段
- 根据计算方式动态显示单价或金额输入框
- 支持按不同计算方式展示对应的单位（元/斤 或 元/车）
- 更新类型定义文件以支持新的字段和枚举值
- 调整部分响应对象中 empty 和 notEmpty 字段顺序
This commit is contained in:
shenyifei 2025-11-10 17:58:44 +08:00
parent cc15943d44
commit 2c51527b89
4 changed files with 205 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
packages/app-operation/src/components/Dealer/DealerRebateCustomerList.tsx
View File

@ -6,7 +6,13 @@ import {
} from '@/components';
import { business } from '@/services';
import { useIntl } from '@@/exports';
import { ProColumns, ProFormText } from '@ant-design/pro-components';
import {
ProColumns,
ProFormDependency,
ProFormDigit,
ProFormRadio,
ProFormText,
} from '@ant-design/pro-components';
import { ProDescriptionsItemProps } from '@ant-design/pro-descriptions';
import React from 'react';
@ -50,6 +56,47 @@ export default function DealerRebateCustomerList(
dataIndex: 'name',
key: 'name',
},
{
title: intl.formatMessage({ id: intlPrefix + '.column.calcMethod' }),
dataIndex: 'calcMethod',
key: 'calcMethod',
valueType: 'select',
valueEnum: {
NET_WEIGHT: intl.formatMessage({
id: intlPrefix + '.column.calcMethod.enum.netWeight',
}),
FIXED_AMOUNT: intl.formatMessage({
id: intlPrefix + '.column.calcMethod.enum.fixedAmount',
}),
NOT_FIXED: intl.formatMessage({
id: intlPrefix + '.column.calcMethod.enum.notFixed',
}),
},
},
{
title: intl.formatMessage({ id: intlPrefix + '.column.unitPrice' }),
dataIndex: 'unitPrice',
key: 'unitPrice',
valueType: 'money',
render: (_, record) => {
if (record.calcMethod === 'NET_WEIGHT' && record.unitPrice) {
return `${record.unitPrice}元/斤`;
}
return '-';
},
},
{
title: intl.formatMessage({ id: intlPrefix + '.column.amount' }),
dataIndex: 'amount',
key: 'amount',
valueType: 'money',
render: (_, record) => {
if (record.calcMethod === 'FIXED_AMOUNT' && record.amount) {
return `${record.amount}元/车`;
}
return '-';
},
},
];
const formContext = [
@ -71,6 +118,73 @@ export default function DealerRebateCustomerList(
},
]}
/>,
<ProFormRadio.Group
key={'calcMethod'}
name={'calcMethod'}
label={intl.formatMessage({ id: intlPrefix + '.form.calcMethod.label' })}
placeholder={intl.formatMessage({
id: intlPrefix + '.form.calcMethod.placeholder',
})}
valueEnum={{
NET_WEIGHT: intl.formatMessage({
id: intlPrefix + '.form.calcMethod.enum.netWeight',
}),
FIXED_AMOUNT: intl.formatMessage({
id: intlPrefix + '.form.calcMethod.enum.fixedAmount',
}),
NOT_FIXED: intl.formatMessage({
id: intlPrefix + '.form.calcMethod.enum.notFixed',
}),
}}
rules={[
{
required: true,
message: intl.formatMessage({
id: intlPrefix + '.form.calcMethod.required',
}),
},
]}
/>,
<ProFormDependency key={'calcMethod'} name={['calcMethod']}>
{({ calcMethod }) => {
return (
<>
{calcMethod === 'NET_WEIGHT' && (
<ProFormDigit
key={'unitPrice'}
name={'unitPrice'}
label={intl.formatMessage({
id: intlPrefix + '.form.unitPrice.label',
})}
fieldProps={{
precision: 2,
step: 0.01,
}}
placeholder={intl.formatMessage({
id: intlPrefix + '.form.unitPrice.placeholder',
})}
/>
)}
{calcMethod === 'FIXED_AMOUNT' && (
<ProFormDigit
key={'amount'}
name={'amount'}
label={intl.formatMessage({
id: intlPrefix + '.form.amount.label',
})}
fieldProps={{
precision: 2,
step: 0.01,
}}
placeholder={intl.formatMessage({
id: intlPrefix + '.form.amount.placeholder',
})}
/>
)}
</>
);
}}
</ProFormDependency>,
];
const detailColumns: ProDescriptionsItemProps<

22
packages/app-operation/src/locales/zh-CN.ts
View File

@ -913,6 +913,12 @@ export default {
column: {
dealerId: '经销商',
name: '客户名称',
calcMethod: '返点计算方式',
'calcMethod.enum.netWeight': '按净重计算',
'calcMethod.enum.fixedAmount': '固定金额',
'calcMethod.enum.notFixed': '不固定',
unitPrice: '返点单价（元/斤）',
amount: '返点金额（元/车）',
remark: '备注',
status: '状态',
'status.enum.enabled': '正常',
@ -927,6 +933,22 @@ export default {
placeholder: '请输入客户名称',
required: '客户名称为必填项',
},
calcMethod: {
label: '返点计算方式',
placeholder: '请选择返点计算方式',
required: '请选择返点计算方式',
'enum.netWeight': '按净重计算',
'enum.fixedAmount': '固定金额',
'enum.notFixed': '不固定',
},
unitPrice: {
label: '返点单价（元/斤）',
placeholder: '请输入返点单价',
},
amount: {
label: '返点金额（元/车）',
placeholder: '请输入返点金额',
},
remark: {
label: '备注',
placeholder: '请输入备注',

112
packages/app-operation/src/services/business/typings.d.ts vendored
View File

@ -1164,6 +1164,12 @@ declare namespace BusinessAPI {
status: boolean;
/** 备注 */
remark?: string;
/** 返点计算方式：1_按净重计算；2_固定金额；3_不固定 */
calcMethod?: 'NET_WEIGHT' | 'FIXED_AMOUNT' | 'NOT_FIXED';
/** 返点单价 */
unitPrice?: number;
/** 返点金额 */
amount?: number;
};
type DealerRebateCustomerDestroyCmd = {
@ -1178,6 +1184,8 @@ declare namespace BusinessAPI {
dealerId?: string;
/** 客户名称 */
name?: string;
/** 返点计算方式 */
calcMethod?: 'NET_WEIGHT' | 'FIXED_AMOUNT' | 'NOT_FIXED';
};
type DealerRebateCustomerPageQry = {
@ -1199,6 +1207,8 @@ declare namespace BusinessAPI {
dealerId?: string;
/** 客户名称 */
name?: string;
/** 返点计算方式 */
calcMethod?: 'NET_WEIGHT' | 'FIXED_AMOUNT' | 'NOT_FIXED';
offset?: number;
};
@ -1222,6 +1232,12 @@ declare namespace BusinessAPI {
status: boolean;
/** 备注 */
remark?: string;
/** 返点计算方式：1_按净重计算；2_固定金额；3_不固定 */
calcMethod?: 'NET_WEIGHT' | 'FIXED_AMOUNT' | 'NOT_FIXED';
/** 返点单价 */
unitPrice?: number;
/** 返点金额 */
amount?: number;
};
type DealerRebateCustomerVO = {
@ -1239,6 +1255,12 @@ declare namespace BusinessAPI {
createdAt?: string;
/** 经销商信息 */
dealerVO?: DealerVO;
/** 返点计算方式：1_按净重计算；2_固定金额；3_不固定 */
calcMethod?: 'NET_WEIGHT' | 'FIXED_AMOUNT' | 'NOT_FIXED';
/** 返点单价 */
unitPrice?: number;
/** 返点金额 */
amount?: number;
};
type DealerShowQry = {
@ -2072,8 +2094,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: AgreementVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseBoxBrandVO = {
@ -2081,8 +2103,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: BoxBrandVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseBoxProductVO = {
@ -2090,8 +2112,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: BoxProductVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseCompanyPaymentAccountVO = {
@ -2099,8 +2121,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: CompanyPaymentAccountVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseCompanyVO = {
@ -2108,8 +2130,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: CompanyVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseCostItemVO = {
@ -2117,8 +2139,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: CostItemVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseDealerPaymentAccountVO = {
@ -2126,8 +2148,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: DealerPaymentAccountVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseDealerRebateCustomerVO = {
@ -2135,8 +2157,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: DealerRebateCustomerVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseDealerVO = {
@ -2144,8 +2166,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: DealerVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseDealerWarehouseVO = {
@ -2153,8 +2175,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: DealerWarehouseVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseDictionaryVO = {
@ -2162,8 +2184,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: DictionaryVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseEmployeeVO = {
@ -2171,8 +2193,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: EmployeeVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseGiftBoxVO = {
@ -2180,8 +2202,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: GiftBoxVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseMaterialVO = {
@ -2189,8 +2211,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: MaterialVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseMenuVO = {
@ -2198,8 +2220,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: MenuVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponsePermissionVO = {
@ -2207,8 +2229,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: PermissionVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponsePlatformVO = {
@ -2216,8 +2238,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: PlatformVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponsePurchaseOrderVO = {
@ -2225,8 +2247,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: PurchaseOrderVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseRoleVO = {
@ -2234,8 +2256,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: RoleVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseShipOrderVO = {
@ -2243,8 +2265,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: ShipOrderVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseSupplierVO = {
@ -2252,8 +2274,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: SupplierVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseTreeLong = {
@ -2261,8 +2283,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: TreeLong[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type MultiResponseUserVO = {
@ -2270,8 +2292,8 @@ declare namespace BusinessAPI {
errCode?: string;
errMessage?: string;
data?: UserVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
};
type OrderCompany = {
@ -2606,8 +2628,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: AgreementVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2619,8 +2641,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: BoxBrandVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2632,8 +2654,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: BoxProductVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2645,8 +2667,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: ChannelVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2658,8 +2680,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: CompanyPaymentAccountVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2671,8 +2693,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: CompanyVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2684,8 +2706,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: CostItemVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2697,8 +2719,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: DealerPaymentAccountVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2710,8 +2732,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: DealerRebateCustomerVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2723,8 +2745,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: DealerVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2736,8 +2758,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: DealerWarehouseVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2749,8 +2771,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: DictionaryVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2762,8 +2784,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: EmployeeVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2775,8 +2797,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: GiftBoxVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2788,8 +2810,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: MaterialVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2801,8 +2823,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: PermissionVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2814,8 +2836,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: PlatformVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2827,8 +2849,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: PurchaseOrderVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2840,8 +2862,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: RoleVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2853,8 +2875,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: ShipOrderVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2866,8 +2888,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: SupplierVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};
@ -2879,8 +2901,8 @@ declare namespace BusinessAPI {
pageSize?: number;
pageIndex?: number;
data?: UserVO[];
notEmpty?: boolean;
empty?: boolean;
notEmpty?: boolean;
totalPages?: number;
};

2
swagger/business.json
View File

File diff suppressed because one or more lines are too long