Handy_Cao преди 11 месеца
родител
ревизия
aedd1cd1c0

+ 2 - 1
public/locales/en-US.json

@@ -1139,7 +1139,7 @@
         }
     },
     "query": {
-        "order": {
+        "internal": {
             "accountsumm": {
                 "marketid": "Market",
                 "summode": "SumMode",
@@ -1459,6 +1459,7 @@
             },
             "tradesumm": {}
         },
+        "order": {},
         "other": {
             "bank_inout": {
                 "date": "TradeDate",

+ 2 - 1
public/locales/th-TH.json

@@ -1139,7 +1139,7 @@
         }
     },
     "query": {
-        "order": {
+        "internal": {
             "accountsumm": {
                 "marketid": "市场",
                 "summode": "汇总方式",
@@ -1459,6 +1459,7 @@
             },
             "tradesumm": {}
         },
+        "order": {},
         "other": {
             "bank_inout": {
                 "date": "交易日",

+ 2 - 1
public/locales/zh-CN.json

@@ -1139,7 +1139,7 @@
         }
     },
     "query": {
-        "order": {
+        "internal": {
             "accountsumm": {
                 "marketid": "市场",
                 "summode": "汇总方式",
@@ -1459,6 +1459,7 @@
             },
             "tradesumm": {}
         },
+        "order": {},
         "other": {
             "bank_inout": {
                 "date": "交易日",

+ 2 - 1
public/locales/zh-TW.json

@@ -1139,7 +1139,7 @@
         }
     },
     "query": {
-        "order": {
+        "internal": {
             "accountsumm": {
                 "marketid": "市場",
                 "summode": "彙總方式",
@@ -1459,6 +1459,7 @@
             },
             "tradesumm": {}
         },
+        "orer": {},
         "other": {
             "bank_inout": {
                 "date": "交易日",

+ 20 - 20
src/packages/pc/views/query/internal/accountsumm/index.vue

@@ -4,7 +4,7 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item :label="t('query.order.accountsumm.marketid')" prop="marketid">
+                <el-form-item :label="t('query.internal.accountsumm.marketid')" prop="marketid">
                     <el-select v-model="queryParams.marketid">
                         <template v-for="item in getMarketOptions([15, 40, 41, 48, 51, 71, 97, 99], true)"
                             :key="item.value">
@@ -12,24 +12,24 @@
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.accountsumm.summode')" prop="summode">
+                <el-form-item :label="t('query.internal.accountsumm.summode')" prop="summode">
                     <el-select v-model="queryParams.summode">
-                        <el-option :label="t('query.order.accountsumm.summode1')" :value="1" />
-                        <el-option :label="t('query.order.accountsumm.summode2')" :value="2" />
+                        <el-option :label="t('query.internal.accountsumm.summode1')" :value="1" />
+                        <el-option :label="t('query.internal.accountsumm.summode2')" :value="2" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.accountsumm.date')" prop="date">
+                <el-form-item :label="t('query.internal.accountsumm.date')" prop="date">
                     <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD" :start-placeholder="t('common.start')"
                         :end-placeholder="t('common.end')" @change="onDateChange" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.accountsumm.goodsid')" prop="goodsid">
-                    <el-input type="number" v-model="queryParams.goodsid" :placeholder="t('query.order.accountsumm.tips1')" />
+                <el-form-item :label="t('query.internal.accountsumm.goodsid')" prop="goodsid">
+                    <el-input type="number" v-model="queryParams.goodsid" :placeholder="t('query.internal.accountsumm.tips1')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.accountsumm.accountid')" prop="accountid">
-                    <el-input type="number" v-model="queryParams.accountid" :placeholder="t('query.order.accountsumm.tips2')" />
+                <el-form-item :label="t('query.internal.accountsumm.accountid')" prop="accountid">
+                    <el-input type="number" v-model="queryParams.accountid" :placeholder="t('query.internal.accountsumm.tips2')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.accountsumm.excludeaccountidsstr')" prop="excludeaccountidsstr">
-                    <el-input v-model="queryParams.excludeaccountidsstr" :placeholder="t('query.order.accountsumm.tips3')"
+                <el-form-item :label="t('query.internal.accountsumm.excludeaccountidsstr')" prop="excludeaccountidsstr">
+                    <el-input v-model="queryParams.excludeaccountidsstr" :placeholder="t('query.internal.accountsumm.tips3')"
                         style="width: 260px;" />
                 </el-form-item>
                 <el-form-item>
@@ -88,15 +88,15 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(accoun
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'tradeDate', label: 'query.order.accountsumm.tradeDate' },
-    { field: 'userfullname', label: 'query.order.accountsumm.userfullname' },
-    { field: 'goodsfullname', label: 'query.order.accountsumm.goodsfullname' },
-    { field: 'membername', label: 'query.order.accountsumm.membername' },
-    { field: 'parentname', label: 'query.order.accountsumm.parentname' },
-    { field: 'tradeqtysum', label: 'query.order.accountsumm.tradeqtysum' },
-    { field: 'tradeamountsum', label: 'query.order.accountsumm.tradeamountsum' },
-    { field: 'closeplsum', label: 'query.order.accountsumm.closeplsum' },
-    { field: 'chargesum', label: 'query.order.accountsumm.chargesum' }
+    { field: 'tradeDate', label: 'query.internal.accountsumm.tradeDate' },
+    { field: 'userfullname', label: 'query.internal.accountsumm.userfullname' },
+    { field: 'goodsfullname', label: 'query.internal.accountsumm.goodsfullname' },
+    { field: 'membername', label: 'query.internal.accountsumm.membername' },
+    { field: 'parentname', label: 'query.internal.accountsumm.parentname' },
+    { field: 'tradeqtysum', label: 'query.internal.accountsumm.tradeqtysum' },
+    { field: 'tradeamountsum', label: 'query.internal.accountsumm.tradeamountsum' },
+    { field: 'closeplsum', label: 'query.internal.accountsumm.closeplsum' },
+    { field: 'chargesum', label: 'query.internal.accountsumm.chargesum' }
 ])
 
 // 表单验证规则

+ 14 - 14
src/packages/pc/views/query/internal/goodssumm/index.vue

@@ -4,27 +4,27 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item :label="t('query.order.goodssumm.marketid')" prop="marketid">
+                <el-form-item :label="t('query.internal.goodssumm.marketid')" prop="marketid">
                     <el-select v-model="queryParams.marketid">
                         <el-option v-for="item in getMarketOptions()" :key="item.value" :label="item.label"
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.goodssumm.date')" prop="date">
+                <el-form-item :label="t('query.internal.goodssumm.date')" prop="date">
                     <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
                         :start-placeholder="t('common.startdate')" :end-placeholder="t('common.enddate')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.goodssumm.summode')" prop="summode">
+                <el-form-item :label="t('query.internal.goodssumm.summode')" prop="summode">
                     <el-select v-model="queryParams.summode">
-                        <el-option :label="t('query.order.goodssumm.summode1')" :value="1" />
-                        <el-option :label="t('query.order.goodssumm.summode2')" :value="2" />
+                        <el-option :label="t('query.internal.goodssumm.summode1')" :value="1" />
+                        <el-option :label="t('query.internal.goodssumm.summode2')" :value="2" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.goodssumm.goodsid')" prop="goodsid">
+                <el-form-item :label="t('query.internal.goodssumm.goodsid')" prop="goodsid">
                     <app-select-goods v-model="queryParams.goodsid" :marketid="queryParams.marketid" status="3,6,7" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.goodssumm.excludeaccountidsstr')" prop="excludeaccountidsstr">
-                    <el-input v-model="queryParams.excludeaccountidsstr" :placeholder="t('query.order.goodssumm.tips1')" style="width: 260px;" />
+                <el-form-item :label="t('query.internal.goodssumm.excludeaccountidsstr')" prop="excludeaccountidsstr">
+                    <el-input v-model="queryParams.excludeaccountidsstr" :placeholder="t('query.internal.goodssumm.tips1')" style="width: 260px;" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="onSearch">{{ t('operation.search') }}</el-button>
@@ -82,12 +82,12 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryG
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'tradeDate', label: 'query.order.goodssumm.tradeDate' },
-    { field: 'goodsfullname', label: 'query.order.goodssumm.goodsfullname' },
-    { field: 'tradeqtysum', label: 'query.order.goodssumm.tradeqtysum' },
-    { field: 'tradeamountsum', label: 'query.order.goodssumm.tradeamountsum' },
-    { field: 'closeplsum', label: 'query.order.goodssumm.closeplsum' },
-    { field: 'chargesum', label: 'query.order.goodssumm.chargesum' },
+    { field: 'tradeDate', label: 'query.internal.goodssumm.tradeDate' },
+    { field: 'goodsfullname', label: 'query.internal.goodssumm.goodsfullname' },
+    { field: 'tradeqtysum', label: 'query.internal.goodssumm.tradeqtysum' },
+    { field: 'tradeamountsum', label: 'query.internal.goodssumm.tradeamountsum' },
+    { field: 'closeplsum', label: 'query.internal.goodssumm.closeplsum' },
+    { field: 'chargesum', label: 'query.internal.goodssumm.chargesum' },
 ])
 
 // 表单验证规则

+ 12 - 12
src/packages/pc/views/query/internal/institutionsumm/index.vue

@@ -4,20 +4,20 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item :label="t('query.order.institutionsumm.marketid')">
+                <el-form-item :label="t('query.internal.institutionsumm.marketid')">
                     <el-select v-model="marketId">
                         <el-option v-for="item in getMarketOptions([15, 40, 41, 48, 51, 71, 97, 99], true)"
                             :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.institutionsumm.goodsid')" prop="goodsid">
+                <el-form-item :label="t('query.internal.institutionsumm.goodsid')" prop="goodsid">
                     <app-select-goods v-model="queryParams.goodsid" :marketid="marketId" status="3,6,7" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.institutionsumm.date')" prop="date">
+                <el-form-item :label="t('query.internal.institutionsumm.date')" prop="date">
                     <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
                     :start-placeholder="t('common.startdate')" :end-placeholder="t('common.enddate')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.institutionsumm.parentuserid')" prop="parentuserid">
+                <el-form-item :label="t('query.internal.institutionsumm.parentuserid')" prop="parentuserid">
                     <app-select-member v-model="queryParams.parentuserid" usertype="2,3" />
                 </el-form-item>
                 <el-form-item>
@@ -77,14 +77,14 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryI
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'userid', label: 'query.order.institutionsumm.userid' },
-    { field: 'accountname', label: 'query.order.institutionsumm.accountname' },
-    { field: 'goodscode', label: 'query.order.institutionsumm.goodscode' },
-    { field: 'goodsname', label: 'query.order.institutionsumm.goodsname' },
-    { field: 'tradeqtysum', label: 'query.order.institutionsumm.tradeqtysum' },
-    { field: 'tradeamountsum', label: 'query.order.institutionsumm.tradeamountsum' },
-    { field: 'closeplsum', label: 'query.order.institutionsumm.closeplsum' },
-    { field: 'chargesum', label: 'query.order.institutionsumm.chargesum' },
+    { field: 'userid', label: 'query.internal.institutionsumm.userid' },
+    { field: 'accountname', label: 'query.internal.institutionsumm.accountname' },
+    { field: 'goodscode', label: 'query.internal.institutionsumm.goodscode' },
+    { field: 'goodsname', label: 'query.internal.institutionsumm.goodsname' },
+    { field: 'tradeqtysum', label: 'query.internal.institutionsumm.tradeqtysum' },
+    { field: 'tradeamountsum', label: 'query.internal.institutionsumm.tradeamountsum' },
+    { field: 'closeplsum', label: 'query.internal.institutionsumm.closeplsum' },
+    { field: 'chargesum', label: 'query.internal.institutionsumm.chargesum' },
 ])
 
 // 表单验证规则

+ 58 - 58
src/packages/pc/views/query/internal/order/components/details/index.vue

@@ -1,17 +1,17 @@
 <!-- 查询管理-内部订单查询-委托单查询-详情 -->
 <template>
-    <app-drawer :title="t('query.order.order.details.title')" width="960" v-model:show="show">
-        <app-table-details :title="t('query.order.order.details.subtitle1')" :data="data" :label-width="200" :cell-props="detailProps1" :column="2" />
-        <app-table-details :title="t('query.order.order.details.subtitle2')" :data="data" :label-width="200" :cell-props="detailProps2" :column="2" />
+    <app-drawer :title="t('query.internal.order.details.title')" width="960" v-model:show="show">
+        <app-table-details :title="t('query.internal.order.details.subtitle1')" :data="data" :label-width="200" :cell-props="detailProps1" :column="2" />
+        <app-table-details :title="t('query.internal.order.details.subtitle2')" :data="data" :label-width="200" :cell-props="detailProps2" :column="2" />
         <template v-if="data && [7, 8, 9].includes(data.orderstatus)">
             <app-table :data="data.tradeHisResultList" :columns="tableColumns" v-if="record.isHis">
                 <template #headerLeft>
-                    <b>{{ t('query.order.order.details.tradelist1') }}</b>
+                    <b>{{ t('query.internal.order.details.tradelist1') }}</b>
                 </template>
             </app-table>
             <app-table :data="data.tradeResultList" :columns="tableColumns" v-else>
                 <template #headerLeft>
-                    <b>{{ t('query.order.order.details.tradelist2') }}</b>
+                    <b>{{ t('query.internal.order.details.tradelist2') }}</b>
                 </template>
             </app-table>
         </template>
@@ -75,38 +75,38 @@ const detailProps1 = computed<CellProp[]>(() => {
     const isTradeMode18Or26 = [18, 26].includes(trademode)
 
     return [
-        { prop: 'orderid', label: 'query.order.order.details.orderid' },
-        { prop: 'accountname', label: 'query.order.order.details.accountname', formatValue: (val) => val && `${val} (${accountid})` },
-        { prop: 'parentusername', label: 'query.order.order.details.parentusername' },
-        { prop: 'memberaccountname', label: 'query.order.order.details.memberaccountname' },
-        { prop: 'marketname', label: 'query.order.order.details.marketname' },
-        { prop: 'goodsname', label: 'query.order.order.details.goodsname', formatValue: (val) => val && `${val}/${goodscode}` },
-        { prop: 'listingselecttype', label: 'query.order.order.details.listingselecttype', show: isTradeMode16 },
-        { prop: 'delistingtype', label: 'query.order.order.details.delistingtype', show: isTradeMode16 },
-        { prop: 'buildtype', label: 'query.order.order.details.buildtype', formatValue: (val) => buildtypeEnum.getEnumTypeName(val) },
-        { prop: 'buyorsell', label: 'query.order.order.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
-        { prop: 'orderprice', label: 'query.order.order.details.orderprice', show: !isTradeMode18Or26 },
-        { prop: 'optiontype', label: 'query.order.order.details.optiontype', show: isTradeMode18Or26 },
-        { prop: 'orderprice', label: 'query.order.order.details.orderprice1', show: isTradeMode18Or26 },
-        { prop: 'premium', label: 'query.order.order.details.premium', show: isTradeMode18Or26 },
-        { prop: 'orderqty', label: 'query.order.order.details.orderqty' },
-        { prop: 'tradeqty', label: 'query.order.order.details.tradeqty' },
-        { prop: 'openqty', label: 'query.order.order.details.openqty' },
-        { prop: 'closeqty', label: 'query.order.order.details.closeqty' },
-        { prop: 'cancelqty', label: 'query.order.order.details.cancelqty' },
-        { prop: 'pricemode', label: 'query.order.order.details.pricemode', formatValue: (val) => Pricemode2Enum.getEnumTypeName(val), show: !isTradeMode18Or26 },
-        { prop: 'validtype', label: 'query.order.order.details.validtype', formatValue: (val) => ValidTypeEnum.getEnumTypeName(val), show: !isTradeMode18Or26 },
-        { prop: 'validtime', label: 'query.order.order.details.validtime', show: !isTradeMode18Or26 },
-        { prop: 'operatetype', label: 'query.order.order.details.operatetype', formatValue: (val) => orderoperatetypeEnum.getEnumTypeName(val), show: !isTradeMode18Or26 },
-        { prop: 'orderstatus', label: 'query.order.order.details.orderstatus', formatValue: (val) => orderstatusEnum.getEnumTypeName(val) },
-        { prop: 'ordertime', label: 'query.order.order.details.ordertime', formatValue: (val) => formatDate(val) },
-        { prop: 'clientticket', label: 'query.order.order.details.clientticket' },
-        { prop: 'cancelorderid', label: 'query.order.order.details.cancelorderid', show: !!cancelorderid },
-        { prop: 'preorderid', label: 'query.order.order.details.preorderid', show: !!preorderid },
-        { prop: 'relatedid', label: 'query.order.order.details.relatedid', show: !!relatedid },
-        { prop: 'retcode', label: 'query.order.order.details.retcode', show: !!retcode },
-        { prop: 'refgoodsid', label: 'query.order.order.details.refgoodsid', show: isTradeMode46 },
-        { prop: 'swapdays', label: 'query.order.order.details.swapdays', show: isTradeMode46 },
+        { prop: 'orderid', label: 'query.internal.order.details.orderid' },
+        { prop: 'accountname', label: 'query.internal.order.details.accountname', formatValue: (val) => val && `${val} (${accountid})` },
+        { prop: 'parentusername', label: 'query.internal.order.details.parentusername' },
+        { prop: 'memberaccountname', label: 'query.internal.order.details.memberaccountname' },
+        { prop: 'marketname', label: 'query.internal.order.details.marketname' },
+        { prop: 'goodsname', label: 'query.internal.order.details.goodsname', formatValue: (val) => val && `${val}/${goodscode}` },
+        { prop: 'listingselecttype', label: 'query.internal.order.details.listingselecttype', show: isTradeMode16 },
+        { prop: 'delistingtype', label: 'query.internal.order.details.delistingtype', show: isTradeMode16 },
+        { prop: 'buildtype', label: 'query.internal.order.details.buildtype', formatValue: (val) => buildtypeEnum.getEnumTypeName(val) },
+        { prop: 'buyorsell', label: 'query.internal.order.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+        { prop: 'orderprice', label: 'query.internal.order.details.orderprice', show: !isTradeMode18Or26 },
+        { prop: 'optiontype', label: 'query.internal.order.details.optiontype', show: isTradeMode18Or26 },
+        { prop: 'orderprice', label: 'query.internal.order.details.orderprice1', show: isTradeMode18Or26 },
+        { prop: 'premium', label: 'query.internal.order.details.premium', show: isTradeMode18Or26 },
+        { prop: 'orderqty', label: 'query.internal.order.details.orderqty' },
+        { prop: 'tradeqty', label: 'query.internal.order.details.tradeqty' },
+        { prop: 'openqty', label: 'query.internal.order.details.openqty' },
+        { prop: 'closeqty', label: 'query.internal.order.details.closeqty' },
+        { prop: 'cancelqty', label: 'query.internal.order.details.cancelqty' },
+        { prop: 'pricemode', label: 'query.internal.order.details.pricemode', formatValue: (val) => Pricemode2Enum.getEnumTypeName(val), show: !isTradeMode18Or26 },
+        { prop: 'validtype', label: 'query.internal.order.details.validtype', formatValue: (val) => ValidTypeEnum.getEnumTypeName(val), show: !isTradeMode18Or26 },
+        { prop: 'validtime', label: 'query.internal.order.details.validtime', show: !isTradeMode18Or26 },
+        { prop: 'operatetype', label: 'query.internal.order.details.operatetype', formatValue: (val) => orderoperatetypeEnum.getEnumTypeName(val), show: !isTradeMode18Or26 },
+        { prop: 'orderstatus', label: 'query.internal.order.details.orderstatus', formatValue: (val) => orderstatusEnum.getEnumTypeName(val) },
+        { prop: 'ordertime', label: 'query.internal.order.details.ordertime', formatValue: (val) => formatDate(val) },
+        { prop: 'clientticket', label: 'query.internal.order.details.clientticket' },
+        { prop: 'cancelorderid', label: 'query.internal.order.details.cancelorderid', show: !!cancelorderid },
+        { prop: 'preorderid', label: 'query.internal.order.details.preorderid', show: !!preorderid },
+        { prop: 'relatedid', label: 'query.internal.order.details.relatedid', show: !!relatedid },
+        { prop: 'retcode', label: 'query.internal.order.details.retcode', show: !!retcode },
+        { prop: 'refgoodsid', label: 'query.internal.order.details.refgoodsid', show: isTradeMode46 },
+        { prop: 'swapdays', label: 'query.internal.order.details.swapdays', show: isTradeMode46 },
     ]
 })
 
@@ -118,31 +118,31 @@ const detailProps2 = computed<CellProp[]>(() => {
     const result: CellProp[] = [
         {
             prop: 'marginvalue',
-            label: t('query.order.order.details.marginvalue'),
+            label: t('query.internal.order.details.marginvalue'),
             formatValue: (val) => marginalgorithm ? marginalgorithm === 1 ? parsePercent(val) : val : '',
             show: isBuildType1Or3
         },
         {
             prop: 'openexchagechargevalue',
-            label: t('query.order.order.details.openexchagechargevalue'),
+            label: t('query.internal.order.details.openexchagechargevalue'),
             formatValue: (val) => marginalgorithm ? marginalgorithm === 1 ? parseTenThousand(val) : val : '',
             show: isBuildType1Or3
         },
         {
             prop: 'openmemberchargevalue',
-            label: t('query.order.order.details.openmemberchargevalue'),
+            label: t('query.internal.order.details.openmemberchargevalue'),
             formatValue: (val) => marginalgorithm ? marginalgorithm === 1 ? parseTenThousand(val) : val : '',
             show: isBuildType1Or3
         },
         {
             prop: 'closeexchagechargevalue',
-            label: t('query.order.order.details.closeexchagechargevalue'),
+            label: t('query.internal.order.details.closeexchagechargevalue'),
             formatValue: (val) => marginalgorithm ? marginalgorithm === 1 ? parseTenThousand(val) : val : '',
             show: isBuildType2Or3
         },
         {
             prop: 'closememberchargevalue',
-            label: t('query.order.order.details.closememberchargevalue'),
+            label: t('query.internal.order.details.closememberchargevalue'),
             formatValue: (val) => marginalgorithm ? marginalgorithm === 1 ? parseTenThousand(val) : val : '',
             show: isBuildType2Or3
         },
@@ -150,14 +150,14 @@ const detailProps2 = computed<CellProp[]>(() => {
 
     if ([3, 5].includes(orderstatus)) {
         result.push(
-            { prop: 'freezemargin', label: 'query.order.order.details.freezemargin' },
-            { prop: 'freezecharge', label: 'query.order.order.details.freezecharge' },
-            { prop: 'openfreezecharge', label: 'query.order.order.details.openfreezecharge' },
-            { prop: 'closefreezecharge', label: 'query.order.order.details.closefreezecharge' },
-            { prop: 'unfreezemargin', label: 'query.order.order.details.unfreezemargin' },
-            { prop: 'unfreezecharge', label: 'query.order.order.details.unfreezecharge' },
-            { prop: 'openunfreezecharge', label: 'query.order.order.details.openunfreezecharge' },
-            { prop: 'closeunfreezecharge', label: 'query.order.order.details.closeunfreezecharge' },
+            { prop: 'freezemargin', label: 'query.internal.order.details.freezemargin' },
+            { prop: 'freezecharge', label: 'query.internal.order.details.freezecharge' },
+            { prop: 'openfreezecharge', label: 'query.internal.order.details.openfreezecharge' },
+            { prop: 'closefreezecharge', label: 'query.internal.order.details.closefreezecharge' },
+            { prop: 'unfreezemargin', label: 'query.internal.order.details.unfreezemargin' },
+            { prop: 'unfreezecharge', label: 'query.internal.order.details.unfreezecharge' },
+            { prop: 'openunfreezecharge', label: 'query.internal.order.details.openunfreezecharge' },
+            { prop: 'closeunfreezecharge', label: 'query.internal.order.details.closeunfreezecharge' },
         )
     }
 
@@ -169,14 +169,14 @@ const tableColumns = computed<Model.TableColumn[]>(() => {
     const isTradeMode18Or26 = [18, 26].includes(trademode)
 
     return [
-        { field: 'tradeid', label: 'query.order.order.details.tradeid' },
-        { field: 'matchaccountid', label: 'query.order.order.details.matchaccountid' },
-        { field: 'tradeqty', label: 'query.order.order.details.tradeqty' },
-        { field: 'tradeprice', label: 'query.order.order.details.tradeprice', show: !isTradeMode18Or26 },
-        { field: 'tradeamount', label: 'query.order.order.details.tradeamount', show: !isTradeMode18Or26 },
-        { field: 'tradeprice', label: 'query.order.order.details.tradeprice1', show: isTradeMode18Or26 },
-        { field: 'chargevalue', label: 'query.order.order.details.chargevalue' },
-        { field: 'tradetime', label: 'query.order.order.details.tradetime', formatValue: (val) => formatDate(val) },
+        { field: 'tradeid', label: 'query.internal.order.details.tradeid' },
+        { field: 'matchaccountid', label: 'query.internal.order.details.matchaccountid' },
+        { field: 'tradeqty', label: 'query.internal.order.details.tradeqty' },
+        { field: 'tradeprice', label: 'query.internal.order.details.tradeprice', show: !isTradeMode18Or26 },
+        { field: 'tradeamount', label: 'query.internal.order.details.tradeamount', show: !isTradeMode18Or26 },
+        { field: 'tradeprice', label: 'query.internal.order.details.tradeprice1', show: isTradeMode18Or26 },
+        { field: 'chargevalue', label: 'query.internal.order.details.chargevalue' },
+        { field: 'tradetime', label: 'query.internal.order.details.tradetime', formatValue: (val) => formatDate(val) },
     ]
 })
 

+ 1 - 1
src/packages/pc/views/query/internal/order/components/export/index.vue

@@ -1,6 +1,6 @@
 <template>
     <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading">
-        <div class="g-text-message">{{ t('query.order.order.export.tips')}}</div>
+        <div class="g-text-message">{{ t('query.internal.order.export.tips')}}</div>
         <template #footer>
             <el-button @click="onCancel">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>

+ 23 - 23
src/packages/pc/views/query/internal/order/index.vue

@@ -4,48 +4,48 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item :label="t('query.order.order.marketid')" prop="marketId">
+                <el-form-item :label="t('query.internal.order.marketid')" prop="marketId">
                     <el-select v-model="queryParams.marketId" @change="onMarketChange">
                         <template v-for="item in getMarketOptions([15, 97, 99], true)" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.order.isHis')" prop="isHis">
+                <el-form-item :label="t('query.internal.order.isHis')" prop="isHis">
                     <el-select v-model="queryParams.isHis" @change="onTypeChange">
                         <el-option :label="t('common.current')" :value="0" />
                         <el-option :label="t('common.history')" :value="1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.order.date')" prop="date" v-if="queryParams.isHis === 1">
+                <el-form-item :label="t('query.internal.order.date')" prop="date" v-if="queryParams.isHis === 1">
                     <el-date-picker type="daterange" v-model="dateValue" value-format="YYYY-MM-DD"
                     :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" @change="onDateChange" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.order.buildType')" prop="buildType">
+                <el-form-item :label="t('query.internal.order.buildType')" prop="buildType">
                     <el-select v-model="queryParams.buildType" clearable>
                         <template v-for="item in buildtypeEnum.getEnumOptions()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.order.orderStatus')" prop="orderStatus">
+                <el-form-item :label="t('query.internal.order.orderStatus')" prop="orderStatus">
                     <el-select v-model="queryParams.orderStatus" clearable>
                         <template v-for="item in orderstatusEnum.getEnumOptions()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.order.orderId')" prop="orderId">
+                <el-form-item :label="t('query.internal.order.orderId')" prop="orderId">
                     <el-input type="number" v-model="queryParams.orderId" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.order.goodsId')" prop="goodsId">
-                    <el-input type="number" v-model="queryParams.goodsId" :placeholder="t('query.order.order.tips3')" />
+                <el-form-item :label="t('query.internal.order.goodsId')" prop="goodsId">
+                    <el-input type="number" v-model="queryParams.goodsId" :placeholder="t('query.internal.order.tips3')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.order.accountName')" prop="accountName">
-                    <el-input type="number" v-model="queryParams.accountName" :placeholder="t('query.order.order.tips2')" />
+                <el-form-item :label="t('query.internal.order.accountName')" prop="accountName">
+                    <el-input type="number" v-model="queryParams.accountName" :placeholder="t('query.internal.order.tips2')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.order.excludeAccountIdsStr')" prop="excludeAccountIdsStr">
-                    <el-input v-model="queryParams.excludeAccountIdsStr" :placeholder="t('query.order.order.tips1')"
+                <el-form-item :label="t('query.internal.order.excludeAccountIdsStr')" prop="excludeAccountIdsStr">
+                    <el-input v-model="queryParams.excludeAccountIdsStr" :placeholder="t('query.internal.order.tips1')"
                         style="width: 260px;" />
                 </el-form-item>
                 <el-form-item>
@@ -119,17 +119,17 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryC
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'orderId', label: 'query.order.order.orderId' },
-    { field: 'accountNameId', label: 'query.order.order.accountNameId' },
-    { field: 'goodsCodeName', label: 'query.order.order.goodsCodeName' },
-    { field: 'buildType', label: 'query.order.order.buildType', formatValue: (val) => buildtypeEnum.getEnumTypeName(val) },
-    { field: 'buyOrSell', label: 'query.order.order.buyOrSell', formatValue: (val) => getBuyOrSellName(val) },
-    { field: 'orderPrice', label: 'query.order.order.orderPrice' },
-    { field: 'orderQty', label: 'query.order.order.orderQty' },
-    { field: 'tradeQty', label: 'query.order.order.tradeQty' },
-    { field: 'orderStatus', label: 'query.order.order.orderStatus', formatValue: (val) => orderstatusEnum.getEnumTypeName(val) },
-    { field: 'orderTime', label: 'query.order.order.orderTime', formatValue: (val) => formatDate(val) },
-    { field: 'tradeDate', label: 'query.order.order.tradeDate' },
+    { field: 'orderId', label: 'query.internal.order.orderId' },
+    { field: 'accountNameId', label: 'query.internal.order.accountNameId' },
+    { field: 'goodsCodeName', label: 'query.internal.order.goodsCodeName' },
+    { field: 'buildType', label: 'query.internal.order.buildType', formatValue: (val) => buildtypeEnum.getEnumTypeName(val) },
+    { field: 'buyOrSell', label: 'query.internal.order.buyOrSell', formatValue: (val) => getBuyOrSellName(val) },
+    { field: 'orderPrice', label: 'query.internal.order.orderPrice' },
+    { field: 'orderQty', label: 'query.internal.order.orderQty' },
+    { field: 'tradeQty', label: 'query.internal.order.tradeQty' },
+    { field: 'orderStatus', label: 'query.internal.order.orderStatus', formatValue: (val) => orderstatusEnum.getEnumTypeName(val) },
+    { field: 'orderTime', label: 'query.internal.order.orderTime', formatValue: (val) => formatDate(val) },
+    { field: 'tradeDate', label: 'query.internal.order.tradeDate' },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 

+ 23 - 23
src/packages/pc/views/query/internal/position/components/details/index.vue

@@ -1,6 +1,6 @@
 <!-- 查询管理-内部订单查询-持仓单查询-详情 -->
 <template>
-    <app-drawer :title="t('query.order.position.details.title')" width="900" v-model:show="show">
+    <app-drawer :title="t('query.internal.position.details.title')" width="900" v-model:show="show">
         <app-table-details :data="data" :label-width="120" :cell-props="detailProps" :column="2" />
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
@@ -49,28 +49,28 @@ const detailProps = computed<CellProp[]>(() => {
     const isTradeMode18Or26 = [18, 26].includes(trademode)
 
     return [
-        { prop: 'tradeid', label: 'query.order.position.details.tradeid' },
-        { prop: 'tradedate', label: 'query.order.position.details.tradedate' },
-        { prop: 'accountid', label: 'query.order.position.details.accountid', formatValue: (val) => val && `${accountname} (${val})` },
-        { prop: 'parentusername', label: 'query.order.position.details.parentusername' },
-        { prop: 'memberusername', label: 'query.order.position.details.memberusername' },
-        { prop: 'marketname', label: 'query.order.position.details.marketname' },
-        { prop: 'goodsname', label: 'query.order.position.details.goodsname', formatValue: (val) => val && `${val}/${goodscode}` },
-        { prop: 'optiontype', label: 'query.order.position.details.optiontype', show: isTradeMode18Or26 },
-        { prop: 'buyorsell', label: 'query.order.position.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
-        { prop: 'holderdays', label: 'query.order.position.details.holderdays', show: !isTradeMode18Or26 },
-        { prop: 'tradetime', label: 'query.order.position.details.tradetime', formatValue: (val) => formatDate(val) },
-        { prop: 'openprice', label: 'query.order.position.details.openprice', show: !isTradeMode18Or26 },
-        { prop: 'holderprice', label: 'query.order.position.details.holderprice', show: !isTradeMode18Or26 },
-        { prop: 'openprice', label: 'query.order.position.details.openprice1', show: isTradeMode18Or26 },
-        { prop: 'premium', label: 'query.order.position.details.premium', show: isTradeMode18Or26 },
-        { prop: 'openqty', label: 'query.order.position.details.openqty' },
-        { prop: 'holderqty', label: 'query.order.position.details.holderqty' },
-        { prop: 'expiretype', label: 'query.order.position.details.expiretype', show: isTradeMode18Or26 },
-        { prop: 'expirecycle', label: 'query.order.position.details.expirecycle', show: isTradeMode18Or26 && expiretype === 1, formatValue: (val) => val && `${val}天` },
-        { prop: 'expiredate', label: 'query.order.position.details.expiredate', show: isTradeMode18Or26 && expiretype === 2 },
-        { prop: 'refgoodsid', label: 'query.order.position.details.refgoodsid', show: isTradeMode46 },
-        { prop: 'swapdays', label: 'query.order.position.details.swapdays', show: isTradeMode46 },
+        { prop: 'tradeid', label: 'query.internal.position.details.tradeid' },
+        { prop: 'tradedate', label: 'query.internal.position.details.tradedate' },
+        { prop: 'accountid', label: 'query.internal.position.details.accountid', formatValue: (val) => val && `${accountname} (${val})` },
+        { prop: 'parentusername', label: 'query.internal.position.details.parentusername' },
+        { prop: 'memberusername', label: 'query.internal.position.details.memberusername' },
+        { prop: 'marketname', label: 'query.internal.position.details.marketname' },
+        { prop: 'goodsname', label: 'query.internal.position.details.goodsname', formatValue: (val) => val && `${val}/${goodscode}` },
+        { prop: 'optiontype', label: 'query.internal.position.details.optiontype', show: isTradeMode18Or26 },
+        { prop: 'buyorsell', label: 'query.internal.position.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+        { prop: 'holderdays', label: 'query.internal.position.details.holderdays', show: !isTradeMode18Or26 },
+        { prop: 'tradetime', label: 'query.internal.position.details.tradetime', formatValue: (val) => formatDate(val) },
+        { prop: 'openprice', label: 'query.internal.position.details.openprice', show: !isTradeMode18Or26 },
+        { prop: 'holderprice', label: 'query.internal.position.details.holderprice', show: !isTradeMode18Or26 },
+        { prop: 'openprice', label: 'query.internal.position.details.openprice1', show: isTradeMode18Or26 },
+        { prop: 'premium', label: 'query.internal.position.details.premium', show: isTradeMode18Or26 },
+        { prop: 'openqty', label: 'query.internal.position.details.openqty' },
+        { prop: 'holderqty', label: 'query.internal.position.details.holderqty' },
+        { prop: 'expiretype', label: 'query.internal.position.details.expiretype', show: isTradeMode18Or26 },
+        { prop: 'expirecycle', label: 'query.internal.position.details.expirecycle', show: isTradeMode18Or26 && expiretype === 1, formatValue: (val) => val && `${val}天` },
+        { prop: 'expiredate', label: 'query.internal.position.details.expiredate', show: isTradeMode18Or26 && expiretype === 2 },
+        { prop: 'refgoodsid', label: 'query.internal.position.details.refgoodsid', show: isTradeMode46 },
+        { prop: 'swapdays', label: 'query.internal.position.details.swapdays', show: isTradeMode46 },
     ]
 })
 

+ 31 - 31
src/packages/pc/views/query/internal/position/index.vue

@@ -4,7 +4,7 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item :label="t('query.order.position.marketid')" prop="marketId">
+                <el-form-item :label="t('query.internal.position.marketid')" prop="marketId">
                     <el-select v-model="queryParams.marketId">
                         <template v-for="item in getMarketOptions([15, 40, 41, 48, 51, 71, 97, 99], true)"
                             :key="item.value">
@@ -12,39 +12,39 @@
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.position.buyOrSell')" prop="buyOrSell">
+                <el-form-item :label="t('query.internal.position.buyOrSell')" prop="buyOrSell">
                     <el-select v-model="queryParams.buyOrSell" clearable>
                         <template v-for="item in getBuyOrSellList()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.position.isHis')" prop="isHis">
+                <el-form-item :label="t('query.internal.position.isHis')" prop="isHis">
                     <el-select v-model="queryParams.isHis" @change="onTypeChange">
                         <el-option :label="t('common.current')" :value="0" />
                         <el-option :label="t('common.history')" :value="1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.position.date')" prop="date" v-if="queryParams.isHis === 1">
+                <el-form-item :label="t('query.internal.position.date')" prop="date" v-if="queryParams.isHis === 1">
                     <el-date-picker type="daterange" v-model="dateValue" value-format="YYYY-MM-DD"
                     :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" @change="onDateChange" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.position.tradeId')" prop="tradeId">
+                <el-form-item :label="t('query.internal.position.tradeId')" prop="tradeId">
                     <el-input type="number" v-model="queryParams.tradeId" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.position.goodsId')" prop="goodsId">
-                    <el-input type="number" v-model="queryParams.goodsId" :placeholder="t('query.order.position.tips1')" />
+                <el-form-item :label="t('query.internal.position.goodsId')" prop="goodsId">
+                    <el-input type="number" v-model="queryParams.goodsId" :placeholder="t('query.internal.position.tips1')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.position.loginId')" prop="loginId">
+                <el-form-item :label="t('query.internal.position.loginId')" prop="loginId">
                     <el-input v-model="queryParams.loginId" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.position.accountId')" prop="accountId">
-                    <el-input v-model="queryParams.accountId" :placeholder="t('query.order.position.tips2')" />
+                <el-form-item :label="t('query.internal.position.accountId')" prop="accountId">
+                    <el-input v-model="queryParams.accountId" :placeholder="t('query.internal.position.tips2')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.position.parentAreaId')" prop="parentAreaId">
-                    <el-input type="number" v-model="queryParams.parentAreaId" :placeholder="t('query.order.position.tips3')" />
+                <el-form-item :label="t('query.internal.position.parentAreaId')" prop="parentAreaId">
+                    <el-input type="number" v-model="queryParams.parentAreaId" :placeholder="t('query.internal.position.tips3')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.position.validHolderQty')" prop="validHolderQty">
+                <el-form-item :label="t('query.internal.position.validHolderQty')" prop="validHolderQty">
                     <el-switch v-model="queryParams.validHolderQty" active-value="1" inactive-value="0" />
                 </el-form-item>
                 <el-form-item>
@@ -118,24 +118,24 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryP
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'tradeid', label: 'query.order.position.tradeid' },
-    { field: 'tradedate', label: 'query.order.position.tradedate' },
-    { field: 'accountNameId', label: 'query.order.position.accountNameId' },
-    { field: 'goodsCodeName', label: 'query.order.position.goodsCodeName' },
-    { field: 'buyorsell', label: 'query.order.position.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
-    { field: 'openqty', label: 'query.order.position.openqty' },
-    { field: 'openprice', label: 'query.order.position.openprice' },
-    { field: 'tradeamount', label: 'query.order.position.tradeamount' },
-    { field: 'holderqty', label: 'query.order.position.holderqty' },
-    { field: 'holderprice', label: 'query.order.position.holderprice' },
-    { field: 'holderamount', label: 'query.order.position.holderamount' },
-    { field: 'actuallYplS', label: 'query.order.position.actuallYplS' },
-    { field: 'holderdays', label: 'query.order.position.holderdays' },
-    { field: 'tradetime', label: 'query.order.position.tradetime', formatValue: (val) => formatDate(val) },
-    { field: 'usertype', label: 'query.order.position.usertype', formatValue: (val) => usertype2Enum.getEnumTypeName(val) },
-    { field: 'memberusername', label: 'query.order.position.memberusername' },
-    { field: 'parentusername', label: 'query.order.position.parentusername' },
-    { field: 'marketname', label: 'query.order.position.marketname' },
+    { field: 'tradeid', label: 'query.internal.position.tradeid' },
+    { field: 'tradedate', label: 'query.internal.position.tradedate' },
+    { field: 'accountNameId', label: 'query.internal.position.accountNameId' },
+    { field: 'goodsCodeName', label: 'query.internal.position.goodsCodeName' },
+    { field: 'buyorsell', label: 'query.internal.position.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { field: 'openqty', label: 'query.internal.position.openqty' },
+    { field: 'openprice', label: 'query.internal.position.openprice' },
+    { field: 'tradeamount', label: 'query.internal.position.tradeamount' },
+    { field: 'holderqty', label: 'query.internal.position.holderqty' },
+    { field: 'holderprice', label: 'query.internal.position.holderprice' },
+    { field: 'holderamount', label: 'query.internal.position.holderamount' },
+    { field: 'actuallYplS', label: 'query.internal.position.actuallYplS' },
+    { field: 'holderdays', label: 'query.internal.position.holderdays' },
+    { field: 'tradetime', label: 'query.internal.position.tradetime', formatValue: (val) => formatDate(val) },
+    { field: 'usertype', label: 'query.internal.position.usertype', formatValue: (val) => usertype2Enum.getEnumTypeName(val) },
+    { field: 'memberusername', label: 'query.internal.position.memberusername' },
+    { field: 'parentusername', label: 'query.internal.position.parentusername' },
+    { field: 'marketname', label: 'query.internal.position.marketname' },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 

+ 1 - 1
src/packages/pc/views/query/internal/positionsumm/components/export/index.vue

@@ -1,6 +1,6 @@
 <template>
     <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading">
-        <div class="g-text-message">{{ t('query.order.positionsumm.export.tips') }}</div>
+        <div class="g-text-message">{{ t('query.internal.positionsumm.export.tips') }}</div>
         <template #footer>
             <el-button @click="onCancel">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>

+ 22 - 22
src/packages/pc/views/query/internal/positionsumm/index.vue

@@ -4,7 +4,7 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item :label="t('query.order.positionsumm.marketid')" prop="marketid">
+                <el-form-item :label="t('query.internal.positionsumm.marketid')" prop="marketid">
                     <el-select v-model="queryParams.marketid">
                         <template v-for="item in getMarketOptions([15, 40, 41, 48, 51, 71, 97, 99], true)"
                             :key="item.value">
@@ -12,16 +12,16 @@
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.positionsumm.goodsid')" prop="goodsid">
-                    <el-input type="number" v-model="queryParams.goodsid" :placeholder="t('query.order.positionsumm.tips1')" />
+                <el-form-item :label="t('query.internal.positionsumm.goodsid')" prop="goodsid">
+                    <el-input type="number" v-model="queryParams.goodsid" :placeholder="t('query.internal.positionsumm.tips1')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.positionsumm.accname')" prop="accname">
-                    <el-input v-model="queryParams.accname" :placeholder="t('query.order.positionsumm.tips2')" />
+                <el-form-item :label="t('query.internal.positionsumm.accname')" prop="accname">
+                    <el-input v-model="queryParams.accname" :placeholder="t('query.internal.positionsumm.tips2')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.positionsumm.areauserid')" prop="areauserid" v-if="userStore.userInfo.releType === 1">
-                    <el-input type="number" v-model="queryParams.areauserid" :placeholder="t('query.order.positionsumm.tips3')" />
+                <el-form-item :label="t('query.internal.positionsumm.areauserid')" prop="areauserid" v-if="userStore.userInfo.releType === 1">
+                    <el-input type="number" v-model="queryParams.areauserid" :placeholder="t('query.internal.positionsumm.tips3')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.positionsumm.loginid')" prop="loginid">
+                <el-form-item :label="t('query.internal.positionsumm.loginid')" prop="loginid">
                     <el-input v-model="queryParams.loginid" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
                 <el-form-item>
@@ -82,20 +82,20 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryP
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodsCodeName', label: 'query.order.positionsumm.goodsCodeName' },
-    { field: 'accountidname', label: 'query.order.positionsumm.accountidname' },
-    { field: 'loginids', label: 'query.order.positionsumm.loginids' },
-    { field: 'buycurpositionqty', label: 'query.order.positionsumm.buycurpositionqty' },
-    { field: 'buycurholderamount', label: 'query.order.positionsumm.buycurholderamount' },
-    { field: 'buycuravgprice', label: 'query.order.positionsumm.buycuravgprice' },
-    { field: 'buyFloatPL', label: 'query.order.positionsumm.buyFloatPL' },
-    { field: 'sellcurpositionqty', label: 'query.order.positionsumm.sellcurpositionqty' },
-    { field: 'sellcurholderamount', label: 'query.order.positionsumm.sellcurholderamount' },
-    { field: 'sellcuravgprice', label: 'query.order.positionsumm.sellcuravgprice' },
-    { field: 'sellFloatPL', label: 'query.order.positionsumm.sellFloatPL' },
-    { field: 'qty', label: 'query.order.positionsumm.qty' },
-    { field: 'buyorsell', label: 'query.order.positionsumm.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
-    { field: 'floatPL', label: 'query.order.positionsumm.floatPL' }
+    { field: 'goodsCodeName', label: 'query.internal.positionsumm.goodsCodeName' },
+    { field: 'accountidname', label: 'query.internal.positionsumm.accountidname' },
+    { field: 'loginids', label: 'query.internal.positionsumm.loginids' },
+    { field: 'buycurpositionqty', label: 'query.internal.positionsumm.buycurpositionqty' },
+    { field: 'buycurholderamount', label: 'query.internal.positionsumm.buycurholderamount' },
+    { field: 'buycuravgprice', label: 'query.internal.positionsumm.buycuravgprice' },
+    { field: 'buyFloatPL', label: 'query.internal.positionsumm.buyFloatPL' },
+    { field: 'sellcurpositionqty', label: 'query.internal.positionsumm.sellcurpositionqty' },
+    { field: 'sellcurholderamount', label: 'query.internal.positionsumm.sellcurholderamount' },
+    { field: 'sellcuravgprice', label: 'query.internal.positionsumm.sellcuravgprice' },
+    { field: 'sellFloatPL', label: 'query.internal.positionsumm.sellFloatPL' },
+    { field: 'qty', label: 'query.internal.positionsumm.qty' },
+    { field: 'buyorsell', label: 'query.internal.positionsumm.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { field: 'floatPL', label: 'query.internal.positionsumm.floatPL' }
 ])
 
 // 表单验证规则

+ 52 - 52
src/packages/pc/views/query/internal/trade/components/details/index.vue

@@ -1,11 +1,11 @@
 <!-- 查询管理-内部订单查询-成交单查询-详情 -->
 <template>
-    <app-drawer :title="t('query.order.trade.details.title')" width="960" v-model:show="show">
-        <app-table-details :title="t('query.order.trade.details.subtitle1')" :data="data" :label-width="200" :cell-props="detailProps1" :column="2" />
-        <app-table-details :title="t('query.order.trade.details.subtitle2')" :data="data" :label-width="200" :cell-props="detailProps2" :column="2" />
+    <app-drawer :title="t('query.internal.trade.details.title')" width="960" v-model:show="show">
+        <app-table-details :title="t('query.internal.trade.details.subtitle1')" :data="data" :label-width="200" :cell-props="detailProps1" :column="2" />
+        <app-table-details :title="t('query.internal.trade.details.subtitle2')" :data="data" :label-width="200" :cell-props="detailProps2" :column="2" />
         <app-table :data="data.resultList" :columns="tableColumns" v-if="data?.buildtype === 2">
             <template #headerLeft>
-                <b>{{ t('query.order.trade.details.subtitle3') }}</b>
+                <b>{{ t('query.internal.trade.details.subtitle3') }}</b>
             </template>
         </app-table>
         <template #footer>
@@ -59,29 +59,29 @@ const detailProps1 = computed<CellProp[]>(() => {
     const isTradeMode18Or26 = [18, 26].includes(trademode)
 
     return [
-        { prop: 'tradeid', label: 'query.order.trade.details.tradeid' },
-        { prop: 'tradedate', label: 'query.order.trade.details.tradedate' },
-        { prop: 'accountid', label: 'query.order.trade.details.accountid', formatValue: (val) => `${nameType === 2 ? membername : accountname} (${val})` },
-        { prop: 'orderid', label: 'query.order.trade.details.orderid' },
-        { prop: 'parentusername', label: 'query.order.trade.details.parentusername' },
-        { prop: 'membername', label: 'query.order.trade.details.membername' },
-        { prop: 'marketname', label: 'query.order.trade.details.marketname' },
-        { prop: 'goodsname', label: 'query.order.trade.details.goodsname', formatValue: (val) => val && `${val}/${goodscode}` },
-        { prop: 'buildtype', label: 'query.order.trade.details.buildtype', formatValue: (val) => tradetype3 === 1 && val === 3 ? '执行交割' : buildtypeEnum.getEnumTypeName(val) },
-        { prop: 'buyorsell', label: 'query.order.trade.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
-        { prop: 'tradeprice', label: 'query.order.trade.details.tradeprice', show: !isTradeMode18Or26 },
-        { prop: 'optiontype', label: 'query.order.trade.details.optiontype', show: isTradeMode18Or26 },
-        { prop: 'isconfirmexercise', label: 'query.order.trade.details.isconfirmexercise', show: isTradeMode18Or26 },
-        { prop: 'tradeprice', label: 'query.order.trade.details.tradeprice1', show: isTradeMode18Or26 },
-        { prop: 'premium', label: 'query.order.trade.details.premium', show: isTradeMode18Or26 },
-        { prop: 'tradeqty', label: 'query.order.trade.details.tradeqty' },
-        { prop: 'tradeamount', label: 'query.order.trade.details.tradeamount' },
-        { prop: 'closepl', label: 'query.order.trade.details.closepl' },
-        { prop: 'tradetype', label: 'query.order.trade.details.tradetype', formatValue: (val) => tradetypeEnum.getEnumTypeName(val) },
-        { prop: 'tradetime', label: 'query.order.trade.details.tradetime', formatValue: (val) => formatDate(val) },
-        { prop: 'matchaccountname', label: 'query.order.trade.details.matchaccountname', formatValue: (val) => val && `${val} (${matchaccountid})` },
-        { prop: 'refgoodsid', label: 'query.order.trade.details.refgoodsid', show: isTradeMode46 },
-        { prop: 'swapdays', label: 'query.order.trade.details.swapdays', show: isTradeMode46 },
+        { prop: 'tradeid', label: 'query.internal.trade.details.tradeid' },
+        { prop: 'tradedate', label: 'query.internal.trade.details.tradedate' },
+        { prop: 'accountid', label: 'query.internal.trade.details.accountid', formatValue: (val) => `${nameType === 2 ? membername : accountname} (${val})` },
+        { prop: 'orderid', label: 'query.internal.trade.details.orderid' },
+        { prop: 'parentusername', label: 'query.internal.trade.details.parentusername' },
+        { prop: 'membername', label: 'query.internal.trade.details.membername' },
+        { prop: 'marketname', label: 'query.internal.trade.details.marketname' },
+        { prop: 'goodsname', label: 'query.internal.trade.details.goodsname', formatValue: (val) => val && `${val}/${goodscode}` },
+        { prop: 'buildtype', label: 'query.internal.trade.details.buildtype', formatValue: (val) => tradetype3 === 1 && val === 3 ? '执行交割' : buildtypeEnum.getEnumTypeName(val) },
+        { prop: 'buyorsell', label: 'query.internal.trade.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+        { prop: 'tradeprice', label: 'query.internal.trade.details.tradeprice', show: !isTradeMode18Or26 },
+        { prop: 'optiontype', label: 'query.internal.trade.details.optiontype', show: isTradeMode18Or26 },
+        { prop: 'isconfirmexercise', label: 'query.internal.trade.details.isconfirmexercise', show: isTradeMode18Or26 },
+        { prop: 'tradeprice', label: 'query.internal.trade.details.tradeprice1', show: isTradeMode18Or26 },
+        { prop: 'premium', label: 'query.internal.trade.details.premium', show: isTradeMode18Or26 },
+        { prop: 'tradeqty', label: 'query.internal.trade.details.tradeqty' },
+        { prop: 'tradeamount', label: 'query.internal.trade.details.tradeamount' },
+        { prop: 'closepl', label: 'query.internal.trade.details.closepl' },
+        { prop: 'tradetype', label: 'query.internal.trade.details.tradetype', formatValue: (val) => tradetypeEnum.getEnumTypeName(val) },
+        { prop: 'tradetime', label: 'query.internal.trade.details.tradetime', formatValue: (val) => formatDate(val) },
+        { prop: 'matchaccountname', label: 'query.internal.trade.details.matchaccountname', formatValue: (val) => val && `${val} (${matchaccountid})` },
+        { prop: 'refgoodsid', label: 'query.internal.trade.details.refgoodsid', show: isTradeMode46 },
+        { prop: 'swapdays', label: 'query.internal.trade.details.swapdays', show: isTradeMode46 },
     ]
 })
 
@@ -92,15 +92,15 @@ const detailProps2 = computed<CellProp[]>(() => {
 
     if (buildtype === 1) {
         result.push(
-            { prop: 'opencharge', label: 'query.order.trade.details.opencharge' },
+            { prop: 'opencharge', label: 'query.internal.trade.details.opencharge' },
             {
                 prop: 'openexchagechargevalue',
-                label: 'query.order.trade.details.openexchagechargevalue',
+                label: 'query.internal.trade.details.openexchagechargevalue',
                 formatValue: (val) => openfeealgorithm ? openfeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
             {
                 prop: 'openmemberchargevalue',
-                label: 'query.order.trade.details.openmemberchargevalue',
+                label: 'query.internal.trade.details.openmemberchargevalue',
                 formatValue: (val) => openfeealgorithm ? openfeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
         )
@@ -108,10 +108,10 @@ const detailProps2 = computed<CellProp[]>(() => {
 
     if (buildtype === 2) {
         result.push(
-            { prop: 'closepl', label: 'query.order.trade.details.closepl' },
+            { prop: 'closepl', label: 'query.internal.trade.details.closepl' },
             {
                 prop: 'actuallypl',
-                label: 'query.order.trade.details.actuallypl',
+                label: 'query.internal.trade.details.actuallypl',
                 formatValue: () => {
                     if (isconfirmexercise === 1) return 0
                     const direction = buyorsell ? -1 : 1
@@ -125,45 +125,45 @@ const detailProps2 = computed<CellProp[]>(() => {
 
     if (buildtype === 3) {
         result.push(
-            { prop: 'closeqty', label: 'query.order.trade.details.closeqty' },
-            { prop: 'openqty', label: 'query.order.trade.details.openqty' },
-            { prop: 'closepl', label: 'query.order.trade.details.closepl' },
-            { prop: 'opencharge', label: 'query.order.trade.details.opencharge' },
-            { prop: 'closecharge', label: 'query.order.trade.details.closecharge' },
-            { prop: 'openfeealgorithm', label: 'query.order.trade.details.openfeealgorithm' },
+            { prop: 'closeqty', label: 'query.internal.trade.details.closeqty' },
+            { prop: 'openqty', label: 'query.internal.trade.details.openqty' },
+            { prop: 'closepl', label: 'query.internal.trade.details.closepl' },
+            { prop: 'opencharge', label: 'query.internal.trade.details.opencharge' },
+            { prop: 'closecharge', label: 'query.internal.trade.details.closecharge' },
+            { prop: 'openfeealgorithm', label: 'query.internal.trade.details.openfeealgorithm' },
             {
                 prop: 'openmemberchargevalue',
-                label: 'query.order.trade.details.openmemberchargevalue',
+                label: 'query.internal.trade.details.openmemberchargevalue',
                 formatValue: (val) => openfeealgorithm ? openfeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
             {
                 prop: 'openmemberchargevalue',
-                label: 'query.order.trade.details.openmemberchargevalue',
+                label: 'query.internal.trade.details.openmemberchargevalue',
                 formatValue: (val) => openfeealgorithm ? openfeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
-            { prop: 'closefeealgorithm', label: 'query.order.trade.details.closefeealgorithm' },
+            { prop: 'closefeealgorithm', label: 'query.internal.trade.details.closefeealgorithm' },
             {
                 prop: 'closeexchagechargevalue',
-                label: 'query.order.trade.details.closeexchagechargevalue',
+                label: 'query.internal.trade.details.closeexchagechargevalue',
                 formatValue: (val) => closefeealgorithm ? closefeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
             {
                 prop: 'closememberchargevalue',
-                label: 'query.order.trade.details.closememberchargevalue',
+                label: 'query.internal.trade.details.closememberchargevalue',
                 formatValue: (val) => closefeealgorithm ? closefeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
         )
     } else {
         result.push(
-            { prop: 'closecharge', label: 'query.order.trade.details.closecharge' },
+            { prop: 'closecharge', label: 'query.internal.trade.details.closecharge' },
             {
                 prop: 'closeexchagechargevalue',
-                label: 'query.order.trade.details.closeexchagechargevalue',
+                label: 'query.internal.trade.details.closeexchagechargevalue',
                 formatValue: (val) => closefeealgorithm ? closefeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
             {
                 prop: 'closememberchargevalue',
-                label: 'query.order.trade.details.closememberchargevalue',
+                label: 'query.internal.trade.details.closememberchargevalue',
                 formatValue: (val) => closefeealgorithm ? closefeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
         )
@@ -177,12 +177,12 @@ const tableColumns = computed<Model.TableColumn[]>(() => {
     const isTradeMode18Or26 = [18, 26].includes(trademode)
 
     return [
-        { field: 'opentradeid', label: 'query.order.trade.details.opentradeid' },
-        { field: 'buyorsell', label: 'query.order.trade.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
-        { field: 'openprice', label: 'query.order.trade.details.openprice', show: !isTradeMode18Or26 },
-        { field: 'holderprice', label: 'query.order.trade.details.holderprice', show: !isTradeMode18Or26 },
-        { field: 'closeprice', label: 'query.order.trade.details.closeprice', show: isTradeMode18Or26 },
-        { field: 'closetime', label: 'query.order.trade.details.closetime', formatValue: (val) => formatDate(val) },
+        { field: 'opentradeid', label: 'query.internal.trade.details.opentradeid' },
+        { field: 'buyorsell', label: 'query.internal.trade.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+        { field: 'openprice', label: 'query.internal.trade.details.openprice', show: !isTradeMode18Or26 },
+        { field: 'holderprice', label: 'query.internal.trade.details.holderprice', show: !isTradeMode18Or26 },
+        { field: 'closeprice', label: 'query.internal.trade.details.closeprice', show: isTradeMode18Or26 },
+        { field: 'closetime', label: 'query.internal.trade.details.closetime', formatValue: (val) => formatDate(val) },
     ]
 })
 

+ 38 - 38
src/packages/pc/views/query/internal/trade/index.vue

@@ -4,65 +4,65 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item :label="t('query.order.trade.marketid')" prop="marketId">
+                <el-form-item :label="t('query.internal.trade.marketid')" prop="marketId">
                     <el-select v-model="queryParams.marketId">
                         <template v-for="item in getMarketOptions([15, 97, 99], true)" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.trade.isHis')" prop="isHis">
+                <el-form-item :label="t('query.internal.trade.isHis')" prop="isHis">
                     <el-select v-model="queryParams.isHis" @change="onTypeChange">
                         <el-option :label="t('common.current')" :value="0" />
                         <el-option :label="t('common.history')" :value="1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.trade.date')" prop="date" v-if="queryParams.isHis === 1">
+                <el-form-item :label="t('query.internal.trade.date')" prop="date" v-if="queryParams.isHis === 1">
                     <el-date-picker type="daterange" v-model="dateValue" value-format="YYYY-MM-DD"
                     :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" @change="onDateChange" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.trade.buyOrSell')" prop="buyOrSell">
+                <el-form-item :label="t('query.internal.trade.buyOrSell')" prop="buyOrSell">
                     <el-select v-model="queryParams.buyOrSell" clearable>
                         <template v-for="item in getBuyOrSellList()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.trade.buildType')" prop="buildType">
+                <el-form-item :label="t('query.internal.trade.buildType')" prop="buildType">
                     <el-select v-model="queryParams.buildType" clearable>
                         <template v-for="item in buildtypeEnum.getEnumOptions()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.trade.tradeTypes')" prop="tradeTypes">
+                <el-form-item :label="t('query.internal.trade.tradeTypes')" prop="tradeTypes">
                     <el-select v-model="queryParams.tradeTypes" clearable>
-                        <el-option :label="t('query.order.trade.tradeTypes1')" value="1,2,10" />
-                        <el-option :label="t('query.order.trade.tradeTypes2')" value="3,4" />
-                        <el-option :label="t('query.order.trade.tradeTypes3')" value="6" />
-                        <el-option :label="t('query.order.trade.tradeTypes4')" value="7,9,11" />
-                        <el-option :label="t('query.order.trade.tradeTypes5')" value="29" />
-                        <el-option :label="t('query.order.trade.tradeTypes6')" value="12" />
-                        <el-option :label="t('query.order.trade.tradeTypes7')" value="5,8,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28" />
+                        <el-option :label="t('query.internal.trade.tradeTypes1')" value="1,2,10" />
+                        <el-option :label="t('query.internal.trade.tradeTypes2')" value="3,4" />
+                        <el-option :label="t('query.internal.trade.tradeTypes3')" value="6" />
+                        <el-option :label="t('query.internal.trade.tradeTypes4')" value="7,9,11" />
+                        <el-option :label="t('query.internal.trade.tradeTypes5')" value="29" />
+                        <el-option :label="t('query.internal.trade.tradeTypes6')" value="12" />
+                        <el-option :label="t('query.internal.trade.tradeTypes7')" value="5,8,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.trade.feeSearchType')" prop="feeSearchType">
+                <el-form-item :label="t('query.internal.trade.feeSearchType')" prop="feeSearchType">
                     <el-select v-model="queryParams.feeSearchType" clearable>
-                        <el-option :label="t('query.order.trade.feeSearchType1')" :value="1" />
-                        <el-option :label="t('query.order.trade.feeSearchType2')" :value="2" />
+                        <el-option :label="t('query.internal.trade.feeSearchType1')" :value="1" />
+                        <el-option :label="t('query.internal.trade.feeSearchType2')" :value="2" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('query.order.trade.tradeId')" prop="tradeId">
+                <el-form-item :label="t('query.internal.trade.tradeId')" prop="tradeId">
                     <el-input type="number" v-model="queryParams.tradeId" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.trade.goodsId')" prop="goodsId">
-                    <el-input type="number" v-model="queryParams.goodsId" :placeholder="t('query.order.trade.tips1')" />
+                <el-form-item :label="t('query.internal.trade.goodsId')" prop="goodsId">
+                    <el-input type="number" v-model="queryParams.goodsId" :placeholder="t('query.internal.trade.tips1')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.trade.accountId')" prop="accountId">
-                    <el-input type="number" v-model="queryParams.accountId" :placeholder="t('query.order.trade.tips2')" />
+                <el-form-item :label="t('query.internal.trade.accountId')" prop="accountId">
+                    <el-input type="number" v-model="queryParams.accountId" :placeholder="t('query.internal.trade.tips2')" />
                 </el-form-item>
-                <el-form-item :label="t('query.order.trade.areaUserName')" prop="areaUserName">
-                    <el-input v-model="queryParams.areaUserName" :placeholder="t('query.order.trade.tips3')" />
+                <el-form-item :label="t('query.internal.trade.areaUserName')" prop="areaUserName">
+                    <el-input v-model="queryParams.areaUserName" :placeholder="t('query.internal.trade.tips3')" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="onSearch(false)">{{ t('operation.search') }}</el-button>
@@ -134,21 +134,21 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryC
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'tradeid', label: 'query.order.trade.tradeid' },
-    { field: 'loginid', label: 'query.order.trade.loginid' },
-    { field: 'accountid', label: 'query.order.trade.accountid' },
-    { field: 'currentname', label: 'query.order.trade.currentname' },
-    { field: 'membername', label: 'query.order.trade.membername' },
-    { field: 'goodsCodeName', label: 'query.order.trade.goodsCodeName' },
-    { field: 'buyorsell', label: 'query.order.trade.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
-    { field: 'buildtype', label: 'query.order.trade.buildtype', formatValue: (val) => buildtypeEnum.getEnumTypeName(val) },
-    { field: 'tradetype', label: 'query.order.trade.tradetype', formatValue: (val) => tradetypeEnum.getEnumTypeName(val) },
-    { field: 'tradeprice', label: 'query.order.trade.tradeprice' },
-    { field: 'tradeqty', label: 'query.order.trade.tradeqty' },
-    { field: 'tradeamount', label: 'query.order.trade.tradeamount' },
-    { field: 'chargevalue', label: 'query.order.trade.chargevalue' },
-    { field: 'closepl', label: 'query.order.trade.closepl' },
-    { field: 'tradetime', label: 'query.order.trade.tradetime', formatValue: (val) => formatDate(val) },
+    { field: 'tradeid', label: 'query.internal.trade.tradeid' },
+    { field: 'loginid', label: 'query.internal.trade.loginid' },
+    { field: 'accountid', label: 'query.internal.trade.accountid' },
+    { field: 'currentname', label: 'query.internal.trade.currentname' },
+    { field: 'membername', label: 'query.internal.trade.membername' },
+    { field: 'goodsCodeName', label: 'query.internal.trade.goodsCodeName' },
+    { field: 'buyorsell', label: 'query.internal.trade.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { field: 'buildtype', label: 'query.internal.trade.buildtype', formatValue: (val) => buildtypeEnum.getEnumTypeName(val) },
+    { field: 'tradetype', label: 'query.internal.trade.tradetype', formatValue: (val) => tradetypeEnum.getEnumTypeName(val) },
+    { field: 'tradeprice', label: 'query.internal.trade.tradeprice' },
+    { field: 'tradeqty', label: 'query.internal.trade.tradeqty' },
+    { field: 'tradeamount', label: 'query.internal.trade.tradeamount' },
+    { field: 'chargevalue', label: 'query.internal.trade.chargevalue' },
+    { field: 'closepl', label: 'query.internal.trade.closepl' },
+    { field: 'tradetime', label: 'query.internal.trade.tradetime', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])