Handy_Cao 1 year ago
parent
commit
dbb9793a26
46 changed files with 458 additions and 490 deletions
  1. 1 1
      src/packages/pc/components/base/table/index.vue
  2. 4 4
      src/packages/pc/views/account/address/index.vue
  3. 7 7
      src/packages/pc/views/account/receipt/index.vue
  4. 1 1
      src/packages/pc/views/account/sign/index.vue
  5. 4 4
      src/packages/pc/views/footer/capital/statement/index.vue
  6. 13 13
      src/packages/pc/views/footer/capital/summary/index.vue
  7. 10 10
      src/packages/pc/views/footer/goods/delivery/index.vue
  8. 12 13
      src/packages/pc/views/footer/goods/position/index.vue
  9. 9 9
      src/packages/pc/views/footer/inout/in/index.vue
  10. 9 9
      src/packages/pc/views/footer/inout/out/index.vue
  11. 14 14
      src/packages/pc/views/footer/performance/buy/index.vue
  12. 12 12
      src/packages/pc/views/footer/performance/components/details/index.vue
  13. 14 14
      src/packages/pc/views/footer/performance/sell/index.vue
  14. 11 14
      src/packages/pc/views/footer/presell/onlinedelivery/index.vue
  15. 12 12
      src/packages/pc/views/footer/presell/presellposition/index.vue
  16. 8 8
      src/packages/pc/views/footer/presell/transferorder/index.vue
  17. 9 12
      src/packages/pc/views/footer/presell/transfertrader/index.vue
  18. 10 10
      src/packages/pc/views/footer/pricing/position/index.vue
  19. 8 11
      src/packages/pc/views/footer/spot/pickup/index.vue
  20. 9 9
      src/packages/pc/views/footer/swap/position/index.vue
  21. 18 19
      src/packages/pc/views/market/trade/goods/list/index.vue
  22. 11 12
      src/packages/pc/views/market/trade/market/index.vue
  23. 7 9
      src/packages/pc/views/market/trade/presell/ballot/index.vue
  24. 7 9
      src/packages/pc/views/market/trade/presell/bidding/index.vue
  25. 18 19
      src/packages/pc/views/market/trade/presell/transfer/index.vue
  26. 12 13
      src/packages/pc/views/market/trade/pricing/index.vue
  27. 8 8
      src/packages/pc/views/market/trade/spot/index.vue
  28. 10 10
      src/packages/pc/views/market/trade/spot/order/index.vue
  29. 12 13
      src/packages/pc/views/market/trade/swap/index.vue
  30. 4 4
      src/packages/pc/views/query/capital/history/index.vue
  31. 4 4
      src/packages/pc/views/query/capital/list/index.vue
  32. 9 9
      src/packages/pc/views/query/order/goods/history/index.vue
  33. 10 10
      src/packages/pc/views/query/order/goods/list/index.vue
  34. 15 15
      src/packages/pc/views/query/order/presell/history/index.vue
  35. 15 17
      src/packages/pc/views/query/order/presell/list/index.vue
  36. 8 8
      src/packages/pc/views/query/order/presell/transferhistory/index.vue
  37. 8 10
      src/packages/pc/views/query/order/presell/transferlist/index.vue
  38. 14 14
      src/packages/pc/views/query/performance/buy/all/index.vue
  39. 14 17
      src/packages/pc/views/query/performance/buy/running/index.vue
  40. 14 14
      src/packages/pc/views/query/performance/sell/all/index.vue
  41. 14 17
      src/packages/pc/views/query/performance/sell/running/index.vue
  42. 11 11
      src/packages/pc/views/query/presell/onlinedelivery/index.vue
  43. 10 10
      src/packages/pc/views/query/trade/goods/history/index.vue
  44. 10 10
      src/packages/pc/views/query/trade/goods/list/index.vue
  45. 9 9
      src/packages/pc/views/query/trade/presell/history/index.vue
  46. 9 12
      src/packages/pc/views/query/trade/presell/list/index.vue

+ 1 - 1
src/packages/pc/components/base/table/index.vue

@@ -29,7 +29,7 @@
         <el-table-column type="index" :label="t('common.orderindex')" align="center" :width="80" v-if="showIndex" />
         <!-- 数据列 -->
         <template v-for="(item, index) in columns" :key="index">
-          <el-table-column :align="item.align ?? 'center'" :min-width="120" :width="item.width" :label="item.label"
+          <el-table-column :align="item.align ?? 'center'" :min-width="120" :width="item.width" :label="t(item.label)"
             :prop="item.field" :fixed="item.fixed || false" :sortable="item.sortable"
             :show-overflow-tooltip="item.field !== 'operate'" v-if="item.show ?? true">
             <template #default="{ row, $index }">

+ 4 - 4
src/packages/pc/views/account/address/index.vue

@@ -59,10 +59,10 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'receivername', label: t('mine.address.receiverName') },
-    { field: 'phonenum', label: t('mine.address.phoneNum') },
-    { field: 'address', label: t('mine.address.address') },
-    { field: 'isdefault', label: t('mine.address.isdefault') },
+    { field: 'receivername', label: 'mine.address.receiverName' },
+    { field: 'phonenum', label: 'mine.address.phoneNum' },
+    { field: 'address', label: 'mine.address.address' },
+    { field: 'isdefault', label: 'mine.address.isdefault' },
 ])
 
 filterOptons.buttonList = [

+ 7 - 7
src/packages/pc/views/account/receipt/index.vue

@@ -48,13 +48,13 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'receipttype', label: t('mine.invoice.receipttype') },
-    { field: 'username', label:  t('mine.invoice.UserName') },
-    { field: 'taxpayerid', label: t('mine.invoice.TaxpayerID') },
-    { field: 'receiptbank', label: t('mine.invoice.ReceiptBank') },
-    { field: 'receiptaccount', label: t('mine.invoice.ReceiptAccount') },
-    { field: 'contactinfo', label: t('mine.invoice.ContactInfo') },
-    { field: 'address', label: t('mine.invoice.Address') },
+    { field: 'receipttype', label: 'mine.invoice.receipttype' },
+    { field: 'username', label: 'mine.invoice.UserName' },
+    { field: 'taxpayerid', label: 'mine.invoice.TaxpayerID' },
+    { field: 'receiptbank', label: 'mine.invoice.ReceiptBank' },
+    { field: 'receiptaccount', label: 'mine.invoice.ReceiptAccount' },
+    { field: 'contactinfo', label: 'mine.invoice.ContactInfo' },
+    { field: 'address', label: 'mine.invoice.Address' },
 ])
 
 filterOptons.buttonList = [

+ 1 - 1
src/packages/pc/views/account/sign/index.vue

@@ -152,7 +152,7 @@ const beforeShowComponent = (row: Model.BankAccountSignRsp) => {
 }
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'accountcode', label: t('banksign.wallet.inoutapply.accountcode') },
+    { field: 'accountcode', label: 'banksign.wallet.inoutapply.accountcode' },
     { field: 'accountname', label: '名称' },
     { field: 'cardtype', label: '证件类型' },
     { field: 'cardno', label: '证件号码' },

+ 4 - 4
src/packages/pc/views/footer/capital/statement/index.vue

@@ -29,9 +29,9 @@ const { loading } = useRequest(queryAmountLog, {
 const { t } = i18n.global
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'accountid', label: t('banksign.capital.accountid') },
-    { field: 'operatetypename', label: t('banksign.capital.operatetypename') },
-    { field: 'amount', label: t('banksign.capital.amount') },
-    { field: 'createtime', label: t('banksign.capital.createtime') }
+    { field: 'accountid', label: 'banksign.capital.accountid' },
+    { field: 'operatetypename', label: 'banksign.capital.operatetypename' },
+    { field: 'amount', label: 'banksign.capital.amount' },
+    { field: 'createtime', label: 'banksign.capital.createtime' }
 ])
 </script>

+ 13 - 13
src/packages/pc/views/footer/capital/summary/index.vue

@@ -103,19 +103,19 @@ const hasAQAuth = computed(() => {
 const authStatus = computed(() => userStore.userAccount.hasauth) // 实名认证状态
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'accountid', label: t('account.account'), width: 160 },
-    { field: 'balance', label: t('account.balance2'), decimal: 2 },
-    { field: 'currentbalance', label: t('account.currentbalance'), decimal: 2 },
-    { field: 'hazardValue', label: t('account.netWorth') },
-    { field: 'avaiableMoney', label: t('account.availableFunds2'), decimal: 2 },
-    { field: 'usedmargin', label: t('account.usedMargin2'), decimal: 2 },
-    { field: 'freezeMargin', label: t('account.freezeMargin2'), decimal: 2 },
-    { field: 'profitLoss', label: t('account.profitLoss') },
-    { field: 'inamount', label: t('account.inamount'), decimal: 2 },
-    { field: 'outamount', label: t('account.outamount'), decimal: 2 },
-    { field: 'closepl', label: t('account.closepl'), decimal: 2 },
-    { field: 'paycharge', label: ('account.paycharge'), decimal: 2, width: 160 },
-    { field: 'tradestatus', label: ('account.tradestatus') },
+    { field: 'accountid', label: 'account.account', width: 160 },
+    { field: 'balance', label: 'account.balance2', decimal: 2 },
+    { field: 'currentbalance', label: 'account.currentbalance', decimal: 2 },
+    { field: 'hazardValue', label: 'account.netWorth' },
+    { field: 'avaiableMoney', label: 'account.availableFunds2', decimal: 2 },
+    { field: 'usedmargin', label: 'account.usedMargin2', decimal: 2 },
+    { field: 'freezeMargin', label: 'account.freezeMargin2', decimal: 2 },
+    { field: 'profitLoss', label: 'account.profitLoss' },
+    { field: 'inamount', label: 'account.inamount', decimal: 2 },
+    { field: 'outamount', label: 'account.outamount', decimal: 2 },
+    { field: 'closepl', label: 'account.closepl', decimal: 2 },
+    { field: 'paycharge', label: 'account.paycharge', decimal: 2, width: 160 },
+    { field: 'tradestatus', label: 'account.tradestatus' },
 ])
 
 /// 进行出入金操作判断

+ 10 - 10
src/packages/pc/views/footer/goods/delivery/index.vue

