xxxx

src/packages/mobile/views/bank/capital/statement/index.vue

@@ -13,6 +13,22 @@
                 <span>{{ formatDate(value, 'YYYY-MM-DD') }}</span>
                 <span>{{ formatDate(value, 'HH:mm:ss') }}</span>
             </template>
+             <!-- 操作类型 -->
+            <template #operatetypename="{ value }" v-if="i18n.global.locale === 'zh-CN'">
+                {{ value }}
+            </template>
+            <!-- 操作类型 -->
+            <template #operatetypename_tw="{ value }" v-if="i18n.global.locale === 'zh-TW'">
+                {{ value }}
+            </template>
+            <!-- 操作类型 -->
+            <template #operatetypenameen="{ value }" v-if="i18n.global.locale === 'en-US'">
+                {{ value }}
+            </template>
+            <!-- 操作类型 -->
+            <template #operatetypenameth="{ value }" v-if="i18n.global.locale === 'th-TH'">
+                {{ value }}
+            </template>
         </app-list>
     </app-pull-refresh>
 </template>
@@ -45,6 +61,9 @@ const operateTypeSearchList = [{
 const columns: Model.TableColumn[] = [
     { field: 'createtime', label: t('banksign.capital.createtime') },
     { field: 'operatetypename', label: t('banksign.capital.operatetypename') },
+    { field: 'operatetypename_tw', label: 'banksign.capital.operatetypename' },
+    { field: 'operatetypenameen', label: 'banksign.capital.operatetypename' },
+    { field: 'operatetypenameth', label: 'banksign.capital.operatetypename' },
     { field: 'amount', label: t('banksign.capital.amount') },
 ]
 

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

@@ -14,7 +14,7 @@
                             </div>
                             <div class="right">
                                 <span>
-                                    {{ item.buyorselldisplay }}
+                                    {{ getBuyOrSellName(item.buyorsell) }}
                                 </span>
                             </div>
                         </div>
@@ -49,6 +49,7 @@
 import { shallowRef } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { queryReportReckonDayPosition } from '@/services/api/report'
+import { getBuyOrSellName } from '@/constants/order'
 import AppModal from '@/components/base/modal/index.vue'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 

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

@@ -15,7 +15,7 @@
                             </div>
                             <div class="right">
                                 <span>
-                                    {{ item.buyorselldisplay }}
+                                    {{ getBuyOrSellName(item.buyorsell) }}/{{ getBuildTypeName(item.buildtype) }}
                                 </span>
                             </div>
                         </div>
@@ -50,6 +50,7 @@
 import { shallowRef } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { queryReportTradeDetail } from '@/services/api/report'
+import { getBuyOrSellName, getBuildTypeName } from '@/constants/order'
 import AppModal from '@/components/base/modal/index.vue'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 

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

@@ -34,11 +34,21 @@
         </fieldset>
         <fieldset class="g-fieldset">
             <legend class="g-fieldset__legend">{{ t('report.ordersumary') }}</legend>
-            <app-table :data="dpostions" v-model:columns="dpostionsTableColumns" />
+            <app-table :data="dpostions" v-model:columns="dpostionsTableColumns">
+                 <!-- 买卖方向 -->
+                <template #buyorsell="{ value }">
+                    {{ getBuyOrSellName(value) }}
+                </template>
+            </app-table>
         </fieldset>
         <fieldset class="g-fieldset">
             <legend class="g-fieldset__legend">{{ t('report.tradedetail') }}</legend>
-            <app-table :data="tradedetails" v-model:columns="tradeDetailsTableColumns" />
+            <app-table :data="tradedetails" v-model:columns="tradeDetailsTableColumns" >
+                 <!-- 买卖方向 -->
+                <template #buyorsell="{ row }">
+                    {{ getBuyOrSellName(row.buyorsell) }}/{{ getBuildTypeName(row.buildtype) }}
+                </template>
+            </app-table>
         </fieldset>
         <template #footer>
             <el-button type="info" @click="show = false" v-if="!!reportAgree[agreeIndex]?.isAgree">{{ t('operation.close1') }}</el-button>
@@ -57,7 +67,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 } from '@/constants/order'
+import { getCurrencyName, getBuyOrSellName, getBuildTypeName } 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'
@@ -224,7 +234,7 @@ const logsTableColumns = shallowRef<Model.TableColumn[]>([
 /// 持仓汇总
 const dpostionsTableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'goodsdisplay', label: 'report.position.goodsdisplay' },
-    { field: 'buyorselldisplay', label: 'report.position.buyorselldisplay' },
+    { field: 'buyorsell', label: 'report.position.buyorselldisplay' },
     { field: 'curpositionqty', label: 'report.position.curpositionqty' },
     { field: 'frozenqty', label: 'report.position.frozenqty' },
     { field: 'curholderamount', label: 'report.position.curholderamount' },
@@ -234,7 +244,7 @@ const dpostionsTableColumns = shallowRef<Model.TableColumn[]>([
 /// 成交明细
 const tradeDetailsTableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'goodsdisplay', label: 'report.trade.goodsdisplay' },
-    { field: 'buyorselldisplay', label: 'report.trade.buyorselldisplay', width: 100 },
+    { field: 'buyorsell', label: 'report.trade.buyorselldisplay', width: 100 },
     { field: 'tradeqty', label: 'report.trade.tradeqty', width: 80 },
     { field: 'tradeprice', label: 'report.trade.tradeprice', width: 80 },
     { field: 'tradeamount', label: 'report.trade.tradeamount', width: 100 },

src/packages/pc/views/footer/capital/statement/index.vue

@@ -1,6 +1,22 @@
 <!-- 资金信息-资金流水 -->
 <template>
     <app-table :data="tableList" v-model:columns="tableColumns" :loading="loading">
+        <!-- 操作类型 -->
+        <template #operatetypename="{ value }" v-if="i18n.global.locale === 'zh-CN'">
+            {{ value }}
+        </template>
+         <!-- 操作类型 -->
+         <template #operatetypename_tw="{ value }" v-if="i18n.global.locale === 'zh-TW'">
+            {{ value }}
+        </template>
+        <!-- 操作类型 -->
+        <template #operatetypenameen="{ value }" v-if="i18n.global.locale === 'en-US'">
+            {{ value }}
+        </template>
+        <!-- 操作类型 -->
+        <template #operatetypenameth="{ value }" v-if="i18n.global.locale === 'th-TH'">
+            {{ value }}
+        </template>
         <!-- 委托时间 -->
         <template #createtime="{ value }">
             {{ formatDate(value) }}
@@ -31,6 +47,9 @@ const { t } = i18n.global
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'accountid', label: 'banksign.capital.accountid' },
     { field: 'operatetypename', label: 'banksign.capital.operatetypename' },
+    { field: 'operatetypename_tw', label: 'banksign.capital.operatetypename' },
+    { field: 'operatetypenameen', label: 'banksign.capital.operatetypename' },
+    { field: 'operatetypenameth', label: 'banksign.capital.operatetypename' },
     { field: 'amount', label: 'banksign.capital.amount' },
     { field: 'createtime', label: 'banksign.capital.createtime' }
 ])

