xxxxx

src/packages/mobile/views/report/components/bank/index.vue

@@ -11,6 +11,12 @@
                         <span>{{ formatDate(value, 'YYYY-MM-DD') }}</span>
                         <span class="text-small">{{ formatDate(value, 'HH:mm:ss') }}</span>
                     </template>
+                    <template #executetype="{ value }">
+                        {{  getInOutExecuteTypeName(value) }}
+                    </template>
+                    <template #applystatus="{ value }">
+                        {{ getInOutApplyStatusName(value) }}
+                    </template>
                 </app-list>
             </app-pull-refresh>
         </app-view>
@@ -26,6 +32,7 @@ import { i18n } from '@/stores'
 import AppModal from '@/components/base/modal/index.vue'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 import AppList from '@mobile/components/base/list/index.vue'
+import { getInOutExecuteTypeName, getInOutApplyStatusName } from '@/constants/order'
 
 const props = defineProps({
     reportType: {
@@ -45,9 +52,9 @@ const { global: { t } } = i18n
 
 const columns: Model.TableColumn[] = [
     { field: 'updatetime', label: t('report.bank.updatetime') },
-    { field: 'executetypedisplay', label: t('report.bank.executetypedisplay') },
+    { field: 'executetype', label: t('report.bank.executetypedisplay') },
     { field: 'amount', label: t('report.bank.amount') },
-    { field: 'applystatusdisplay', label: t('report.bank.applystatusdisplay') },
+    { field: 'applystatus', label: t('report.bank.applystatusdisplay') },
 ]
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryReportBankAccountOutInLog, {

src/packages/pc/components/layouts/header/components/report/index.vue

@@ -30,7 +30,16 @@
         <app-table-details :title="t('report.fundsinfo')" :data="taaccount" :label-width="180" :cell-props="taDetailProps" :column="2" />
         <fieldset class="g-fieldset">
             <legend class="g-fieldset__legend">{{ t('report.inoutamountdetail') }}</legend>
-            <app-table :data="logs" v-model:columns="logsTableColumns" />
+            <app-table :data="logs" v-model:columns="logsTableColumns">
+                <!-- executetype -->
+                <template #executetype="{ value }">
+                    {{ getInOutExecuteTypeName(value) }}
+                </template>
+                <!-- applystatus -->
+                <template #applystatus="{ value }">
+                    {{ getInOutApplyStatusName(value) }}
+                </template>
+            </app-table>
         </fieldset>
         <fieldset class="g-fieldset">
             <legend class="g-fieldset__legend">{{ t('report.ordersumary') }}</legend>
@@ -67,7 +76,7 @@ import { useLoginStore, useAccountStore, useUserStore, i18n  } from '@/stores'
 import { formatDate } from '@/filters'
 import { localData } from '@/stores/storage'
 import { queryMarketRun } from '@/services/api/market'
-import { getCurrencyName, getBuyOrSellName, getBuildTypeName } from '@/constants/order'
+import { getCurrencyName, getBuyOrSellName, getBuildTypeName, getInOutExecuteTypeName, getInOutApplyStatusName } from '@/constants/order'
 import { queryReportBankAccountOutInLog, queryReportMonthTaaccount, queryReportReckonDayPosition, queryReportReckonDayTaaccount, queryReportTradeDetail } from '@/services/api/report'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTable from '@pc/components/base/table/index.vue'
@@ -226,9 +235,9 @@ const taDetailProps = [
 /// 出入金明细
 const logsTableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'updatetime', label: 'report.bank.updatetime' },
-    { field: 'executetypedisplay', label: 'report.bank.executetypedisplay' },
+    { field: 'executetype', label: 'report.bank.executetypedisplay' },
     { field: 'amount', label: 'report.bank.amount' },
-    { field: 'applystatusdisplay', label: 'report.bank.applystatusdisplay' },
+    { field: 'applystatus', label: 'report.bank.applystatusdisplay' },
 ])
 
 /// 持仓汇总

src/types/model/report.d.ts

@@ -21,8 +21,12 @@ declare namespace Model {
        amount: number
        /// 申请状态
        applystatusdisplay: string
+       /// 申请状态
+       applystatus: number
        /// 申请类型
        executetypedisplay: string
+       /// 申请类型
+       executetype: number
        /// 报表类型 日报表-1 月报表-2
        reportType: number
        /// 查询日期 日报表-yyyyMMdd 月报表-yyyyMM