@@ -48,16 +48,16 @@ const { rowKey, expandKeys, selectedRow, rowClick } = useComposeTable<Model.Mine
 const { global: { t } } = i18n
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsnamedisplay', label: t('delivery.offline.goodsnamedisplay') },
-    { field: 'buyorselldisplay', label: t('delivery.offline.buyorselldisplay') },
-    { field: 'deliveryqty', label: t('delivery.offline.deliveryqty') },
-    { field: 'deliveryprice', label: t('delivery.offline.deliveryprice') },
-    { field: 'deliveryamount', label: t('delivery.offline.deliveryamount') },
-    { field: 'deliveryinfo', label: t('delivery.offline.deliveryinfo') },
-    { field: 'orderstatusdisplay', label: t('delivery.offline.orderstatusdisplay') },
-    { field: 'deliveryorderid', label: t('delivery.offline.deliveryorderid') },
-    { field: 'matchusername', label: t('delivery.offline.matchusername') },
-    { field: 'reqtime', label: t('delivery.offline.reqtime') }
+    { field: 'goodsnamedisplay', label: 'delivery.offline.goodsnamedisplay' },
+    { field: 'buyorselldisplay', label: 'delivery.offline.buyorselldisplay' },
+    { field: 'deliveryqty', label: 'delivery.offline.deliveryqty' },
+    { field: 'deliveryprice', label: 'delivery.offline.deliveryprice' },
+    { field: 'deliveryamount', label: 'delivery.offline.deliveryamount' },
+    { field: 'deliveryinfo', label: 'delivery.offline.deliveryinfo' },
+    { field: 'orderstatusdisplay', label: 'delivery.offline.orderstatusdisplay' },
+    { field: 'deliveryorderid', label: 'delivery.offline.deliveryorderid' },
+    { field: 'matchusername', label: 'delivery.offline.matchusername' },
+    { field: 'reqtime', label: 'delivery.offline.reqtime' }
 ])
 
 const showComponent = (componentName: string, row?: Model.MineTradeGoodsDeliveryOfflinesRsp) => {

+ 12 - 13
src/packages/pc/views/footer/goods/position/index.vue

@@ -30,7 +30,7 @@
 import { shallowRef, computed, onMounted } from 'vue'
 import { handleNumberValue, formatDecimal } from '@/filters'
 import { BuyOrSell, getBuyOrSellName } from '@/constants/order'
-import { usePositionStore, useUserStore, useFuturesStore, useDeliveryRelationStore, i18n } from '@/stores'
+import { usePositionStore, useUserStore, useFuturesStore, useDeliveryRelationStore } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppAuthOperation from '@pc/components/modules/auth-operation/index.vue'
 
@@ -38,7 +38,6 @@ defineProps({
     code: String
 })
 
-const { global: { t } } = i18n
 const userStore = useUserStore()
 const positionStore = usePositionStore()
 const futuresStore = useFuturesStore()
@@ -48,17 +47,17 @@ const positionList = computed(() => positionStore.getPositionListByTradeMode(50,
 const goodsList = computed(() => futuresStore.goodsList.filter((a) => positionList.value.some((b) => b.goodsid === a.goodsid)))
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsname', label: t('position.goods.goodsname') },
-    { field: 'buyorsell', label: t('position.goods.buyorsell') },
-    { field: 'curpositionqty', label: t('position.goods.curpositionqty') },
-    { field: 'enableqty', label: t('position.goods.enableqty') },
-    { field: 'frozenqty', label: t('position.goods.frozenqty') },
-    { field: 'averageprice', label: t('position.goods.averageprice') },
-    { field: 'lastprice', label: t('position.goods.last') },
-    { field: 'curholderamount', label: t('position.goods.curholderamount') },
-    { field: 'marketValue', label: t('position.goods.marketValue') },
-    { field: 'closepl', label: t('position.goods.closepl') },
-    { field: 'operate', label: t('common.operate'), fixed: 'right', width: 140 },
+    { field: 'goodsname', label: 'position.goods.goodsname' },
+    { field: 'buyorsell', label: 'position.goods.buyorsell' },
+    { field: 'curpositionqty', label: 'position.goods.curpositionqty' },
+    { field: 'enableqty', label: 'position.goods.enableqty' },
+    { field: 'frozenqty', label: 'position.goods.frozenqty' },
+    { field: 'averageprice', label: 'position.goods.averageprice' },
+    { field: 'lastprice', label: 'position.goods.last' },
+    { field: 'curholderamount', label: 'position.goods.curholderamount' },
+    { field: 'marketValue', label: 'position.goods.marketValue' },
+    { field: 'closepl', label: 'position.goods.closepl' },
+    { field: 'operate', label: 'common.operate', fixed: 'right', width: 140 },
 ])
 
 const handleOperateButtons = (row: Model.TradePositionRsp) => {

+ 9 - 9
src/packages/pc/views/footer/inout/in/index.vue

@@ -43,15 +43,15 @@ const { loading, dataList, run } = useRequest(queryInTradePositionTransfer)
 const { global: { t } } = i18n 
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsdisplay', label: t('inout.in.goodsdisplay') },
-    { field: 'outusername', label: t('inout.in.outusername') },
-    { field: 'qty', label: t('inout.in.qty') },
-    { field: 'transferprice', label: t('inout.in.transferprice') },
-    { field: 'freezedays', label: t('inout.in.freezedays') },
-    { field: 'goodscurprice', label: t('inout.in.goodscurprice') },
-    { field: 'incharge', label: t('inout.in.incharge') },
-    { field: 'transferapplystatus', label: t('inout.in.transferapplystatus') },
-    { field: 'applytime', label: t('inout.in.applytime') }
+    { field: 'goodsdisplay', label: 'inout.in.goodsdisplay' },
+    { field: 'outusername', label: 'inout.in.outusername' },
+    { field: 'qty', label: 'inout.in.qty' },
+    { field: 'transferprice', label: 'inout.in.transferprice' },
+    { field: 'freezedays', label: 'inout.in.freezedays' },
+    { field: 'goodscurprice', label: 'inout.in.goodscurprice' },
+    { field: 'incharge', label: 'inout.in.incharge' },
+    { field: 'transferapplystatus', label: 'inout.in.transferapplystatus' },
+    { field: 'applytime', label: 'inout.in.applytime' }
 ])
 
 const showComponent = (componentName: string, row: Model.InTradePositionTransferRsp) => {

+ 9 - 9
src/packages/pc/views/footer/inout/out/index.vue

@@ -37,14 +37,14 @@ const { loading, dataList, run } = useRequest(queryOutTradepositiontransfer)
 const { global: { t } } = i18n 
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsdisplay', label: t('inout.out.goodsdisplay') },
-    { field: 'inusername', label: t('inout.out.inusername') },
-    { field: 'qty', label: t('inout.out.qty') },
-    { field: 'transferprice', label: t('inout.out.transferprice') },
-    { field: 'freezedays', label: t('inout.out.freezedays') },
-    { field: 'goodscurprice', label: t('inout.out.goodscurprice') },
-    { field: 'outcharge', label: t('inout.out.outcharge') },
-    { field: 'transferapplystatus', label: t('inout.out.transferapplystatus') },
-    { field: 'applytime', label: t('inout.out.applytime') }
+    { field: 'goodsdisplay', label: 'inout.out.goodsdisplay' },
+    { field: 'inusername', label: 'inout.out.inusername' },
+    { field: 'qty', label: 'inout.out.qty' },
+    { field: 'transferprice', label: 'inout.out.transferprice' },
+    { field: 'freezedays', label: 'inout.out.freezedays' },
+    { field: 'goodscurprice', label: 'inout.out.goodscurprice' },
+    { field: 'outcharge', label: 'inout.out.outcharge' },
+    { field: 'transferapplystatus', label: 'inout.out.transferapplystatus' },
+    { field: 'applytime', label: 'inout.out.applytime' }
 ])
 </script>

+ 14 - 14
src/packages/pc/views/footer/performance/buy/index.vue

@@ -73,20 +73,20 @@ const { loading, dataList, run } = useRequest(queryPerformancePlan, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'deliverygoodsname', label: t('performance.deliverygoodsname') },
-    { field: 'wrstandardname', label: t('performance.wrstandardname') },
-    { field: 'performancetype', label: t('performance.performancetype') },
-    { field: 'relatedorderid', label: t('performance.relatedorderid') },
-    { field: 'paymenttype', label: t('performance.paymenttype') },
-    { field: 'buyerfreezeamount', label: t('performance.buyerfreezeamount') },
-    { field: 'buyerfreezeamountremain', label: t('performance.buyerfreezeamountremain') },
-    { field: 'amount', label: t('performance.amount') },
-    { field: 'buypaidamount', label: t('performance.buypaidamount') },
-    { field: 'overshortamount', label: t('performance.overshortamount') },
-    { field: 'buyusername', label: t('performance.buyusername') },
-    { field: 'performancestatus', label: t('performance.performancestatus') },
-    { field: 'curstepname', label: t('performance.curstepname') },
-    { field: 'starttime', label: t('performance.starttime1') }
+    { field: 'deliverygoodsname', label: 'performance.deliverygoodsname' },
+    { field: 'wrstandardname', label: 'performance.wrstandardname' },
+    { field: 'performancetype', label: 'performance.performancetype' },
+    { field: 'relatedorderid', label: 'performance.relatedorderid' },
+    { field: 'paymenttype', label: 'performance.paymenttype' },
+    { field: 'buyerfreezeamount', label: 'performance.buyerfreezeamount' },
+    { field: 'buyerfreezeamountremain', label: 'performance.buyerfreezeamountremain' },
+    { field: 'amount', label: 'performance.amount' },
+    { field: 'buypaidamount', label: 'performance.buypaidamount' },
+    { field: 'overshortamount', label: 'performance.overshortamount' },
+    { field: 'buyusername', label: 'performance.buyusername' },
+    { field: 'performancestatus', label: 'performance.performancestatus' },
+    { field: 'curstepname', label: 'performance.curstepname' },
+    { field: 'starttime', label: 'performance.starttime1' }
 ])
 
 const showComponent = (componentName: string, row: Model.PerformancePlanRsp) => {

+ 12 - 12
src/packages/pc/views/footer/performance/components/details/index.vue

@@ -131,18 +131,18 @@ const detailProps = [
 ]
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'steptypename', label: t('performance.steps.steptypename') },
-    { field: 'stepdays', label: t('performance.steps.stepdays') },
-    { field: 'remaindays', label: t('performance.steps.remaindays') },
-    { field: 'stepvalue', label: t('performance.steps.stepvalue') },
-    { field: 'stepamount', label: t('performance.steps.stepamount') },
-    { field: 'realamount', label: t('performance.steps.realamount') },
-    { field: 'isauto', label: t('performance.steps.isauto') },
-    { field: 'steplanchtype', label: t('performance.steps.steplanchtype') },
-    { field: 'starttime', label: t('performance.steps.starttime') },
-    { field: 'endtime', label: t('performance.steps.endtime') },
-    { field: 'stepstatus', label: t('performance.steps.stepstatus') },
-    { field: 'remark', label: t('performance.steps.remark') },
+    { field: 'steptypename', label: 'performance.steps.steptypename' },
+    { field: 'stepdays', label: 'performance.steps.stepdays' },
+    { field: 'remaindays', label: 'performance.steps.remaindays' },
+    { field: 'stepvalue', label: 'performance.steps.stepvalue' },
+    { field: 'stepamount', label: 'performance.steps.stepamount' },
+    { field: 'realamount', label: 'performance.steps.realamount' },
+    { field: 'isauto', label: 'performance.steps.isauto' },
+    { field: 'steplanchtype', label: 'performance.steps.steplanchtype' },
+    { field: 'starttime', label: 'performance.steps.starttime' },
+    { field: 'endtime', label: 'performance.steps.endtime' },
+    { field: 'stepstatus', label: 'performance.steps.stepstatus' },
+    { field: 'remark', label: 'performance.steps.remark' },
 ])
 
 // 当前步骤索引位置