src/packages/pc/views/query/capital/list/index.vue

@@ -20,6 +20,22 @@
         <template #createtime="{ value }">
             {{ formatDate(value) }}
         </template>
+        <!-- 操作类型 -->
+        <template #operatetypename="{ value }" v-if="i18n.global.locale === 'zh-CN'">
+            {{ value }}
+        </template>
+         <!-- 操作类型 -->
+         <template #operatetypename_tw="{ value }" v-if="i18n.global.locale === 'zh-TW'">
+            {{ value }}
+        </template>
+         <!-- 操作类型 -->
+         <template #operatetypenameen="{ value }" v-if="i18n.global.locale === 'en-US'">
+            {{ value }}
+        </template>
+         <!-- 操作类型 -->
+         <template #operatetypenameth="{ value }" v-if="i18n.global.locale === 'th-TH'">
+            {{ value }}
+        </template>
         <template #append v-if="showLoadMore">
             <el-button size="small" plain @click="loadMore">{{ t('common.loadMore') }}</el-button>
         </template>
@@ -50,6 +66,9 @@ const { t } = i18n.global
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'accountid', label: 'banksign.capital.accountid' },
     { field: 'operatetypename', label: 'banksign.capital.operatetypename' },
+    { field: 'operatetypename_tw', label: 'banksign.capital.operatetypename' },
+    { field: 'operatetypenameen', label: 'banksign.capital.operatetypename' },
+    { field: 'operatetypenameth', label: 'banksign.capital.operatetypename' },
     { field: 'amount', label: 'banksign.capital.amount' },
     { field: 'createtime', label: 'banksign.capital.createtime' }
 ])

