修复应收应付的bug
This commit is contained in:
@@ -2,9 +2,6 @@
|
|||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-card class="filter-container" shadow="never">
|
<el-card class="filter-container" shadow="never">
|
||||||
<el-form :model="queryParams" :inline="true" label-width="100px">
|
<el-form :model="queryParams" :inline="true" label-width="100px">
|
||||||
<el-form-item label="用户ID">
|
|
||||||
<el-input v-model="queryParams.userId" clearable placeholder="请输入用户ID" style="width: 180px" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="昵称">
|
<el-form-item label="昵称">
|
||||||
<el-input v-model="queryParams.nickname" clearable placeholder="请输入昵称" style="width: 180px" />
|
<el-input v-model="queryParams.nickname" clearable placeholder="请输入昵称" style="width: 180px" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -42,9 +39,16 @@
|
|||||||
</el-card>
|
</el-card>
|
||||||
|
|
||||||
<el-card class="action-container" shadow="never">
|
<el-card class="action-container" shadow="never">
|
||||||
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
|
<div class="action-bar">
|
||||||
<el-button type="warning" icon="el-icon-data-analysis" :loading="reportSumLoading" @click="openReportSumDialog">汇总数据</el-button>
|
<div class="action-buttons">
|
||||||
<el-button type="danger" icon="el-icon-delete" :loading="deleteByDateLoading" @click="openDeleteByDateDialog">删除报表数据</el-button>
|
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
|
||||||
|
<el-button type="warning" icon="el-icon-data-analysis" :loading="reportSumLoading" @click="openReportSumDialog">汇总数据</el-button>
|
||||||
|
<el-button type="danger" icon="el-icon-delete" :loading="deleteByDateLoading" @click="openDeleteByDateDialog">删除报表数据</el-button>
|
||||||
|
</div>
|
||||||
|
<div class="action-tip">
|
||||||
|
说明:服务费=当日买入×0.01;差额=当日卖出−当日买入;应收应付=差额−服务费(>0 应收(当前人),<0 应付(当前人))
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</el-card>
|
</el-card>
|
||||||
|
|
||||||
<el-card class="table-container" shadow="never">
|
<el-card class="table-container" shadow="never">
|
||||||
@@ -60,6 +64,7 @@
|
|||||||
<el-table-column label="当日买入金额" prop="dailyBuyAmt" min-width="130" />
|
<el-table-column label="当日买入金额" prop="dailyBuyAmt" min-width="130" />
|
||||||
<el-table-column label="服务费" prop="serviceAmt" min-width="100" />
|
<el-table-column label="服务费" prop="serviceAmt" min-width="100" />
|
||||||
<el-table-column label="差额" prop="diffAmt" min-width="100" />
|
<el-table-column label="差额" prop="diffAmt" min-width="100" />
|
||||||
|
<el-table-column label="应收应付" prop="actualReceiptsPayments" min-width="110" />
|
||||||
<el-table-column label="抵扣金额" prop="dikouAmt" min-width="110" />
|
<el-table-column label="抵扣金额" prop="dikouAmt" min-width="110" />
|
||||||
<el-table-column label="数据类型" prop="dataType" min-width="100" />
|
<el-table-column label="数据类型" prop="dataType" min-width="100" />
|
||||||
<el-table-column label="描述" prop="descContent" min-width="140" show-overflow-tooltip />
|
<el-table-column label="描述" prop="descContent" min-width="140" show-overflow-tooltip />
|
||||||
@@ -264,7 +269,6 @@ export default {
|
|||||||
queryParams: {
|
queryParams: {
|
||||||
current: 1,
|
current: 1,
|
||||||
size: 10,
|
size: 10,
|
||||||
userId: '',
|
|
||||||
dataType: '',
|
dataType: '',
|
||||||
nickname: '',
|
nickname: '',
|
||||||
...getDefaultReportRange()
|
...getDefaultReportRange()
|
||||||
@@ -330,7 +334,6 @@ export default {
|
|||||||
const params = {
|
const params = {
|
||||||
current: this.queryParams.current,
|
current: this.queryParams.current,
|
||||||
size: this.queryParams.size,
|
size: this.queryParams.size,
|
||||||
userId: this.queryParams.userId || undefined,
|
|
||||||
dataType: this.queryParams.dataType || undefined,
|
dataType: this.queryParams.dataType || undefined,
|
||||||
nickname: this.queryParams.nickname || undefined,
|
nickname: this.queryParams.nickname || undefined,
|
||||||
reportStartTime: this.queryParams.reportStartTime || undefined,
|
reportStartTime: this.queryParams.reportStartTime || undefined,
|
||||||
@@ -349,7 +352,6 @@ export default {
|
|||||||
this.queryParams = {
|
this.queryParams = {
|
||||||
current: 1,
|
current: 1,
|
||||||
size: 10,
|
size: 10,
|
||||||
userId: '',
|
|
||||||
dataType: '',
|
dataType: '',
|
||||||
nickname: '',
|
nickname: '',
|
||||||
...getDefaultReportRange()
|
...getDefaultReportRange()
|
||||||
@@ -584,6 +586,27 @@ export default {
|
|||||||
|
|
||||||
.action-container {
|
.action-container {
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
|
|
||||||
|
.action-bar {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action-buttons {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.action-tip {
|
||||||
|
color: #909399;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 18px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.table-container {
|
.table-container {
|
||||||
|
|||||||
Reference in New Issue
Block a user