+ 14 - 14
src/packages/pc/views/footer/performance/sell/index.vue

@@ -73,20 +73,20 @@ const { loading, dataList, run } = useRequest(queryPerformancePlan, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'deliverygoodsname', label: t('performance.deliverygoodsname') },
-    { field: 'wrstandardname', label: t('performance.wrstandardname') },
-    { field: 'performancetype', label: t('performance.performancetype') },
-    { field: 'relatedorderid', label: t('performance.relatedorderid') },
-    { field: 'paymenttype', label: t('performance.paymenttype') },
-    { field: 'sellerfreezeamount', label: t('performance.sellerfreezeamount') },
-    { field: 'sellerfreezeamountremain', label: t('performance.sellerfreezeamountremain') },
-    { field: 'amount', label: t('performance.amount') },
-    { field: 'sellreceivedamount', label: t('performance.sellreceivedamount') },
-    { field: 'overshortamount', label: t('performance.overshortamount') },
-    { field: 'buyusername', label: t('performance.buyusername') },
-    { field: 'performancestatus', label: t('performance.performancestatus')  },
-    { field: 'curstepname', label: t('performance.curstepname') },
-    { field: 'starttime', label: t('performance.starttime') },
+    { field: 'deliverygoodsname', label: 'performance.deliverygoodsname' },
+    { field: 'wrstandardname', label: 'performance.wrstandardname' },
+    { field: 'performancetype', label: 'performance.performancetype' },
+    { field: 'relatedorderid', label: 'performance.relatedorderid' },
+    { field: 'paymenttype', label: 'performance.paymenttype' },
+    { field: 'sellerfreezeamount', label: 'performance.sellerfreezeamount' },
+    { field: 'sellerfreezeamountremain', label: 'performance.sellerfreezeamountremain' },
+    { field: 'amount', label: 'performance.amount' },
+    { field: 'sellreceivedamount', label: 'performance.sellreceivedamount' },
+    { field: 'overshortamount', label: 'performance.overshortamount' },
+    { field: 'buyusername', label: 'performance.buyusername' },
+    { field: 'performancestatus', label: 'performance.performancestatus'  },
+    { field: 'curstepname', label: 'performance.curstepname' },
+    { field: 'starttime', label: 'performance.starttime' },
 
 ])
 

+ 11 - 14
src/packages/pc/views/footer/presell/onlinedelivery/index.vue

@@ -21,26 +21,23 @@ import { shallowRef } from 'vue'
 import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryWrDeliveryDetail } from '@/services/api/transfer'
-import { i18n } from "@/stores";
 import AppTable from '@pc/components/base/table/index.vue'
 
 const { loading, dataList } = useRequest(queryWrDeliveryDetail, {})
 
-const { t } = i18n.global
-
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'wrtypename', label: t('delivery.online.wrtypename') },
-    { field: 'deliveryqty', label: t('delivery.online.deliveryqty') },
-    { field: 'xdeliveryprice', label: t('delivery.online.xdeliveryprice') },
-    { field: 'deliverypricemove', label: t('delivery.online.deliverypricemove') },
+    { field: 'wrtypename', label: 'delivery.online.wrtypename' },
+    { field: 'deliveryqty', label: 'delivery.online.deliveryqty' },
+    { field: 'xdeliveryprice', label: 'delivery.online.xdeliveryprice' },
+    { field: 'deliverypricemove', label: 'delivery.online.deliverypricemove' },
     // { field: 'deliveryamount', label: '总货款' },
     // { field: 'xgoodsremainamount', label: '剩余货款' },
-    { field: 'deliverytotalamount', label: t('delivery.online.deliverytotalamount') },
-    { field: 'remaintotalamount', label: t('delivery.online.remaintotalamount') },
-    { field: 'warehousename', label: t('delivery.online.warehousename') },
-    { field: 'matchusername', label: t('delivery.online.matchusername') },
-    { field: 'deliverytime', label: t('delivery.online.deliverytime') },
-    { field: 'xgoodsname', label: t('delivery.online.xgoodscode') },
-    { field: 'deliveryid', label: t('delivery.online.deliveryid') }
+    { field: 'deliverytotalamount', label: 'delivery.online.deliverytotalamount' },
+    { field: 'remaintotalamount', label: 'delivery.online.remaintotalamount' },
+    { field: 'warehousename', label: 'delivery.online.warehousename' },
+    { field: 'matchusername', label: 'delivery.online.matchusername' },
+    { field: 'deliverytime', label: 'delivery.online.deliverytime' },
+    { field: 'xgoodsname', label: 'delivery.online.xgoodscode' },
+    { field: 'deliveryid', label: 'delivery.online.deliveryid' }
 ])
 </script>

+ 12 - 12
src/packages/pc/views/footer/presell/presellposition/index.vue

@@ -61,18 +61,18 @@ const { rowKey, expandKeys, selectedRow, rowClick } = useComposeTable<Model.Mine
 const { t } = i18n.global
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodsname', label: t('position.presale.goodsname') },
-    { field: 'sellname', label: t('position.presale.sellname') },
-    { field: 'starttime', label: t('position.presale.starttime1') },
-    { field: 'endtime', label: t('position.presale.endtime1') },
-    { field: 'tradeqty', label: t('position.presale.tradeqty') },
-    { field: 'openprice', label: t('position.presale.openprice') },
-    { field: 'tradeamount', label: t('position.presale.tradeamount') },
-    { field: 'transferdepositratio', label: t('position.presale.transferdepositratio') },
-    { field: 'transferdeposit', label: t('position.presale.transferdeposit') },
-    { field: 'depositremain', label: t('position.presale.depositremain') },
-    { field: 'paystatus', label: t('position.presale.paystatus') },
-    { field: 'tradeid', label: t('position.presale.tradeid') }
+    { field: 'goodsname', label: 'position.presale.goodsname' },
+    { field: 'sellname', label: 'position.presale.sellname' },
+    { field: 'starttime', label: 'position.presale.starttime1' },
+    { field: 'endtime', label: 'position.presale.endtime1' },
+    { field: 'tradeqty', label: 'position.presale.tradeqty' },
+    { field: 'openprice', label: 'position.presale.openprice' },
+    { field: 'tradeamount', label: 'position.presale.tradeamount' },
+    { field: 'transferdepositratio', label: 'position.presale.transferdepositratio' },
+    { field: 'transferdeposit', label: 'position.presale.transferdeposit' },
+    { field: 'depositremain', label: 'position.presale.depositremain' },
+    { field: 'paystatus', label: 'position.presale.paystatus' },
+    { field: 'tradeid', label: 'position.presale.tradeid' }
 ])
 
 const showComponent = (componentName: string, row?: Model.MineCpTradePreSaleResultsRsp) => {

+ 8 - 8
src/packages/pc/views/footer/presell/transferorder/index.vue

@@ -65,14 +65,14 @@ const showComponent = (componentName: string, row?: Model.MineTradeOrdersRsp) =>
 const { t } = i18n.global
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodsname', label: t('order.transferorder.goodsname') },
-    { field: 'orderqty', label: t('order.transferorder.orderqty') },
-    { field: 'orderprice', label: t('order.transferorder.orderprice') },
-    { field: 'presaleprice', label: t('order.transferorder.presaleprice') },
-    { field: 'tradeqty', label: t('order.transferorder.tradeqty') },
-    { field: 'orderstatus', label: t('order.transferorder.orderstatus') },
-    { field: 'ordertime', label: t('order.transferorder.ordertime') },
-    { field: 'orderid', label: t('order.transferorder.orderid') }
+    { field: 'goodsname', label: 'order.transferorder.goodsname' },
+    { field: 'orderqty', label: 'order.transferorder.orderqty' },
+    { field: 'orderprice', label: 'order.transferorder.orderprice' },
+    { field: 'presaleprice', label: 'order.transferorder.presaleprice' },
+    { field: 'tradeqty', label: 'order.transferorder.tradeqty' },
+    { field: 'orderstatus', label: 'order.transferorder.orderstatus' },
+    { field: 'ordertime', label: 'order.transferorder.ordertime' },
+    { field: 'orderid', label: 'order.transferorder.orderid' }
 ])
 
 // 接收委托回应通知

+ 9 - 12
src/packages/pc/views/footer/presell/transfertrader/index.vue

@@ -22,22 +22,19 @@ import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeTradeDetails } from '@/services/api/transfer'
 import { getBuyOrSellName } from '@/constants/order'
-import { i18n } from "@/stores";
 import AppTable from '@pc/components/base/table/index.vue'
 
 const { loading, dataList } = useRequest(queryMineTradeTradeDetails, {})
 
-const { t } = i18n.global
-
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsname', label: t('order.transfertrade.goodsname') },
-    { field: 'buyorsell', label: t('order.transfertrade.buyorsell') },
-    { field: 'tradeqty', label: t('order.transfertrade.tradeqty') },
-    { field: 'tradeprice', label: t('order.transfertrade.tradeprice') },
-    { field: 'presaleprice', label: t('order.transfertrade.presaleprice') },
-    { field: 'closepl', label: t('order.transfertrade.closepl') },
-    { field: 'accountname', label: t('order.transfertrade.accountname') },
-    { field: 'tradedate', label: t('order.transfertrade.tradedate') },
-    { field: 'orderid', label: t('order.transfertrade.orderid') }
+    { field: 'goodsname', label: 'order.transfertrade.goodsname' },
+    { field: 'buyorsell', label: 'order.transfertrade.buyorsell' },
+    { field: 'tradeqty', label: 'order.transfertrade.tradeqty' },
+    { field: 'tradeprice', label: 'order.transfertrade.tradeprice' },
+    { field: 'presaleprice', label: 'order.transfertrade.presaleprice' },
+    { field: 'closepl', label: 'order.transfertrade.closepl' },
+    { field: 'accountname', label: 'order.transfertrade.accountname' },
+    { field: 'tradedate', label: 'order.transfertrade.tradedate' },
+    { field: 'orderid', label: 'order.transfertrade.orderid' }
 ])
 </script>

+ 10 - 10
src/packages/pc/views/footer/pricing/position/index.vue

@@ -58,16 +58,16 @@ const positionList = computed(() => positionStore.getPositionListByTradeMode(10)
 const { t } = i18n.global
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsname', label: t('position.pricing.goodsname') },
-    { field: 'buyorsell', label: t('position.pricing.buyorsell') },
-    { field: 'curpositionqty', label: t('position.pricing.curpositionqty') },
-    { field: 'lastprice', label: t('position.pricing.lastprice') },
-    { field: 'averageprice', label: t('position.pricing.averageprice') },
-    { field: 'frozenqty', label: t('position.pricing.frozenqty') },
-    { field: 'curholderamount', label: t('position.pricing.curholderamount') },
-    { field: 'enableqty', label: t('position.pricing.enableqty') },
-    { field: 'closepl', label: t('position.pricing.closepl') },
-    { field: 'operate', label: t('common.operate'), fixed: 'right' },
+    { field: 'goodsname', label: 'position.pricing.goodsname' },
+    { field: 'buyorsell', label: 'position.pricing.buyorsell' },
+    { field: 'curpositionqty', label: 'position.pricing.curpositionqty' },
+    { field: 'lastprice', label: 'position.pricing.lastprice' },
+    { field: 'averageprice', label: 'position.pricing.averageprice' },
+    { field: 'frozenqty', label: 'position.pricing.frozenqty' },
+    { field: 'curholderamount', label: 'position.pricing.curholderamount' },
+    { field: 'enableqty', label: 'position.pricing.enableqty' },
+    { field: 'closepl', label: 'position.pricing.closepl' },
+    { field: 'operate', label: 'common.operate', fixed: 'right' },
 ])
 
 const showComponent = (componentName: string, row: Model.TradePositionRsp) => {

+ 8 - 11
src/packages/pc/views/footer/spot/pickup/index.vue

@@ -18,21 +18,18 @@ import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryWrOutInApply } from '@/services/api/order'
 import { getApplyStatusName } from '@/constants/order'