src/types/model/bank.d.ts

@@ -260,7 +260,13 @@ declare namespace Model {
         // 资金流水号：银行端流水号
         moneyticket: number
         // 资金操作类型 (AccountFundCmdOp)- 101:入金 102:入金手续费 103:出金 104:出金冻结 105:出金解冻 106:出金手续费 107:出金手续费冻结 108:出金手续费解冻 201:交易冻结 202:交易解冻 203:交易占用 204:交易解占用 205:交易手续费冻结 206:交易手续费解冻 207:交易手续费 208:交易货款 209:交易盈亏 301:交割冻结 302:交割解冻 303:交割手续费 304:交割手续费冻结 305:交割手续费解冻 306:交割货款 307:交割税款 401:结算盈亏 402:结算递延费 403:分润收入 404:延期分润 501:授信增加 502:授信减少 503:转积分 504:转入 505:转出 506:转出冻结 507:转出解冻 601:履约金额冻结 602:履约最大冻结 603:履约金额解冻 604:履约扣款 605:履约收款 606:履约违约手续费 607:履约违约收入 608:履约最大扣款 701:供应链金融冻结 702:供应链金融解冻 703:供应链金融最大冻结 704:供应链金融利息 705:供应链金融货款 706:供应链金融押金 707:供应链金融最大扣款 801:仓单贸易冻结 802:仓单贸易解冻 803:仓单贸易首付款 804:仓单贸易最大扣款 901:商城扣款冻结 902:商城扣款解冻 903:商城扣款 904:商城收款 1001:期权冻结 1002:期权解冻 1003:期权权力金 1004:期权手续费冻结 1005:期权手续费解冻 1006:期权手续费 1007:期权盈亏 1101:营销扣款 1102:营销收款
-        operatetypename: string; 
+        operatetypename: string
+        /// 枚举项名称 - 繁体
+        operatetypename_tw: string
+        /// 枚举项名称 - 英文
+        operatetypenameen: string
+        /// 枚举项名称 - 泰文
+        operatetypenameth: string
         // 资金操作类型名称(显示)
         operatetype: number
         // 关联单号

src/types/model/report.d.ts

@@ -211,6 +211,8 @@ declare namespace Model {
        accountid: number
        /// 均价
        avagepricedisplay: string
+       /// 买卖方向 0-买 1-卖
+       buyorsell: number
        /// 方向
        buyorselldisplay: string
        /// 当前持仓总金额
@@ -419,6 +421,10 @@ declare namespace Model {
    interface ReportTradeDetailRsp {
        /// 资金账户
        accountid: number
+       /// 买卖方向 - 0:买 1:卖
+       buyorsell: number
+       /// 委托单据类型 - 1:建仓 2:平仓 3:先平后建
+       buildtype: number
        /// 类型/方向
        buyorselldisplay: string
        /// 服务费