|
|
@@ -4,9 +4,10 @@
|
|
|
<el-select placeholder="请选择" v-model="reporttype" @change="onChange">
|
|
|
<el-option v-for="option in selectList" :key="option.value" :value="option.value" :label="option.label" />
|
|
|
</el-select>
|
|
|
- <el-date-picker :type="reporttype === 1 ? 'date' : 'month'" placeholder="查询日期" :value-format="reporttype === 1 ? 'YYYYMMDD' : 'YYYYMM'" v-model="cycletime" />
|
|
|
+ <el-date-picker :type="reporttype === 1 ? 'date' : 'month'" placeholder="查询日期"
|
|
|
+ :value-format="reporttype === 1 ? 'YYYYMMDD' : 'YYYYMM'" v-model="cycletime" />
|
|
|
<el-button type="danger" @click="reloadData">查询</el-button>
|
|
|
- <app-table-details title="账户信息" :data="ta" :label-width="180" :cell-props="accountDetailProps" :column="2" >
|
|
|
+ <app-table-details title="账户信息" :data="ta" :label-width="180" :cell-props="accountDetailProps" :column="2">
|
|
|
<!-- 名称 -->
|
|
|
<template #accountname>
|
|
|
{{ userinfo?.customername }}
|
|
|
@@ -20,8 +21,10 @@
|
|
|
{{ formatDate(value) }}
|
|
|
</template>
|
|
|
</app-table-details>
|
|
|
- <app-table-details v-if="reporttype === 1 && dtaaccounts.length != 0" title="资金信息" :data="dtaaccounts[0]" :label-width="180" :cell-props="taDetailProps" :column="2" ></app-table-details>
|
|
|
- <app-table-details v-if="reporttype === 2 && mtaaccounts.length != 0" title="资金信息" :data="mtaaccounts[0]" :label-width="180" :cell-props="taDetailProps" :column="2" ></app-table-details>
|
|
|
+ <app-table-details v-if="reporttype === 1 && dtaaccounts.length != 0" title="资金信息" :data="dtaaccounts[0]"
|
|
|
+ :label-width="180" :cell-props="taDetailProps" :column="2"></app-table-details>
|
|
|
+ <app-table-details v-if="reporttype === 2 && mtaaccounts.length != 0" title="资金信息" :data="mtaaccounts[0]"
|
|
|
+ :label-width="180" :cell-props="taDetailProps" :column="2"></app-table-details>
|
|
|
<span>出入金明细</span>
|
|
|
<app-table :data="logs" v-model:columns="logsTableColumns" />
|
|
|
<span>持仓汇总</span>
|
|
|
@@ -67,7 +70,7 @@ const tradedetails = shallowRef<Model.ReportTradeDetailRsp[]>([])
|
|
|
|
|
|
const onAgree = () => {
|
|
|
/// 记录时间和是否同意
|
|
|
- localData.setValue('isReportAgree', true)
|
|
|
+ localData.setValue('isReportAgree', true)
|
|
|
localData.setValue('reportTime', new Date().toISOString())
|
|
|
show.value = false
|
|
|
refresh.value = false
|
|
|
@@ -75,7 +78,7 @@ const onAgree = () => {
|
|
|
|
|
|
const onDisAgree = () => {
|
|
|
/// 记录时间和是否同意
|
|
|
- localData.setValue('isReportAgree', false)
|
|
|
+ localData.setValue('isReportAgree', false)
|
|
|
eventBus.$emit('LogoutNotify')
|
|
|
router.replace({ name: 'login' })
|
|
|
}
|
|
|
@@ -161,16 +164,13 @@ const accountDetailProps = [
|
|
|
|
|
|
/// 资金信息
|
|
|
const taDetailProps = [
|
|
|
- { prop: 'balance', label: '期初余额：' },
|
|
|
- { prop: '', label: '' },
|
|
|
+ { prop: 'balance', label: '期初余额：', entireRow: true },
|
|
|
{ prop: 'inamount', label: '银行入金：' },
|
|
|
{ prop: 'closepl', label: '平仓损益：' },
|
|
|
{ prop: 'outamount', label: '银行出金：' },
|
|
|
{ prop: 'reckonpl', label: '结算损益：' },
|
|
|
{ prop: 'freezecharge', label: '服务费：' },
|
|
|
- { prop: '', label: '' },
|
|
|
- { prop: 'currentbalance', label: '期末余额：' },
|
|
|
- { prop: '', label: '' },
|
|
|
+ { prop: 'currentbalance', label: '期末余额：', entireRow: true },
|
|
|
{ prop: 'oriusedmargin', label: '占用资金：' },
|
|
|
{ prop: 'orioutamountfreeze', label: '冻结资金：' },
|
|
|
{ prop: 'avaiablemoney', label: '可用资金：' },
|