-import { i18n } from "@/stores";
 import AppTable from '@pc/components/base/table/index.vue'
 
 const { loading, dataList } = useRequest(queryWrOutInApply, {})
 
-const { t } = i18n.global
-
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'deliverygoodsname', label: t('delivery.spot.deliverygoodsname') },
-    { field: 'wrstandardname', label: t('delivery.spot.wrstandardname') },
-    { field: 'warehousename', label: t('delivery.spot.warehousename') },
-    { field: 'appointmentmodeldisplay', label: t('delivery.spot.appointmentmodeldisplay') },
-    { field: 'qty', label: t('delivery.spot.qty') },
-    { field: 'applytime', label: t('delivery.spot.applytime') },
-    { field: 'expressnum', label: t('delivery.spot.expressnum') },
-    { field: 'applystatus', label: t('delivery.spot.applystatus') }
+    { field: 'deliverygoodsname', label: 'delivery.spot.deliverygoodsname' },
+    { field: 'wrstandardname', label: 'delivery.spot.wrstandardname' },
+    { field: 'warehousename', label: 'delivery.spot.warehousename' },
+    { field: 'appointmentmodeldisplay', label: 'delivery.spot.appointmentmodeldisplay' },
+    { field: 'qty', label: 'delivery.spot.qty' },
+    { field: 'applytime', label: 'delivery.spot.applytime' },
+    { field: 'expressnum', label: 'delivery.spot.expressnum' },
+    { field: 'applystatus', label: 'delivery.spot.applystatus' }
 ])
 </script>

+ 9 - 9
src/packages/pc/views/footer/swap/position/index.vue

