表结构up

This commit is contained in:
zhuangdashia 2025-09-03 14:44:28 +08:00
parent 9ca39731ae
commit df1bad04f3
3 changed files with 210 additions and 102 deletions

View File

@ -84,6 +84,8 @@ const {
huinongBuyerAmount: null,
waterFeeCollectionCount: null,
waterFeeCollectionAmount: null,
heatFeeCollectionCount: null,
heatFeeCollectionAmount: null,
electricityFeeCollectionCount: null,
electricityFeeCollectionAmount: null,
trafficFineCollectionCount: null,
@ -108,6 +110,8 @@ const {
fixedTermWealthAmount: null,
newHousingFundCustomerCount: null,
newHousingFundCustomerAmount: null,
housingFundCustomerCount: null,
housingFundCustomerAmount: null,
addItem: null,
totalCount: null,
totalAmount: null,
@ -724,6 +728,32 @@ const {
},
]
},
{
key: 'heatFeeCollectionCount',
title: '代收热力费',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true,
children:[
{
key: 'heatFeeCollectionCount',
title: '有效个数',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
{
key: 'heatFeeCollectionAmount',
title: '奖励金额',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
]
},
{
key: 'electricityFeeCollectionCount',
title: '代收电费',
@ -1037,6 +1067,32 @@ const {
},
]
},
{
key: 'housingFundCustomerCount',
title: '公积金缴存账户',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true,
children:[
{
key: 'housingFundCustomerCount',
title: '有效个数',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
{
key: 'housingFundCustomerAmount',
title: '奖励金额',
align: 'center',
minWidth: 120,
ellipsis: true,
resizable: true
},
]
},
{
key: 'addItem',
title: '附加项',
@ -1215,29 +1271,29 @@ const {
const scrollX = ref(0);
//
const calculateTotalWidth = () => {
let totalWidth = 0;
const visibleColumns = columns.value;
for (let i = 0; i < visibleColumns.length; i++) {
const column = visibleColumns[i];
//
// column.width
let width = column.width;
// 使minWidth
if (!width) {
width = column.minWidth || 120;
}
//
width = typeof width === 'string' ? parseInt(width) : width;
totalWidth += width;
let totalWidth = 0;
const visibleColumns = columns.value;
for (let i = 0; i < visibleColumns.length; i++) {
const column = visibleColumns[i];
//
// column.width
let width = column.width;
// 使minWidth
if (!width) {
width = column.minWidth || 120;
}
//
width = typeof width === 'string' ? parseInt(width) : width;
totalWidth += width;
}
// 50px
return totalWidth + 50;
// 50px
return totalWidth + 50;
};
//
watch(columns, (newColumns) => {
scrollX.value = calculateTotalWidth();
scrollX.value = calculateTotalWidth();
}, { deep: true });
@ -1263,7 +1319,7 @@ function edit(id: CommonType.IdType) {
}
function handleImport() {
openImportModal();
openImportModal();
}
function handleExport() {
@ -1288,14 +1344,14 @@ function handleExport() {
@export="handleExport"
@refresh="getData"
>
<!-- <template #after>-->
<!-- <NButton v-if="hasAuth('mps:privateEbankNew:export')" size="small" ghost @click="handleImport">-->
<!-- <template #icon>-->
<!-- <SvgIcon local-icon="upload-rounded"/>-->
<!-- </template>-->
<!-- {{ $t('common.import') }}-->
<!-- </NButton>-->
<!-- </template>-->
<!-- <template #after>-->
<!-- <NButton v-if="hasAuth('mps:privateEbankNew:export')" size="small" ghost @click="handleImport">-->
<!-- <template #icon>-->
<!-- <SvgIcon local-icon="upload-rounded"/>-->
<!-- </template>-->
<!-- {{ $t('common.import') }}-->
<!-- </NButton>-->
<!-- </template>-->
</TableHeaderOperation>
</template>
@ -1315,7 +1371,7 @@ function handleExport() {
@update-resize-widths="scrollX = calculateTotalWidth()"
/>
<PerformanceImportModal v-model:visible="importVisible" @submitted="getDataByPage"/>
<PerformanceImportModal v-model:visible="importVisible" @submitted="getDataByPage"/>
<PerformanceOperateDrawer
v-model:visible="drawerVisible"

View File

@ -91,6 +91,8 @@ function createDefaultModel(): Model {
huinongBuyerAmount: undefined,
waterFeeCollectionCount: undefined,
waterFeeCollectionAmount: undefined,
heatFeeCollectionCount: undefined,
heatFeeCollectionAmount: undefined,
electricityFeeCollectionCount: undefined,
electricityFeeCollectionAmount: undefined,
trafficFineCollectionCount: undefined,
@ -115,6 +117,8 @@ function createDefaultModel(): Model {
fixedTermWealthAmount: undefined,
newHousingFundCustomerCount: undefined,
newHousingFundCustomerAmount: undefined,
housingFundCustomerCount: undefined,
housingFundCustomerAmount: undefined,
addItem: 0.00,
totalCount: undefined,
totalAmount: undefined,
@ -181,6 +185,8 @@ type RuleKey = Extract<
| 'huinongBuyerAmount'
| 'waterFeeCollectionCount'
| 'waterFeeCollectionAmount'
| 'heatFeeCollectionCount'
| 'heatFeeCollectionAmount'
| 'electricityFeeCollectionCount'
| 'electricityFeeCollectionAmount'
| 'trafficFineCollectionCount'
@ -205,6 +211,8 @@ type RuleKey = Extract<
| 'fixedTermWealthAmount'
| 'newHousingFundCustomerCount'
| 'newHousingFundCustomerAmount'
| 'housingFundCustomerCount'
| 'housingFundCustomerAmount'
| 'addItem'
| 'totalCount'
| 'totalAmount'
@ -234,76 +242,80 @@ const rules: Record<RuleKey, App.Global.FormRule> = {
marketerName: createRequiredRule('经办人员姓名不能为空'),
marketerIdCard: createRequiredRule('经办人员身份证号不能为空'),
marketerCode: createRequiredRule('经办人员营销号不能为空'),
marketerPosition: createRequiredRule('营销人员岗位不能为空'),
zhiEIndividualCount: createRequiredRule('智E通个人有效个数不能为空'),
zhiEIndividualAmount: createRequiredRule('智E通个人奖励金额不能为空'),
zhiEInactiveCount: createRequiredRule('智E通未动户激活有效个数不能为空'),
zhiEInactiveAmount: createRequiredRule('智E通未动户激活奖励金额不能为空'),
zhiEEnterpriseCount: createRequiredRule('智E通企业有效个数不能为空'),
zhiEEnterpriseAmount: createRequiredRule('智E通企业奖励金额不能为空'),
corporateMobileBankCount: createRequiredRule('企业手机银行有效个数不能为空'),
corporateMobileBankAmount: createRequiredRule('企业手机银行奖励金额不能为空'),
newMerchantFirstMonthCount: createRequiredRule('新增综合收单商户(首月)有效个数不能为空'),
newMerchantFirstMonthAmount: createRequiredRule('新增综合收单商户(首月)奖励金额不能为空'),
newMerchantRetentionQuarterCount: createRequiredRule('新增综合收单商户留存率提升(当季)有效个数不能为空'),
newMerchantRetentionQuarterAmount: createRequiredRule('新增综合收单商户留存率提升(当季)奖励金额不能为空'),
existingMerchantRetentionCount: createRequiredRule('存量综合收单商户留存率提升有效个数不能为空'),
existingMerchantRetentionAmount: createRequiredRule('存量综合收单商户留存率提升奖励金额不能为空'),
onlinePaymentCount: createRequiredRule('网上支付有效个数不能为空'),
onlinePaymentAmount: createRequiredRule('网上支付奖励金额不能为空'),
magneticToIcCardCount: createRequiredRule('磁条卡更换金融IC卡有效个数不能为空'),
magneticToIcCardAmount: createRequiredRule('磁条卡更换金融IC卡奖励金额不能为空'),
newBankCardCount: createRequiredRule('新开有效银行卡有效个数不能为空'),
newBankCardAmount: createRequiredRule('新开有效银行卡奖励金额不能为空'),
newSocialCardCount: createRequiredRule('新开有效社保卡有效个数不能为空'),
newSocialCardAmount: createRequiredRule('新开有效社保卡奖励金额不能为空'),
loanCustomerSocialCardCount: createRequiredRule('营销贷款客户社保卡有效个数不能为空'),
loanCustomerSocialCardAmount: createRequiredRule('营销贷款客户社保卡奖励金额不能为空'),
employeeSocialCardCount: createRequiredRule('营销职工社保卡有效个数不能为空'),
employeeSocialCardAmount: createRequiredRule('营销职工社保卡奖励金额不能为空'),
activatedSocialCardCount: createRequiredRule('社保卡激活并使用有效个数不能为空'),
activatedSocialCardAmount: createRequiredRule('社保卡激活并使用奖励金额不能为空'),
eSocialCardCount: createRequiredRule('签发电子社保卡有效个数不能为空'),
eSocialCardAmount: createRequiredRule('签发电子社保卡奖励金额不能为空'),
medicalEVoucherCount: createRequiredRule('医保电子凭证有效个数不能为空'),
medicalEVoucherAmount: createRequiredRule('医保电子凭证奖励金额不能为空'),
zhiEPayCount: createRequiredRule('智E付有效个数不能为空'),
zhiEPayAmount: createRequiredRule('智E付奖励金额不能为空'),
huinongFarmerCount: createRequiredRule('慧农通-农户有效个数不能为空'),
huinongFarmerAmount: createRequiredRule('慧农通-农户奖励金额不能为空'),
huinongBuyerCount: createRequiredRule('慧农通-收购商有效个数不能为空'),
huinongBuyerAmount: createRequiredRule('慧农通-收购商奖励金额不能为空'),
waterFeeCollectionCount: createRequiredRule('代收水费有效个数不能为空'),
waterFeeCollectionAmount: createRequiredRule('代收水费奖励金额不能为空'),
electricityFeeCollectionCount: createRequiredRule('代收电费有效个数不能为空'),
electricityFeeCollectionAmount: createRequiredRule('代收电费奖励金额不能为空'),
trafficFineCollectionCount: createRequiredRule('代收交警罚没款有效个数不能为空'),
trafficFineCollectionAmount: createRequiredRule('代收交警罚没款奖励金额不能为空'),
newPartyFeeUnitCount: createRequiredRule('新增党费缴费单位有效个数不能为空'),
newPartyFeeUnitAmount: createRequiredRule('新增党费缴费单位奖励金额不能为空'),
newUnionFeeUnitCount: createRequiredRule('新增工会费缴费单位有效个数不能为空'),
newUnionFeeUnitAmount: createRequiredRule('新增工会费缴费单位奖励金额不能为空'),
newPropertyFeeUnitCount: createRequiredRule('新增物业费缴费单位有效个数不能为空'),
newPropertyFeeUnitAmount: createRequiredRule('新增物业费缴费单位奖励金额不能为空'),
newMealFeeUnitCount: createRequiredRule('新增餐费缴费单位有效个数不能为空'),
newMealFeeUnitAmount: createRequiredRule('新增餐费缴费单位奖励金额不能为空'),
newForeignAccountCount: createRequiredRule('新开立外汇账户有效户有效个数不能为空'),
newForeignAccountAmount: createRequiredRule('新开立外汇账户有效户奖励金额不能为空'),
newPersonalWealthCount: createRequiredRule('新增理财销售有效户(个人)有效个数不能为空'),
newPersonalWealthAmount: createRequiredRule('新增理财销售有效户(个人)奖励金额不能为空'),
newCorporateWealthCount: createRequiredRule('新增理财销售有效户(对公)有效个数不能为空'),
newCorporateWealthAmount: createRequiredRule('新增理财销售有效户(对公)奖励金额不能为空'),
wealthSalesCount: createRequiredRule('理财销售系统业务量有效个数不能为空'),
wealthSalesAmount: createRequiredRule('理财销售系统业务量奖励金额不能为空'),
fixedTermWealthCount: createRequiredRule('代销定期类理财产品有效个数不能为空'),
fixedTermWealthAmount: createRequiredRule('代销定期类理财产品奖励金额不能为空'),
newHousingFundCustomerCount: createRequiredRule('新营销公积金缴存客户奖励有效个数不能为空'),
newHousingFundCustomerAmount: createRequiredRule('新营销公积金缴存客户奖励金额不能为空'),
addItem: createRequiredRule('附加项不能为空'),
totalCount: createRequiredRule('有效个数总计不能为空'),
totalAmount: createRequiredRule('合计计价不能为空'),
// marketerPosition: createRequiredRule(''),
// zhiEIndividualCount: createRequiredRule('E'),
// zhiEIndividualAmount: createRequiredRule('E'),
// zhiEInactiveCount: createRequiredRule('E'),
// zhiEInactiveAmount: createRequiredRule('E'),
// zhiEEnterpriseCount: createRequiredRule('E'),
// zhiEEnterpriseAmount: createRequiredRule('E'),
// corporateMobileBankCount: createRequiredRule(''),
// corporateMobileBankAmount: createRequiredRule(''),
// newMerchantFirstMonthCount: createRequiredRule('()'),
// newMerchantFirstMonthAmount: createRequiredRule('()'),
// newMerchantRetentionQuarterCount: createRequiredRule('()'),
// newMerchantRetentionQuarterAmount: createRequiredRule('()'),
// existingMerchantRetentionCount: createRequiredRule(''),
// existingMerchantRetentionAmount: createRequiredRule(''),
// onlinePaymentCount: createRequiredRule(''),
// onlinePaymentAmount: createRequiredRule(''),
// magneticToIcCardCount: createRequiredRule('IC'),
// magneticToIcCardAmount: createRequiredRule('IC'),
// newBankCardCount: createRequiredRule(''),
// newBankCardAmount: createRequiredRule(''),
// newSocialCardCount: createRequiredRule(''),
// newSocialCardAmount: createRequiredRule(''),
// loanCustomerSocialCardCount: createRequiredRule(''),
// loanCustomerSocialCardAmount: createRequiredRule(''),
// employeeSocialCardCount: createRequiredRule(''),
// employeeSocialCardAmount: createRequiredRule(''),
// activatedSocialCardCount: createRequiredRule('使'),
// activatedSocialCardAmount: createRequiredRule('使'),
// eSocialCardCount: createRequiredRule(''),
// eSocialCardAmount: createRequiredRule(''),
// medicalEVoucherCount: createRequiredRule(''),
// medicalEVoucherAmount: createRequiredRule(''),
// zhiEPayCount: createRequiredRule('E'),
// zhiEPayAmount: createRequiredRule('E'),
// huinongFarmerCount: createRequiredRule('-'),
// huinongFarmerAmount: createRequiredRule('-'),
// huinongBuyerCount: createRequiredRule('-'),
// huinongBuyerAmount: createRequiredRule('-'),
// waterFeeCollectionCount: createRequiredRule(''),
// waterFeeCollectionAmount: createRequiredRule(''),
// heatFeeCollectionCount: createRequiredRule(''),
// heatFeeCollectionAmount: createRequiredRule(''),
// electricityFeeCollectionCount: createRequiredRule(''),
// electricityFeeCollectionAmount: createRequiredRule(''),
// trafficFineCollectionCount: createRequiredRule(''),
// trafficFineCollectionAmount: createRequiredRule(''),
// newPartyFeeUnitCount: createRequiredRule(''),
// newPartyFeeUnitAmount: createRequiredRule(''),
// newUnionFeeUnitCount: createRequiredRule(''),
// newUnionFeeUnitAmount: createRequiredRule(''),
// newPropertyFeeUnitCount: createRequiredRule(''),
// newPropertyFeeUnitAmount: createRequiredRule(''),
// newMealFeeUnitCount: createRequiredRule(''),
// newMealFeeUnitAmount: createRequiredRule(''),
// newForeignAccountCount: createRequiredRule(''),
// newForeignAccountAmount: createRequiredRule(''),
// newPersonalWealthCount: createRequiredRule('()'),
// newPersonalWealthAmount: createRequiredRule('()'),
// newCorporateWealthCount: createRequiredRule('()'),
// newCorporateWealthAmount: createRequiredRule('()'),
// wealthSalesCount: createRequiredRule(''),
// wealthSalesAmount: createRequiredRule(''),
// fixedTermWealthCount: createRequiredRule(''),
// fixedTermWealthAmount: createRequiredRule(''),
// newHousingFundCustomerCount: createRequiredRule(''),
// newHousingFundCustomerAmount: createRequiredRule(''),
// housingFundCustomerCount: createRequiredRule(''),
// housingFundCustomerAmount: createRequiredRule(''),
// addItem: createRequiredRule(''),
// totalCount: createRequiredRule(''),
// totalAmount: createRequiredRule(''),
recordDate: createRequiredRule('记录日期不能为空'),
reportType: createRequiredRule('报表类型 d:日报 m:月报 q:季报 y:年报不能为空'),
// reportType: createRequiredRule(' d: m: q: y:'),
// fill1: createRequiredRule(''),
// fill2: createRequiredRule(''),
// fill3: createRequiredRule(''),
@ -314,12 +326,12 @@ const rules: Record<RuleKey, App.Global.FormRule> = {
// fill8: createRequiredRule(''),
// fill9: createRequiredRule(''),
// fill10: createRequiredRule(''),
tenantId: createRequiredRule('租户编号不能为空'),
createBy: createRequiredRule('创建者不能为空'),
createDept: createRequiredRule('不能为空'),
createTime: createRequiredRule('创建时间不能为空'),
updateBy: createRequiredRule('更新者不能为空'),
updateTime: createRequiredRule('更新时间不能为空')
// tenantId: createRequiredRule(''),
// createBy: createRequiredRule(''),
// createDept: createRequiredRule(''),
// createTime: createRequiredRule(''),
// updateBy: createRequiredRule(''),
// updateTime: createRequiredRule('')
};
function handleUpdateModelWhenEdit() {
@ -508,6 +520,12 @@ watch(visible, () => {
<NFormItem label="代收水费奖励金额" path="waterFeeCollectionAmount">
<NInput v-model:value="model.waterFeeCollectionAmount" placeholder="请输入代收水费奖励金额" />
</NFormItem>
<NFormItem label="代收热力费有效个数" path="heatFeeCollectionCount">
<NInput-number v-model:value="model.heatFeeCollectionCount" placeholder="请输入代收热力费有效个数" />
</NFormItem>
<NFormItem label="代收热力奖励金额" path="heatFeeCollectionAmount">
<NInput v-model:value="model.heatFeeCollectionAmount" placeholder="请输入代收热力奖励金额" />
</NFormItem>
<NFormItem label="代收电费有效个数" path="electricityFeeCollectionCount">
<NInput-number v-model:value="model.electricityFeeCollectionCount" placeholder="请输入代收电费有效个数" />
</NFormItem>
@ -580,6 +598,12 @@ watch(visible, () => {
<NFormItem label="新营销公积金缴存客户奖励金额" path="newHousingFundCustomerAmount">
<NInput v-model:value="model.newHousingFundCustomerAmount" placeholder="请输入新营销公积金缴存客户奖励金额" />
</NFormItem>
<NFormItem label="公积金缴存账户有效个数" path="housingFundCustomerCount">
<NInput-number v-model:value="model.housingFundCustomerCount" placeholder="请输入公积金缴存账户有效个数" />
</NFormItem>
<NFormItem label="公积金缴存账户奖励金额" path="housingFundCustomerAmount">
<NInput v-model:value="model.housingFundCustomerAmount" placeholder="请输入公积金缴存账户奖励金额" />
</NFormItem>
<NFormItem label="附加项" path="addItem">
<NInput-number v-model:value="model.addItem" placeholder="请输入附加项" disabled />
</NFormItem>

View File

@ -529,6 +529,34 @@ public class MarketingPerformanceVo implements Serializable {
@ExcelProperty(value ={ "新营销公积金缴存客户", "奖励金额" }, index = 67)
private BigDecimal newHousingFundCustomerAmount;
/**
* 公积金缴存账户有效个数
*/
@ExcelProperty(value = "公积金缴存账户有效个数")
// @ExcelProperty(value ={ "公积金缴存账户", "有效个数" }, index = 68)
private Long housingFundCustomerCount;
/**
* 公积金缴存账户奖励金额
*/
@ExcelProperty(value = "公积金缴存账户奖励金额")
// @ExcelProperty(value ={ "公积金缴存账户", "奖励金额" }, index = 69)
private BigDecimal housingFundCustomerAmount;
/**
* 代收热力费有效个数
*/
@ExcelProperty(value = "代收热力费有效个数")
// @ExcelProperty(value ={ "代收热力费", "有效个数" }, index = 70 )
private Long heatFeeCollectionCount;
/**
* 代收热力奖励金额
*/
@ExcelProperty(value = "代收热力奖励金额")
// @ExcelProperty(value ={ "代收热力费", "奖励金额" }, index = 71 )
private BigDecimal heatFeeCollectionAmount;
/**
* 附加项
*/