qiushanhe/ss-crm-manage-web
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into dev-cl

Browse Source
This commit is contained in:
caolin
2024-10-21 21:23:46 +08:00
parent 02af7babc4 1ab365efae
commit acccadd43a
2 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/UploadFile/src/UploadFile.vue
View File

@@ -47,7 +47,7 @@ const props = defineProps({
// fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: propTypes.array.def([]),
accept: propTypes.string.def('*'),
fileSize: propTypes.number.def(5), // 大小限制(MB)
fileSize: propTypes.number.def(100), // 大小限制(MB)
limit: propTypes.number.def(5), // 数量限制
autoUpload: propTypes.bool.def(true), // 自动上传
drag: propTypes.bool.def(false), // 拖拽上传

47
src/views/Home/Comp/SignListCard.vue
View File

@@ -38,31 +38,42 @@
</el-form>
<el-table :data="tableList" border stripe show-summary :summary-method="getSummaries">
<el-table-column label="周期" prop="period" width="110px" />
<el-table-column label="成交" align="center">
<el-table-column prop="signNumber" label="成交数" />
<el-table-column prop="signPrice" label="成交额" />
<el-table-column
prop="signPriceSequentialGrowth"
label="成交额环比增长"
:formatter="parseRate"
/>
<el-table-column prop="signPriceSequentialGrowth" label="环比" :formatter="parseRate" />
<el-table-column
prop="signPriceSamePeriodCompareGrowth"
label="成交额同比增长"
label="同比"
:formatter="parseRate"
/>
<el-table-column prop="profit" label="利润" />
<el-table-column prop="profitSequentialGrowth" label="利润环比增长" :formatter="parseRate" />
<el-table-column
prop="profitSamePeriodCompareGrowth"
label="利润同比增长"
:formatter="parseRate"
/>
<el-table-column prop="notReceivedMoney" label="未到账金额" />
<el-table-column prop="receivedMoney" label="已到账金额" />
</el-table-column>
<el-table-column label="利润" align="center">
<el-table-column prop="profit">
<template #header> <Tooltip message="公司利润" /> <span>利润</span> </template>
</el-table-column>
<el-table-column prop="profitSequentialGrowth" label="环比" :formatter="parseRate" />
<el-table-column prop="profitSamePeriodCompareGrowth" label="同比" :formatter="parseRate" />
</el-table-column>
<el-table-column prop="notReceivedMoney">
<template #header>
<Tooltip message="回款列表中未审核的公司利润" /> <span>未到账</span>
</template>
</el-table-column>
<el-table-column prop="receivedMoney">
<template #header>
<Tooltip message="回款列表中已审核的公司利润" /> <span>已到账</span>
</template>
</el-table-column>
<el-table-column prop="waitSettleMoney" label="待结算金额" />
<el-table-column prop="settledMoney" label="已结算金额" />
<el-table-column prop="refundAmount" label="已退款金额" />
<el-table-column prop="remainMoney" label="结余" />
<el-table-column prop="remainMoney">
<template #header>
<Tooltip message="已到账金额-已结算金额-已退款金额" /> <span>结余</span>
</template>
</el-table-column>
</el-table>
</ContentWrap>
</template>
@@ -129,7 +140,8 @@ function getSummaries({ columns, data }) {
if (column.property.includes('Growth')) {
sums[index] = ''
} else {
sums[index] = values.reduce((prev, curr) => {
sums[index] = values
.reduce((prev, curr) => {
const value = Number(curr)
if (!Number.isNaN(value)) {
return prev + curr
@@ -137,6 +149,7 @@ function getSummaries({ columns, data }) {
return prev
}
}, 0)
.toFixed(2)
}
} else {
sums[index] = ''