@@ -59,15 +59,15 @@ const { global: { t } } = i18n
 const positionList = computed(() => positionStore.getPositionListByTradeMode(46))
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsname', label: t('position.swap.goodsname') },
-    { field: 'buyorsell', label: t('position.swap.buyorsell') },
-    { field: 'curpositionqty', label: t('position.swap.curpositionqty') },
-    { field: 'lastprice', label: t('position.swap.lastprice') },
-    { field: 'averageprice', label: t('position.swap.averageprice') },
-    { field: 'frozenqty', label: t('position.swap.frozenqty') },
-    { field: 'curholderamount', label: t('position.swap.curholderamount') },
-    { field: 'enableqty', label: t('position.swap.enableqty') },
-    { field: 'closepl', label: t('position.swap.closepl') }
+    { field: 'goodsname', label: 'position.swap.goodsname' },
+    { field: 'buyorsell', label: 'position.swap.buyorsell' },
+    { field: 'curpositionqty', label: 'position.swap.curpositionqty' },
+    { field: 'lastprice', label: 'position.swap.lastprice' },
+    { field: 'averageprice', label: 'position.swap.averageprice' },
+    { field: 'frozenqty', label: 'position.swap.frozenqty' },
+    { field: 'curholderamount', label: 'position.swap.curholderamount' },
+    { field: 'enableqty', label: 'position.swap.enableqty' },
+    { field: 'closepl', label: 'position.swap.closepl' }
 ])
 
 const showComponent = (componentName: string, row: Model.TradePositionRsp) => {

+ 18 - 19
src/packages/pc/views/market/trade/goods/list/index.vue

@@ -69,7 +69,7 @@ import { shallowRef, onMounted, onUnmounted, defineAsyncComponent } from 'vue'
 import { parsePercent, handleNumberValue, formatDecimal } from '@/filters'
 import { useComponent } from '@/hooks/component'
 import { getGoodsUnitName } from '@/constants/unit'
-import { useFuturesStore, useGlobalStore, i18n } from '@/stores'
+import { useFuturesStore, useGlobalStore } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const componentMap = new Map<string, unknown>([
@@ -78,28 +78,27 @@ const componentMap = new Map<string, unknown>([
 
 const globalStore = useGlobalStore()
 const futuresStore = useFuturesStore()
-const { global: { t } } = i18n
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => true, false)
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodscode', label: t('quote.goodscode') },
-    { field: 'goodsname', label: t('quote.goodsname') },
-    { field: 'spec', label: t('quote.spec') },
-    { field: 'bid', label: t('quote.bid') },
-    { field: 'bidvolume', label: t('quote.bidvolume') },
-    { field: 'ask', label: t('quote.ask') },
-    { field: 'askvolume', label: t('quote.askvolume') },
-    { field: 'last', label: t('quote.last') },
-    { field: 'rise', label: t('quote.rise') },
-    { field: 'change', label: t('quote.change') },
-    { field: 'opened', label: t('quote.opened') },
-    { field: 'presettle', label: t('quote.presettle') },
-    { field: 'highest', label: t('quote.highest') },
-    { field: 'lowest', label: t('quote.lowest') },
-    { field: 'amplitude', label: t('quote.amplitude') },
-    { field: 'limitup', label: t('quote.limitup')},
-    { field: 'limitdown', label: t('quote.limitdown') },
+    { field: 'goodscode', label: 'quote.goodscode' },
+    { field: 'goodsname', label: 'quote.goodsname' },
+    { field: 'spec', label: 'quote.spec' },
+    { field: 'bid', label: 'quote.bid' },
+    { field: 'bidvolume', label: 'quote.bidvolume' },
+    { field: 'ask', label: 'quote.ask' },
+    { field: 'askvolume', label: 'quote.askvolume' },
+    { field: 'last', label: 'quote.last' },
+    { field: 'rise', label: 'quote.rise' },
+    { field: 'change', label: 'quote.change' },
+    { field: 'opened', label: 'quote.opened' },
+    { field: 'presettle', label: 'quote.presettle' },
+    { field: 'highest', label: 'quote.highest' },
+    { field: 'lowest', label: 'quote.lowest' },
+    { field: 'amplitude', label: 'quote.amplitude' },
+    { field: 'limitup', label: 'quote.limitup' },
+    { field: 'limitdown', label: 'quote.limitdown' },
 ])
 
 const onRowClick = (row: Model.GoodsQuote) => {

+ 11 - 12
src/packages/pc/views/market/trade/market/index.vue

@@ -52,12 +52,11 @@
 import { shallowRef, onMounted, onUnmounted, defineAsyncComponent } from 'vue'
 import { useComponent } from '@/hooks/component'
 import { parsePercent, handleNumberValue, formatDecimal } from '@/filters'
-import { useFuturesStore, useGlobalStore, i18n } from '@/stores'
+import { useFuturesStore, useGlobalStore } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const globalStore = useGlobalStore()
 const futuresStore = useFuturesStore()
-const { global: { t } } = i18n
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => true, false)
 
@@ -66,18 +65,18 @@ const componentMap = new Map<string, unknown>([
 ])
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodscode', label: t('quote.goodscode') },
-    { field: 'goodsname', label: t('quote.goodsname1') },
+    { field: 'goodscode', label: 'quote.goodscode' },
+    { field: 'goodsname', label: 'quote.goodsname1' },
     // { field: 'ask', label: '卖价' },
     // { field: 'bid', label: '买价' },
-    { field: 'last', label: t('quote.last') },
-    { field: 'rise', label: t('quote.rise') },
-    { field: 'change', label: t('quote.change') },
-    { field: 'opened', label: t('quote.opened') },
-    { field: 'presettle', label: t('quote.presettle') },
-    { field: 'lowest', label: t('quote.lowest') },
-    { field: 'highest', label: t('quote.highest') },
-    { field: 'amplitude', label: t('quote.amplitude') },
+    { field: 'last', label: 'quote.last' },
+    { field: 'rise', label: 'quote.rise' },
+    { field: 'change', label: 'quote.change' },
+    { field: 'opened', label: 'quote.opened' },
+    { field: 'presettle', label: 'quote.presettle' },
+    { field: 'lowest', label: 'quote.lowest' },
+    { field: 'highest', label: 'quote.highest' },
+    { field: 'amplitude', label: 'quote.amplitude' },
 ])
 
 const onRowClick = (row: Model.GoodsQuote) => {

+ 7 - 9
src/packages/pc/views/market/trade/presell/ballot/index.vue

@@ -25,7 +25,6 @@ import { useRequest } from '@/hooks/request'
 import { useDataFilter } from '@/hooks/datatable'
 import { getWRPresaleStatusList, getWRPresaleStatusName } from '@/constants/order'
 import { queryPresaleAuctions } from '@/services/api/presale'
-import { i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -36,7 +35,6 @@ const componentMap = new Map<string, unknown>([
 const { filterOptons, getQueryParams } = useDataFilter<Model.PresaleAuctionsReq>()
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => run(), false)
 const selectedRow = shallowRef<Model.PresaleAuctionsRsp>()
-const { global: { t } } = i18n
 
 const { dataList, run, loading } = useRequest(queryPresaleAuctions, {
     params: {
@@ -46,13 +44,13 @@ const { dataList, run, loading } = useRequest(queryPresaleAuctions, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'attachmenturl', label: t('quote.ballot.attachmenturl') },
-    { field: 'goodscode', label: t('quote.goodscode')  },
-    { field: 'goodsname', label: t('quote.goodsname')  },
-    { field: 'refprice', label: t('quote.ballot.refprice') },
-    { field: 'starttime', label: t('quote.ballot.starttime1') },
-    { field: 'endtime', label: t('quote.ballot.endtime1') },
-    { field: 'presalestatus', label: t('quote.ballot.presalestatus') },
+    { field: 'attachmenturl', label: 'quote.ballot.attachmenturl' },
+    { field: 'goodscode', label: 'quote.goodscode' },
+    { field: 'goodsname', label: 'quote.goodsname' },
+    { field: 'refprice', label: 'quote.ballot.refprice' },
+    { field: 'starttime', label: 'quote.ballot.starttime1' },
+    { field: 'endtime', label: 'quote.ballot.endtime1' },
+    { field: 'presalestatus', label: 'quote.ballot.presalestatus' },
 ])
 
 filterOptons.selectList = [

+ 7 - 9
src/packages/pc/views/market/trade/presell/bidding/index.vue

@@ -25,7 +25,6 @@ import { useRequest } from '@/hooks/request'
 import { useDataFilter } from '@/hooks/datatable'
 import { getWRPresaleStatusList, getWRPresaleStatusName } from '@/constants/order'
 import { queryPresaleAuctions } from '@/services/api/presale'
-import { i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -36,7 +35,6 @@ const componentMap = new Map<string, unknown>([
 const { filterOptons, getQueryParams } = useDataFilter<Model.PresaleAuctionsReq>()
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => run(), false)
 const selectedRow = shallowRef<Model.PresaleAuctionsRsp>()
-const { global: { t } } = i18n
 
 const { dataList, run, loading } = useRequest(queryPresaleAuctions, {
     params: {
@@ -46,13 +44,13 @@ const { dataList, run, loading } = useRequest(queryPresaleAuctions, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'attachmenturl', label: t('quote.presale.attachmenturl') },
-    { field: 'goodscode', label: t('quote.goodscode') },
-    { field: 'goodsname', label: t('quote.goodsname') },
-    { field: 'startprice', label: t('quote.presale.startprice') },
-    { field: 'starttime', label: t('quote.presale.starttime1') },
-    { field: 'endtime', label: t('quote.presale.endtime1') },
-    { field: 'presalestatus', label: t('quote.presale.presalestatus') },
+    { field: 'attachmenturl', label: 'quote.presale.attachmenturl' },
+    { field: 'goodscode', label: 'quote.goodscode' },
+    { field: 'goodsname', label: 'quote.goodsname' },
+    { field: 'startprice', label: 'quote.presale.startprice' },
+    { field: 'starttime', label: 'quote.presale.starttime1' },
+    { field: 'endtime', label: 'quote.presale.endtime1' },
+    { field: 'presalestatus', label: 'quote.presale.presalestatus' },
 ])
 
 filterOptons.selectList = [

+ 18 - 19
src/packages/pc/views/market/trade/presell/transfer/index.vue

@@ -69,7 +69,7 @@ import { shallowRef, onMounted, onUnmounted, defineAsyncComponent } from 'vue'
 import { parsePercent, handleNumberValue, formatDecimal } from '@/filters'
 import { useComponent } from '@/hooks/component'
 import { getGoodsUnitName } from '@/constants/unit'
-import { useFuturesStore, useGlobalStore, i18n } from '@/stores'
+import { useFuturesStore, useGlobalStore } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const componentMap = new Map<string, unknown>([
@@ -78,27 +78,26 @@ const componentMap = new Map<string, unknown>([
 
 const globalStore = useGlobalStore()
 const futuresStore = useFuturesStore()
-const { global: { t } } = i18n
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => true, false)
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodscode', label: t('quote.goodscode') },
-    { field: 'goodsname', label: t('quote.goodsname') },
-    { field: 'spec', label: t('quote.spec') },
-    { field: 'bid', label: t('quote.bid') },
-    { field: 'bidvolume', label: t('quote.bidvolume') },
-    { field: 'ask', label: t('quote.ask') },
-    { field: 'askvolume', label: t('quote.askvolume') },
-    { field: 'last', label: t('quote.last') },
-    { field: 'rise', label: t('quote.rise') },
-    { field: 'change', label: t('quote.change') },
-    { field: 'opened', label: t('quote.opened') },
-    { field: 'presettle', label: t('quote.presettle') },
-    { field: 'highest', label: t('quote.highest') },
-    { field: 'lowest', label: t('quote.lowest')},
-    { field: 'amplitude', label: t('quote.amplitude') },
-    { field: 'limitup', label: t('quote.limitup') },
-    { field: 'limitdown', label: t('quote.limitdown') },
+    { field: 'goodscode', label: 'quote.goodscode' },
+    { field: 'goodsname', label: 'quote.goodsname' },
+    { field: 'spec', label: 'quote.spec' },
+    { field: 'bid', label: 'quote.bid' },
+    { field: 'bidvolume', label: 'quote.bidvolume' },
+    { field: 'ask', label: 'quote.ask' },
+    { field: 'askvolume', label: 'quote.askvolume' },
+    { field: 'last', label: 'quote.last' },
+    { field: 'rise', label: 'quote.rise' },
+    { field: 'change', label: 'quote.change' },
+    { field: 'opened', label: 'quote.opened' },
+    { field: 'presettle', label: 'quote.presettle' },
+    { field: 'highest', label: 'quote.highest' },
+    { field: 'lowest', label: 'quote.lowest' },
+    { field: 'amplitude', label: 'quote.amplitude' },
+    { field: 'limitup', label: 'quote.limitup' },
+    { field: 'limitdown', label: 'quote.limitdown' },
 ])
 
 const onRowClick = (row: Model.GoodsQuote) => {

+ 12 - 13
src/packages/pc/views/market/trade/pricing/index.vue

@@ -44,7 +44,7 @@
 import { shallowRef, onMounted, onUnmounted, defineAsyncComponent, computed } from 'vue'
 import { useComponent } from '@/hooks/component'
 import { parsePercent, handleNumberValue, formatDecimal } from '@/filters'
-import { useFuturesStore, useUserStore, useGlobalStore, i18n } from '@/stores'
+import { useFuturesStore, useUserStore, useGlobalStore } from '@/stores'
 import { useRequest } from '@/hooks/request'
 import { queryQuoteGoodsList } from '@/services/api/swap'
 import quoteSocket from '@/services/websocket/quote'
@@ -54,7 +54,6 @@ const subscribe = quoteSocket.createSubscribe()
 const futuresStore = useFuturesStore()
 const userStore = useUserStore()
 const globalStore = useGlobalStore()
-const { global: { t } } = i18n
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => true, false)
 
@@ -101,17 +100,17 @@ const tableList = computed(() => {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsname', label: t('quote.goodsname') },
-    { field: 'last', label: t('quote.last')  },
-    { field: 'ask', label: t('quote.bid')  },
-    { field: 'bid', label: t('quote.ask') },
-    { field: 'rise', label: t('quote.rise') },
-    { field: 'change', label: t('quote.change') },
-    { field: 'opened', label: t('quote.opened') },
-    { field: 'presettle', label: t('quote.presettle') },
-    { field: 'lowest', label: t('quote.lowest') },
-    { field: 'highest', label: t('quote.highest') },
-    { field: 'amplitude', label: t('quote.amplitude') },
+    { field: 'goodsname', label: 'quote.goodsname' },
+    { field: 'last', label: 'quote.last' },
+    { field: 'ask', label: 'quote.bid' },
+    { field: 'bid', label: 'quote.ask' },
+    { field: 'rise', label: 'quote.rise' },
+    { field: 'change', label: 'quote.change' },
+    { field: 'opened', label: 'quote.opened' },
+    { field: 'presettle', label: 'quote.presettle' },
+    { field: 'lowest', label: 'quote.lowest' },
+    { field: 'highest', label: 'quote.highest' },
+    { field: 'amplitude', label: 'quote.amplitude' },
 ])
 
 const onRowClick = (row: Model.GoodsQuote) => {

+ 8 - 8
src/packages/pc/views/market/trade/spot/index.vue

@@ -51,14 +51,14 @@ const { dataList, loading, run } = useRequest(queryOrderQuote, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'thumurls', label: t('quote.spot.attachmenturl') },
-    { field: 'deliverygoodsname', label: t('quote.spot.deliverygoodsname') },
-    { field: 'wrgoodsname', label: t('quote.spot.wrgoodsname') },
-    { field: 'warehousename', label: t('quote.spot.warehousename1') },
-    { field: 'sellprice', label: t('quote.spot.sellprice') },
-    { field: 'sellqty', label: t('quote.spot.sellqty') },
-    { field: 'buyprice', label: t('quote.spot.buyprice') },
-    { field: 'buyqty', label: t('quote.spot.buyqty') },
+    { field: 'thumurls', label: 'quote.spot.attachmenturl' },
+    { field: 'deliverygoodsname', label: 'quote.spot.deliverygoodsname' },
+    { field: 'wrgoodsname', label: 'quote.spot.wrgoodsname' },
+    { field: 'warehousename', label: 'quote.spot.warehousename1' },
+    { field: 'sellprice', label: 'quote.spot.sellprice' },
+    { field: 'sellqty', label: 'quote.spot.sellqty' },
+    { field: 'buyprice', label: 'quote.spot.buyprice' },
+    { field: 'buyqty', label: 'quote.spot.buyqty' },
 ])
 
 filterOptons.inputList = [

+ 10 - 10
src/packages/pc/views/market/trade/spot/order/index.vue

@@ -135,19 +135,19 @@ const { dataList: sellList, run: getSellList } = useRequest(queryOrderQuoteDetai
 })
 
 const buyColumns = shallowRef<Model.TableColumn[]>(
-    oem != 'zrwyt' ? [{ field: 'fixedprice', label: t('quote.bid' ) },
-    { field: 'orderqty', label: t('quote.bidvolume' ) },
-    { field: 'username', label: t('quote.buyusername' ) }] :
-        [{ field: 'fixedprice', label: t('quote.bid' ) },
-        { field: 'orderqty', label: t('quote.bidvolume' ) }]
+    oem != 'zrwyt' ? [{ field: 'fixedprice', label: 'quote.bid' },
+    { field: 'orderqty', label: 'quote.bidvolume' },
+    { field: 'username', label: 'quote.buyusername' }] :
+        [{ field: 'fixedprice', label: 'quote.bid' },
+        { field: 'orderqty', label: 'quote.bidvolume' }]
 )
 
 const sellColumns = shallowRef<Model.TableColumn[]>(
-    oem != 'zrwyt' ? [{ field: 'fixedprice', label: t('quote.ask' ) },
-    { field: 'orderqty', label: t('quote.askvolume' ) },
-    { field: 'username', label: t('quote.sellusername' ) }] :
-        [{ field: 'fixedprice', label: t('quote.ask' ) },
-        { field: 'orderqty', label: t('quote.askvolume' ) }]
+    oem != 'zrwyt' ? [{ field: 'fixedprice', label: 'quote.ask' },
+    { field: 'orderqty', label: 'quote.askvolume' },
+    { field: 'username', label: 'quote.sellusername' }] :
+        [{ field: 'fixedprice', label: 'quote.ask' },
+        { field: 'orderqty', label: 'quote.askvolume' }]
 )
 
 const showComponent = (componentName: string, row: Model.OrderQuoteDetailRsp) => {

+ 12 - 13
src/packages/pc/views/market/trade/swap/index.vue

@@ -36,7 +36,7 @@
 import { shallowRef, onUnmounted, defineAsyncComponent, computed } from 'vue'
 import { useComponent } from '@/hooks/component'
 import { parsePercent, handleNumberValue, formatDecimal } from '@/filters'
-import { useFuturesStore, useUserStore, i18n } from '@/stores'
+import { useFuturesStore, useUserStore } from '@/stores'
 import { useRequest } from '@/hooks/request'
 import { queryQuoteGoodsList, queryMdUserSwapProtocol } from '@/services/api/swap'
 import quoteSocket from '@/services/websocket/quote'
@@ -48,7 +48,6 @@ const subscribe = quoteSocket.createSubscribe()
 const futuresStore = useFuturesStore()
 const userStore = useUserStore()
 const selectedRow = shallowRef<Model.QuoteGoodsListRsp>()
-const { global: { t } } = i18n
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => true, false)
 
@@ -103,17 +102,17 @@ const tableList = computed(() => {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodscode', label: t('quote.goodscode') },
-    { field: 'goodsname', label: t('quote.goodsname1') },
-    { field: 'refgoodsname', label: t('quote.refgoodsname') },
-    { field: 'last', label: t('quote.last') },
-    { field: 'rise', label: t('quote.rise') },
-    { field: 'change', label: t('quote.change') },
-    { field: 'opened', label: t('quote.opened') },
-    { field: 'presettle', label: t('quote.presettle') },
-    { field: 'lowest', label: t('quote.lowest') },
-    { field: 'highest', label: t('quote.highest') },
-    { field: 'amplitude', label: t('quote.amplitude') },
+    { field: 'goodscode', label: 'quote.goodscode' },
+    { field: 'goodsname', label: 'quote.goodsname1' },
+    { field: 'refgoodsname', label: 'quote.refgoodsname' },
+    { field: 'last', label: 'quote.last' },
+    { field: 'rise', label: 'quote.rise' },
+    { field: 'change', label: 'quote.change' },
+    { field: 'opened', label: 'quote.opened' },
+    { field: 'presettle', label: 'quote.presettle' },
+    { field: 'lowest', label: 'quote.lowest' },
+    { field: 'highest', label: 'quote.highest' },
+    { field: 'amplitude', label: 'quote.amplitude' },
 ])
 
 const onRowClick = (row: Model.QuoteGoodsListRsp) => {

+ 4 - 4
src/packages/pc/views/query/capital/history/index.vue

@@ -66,10 +66,10 @@ const { loading, run, pageIndex, pageCount } = useRequest(queryHisAmountLog, {
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'accountid', label: t('banksign.capital.accountid') },
-    { field: 'operatetypename', label: t('banksign.capital.operatetypename') },
-    { field: 'amount', label: t('banksign.capital.amount') },
-    { field: 'createtime', label: t('banksign.capital.createtime') }
+    { field: 'accountid', label: 'banksign.capital.accountid' },
+    { field: 'operatetypename', label: 'banksign.capital.operatetypename' },
+    { field: 'amount', label: 'banksign.capital.amount' },
+    { field: 'createtime', label: 'banksign.capital.createtime' }
 ])
 
 filterOptons.buttonList = [

+ 4 - 4
src/packages/pc/views/query/capital/list/index.vue

@@ -48,10 +48,10 @@ const { loading, dataList, run } = useRequest(queryAmountLog, {
 const { t } = i18n.global
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'accountid', label: t('banksign.capital.accountid') },
-    { field: 'operatetypename', label: t('banksign.capital.operatetypename') },
-    { field: 'amount', label: t('banksign.capital.amount') },
-    { field: 'createtime', label: t('banksign.capital.createtime') }
+    { field: 'accountid', label: 'banksign.capital.accountid' },
+    { field: 'operatetypename', label: 'banksign.capital.operatetypename' },
+    { field: 'amount', label: 'banksign.capital.amount' },
+    { field: 'createtime', label: 'banksign.capital.createtime' }
 ])
 
 filterOptons.buttonList = [

+ 9 - 9
src/packages/pc/views/query/order/goods/history/index.vue

@@ -76,15 +76,15 @@ filterOptons.selectList = [
 ]
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodscode', label: t('order.goodsorder.goodscode') },
-    { field: 'buyorsell', label: t('order.goodsorder.buyorsell') },
-    { field: 'buildtype', label: t('order.goodsorder.buildtype') },
-    { field: 'orderprice', label: t('order.goodsorder.orderprice') },
-    { field: 'orderqty', label: t('order.goodsorder.orderqty') },
-    { field: 'tradeqty', label: t('order.goodsorder.tradeqty') },
-    { field: 'orderid', label: t('order.goodsorder.orderid') },
-    { field: 'ordertime', label: t('order.goodsorder.ordertime') },
-    { field: 'orderstatus', label: t('order.goodsorder.orderstatus') },
+    { field: 'goodscode', label: 'order.goodsorder.goodscode' },
+    { field: 'buyorsell', label: 'order.goodsorder.buyorsell' },
+    { field: 'buildtype', label: 'order.goodsorder.buildtype' },
+    { field: 'orderprice', label: 'order.goodsorder.orderprice' },
+    { field: 'orderqty', label: 'order.goodsorder.orderqty' },
+    { field: 'tradeqty', label: 'order.goodsorder.tradeqty' },
+    { field: 'orderid', label: 'order.goodsorder.orderid' },
+    { field: 'ordertime', label: 'order.goodsorder.ordertime' },
+    { field: 'orderstatus', label: 'order.goodsorder.orderstatus' },
 ])
 
 filterOptons.buttonList = [

+ 10 - 10
src/packages/pc/views/query/order/goods/list/index.vue

@@ -44,15 +44,15 @@ const { loading } = useRequest(queryTradeOrderDetail, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodscode', label: t('order.goodsorder.goodscode') },
-    { field: 'goodsname', label: t('order.goodsorder.goodsname1') },
-    { field: 'buyorsell', label: t('order.goodsorder.buyorsell') },
-    { field: 'buildtype', label: t('order.goodsorder.buildtype') },
-    { field: 'orderprice', label: t('order.goodsorder.orderprice') },
-    { field: 'orderqty', label: t('order.goodsorder.orderqty') },
-    { field: 'tradeqty', label: t('order.goodsorder.tradeqty') },
-    { field: 'orderid', label: t('order.goodsorder.orderid') },
-    { field: 'ordertime', label: t('order.goodsorder.ordertime') },
-    { field: 'orderstatus', label: t('order.goodsorder.orderstatus') },
+    { field: 'goodscode', label: 'order.goodsorder.goodscode' },
+    { field: 'goodsname', label: 'order.goodsorder.goodsname1' },
+    { field: 'buyorsell', label: 'order.goodsorder.buyorsell' },
+    { field: 'buildtype', label: 'order.goodsorder.buildtype' },
+    { field: 'orderprice', label: 'order.goodsorder.orderprice' },
+    { field: 'orderqty', label: 'order.goodsorder.orderqty' },
+    { field: 'tradeqty', label: 'order.goodsorder.tradeqty' },
+    { field: 'orderid', label: 'order.goodsorder.orderid' },
+    { field: 'ordertime', label: 'order.goodsorder.ordertime' },
+    { field: 'orderstatus', label: 'order.goodsorder.orderstatus' },
 ])
 </script>

+ 15 - 15
src/packages/pc/views/query/order/presell/history/index.vue

@@ -73,21 +73,21 @@ const { loading, run, pageIndex, pageCount } = useRequest(queryMineTradeOrderDet
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodsnamedisplay', label: t('order.presale.goodsname') },
-    { field: 'orderqty', label: t('order.presale.orderqty') },
-    { field: 'orderprice', label: t('order.presale.orderprice') },
-    { field: 'orderamount', label: t('order.presale.orderamount') },
-    { field: 'presaledepositalgorithm', label: t('order.presale.presaledepositalgorithm') },
-    { field: 'presaledepositvalue', label: t('order.presale.presaledepositvalue') },
-    { field: 'freezemargin', label: t('order.presale.freezemargin') },
-    { field: 'sellname', label: t('order.presale.sellname') },
-    { field: 'starttime', label: t('order.presale.starttime') },
-    { field: 'endtime', label: t('order.presale.endtime') },
-    { field: 'orderstatus', label: t('order.presale.orderstatus') },
-    { field: 'ordertime', label: t('order.presale.ordertime') },
-    { field: 'tradeprice', label: t('order.presale.tradeprice') },
-    { field: 'tradeqty', label: t('order.presale.tradeqty') },
-    { field: 'orderid', label: t('order.presale.orderid') }
+    { field: 'goodsnamedisplay', label: 'order.presale.goodsname' },
+    { field: 'orderqty', label: 'order.presale.orderqty' },
+    { field: 'orderprice', label: 'order.presale.orderprice' },
+    { field: 'orderamount', label: 'order.presale.orderamount' },
+    { field: 'presaledepositalgorithm', label: 'order.presale.presaledepositalgorithm' },
+    { field: 'presaledepositvalue', label: 'order.presale.presaledepositvalue' },
+    { field: 'freezemargin', label: 'order.presale.freezemargin' },
+    { field: 'sellname', label: 'order.presale.sellname' },
+    { field: 'starttime', label: 'order.presale.starttime' },
+    { field: 'endtime', label: 'order.presale.endtime' },
+    { field: 'orderstatus', label: 'order.presale.orderstatus' },
+    { field: 'ordertime', label: 'order.presale.ordertime' },
+    { field: 'tradeprice', label: 'order.presale.tradeprice' },
+    { field: 'tradeqty', label: 'order.presale.tradeqty' },
+    { field: 'orderid', label: 'order.presale.orderid' }
 ])
 
 filterOptons.buttonList = [

+ 15 - 17
src/packages/pc/views/query/order/presell/list/index.vue

@@ -38,28 +38,26 @@ import { formatDate, parsePercent } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeOrderDetails } from '@/services/api/presale'
 import { getOrderStatusName } from '@/constants/order'
-import { i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const { loading, dataList } = useRequest(queryMineTradeOrderDetails, {})
-const { global: { t } } = i18n
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsname', label: t('order.presale.goodsname') },
-    { field: 'orderqty', label: t('order.presale.orderqty') },
-    { field: 'orderprice', label: t('order.presale.orderprice') },
-    { field: 'orderamount', label: t('order.presale.orderamount') },
-    { field: 'presaledepositalgorithm', label: t('order.presale.presaledepositalgorithm') },
-    { field: 'presaledepositvalue', label: t('order.presale.presaledepositvalue') },
-    { field: 'freezemargin', label: t('order.presale.freezemargin') },
-    { field: 'sellname', label: t('order.presale.sellname') },
-    { field: 'starttime', label: t('order.presale.starttime') },
-    { field: 'endtime', label: t('order.presale.endtime') },
-    { field: 'orderstatus', label: t('order.presale.orderstatus') },
-    { field: 'ordertime', label: t('order.presale.ordertime') },
-    { field: 'tradeprice', label: t('order.presale.tradeprice') },
-    { field: 'tradeqty', label: t('order.presale.tradeqty') },
-    { field: 'orderid', label: t('order.presale.orderid') }
+    { field: 'goodsname', label: 'order.presale.goodsname' },
+    { field: 'orderqty', label: 'order.presale.orderqty' },
+    { field: 'orderprice', label: 'order.presale.orderprice' },
+    { field: 'orderamount', label: 'order.presale.orderamount' },
+    { field: 'presaledepositalgorithm', label: 'order.presale.presaledepositalgorithm' },
+    { field: 'presaledepositvalue', label: 'order.presale.presaledepositvalue' },
+    { field: 'freezemargin', label: 'order.presale.freezemargin' },
+    { field: 'sellname', label: 'order.presale.sellname' },
+    { field: 'starttime', label: 'order.presale.starttime' },
+    { field: 'endtime', label: 'order.presale.endtime' },
+    { field: 'orderstatus', label: 'order.presale.orderstatus' },
+    { field: 'ordertime', label: 'order.presale.ordertime' },
+    { field: 'tradeprice', label: 'order.presale.tradeprice' },
+    { field: 'tradeqty', label: 'order.presale.tradeqty' },
+    { field: 'orderid', label: 'order.presale.orderid' }
 ])
 
 </script>

+ 8 - 8
src/packages/pc/views/query/order/presell/transferhistory/index.vue

@@ -57,14 +57,14 @@ const { loading, run, pageIndex, pageCount } = useRequest(queryMineTradeOrders,
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodsnamedisplay', label: t('order.transferorder.goodsname') },
-    { field: 'orderqty', label: t('order.transferorder.orderqty') },
-    { field: 'orderprice', label: t('order.transferorder.orderprice') },
-    { field: 'presaleprice', label: t('order.transferorder.presaleprice') },
-    { field: 'tradeqty', label: t('order.transferorder.tradeqty') },
-    { field: 'orderstatus', label: t('order.transferorder.orderstatus') },
-    { field: 'ordertime', label: t('order.transferorder.ordertime') },
-    { field: 'orderid', label: t('order.transferorder.orderid') }
+    { field: 'goodsnamedisplay', label: 'order.transferorder.goodsname' },
+    { field: 'orderqty', label: 'order.transferorder.orderqty' },
+    { field: 'orderprice', label: 'order.transferorder.orderprice' },
+    { field: 'presaleprice', label: 'order.transferorder.presaleprice' },
+    { field: 'tradeqty', label: 'order.transferorder.tradeqty' },
+    { field: 'orderstatus', label: 'order.transferorder.orderstatus' },
+    { field: 'ordertime', label: 'order.transferorder.ordertime' },
+    { field: 'orderid', label: 'order.transferorder.orderid' }
 ])
 
 filterOptons.buttonList = [

+ 8 - 10
src/packages/pc/views/query/order/presell/transferlist/index.vue

@@ -22,20 +22,18 @@ import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeOrders } from '@/services/api/transfer'
 import { getOrderStatusName } from '@/constants/order'
-import { i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const { loading, dataList } = useRequest(queryMineTradeOrders, {})
-const { global: { t } } = i18n
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsname', label: t('order.transferorder.goodsname') },
-    { field: 'orderqty', label: t('order.transferorder.orderqty') },
-    { field: 'orderprice', label: t('order.transferorder.orderprice') },
-    { field: 'presaleprice', label: t('order.transferorder.presaleprice') },
-    { field: 'tradeqty', label: t('order.transferorder.tradeqty') },
-    { field: 'orderstatus', label: t('order.transferorder.orderstatus') },
-    { field: 'ordertime', label: t('order.transferorder.ordertime') },
-    { field: 'orderid', label: t('order.transferorder.orderid') }
+    { field: 'goodsname', label: 'order.transferorder.goodsname' },
+    { field: 'orderqty', label: 'order.transferorder.orderqty' },
+    { field: 'orderprice', label: 'order.transferorder.orderprice' },
+    { field: 'presaleprice', label: 'order.transferorder.presaleprice' },
+    { field: 'tradeqty', label: 'order.transferorder.tradeqty' },
+    { field: 'orderstatus', label: 'order.transferorder.orderstatus' },
+    { field: 'ordertime', label: 'order.transferorder.ordertime' },
+    { field: 'orderid', label: 'order.transferorder.orderid' }
 ])
 </script>

+ 14 - 14
src/packages/pc/views/query/performance/buy/all/index.vue

@@ -51,20 +51,20 @@ const { loading, dataList, run } = useRequest(queryPerformancePlan, {
 const { t } = i18n.global
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'deliverygoodsname', label: t('performance.deliverygoodsname') },
-    { field: 'wrstandardname', label: t('performance.wrstandardname') },
-    { field: 'performancetype', label: t('performance.performancetype') },
-    { field: 'relatedorderid', label: t('performance.relatedorderid') },
-    { field: 'paymenttype', label: t('performance.paymenttype') },
-    { field: 'buyerfreezeamount', label: t('performance.buyerfreezeamount') },
-    { field: 'buyerfreezeamountremain', label: t('performance.buyerfreezeamountremain') },
-    { field: 'amount', label: t('performance.amount') },
-    { field: 'buypaidamount', label: t('performance.buypaidamount') },
-    { field: 'overshortamount', label: t('performance.overshortamount') },
-    { field: 'sellusername', label: t('performance.sellusername') },
-    { field: 'performancestatus', label: t('performance.performancestatus') },
-    { field: 'curstepname', label: t('performance.curstepname') },
-    { field: 'starttime', label: t('performance.starttime1') },
+    { field: 'deliverygoodsname', label: 'performance.deliverygoodsname' },
+    { field: 'wrstandardname', label: 'performance.wrstandardname' },
+    { field: 'performancetype', label: 'performance.performancetype' },
+    { field: 'relatedorderid', label: 'performance.relatedorderid' },
+    { field: 'paymenttype', label: 'performance.paymenttype' },
+    { field: 'buyerfreezeamount', label: 'performance.buyerfreezeamount' },
+    { field: 'buyerfreezeamountremain', label: 'performance.buyerfreezeamountremain' },
+    { field: 'amount', label: 'performance.amount' },
+    { field: 'buypaidamount', label: 'performance.buypaidamount' },
+    { field: 'overshortamount', label: 'performance.overshortamount' },
+    { field: 'sellusername', label: 'performance.sellusername' },
+    { field: 'performancestatus', label: 'performance.performancestatus' },
+    { field: 'curstepname', label: 'performance.curstepname' },
+    { field: 'starttime', label: 'performance.starttime1' },
 ])
 
 filterOptons.selectList = [

+ 14 - 17
src/packages/pc/views/query/performance/buy/running/index.vue

@@ -26,7 +26,6 @@ import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryPerformancePlan } from '@/services/api/performance'
 import { BuyOrSell, getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/constants/order'
-import { i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const { loading, dataList } = useRequest(queryPerformancePlan, {
@@ -36,22 +35,20 @@ const { loading, dataList } = useRequest(queryPerformancePlan, {
     },
 })
 
-const { t } = i18n.global
-
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'deliverygoodsname', label: t('performance.deliverygoodsname') },
-    { field: 'wrstandardname', label: t('performance.wrstandardname') },
-    { field: 'performancetype', label: t('performance.performancetype') },
-    { field: 'relatedorderid', label: t('performance.relatedorderid') },
-    { field: 'paymenttype', label: t('performance.paymenttype') },
-    { field: 'buyerfreezeamount', label: t('performance.buyerfreezeamount') },
-    { field: 'buyerfreezeamountremain', label: t('performance.buyerfreezeamountremain') },
-    { field: 'amount', label: t('performance.amount') },
-    { field: 'buypaidamount', label: t('performance.buypaidamount') },
-    { field: 'overshortamount', label: t('performance.overshortamount') },
-    { field: 'sellusername', label: t('performance.sellusername') },
-    { field: 'performancestatus', label: t('performance.performancestatus') },
-    { field: 'curstepname', label: t('performance.curstepname') },
-    { field: 'starttime', label: t('performance.starttime1') },
+    { field: 'deliverygoodsname', label: 'performance.deliverygoodsname' },
+    { field: 'wrstandardname', label: 'performance.wrstandardname' },
+    { field: 'performancetype', label: 'performance.performancetype' },
+    { field: 'relatedorderid', label: 'performance.relatedorderid' },
+    { field: 'paymenttype', label: 'performance.paymenttype' },
+    { field: 'buyerfreezeamount', label: 'performance.buyerfreezeamount' },
+    { field: 'buyerfreezeamountremain', label: 'performance.buyerfreezeamountremain' },
+    { field: 'amount', label: 'performance.amount' },
+    { field: 'buypaidamount', label: 'performance.buypaidamount' },
+    { field: 'overshortamount', label: 'performance.overshortamount' },
+    { field: 'sellusername', label: 'performance.sellusername' },
+    { field: 'performancestatus', label: 'performance.performancestatus' },
+    { field: 'curstepname', label: 'performance.curstepname' },
+    { field: 'starttime', label: 'performance.starttime1' },
 ])
 </script>

+ 14 - 14
src/packages/pc/views/query/performance/sell/all/index.vue

@@ -51,20 +51,20 @@ const { loading, dataList, run } = useRequest(queryPerformancePlan, {
 const { t } = i18n.global
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'deliverygoodsname', label: t('performance.deliverygoodsname') },
-    { field: 'wrstandardname', label: t('performance.wrstandardname') },
-    { field: 'performancetype', label: t('performance.performancetype') },
-    { field: 'relatedorderid', label: t('performance.relatedorderid') },
-    { field: 'paymenttype', label: t('performance.paymenttype') },
-    { field: 'sellerfreezeamount', label: t('performance.sellerfreezeamount') },
-    { field: 'sellerfreezeamountremain', label: t('performance.sellerfreezeamountremain') },
-    { field: 'amount', label: t('performance.amount') },
-    { field: 'sellreceivedamount', label: t('performance.sellreceivedamount') },
-    { field: 'overshortamount', label: t('performance.overshortamount') },
-    { field: 'buyusername', label: t('performance.buyusername') },
-    { field: 'performancestatus', label: t('performance.performancestatus') },
-    { field: 'curstepname', label: t('performance.curstepname') },
-    { field: 'starttime', label: t('performance.starttime1') },
+    { field: 'deliverygoodsname', label: 'performance.deliverygoodsname' },
+    { field: 'wrstandardname', label: 'performance.wrstandardname' },
+    { field: 'performancetype', label: 'performance.performancetype' },
+    { field: 'relatedorderid', label: 'performance.relatedorderid' },
+    { field: 'paymenttype', label: 'performance.paymenttype' },
+    { field: 'sellerfreezeamount', label: 'performance.sellerfreezeamount' },
+    { field: 'sellerfreezeamountremain', label: 'performance.sellerfreezeamountremain' },
+    { field: 'amount', label: 'performance.amount' },
+    { field: 'sellreceivedamount', label: 'performance.sellreceivedamount' },
+    { field: 'overshortamount', label: 'performance.overshortamount' },
+    { field: 'buyusername', label: 'performance.buyusername' },
+    { field: 'performancestatus', label: 'performance.performancestatus' },
+    { field: 'curstepname', label: 'performance.curstepname' },
+    { field: 'starttime', label: 'performance.starttime1' },
 ])
 
 filterOptons.selectList = [

+ 14 - 17
src/packages/pc/views/query/performance/sell/running/index.vue

@@ -26,7 +26,6 @@ import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryPerformancePlan } from '@/services/api/performance'
 import { BuyOrSell, getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/constants/order'
-import { i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const { loading, dataList } = useRequest(queryPerformancePlan, {
@@ -36,23 +35,21 @@ const { loading, dataList } = useRequest(queryPerformancePlan, {
     },
 })
 
-const { t } = i18n.global
-
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'deliverygoodsname', label: t('performance.deliverygoodsname') },
-    { field: 'wrstandardname', label: t('performance.wrstandardname') },
-    { field: 'performancetype', label: t('performance.performancetype') },
-    { field: 'relatedorderid', label: t('performance.relatedorderid') },
-    { field: 'paymenttype', label: t('performance.paymenttype') },
-    { field: 'sellerfreezeamount', label: t('performance.sellerfreezeamount') },
-    { field: 'sellerfreezeamountremain', label: t('performance.sellerfreezeamountremain') },
-    { field: 'amount', label: t('performance.amount') },
-    { field: 'sellreceivedamount', label: t('performance.sellreceivedamount') },
-    { field: 'overshortamount', label: t('performance.overshortamount') },
-    { field: 'buyusername', label: t('performance.buyusername') },
-    { field: 'performancestatus', label: t('performance.performancestatus') },
-    { field: 'curstepname', label: t('performance.curstepname') },
-    { field: 'starttime', label: t('performance.starttime1') },
+    { field: 'deliverygoodsname', label: 'performance.deliverygoodsname'},
+    { field: 'wrstandardname', label: 'performance.wrstandardname'},
+    { field: 'performancetype', label: 'performance.performancetype'},
+    { field: 'relatedorderid', label: 'performance.relatedorderid'},
+    { field: 'paymenttype', label: 'performance.paymenttype'},
+    { field: 'sellerfreezeamount', label: 'performance.sellerfreezeamount'},
+    { field: 'sellerfreezeamountremain', label: 'performance.sellerfreezeamountremain'},
+    { field: 'amount', label: 'performance.amount'},
+    { field: 'sellreceivedamount', label: 'performance.sellreceivedamount'},
+    { field: 'overshortamount', label: 'performance.overshortamount'},
+    { field: 'buyusername', label: 'performance.buyusername'},
+    { field: 'performancestatus', label: 'performance.performancestatus'},
+    { field: 'curstepname', label: 'performance.curstepname'},
+    { field: 'starttime', label: 'performance.starttime1'},
     
 ])
 </script>

+ 11 - 11
src/packages/pc/views/query/presell/onlinedelivery/index.vue

@@ -42,17 +42,17 @@ const { loading, dataList, run } = useRequest(queryWrDeliveryDetail, {})
 const { t } = i18n.global
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'wrtypename', label: t('delivery.online.wrtypename')  },
-    { field: 'deliveryqty', label: t('delivery.online.deliveryqty') },
-    { field: 'xdeliveryprice', label: t('delivery.online.xdeliveryprice') },
-    { field: 'deliverypricemove', label: t('delivery.online.deliverypricemove') },
-    { field: 'deliverytotalamount', label: t('delivery.online.deliverytotalamount') },
-    { field: 'remaintotalamount', label: t('delivery.online.remaintotalamount') },
-    { field: 'warehousename', label: t('delivery.online.warehousename') },
-    { field: 'matchusername', label: t('delivery.online.matchusername') },
-    { field: 'deliverytime', label: t('delivery.online.deliverytime') },
-    { field: 'xgoodsname', label: t('delivery.online.xgoodscode') },
-    { field: 'deliveryid', label: t('delivery.online.deliveryid') }
+    { field: 'wrtypename', label: 'delivery.online.wrtypename' },
+    { field: 'deliveryqty', label: 'delivery.online.deliveryqty' },
+    { field: 'xdeliveryprice', label: 'delivery.online.xdeliveryprice' },
+    { field: 'deliverypricemove', label: 'delivery.online.deliverypricemove' },
+    { field: 'deliverytotalamount', label: 'delivery.online.deliverytotalamount' },
+    { field: 'remaintotalamount', label: 'delivery.online.remaintotalamount' },
+    { field: 'warehousename', label: 'delivery.online.warehousename' },
+    { field: 'matchusername', label: 'delivery.online.matchusername' },
+    { field: 'deliverytime', label: 'delivery.online.deliverytime' },
+    { field: 'xgoodsname', label: 'delivery.online.xgoodscode' },
+    { field: 'deliveryid', label: 'delivery.online.deliveryid' }
 ])
 
 filterOptons.buttonList = [

+ 10 - 10
src/packages/pc/views/query/trade/goods/history/index.vue

@@ -68,17 +68,17 @@ const { loading, run, pageIndex, pageCount } = useRequest(queryHisTradeDetail, {
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodscode', label: t('order.goodstrade.goodscode') },
-    { field: 'goodsname', label: t('order.goodstrade.goodsname') },
-    { field: 'buyorsell', label: t('order.goodstrade.buyorsell') },
-    { field: 'buildtype', label: t('order.goodstrade.buildtype') },
-    { field: 'tradeprice', label: t('order.goodstrade.tradeprice') },
-    { field: 'tradeqty', label: t('order.goodstrade.tradeqty') },
-    { field: 'charge', label: t('order.goodstrade.charge') },
-    { field: 'closepl', label: t('order.goodstrade.closepl') },
-    { field: 'tradeid', label: t('order.goodstrade.tradeid') },
+    { field: 'goodscode', label: 'order.goodstrade.goodscode' },
+    { field: 'goodsname', label: 'order.goodstrade.goodsname' },
+    { field: 'buyorsell', label: 'order.goodstrade.buyorsell' },
+    { field: 'buildtype', label: 'order.goodstrade.buildtype' },
+    { field: 'tradeprice', label: 'order.goodstrade.tradeprice' },
+    { field: 'tradeqty', label: 'order.goodstrade.tradeqty' },
+    { field: 'charge', label: 'order.goodstrade.charge' },
+    { field: 'closepl', label: 'order.goodstrade.closepl' },
+    { field: 'tradeid', label: 'order.goodstrade.tradeid' },
     //{ field: 'matchaccountid', label: '成交对手' },
-    { field: 'tradetime', label: t('order.goodstrade.tradetime') },
+    { field: 'tradetime', label: 'order.goodstrade.tradetime' },
 ])
 
 filterOptons.selectList = [

+ 10 - 10
src/packages/pc/views/query/trade/goods/list/index.vue

@@ -45,16 +45,16 @@ const { loading } = useRequest(queryTradeDetail, {
 const { t } = i18n.global
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodscode', label: t('order.goodstrade.goodscode') },
-    { field: 'goodsname', label: t('order.goodstrade.goodsname') },
-    { field: 'buyorsell', label: t('order.goodstrade.buyorsell') },
-    { field: 'buildtype', label: t('order.goodstrade.buildtype') },
-    { field: 'tradeprice', label: t('order.goodstrade.tradeprice') },
-    { field: 'tradeqty', label: t('order.goodstrade.tradeqty') },
-    { field: 'charge', label: t('order.goodstrade.charge') },
-    { field: 'closepl', label: t('order.goodstrade.closepl') },
-    { field: 'tradeid', label: t('order.goodstrade.tradeid') },
+    { field: 'goodscode', label: 'order.goodstrade.goodscode' },
+    { field: 'goodsname', label: 'order.goodstrade.goodsname' },
+    { field: 'buyorsell', label: 'order.goodstrade.buyorsell' },
+    { field: 'buildtype', label: 'order.goodstrade.buildtype' },
+    { field: 'tradeprice', label: 'order.goodstrade.tradeprice' },
+    { field: 'tradeqty', label: 'order.goodstrade.tradeqty' },
+    { field: 'charge', label: 'order.goodstrade.charge' },
+    { field: 'closepl', label: 'order.goodstrade.closepl' },
+    { field: 'tradeid', label: 'order.goodstrade.tradeid' },
     //{ field: 'matchaccountid', label: '成交对手' },
-    { field: 'tradetime', label: t('order.goodstrade.tradetime') },
+    { field: 'tradetime', label: 'order.goodstrade.tradetime' },
 ])
 </script>

+ 9 - 9
src/packages/pc/views/query/trade/presell/history/index.vue

@@ -62,15 +62,15 @@ const { loading, run, pageIndex, pageCount } = useRequest(queryMineTradeTradeDet
 const { t } = i18n.global
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodsname', label: t('order.transfertrade.goodsname')  },
-    { field: 'buyorsell', label: t('order.transfertrade.buyorsell') },
-    { field: 'tradeqty', label: t('order.transfertrade.tradeqty') },
-    { field: 'tradeprice', label: t('order.transfertrade.tradeprice') },
-    { field: 'presaleprice', label: t('order.transfertrade.presaleprice') },
-    { field: 'closepl', label: t('order.transfertrade.closepl') },
-    { field: 'accountname', label: t('order.transfertrade.accountname') },
-    { field: 'tradedate', label: t('order.transfertrade.tradetime') },
-    { field: 'orderid', label: t('order.transfertrade.orderid') }
+    { field: 'goodsname', label: 'order.transfertrade.goodsname'  },
+    { field: 'buyorsell', label: 'order.transfertrade.buyorsell' },
+    { field: 'tradeqty', label: 'order.transfertrade.tradeqty' },
+    { field: 'tradeprice', label: 'order.transfertrade.tradeprice' },
+    { field: 'presaleprice', label: 'order.transfertrade.presaleprice' },
+    { field: 'closepl', label: 'order.transfertrade.closepl' },
+    { field: 'accountname', label: 'order.transfertrade.accountname' },
+    { field: 'tradedate', label: 'order.transfertrade.tradetime' },
+    { field: 'orderid', label: 'order.transfertrade.orderid' }
 ])
 
 filterOptons.buttonList = [

+ 9 - 12
src/packages/pc/views/query/trade/presell/list/index.vue

@@ -22,22 +22,19 @@ import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeTradeDetails } from '@/services/api/transfer'
 import { getBuyOrSellName } from '@/constants/order'
-import { i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const { loading, dataList } = useRequest(queryMineTradeTradeDetails)
 
-const { t } = i18n.global
-
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsname', label: t('order.transfertrade.goodsname') },
-    { field: 'buyorsell', label: t('order.transfertrade.buyorsell') },
-    { field: 'tradeqty', label: t('order.transfertrade.tradeqty') },
-    { field: 'tradeprice', label: t('order.transfertrade.tradeprice') },
-    { field: 'presaleprice', label: t('order.transfertrade.presaleprice') },
-    { field: 'closepl', label: t('order.transfertrade.closepl') },
-    { field: 'accountname', label: t('order.transfertrade.accountname') },
-    { field: 'tradedate', label: t('order.transfertrade.tradetime') },
-    { field: 'orderid', label: t('order.transfertrade.orderid') }
+    { field: 'goodsname', label: 'order.transfertrade.goodsname' },
+    { field: 'buyorsell', label: 'order.transfertrade.buyorsell' },
+    { field: 'tradeqty', label: 'order.transfertrade.tradeqty' },
+    { field: 'tradeprice', label: 'order.transfertrade.tradeprice' },
+    { field: 'presaleprice', label: 'order.transfertrade.presaleprice' },
+    { field: 'closepl', label: 'order.transfertrade.closepl' },
+    { field: 'accountname', label: 'order.transfertrade.accountname' },
+    { field: 'tradedate', label: 'order.transfertrade.tradetime' },
+    { field: 'orderid', label: 'order.transfertrade.orderid' }
 ])
 </script>