Handy_Cao 1 年間 前
コミット
b1e373ba5e

+ 30 - 3
public/locales/en-US.json

@@ -22,6 +22,7 @@
         "loading": "Loading...",
         "nomore": "No more",
         "loadMore": "Load More",
+        "orderindex": "Index",
         "requestfailure": "Request failed, click Reload"
     },
     "tabbar": {
@@ -50,6 +51,7 @@
         "transfer": "Transfer",
         "delivery": "Delivery",
         "listing": "Listing",
+        "listing1": "Listing Subscribe",
         "delisting": "Delisting",
         "pickup": "Pick Up",
         "details": "Details",
@@ -63,6 +65,8 @@
         "extension": "Delay",
         "execution": "Execute",
         "payment": "Payment",
+        "search": "Search",
+        "reset": "Reset",
         "disagree": "Disagree",
         "agree": "Agree"
     },
@@ -99,12 +103,17 @@
         "closepl": "Today Close Pl",
         "paycharge": "Pay Charge",
         "tradestatus": "Trade Status",
-        "riskRate": "Risk Rate"
+        "riskRate": "Risk Rate",
+        "riskRate1": "Risk Rate:",
+        "cutRate": "Cut Rate:"
     },
     "quote": {
         "goodsname": "Name/Code",
+        "goodsname1": "GoodsName",
+        "goodscode": "GoodsCode",
         "refgoodsname": "RefGoodsName",
         "averageprice": "Average",
+        "spec": "Spec",
         "last": "Last",
         "rise": "Up Down",
         "change": "Change",
@@ -151,8 +160,11 @@
         "ballot": {
             "title": "Subscribe",
             "refprice": "RefPrice",
+            "attachmenturl": "Image",
             "starttime": "Start:",
             "endtime": "End:",
+            "starttime1": "StartTime",
+            "endtime1": "EndTime",
             "historypresale": "History Presale",
             "presalewin": "Presale Win",
             "issueprice": "IssuePrice",
@@ -166,6 +178,7 @@
             "maxbuyqty": "MaxBuyQty",
             "deposit": "Deposit",
             "avaiablefunds": "Avaiable Funds",
+            "presalestatus": "PreSaleStatus",
             "ordercannotbegreaterthan": "orderqty can not begreater than",
             "pleaseenterthesubscriptionquantity": "Please enter the subscription quantity"
         },
@@ -190,6 +203,7 @@
         },
         "presale": {
             "title": "Goods Details",
+            "attachmenturl": "Image",
             "bulk": "Bulk Bidding",
             "earnest": "Earnest",
             "transferdeposit": "TransferDeposit",
@@ -199,8 +213,11 @@
             "presalehistory": "Pre-sale History",
             "starttime": "Start:",
             "endtime": "End:",
+            "starttime1": "StartTime",
+            "endtime1": "EndTime",
             "presalebidding": "Pre-sale Bidding",
             "bidfor": "BidFor",
+            "presalestatus": "PreSaleStatus",
             "SubscriptionPrice": "SubscriptionPrice",
             "avaiableMoney": "Avaiable Funds",
             "SubscriptionQty": "SubscriptionQty",
@@ -265,6 +282,7 @@
         },
         "spot": {
             "title": "Listing Detail",
+            "attachmenturl": "Image",
             "orderprice": "Order Price",
             "operate": "Operate",
             "username": "UserName",
@@ -295,13 +313,20 @@
             "enableqty1": "enableQty:",
             "wrstandard": "WrstandardName",
             "deliverygoods": "DeliveryGoods",
+            "deliverygoodsname": "DeliveryGoodsName",
+            "wrgoodsname": "WrGoodsName",
+            "sellprice": "SellPrice",
+            "sellqty": "SellQty",
+            "buyprice": "BuyPrice",
+            "buyqty": "BuyQty",
             "tons": "Tons",
             "yuan": "Yuan",
             "tips8": "Delisting submission was successful.",
             "tips9": "Please select",
             "tips10": "Please select a category",
             "tips11": "Please select the product",
-            "tips12": "Please select warehouse"
+            "tips12": "Please select warehouse",
+            "tips13": "Factor of commodities"
         },
         "transfer": {
             "title1": "Transfer Detail",
@@ -334,7 +359,9 @@
             "title": "Goods Order",
             "title2": "History Goods Order",
             "subtitle": "Goods Order Information",
-            "goodsname": "Name/Codee",
+            "goodsname": "Name/Code",
+            "goodsname1": "GoodsName",
+            "goodscode": "GoodsCode",
             "buyorsell": "BuyOrSell",
             "buildtype": "BuildType",
             "buyorsellbuildtype": "BuyOrSell/BuildType",

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

@@ -23,6 +23,7 @@
         "submiting": "提交中...",
         "nomore": "没有更多了",
         "loadMore": "加载更多",
+        "orderindex": "序号",
         "requestfailure": "请求失败,点击重新加载"
     },
     "tabbar": {
@@ -51,6 +52,7 @@
         "transfer": "转让",
         "delivery": "交收",
         "listing": "挂牌",
+        "listing1": "挂牌求购",
         "delisting": "摘牌",
         "pickup": "提货",
         "details": "详情",
@@ -64,6 +66,8 @@
         "extension": "延期申请",
         "execution": "立即执行",
         "payment": "付款",
+        "search": "查询",
+        "reset": "重置",
         "disagree": "不同意",
         "agree": "同意"
     },
@@ -100,12 +104,18 @@
         "closepl": "今日损益",
         "paycharge": "贸易手续费",
         "tradestatus": "状态",
-        "riskRate": "风险率"
+        "riskRate": "风险率",
+        "riskRate1": "风险率:",
+        "cutRate": "斩仓率:",
+        "formula": "公式"
     },
     "quote": {
         "goodsname": "商品/代码",
+        "goodsname1": "名称",
+        "goodscode": "代码",
         "refgoodsname": "标的合约",
         "averageprice": "均价",
+        "spec": "规格",
         "last": "最新价",
         "rise": "涨跌",
         "change": "幅度",
@@ -151,9 +161,12 @@
         "ask5": "卖五",
         "ballot": {
             "title": "认购",
+            "attachmenturl": "图片",
             "refprice": "预售价",
             "starttime": "开始:",
             "endtime": "结束:",
+            "starttime1": "开始时间",
+            "endtime1": "结束时间",
             "historypresale": "发售历史",
             "presalewin": "预售中签",
             "issueprice": "发行价",
@@ -167,6 +180,7 @@
             "maxbuyqty": "最大申购量",
             "deposit": "预售定金",
             "avaiablefunds": "可用资金",
+            "presalestatus": "预售状态",
             "ordercannotbegreaterthan": "委托量不能大于",
             "pleaseenterthesubscriptionquantity": "请输入认购量"
         },
@@ -191,10 +205,13 @@
         },
         "presale": {
             "title": "商品详情",
+            "attachmenturl": "图片",
             "startprice": "起拍价",
             "presalehistory": "发售历史",
             "starttime": "开始:",
             "endtime": "结束:",
+            "starttime1": "开始时间",
+            "endtime1": "结束时间",
             "bulk": "大宗竞拍",
             "earnest": "预售定金",
             "transferdeposit": "转让定金",
@@ -202,6 +219,7 @@
             "buy": "我要出价",
             "presalebidding": "预售竞拍",
             "bidfor": "出价",
+            "presalestatus": "预售状态",
             "SubscriptionPrice": "认购价",
             "avaiableMoney": "可用资金",
             "SubscriptionQty": "认购量",
@@ -266,6 +284,7 @@
         },
         "spot": {
             "title": "挂牌详情",
+            "attachmenturl": "图片",
             "subtitle": "现货下单",
             "subtitle1": "现货仓单",
             "orderprice": "价格",
@@ -290,6 +309,12 @@
             "enableqty1": "可用:",
             "wrstandard": "商品",
             "deliverygoods": "品类",
+            "deliverygoodsname": "品种",
+            "wrgoodsname": "商品",
+            "sellprice": "卖价",
+            "sellqty": "卖量",
+            "buyprice": "买价",
+            "buyqty": "买量",
             "tons": "吨",
             "yuan": "元",
             "tips1": "请选择履约模板",
@@ -303,7 +328,8 @@
             "tips9": "请选择",
             "tips10": "请选择品类",
             "tips11": "请选择商品",
-            "tips12": "请选择仓库"
+            "tips12": "请选择仓库",
+            "tips13": "商品要素"
         },
         "transfer": {
             "title1": "转让详情",
@@ -337,6 +363,8 @@
             "title2": "历史订单委托",
             "subtitle": "订单委托信息",
             "goodsname": "商品代码/名称",
+            "goodsname1": "商品名称",
+            "goodscode": "订单合约",
             "buyorsell": "方向",
             "buildtype": "类型",
             "buyorsellbuildtype": "方向/类型",

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

@@ -26,7 +26,7 @@
         <!-- 选择列 -->
         <el-table-column type="selection" width="55" align="center" fixed v-if="selectionType" />
         <!-- 序号 -->
-        <el-table-column type="index" label="序号" align="center" :width="80" v-if="showIndex" />
+        <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="t(item.label)"

+ 19 - 18
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 } from '@/stores'
+import { useFuturesStore, useGlobalStore, i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const componentMap = new Map<string, unknown>([
@@ -78,27 +78,28 @@ 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: '代码' },
-    { field: 'goodsname', label: '名称' },
-    { field: 'spec', label: '规格' },
-    { field: 'bid', label: '买价' },
-    { field: 'bidvolume', label: '买量' },
-    { field: 'ask', label: '卖价' },
-    { field: 'askvolume', label: '卖量' },
-    { field: 'last', label: '当前价' },
-    { field: 'rise', label: '涨跌' },
-    { field: 'change', label: '涨跌幅' },
-    { field: 'opened', label: '开盘' },
-    { field: 'presettle', label: '昨结' },
-    { field: 'highest', label: '最高' },
-    { field: 'lowest', label: '最低' },
-    { field: 'amplitude', label: '振幅' },
-    { field: 'limitup', label: '涨停价' },
-    { field: 'limitdown', label: '跌停价' },
+    { 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') },
 ])
 
 const onRowClick = (row: Model.GoodsQuote) => {

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

@@ -52,11 +52,12 @@
 import { shallowRef, onMounted, onUnmounted, defineAsyncComponent } from 'vue'
 import { useComponent } from '@/hooks/component'
 import { parsePercent, handleNumberValue, formatDecimal } from '@/filters'
-import { useFuturesStore, useGlobalStore } from '@/stores'
+import { useFuturesStore, useGlobalStore, i18n } 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)
 
@@ -65,18 +66,18 @@ const componentMap = new Map<string, unknown>([
 ])
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodscode', label: '商品代码' },
-    { field: 'goodsname', label: '商品' },
+    { field: 'goodscode', label: t('quote.goodscode') },
+    { field: 'goodsname', label: t('quote.goodsname1') },
     // { field: 'ask', label: '卖价' },
     // { field: 'bid', label: '买价' },
-    { field: 'last', label: '最新价' },
-    { field: 'rise', label: '涨跌' },
-    { field: 'change', label: '幅度' },
-    { field: 'opened', label: '今开' },
-    { field: 'presettle', label: '昨结' },
-    { field: 'lowest', label: '最低' },
-    { field: 'highest', label: '最高' },
-    { field: 'amplitude', 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') },
 ])
 
 const onRowClick = (row: Model.GoodsQuote) => {

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

@@ -25,6 +25,7 @@ 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'
 
@@ -35,6 +36,7 @@ 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: {
@@ -44,13 +46,13 @@ const { dataList, run, loading } = useRequest(queryPresaleAuctions, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'attachmenturl', label: '图片' },
-    { field: 'goodscode', label: '代码' },
-    { field: 'goodsname', label: '名称' },
-    { field: 'refprice', label: '预售价' },
-    { field: 'starttime', label: '开始时间' },
-    { field: 'endtime', label: '结束时间' },
-    { field: 'presalestatus', label: '预售状态' },
+    { 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') },
 ])
 
 filterOptons.selectList = [

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

@@ -25,6 +25,7 @@ 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'
 
@@ -35,6 +36,7 @@ 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: {
@@ -44,13 +46,13 @@ const { dataList, run, loading } = useRequest(queryPresaleAuctions, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'attachmenturl', label: '图片' },
-    { field: 'goodscode', label: '代码' },
-    { field: 'goodsname', label: '名称' },
-    { field: 'startprice', label: '起拍价' },
-    { field: 'starttime', label: '开始时间' },
-    { field: 'endtime', label: '结束时间' },
-    { field: 'presalestatus', label: '预售状态' },
+    { 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') },
 ])
 
 filterOptons.selectList = [

+ 19 - 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 } from '@/stores'
+import { useFuturesStore, useGlobalStore, i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const componentMap = new Map<string, unknown>([
@@ -78,27 +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: '代码' },
-    { field: 'goodsname', label: '名称' },
-    { field: 'spec', label: '规格' },
-    { field: 'bid', label: '买价' },
-    { field: 'bidvolume', label: '买量' },
-    { field: 'ask', label: '卖价' },
-    { field: 'askvolume', label: '卖量' },
-    { field: 'last', label: '当前价' },
-    { field: 'rise', label: '涨跌' },
-    { field: 'change', label: '涨跌幅' },
-    { field: 'opened', label: '开盘' },
-    { field: 'presettle', label: '昨结' },
-    { field: 'highest', label: '最高' },
-    { field: 'lowest', label: '最低' },
-    { field: 'amplitude', label: '振幅' },
-    { field: 'limitup', label: '涨停价' },
-    { field: 'limitdown', label: '跌停价' },
+    { 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') },
 ])
 
 const onRowClick = (row: Model.GoodsQuote) => {

+ 13 - 12
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 } from '@/stores'
+import { useFuturesStore, useUserStore, useGlobalStore, i18n } from '@/stores'
 import { useRequest } from '@/hooks/request'
 import { queryQuoteGoodsList } from '@/services/api/swap'
 import quoteSocket from '@/services/websocket/quote'
@@ -54,6 +54,7 @@ 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)
 
@@ -100,17 +101,17 @@ const tableList = computed(() => {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsname', label: '商品/标的' },
-    { field: 'last', label: '当前价' },
-    { field: 'ask', label: '买价' },
-    { field: 'bid', label: '卖价' },
-    { field: 'rise', label: '涨跌' },
-    { field: 'change', label: '幅度' },
-    { field: 'opened', label: '今开' },
-    { field: 'presettle', label: '昨结' },
-    { field: 'lowest', label: '最低' },
-    { field: 'highest', label: '最高' },
-    { field: 'amplitude', label: '振幅' },
+    { 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') },
 ])
 
 const onRowClick = (row: Model.GoodsQuote) => {

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

@@ -29,6 +29,7 @@ import { useComponent } from '@/hooks/component'
 import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
 import { queryOrderQuote } from '@/services/api/goods'
+import { i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -40,6 +41,7 @@ const componentMap = new Map<string, unknown>([
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => run(), false)
 const { filterOptons, getQueryParams } = useDataFilter<Model.OrderQuoteReq>()
 const selectedRow = shallowRef<Model.OrderQuoteRsp>()
+const { global: { t } } = i18n
 
 const { dataList, loading, run } = useRequest(queryOrderQuote, {
     params: {
@@ -49,24 +51,24 @@ const { dataList, loading, run } = useRequest(queryOrderQuote, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'thumurls', label: '图片' },
-    { field: 'deliverygoodsname', label: '品种' },
-    { field: 'wrgoodsname', label: '商品' },
-    { field: 'warehousename', label: '仓库' },
-    { field: 'sellprice', label: '卖价' },
-    { field: 'sellqty', label: '卖量' },
-    { field: 'buyprice', label: '买价' },
-    { field: 'buyqty', label: '买量' },
+    { 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') },
 ])
 
 filterOptons.inputList = [
-    { keys: ['dgitemname'], placeholder: '商品要素' }
+    { keys: ['dgitemname'], placeholder: t('quote.spot.tips13') }
 ]
 
 filterOptons.buttonList = [
-    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
-    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) },
-    { lable: '挂牌求购', className: 'el-button--primary', onClick: () => openComponent('listing') }
+    { lable: t('operation.search'), className: 'el-button--info', onClick: () => onSearch() },
+    { lable: t('operation.reset'), className: 'el-button--info', onClick: () => onSearch(true) },
+    { lable: t('operation.listing1'), className: 'el-button--primary', onClick: () => openComponent('listing') }
 ]
 
 const onSearch = (clear = false) => {

+ 13 - 12
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 } from '@/stores'
+import { useFuturesStore, useUserStore, i18n } from '@/stores'
 import { useRequest } from '@/hooks/request'
 import { queryQuoteGoodsList, queryMdUserSwapProtocol } from '@/services/api/swap'
 import quoteSocket from '@/services/websocket/quote'
@@ -48,6 +48,7 @@ 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)
 
@@ -102,17 +103,17 @@ const tableList = computed(() => {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodscode', label: '代码' },
-    { field: 'goodsname', label: '名称' },
-    { field: 'refgoodsname', label: '标的合约' },
-    { field: 'last', label: '当前价' },
-    { field: 'rise', label: '涨跌' },
-    { field: 'change', label: '涨跌幅' },
-    { field: 'opened', label: '今开' },
-    { field: 'presettle', label: '昨结' },
-    { field: 'lowest', label: '最低' },
-    { field: 'highest', label: '最高' },
-    { field: 'amplitude', label: '振幅' },
+    { 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') },
 ])
 
 const onRowClick = (row: Model.QuoteGoodsListRsp) => {

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

@@ -36,6 +36,7 @@ import { ref } from 'vue'
 import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
+import { i18n } from '@/stores'
 import { queryHisTradeOrderDetail } from '@/services/api/order'
 import { getBuildTypeName, getWRTradeOrderStatusName, getBuyOrSellName, getWRTradeOrderStatusList } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
@@ -45,6 +46,7 @@ const { filterOptons, getQueryParams } = useDataFilter<Model.HisTradeOrderDetail
 const currentDate = new Date()
 const dataList = ref<Model.HisTradeOrderDetailRsp[]>([])
 const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYY-MM-DD'))
+const { global: { t } } = i18n
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryHisTradeOrderDetail, {
     manual: true,
@@ -74,20 +76,20 @@ filterOptons.selectList = [
 ]
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodscode', label: '订单合约' },
-    { field: 'buyorsell', label: '方向' },
-    { field: 'buildtype', label: '类型' },
-    { field: 'orderprice', label: '委托价' },
-    { field: 'orderqty', label: '委托量' },
-    { field: 'tradeqty', label: '成交量' },
-    { field: 'orderid', label: '委托单号' },
-    { field: 'ordertime', label: '委托时间' },
-    { field: 'orderstatus', label: '状态' },
+    { 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') },
 ])
 
 filterOptons.buttonList = [
     {
-        lable: '查询',
+        lable: t('operation.search'),
         className: 'el-button--info',
         onClick: () => {
             pageIndex.value = 1

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

@@ -30,9 +30,11 @@ import { useLocalPagination } from '@/hooks/pagination'
 import { useRequest } from '@/hooks/request'
 import { queryTradeOrderDetail } from '@/services/api/order'
 import { getBuildTypeName, getBuyOrSellName, getWRTradeOrderStatusName } from '@/constants/order'
+import { i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const { tableList, showLoadMore, initTableData, loadMore } = useLocalPagination<Model.TradeOrderDetailRsp>()
+const { global: { t } } = i18n
 
 const { loading } = useRequest(queryTradeOrderDetail, {
     params: {
@@ -42,15 +44,15 @@ const { loading } = useRequest(queryTradeOrderDetail, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodscode', label: '订单合约' },
-    { field: 'goodsname', label: '商品名称' },
-    { field: 'buyorsell', label: '方向' },
-    { field: 'buildtype', label: '类型' },
-    { field: 'orderprice', label: '委托价' },
-    { field: 'orderqty', label: '委托量' },
-    { field: 'tradeqty', label: '成交量' },
-    { field: 'orderid', label: '委托单号' },
-    { field: 'ordertime', label: '委托时间' },
-    { field: 'orderstatus', label: '状态' },
+    { 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') },
 ])
 </script>

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

@@ -46,6 +46,7 @@ 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'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -53,6 +54,7 @@ const { filterOptons, getQueryParams } = useDataFilter<Model.MineTradeOrderDetai
 const currentDate = new Date()
 const dataList = ref<Model.MineTradeOrderDetailsRsp[]>([])
 const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYYMMDD'))
+const { global: { t } } = i18n
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryMineTradeOrderDetails, {
     manual: true,
@@ -71,26 +73,26 @@ const { loading, run, pageIndex, pageCount } = useRequest(queryMineTradeOrderDet
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodsnamedisplay', label: '商品代码/名称' },
-    { field: 'orderqty', label: '认购量' },
-    { field: 'orderprice', label: '认购价' },
-    { field: 'orderamount', label: '认购金额' },
-    { field: 'presaledepositalgorithm', label: '定金方式' },
-    { field: 'presaledepositvalue', label: '定金比例' },
-    { field: 'freezemargin', label: '预售定金' },
-    { field: 'sellname', label: '发售方' },
-    { field: 'starttime', label: '开始日期' },
-    { field: 'endtime', label: '结束日期' },
-    { field: 'orderstatus', label: '委托状态' },
-    { field: 'ordertime', label: '委托时间' },
-    { field: 'tradeprice', label: '预售价' },
-    { field: 'tradeqty', label: '订单量' },
-    { field: 'orderid', label: '委托单号' }
+    { 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') }
 ])
 
 filterOptons.buttonList = [
     {
-        lable: '查询',
+        lable: t('operation.search'),
         className: 'el-button--info',
         onClick: () => {
             pageIndex.value = 1

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

@@ -38,26 +38,28 @@ 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: '商品代码/名称' },
-    { field: 'orderqty', label: '认购量' },
-    { field: 'orderprice', label: '认购价' },
-    { field: 'orderamount', label: '认购金额' },
-    { field: 'presaledepositalgorithm', label: '定金方式' },
-    { field: 'presaledepositvalue', label: '定金比例' },
-    { field: 'freezemargin', label: '预售定金' },
-    { field: 'sellname', label: '发售方' },
-    { field: 'starttime', label: '开始日期' },
-    { field: 'endtime', label: '结束日期' },
-    { field: 'orderstatus', label: '委托状态' },
-    { field: 'ordertime', label: '委托时间' },
-    { field: 'tradeprice', label: '预售价' },
-    { field: 'tradeqty', label: '订单量' },
-    { field: 'orderid', label: '委托单号' }
+    { 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') }
 ])
 
 </script>

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

@@ -30,6 +30,7 @@ import { useDataFilter } from '@/hooks/datatable'
 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'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -37,6 +38,7 @@ const { filterOptons, getQueryParams } = useDataFilter<Model.MineTradeOrdersReq>
 const currentDate = new Date()
 const dataList = ref<Model.MineTradeOrdersRsp[]>([])
 const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYYMMDD'))
+const { global: { t } } = i18n
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryMineTradeOrders, {
     manual: true,
@@ -55,19 +57,19 @@ const { loading, run, pageIndex, pageCount } = useRequest(queryMineTradeOrders,
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodsnamedisplay', label: '商品代码/名称' },
-    { field: 'orderqty', label: '转让量' },
-    { field: 'orderprice', label: '转让价' },
-    { field: 'presaleprice', label: '订货价' },
-    { field: 'tradeqty', label: '摘牌量' },
-    { field: 'orderstatus', label: '委托状态' },
-    { field: 'ordertime', label: '委托时间' },
-    { field: 'orderid', label: '委托单号' }
+    { 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') }
 ])
 
 filterOptons.buttonList = [
     {
-        lable: '查询',
+        lable: t('operation.search'),
         className: 'el-button--info',
         onClick: () => {
             pageIndex.value = 1

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

@@ -22,18 +22,20 @@ 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: '商品代码/名称' },
-    { field: 'orderqty', label: '转让量' },
-    { field: 'orderprice', label: '转让价' },
-    { field: 'presaleprice', label: '订货价' },
-    { field: 'tradeqty', label: '摘牌量' },
-    { field: 'orderstatus', label: '委托状态' },
-    { field: 'ordertime', label: '委托时间' },
-    { field: 'orderid', label: '委托单号' }
+    { 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') }
 ])
 </script>

+ 3 - 2
src/packages/pc/views/query/order/pricing/history/index.vue

@@ -42,7 +42,7 @@ import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeOrderDetail } from '@/services/api/order'
 import { getBuyOrSellName, getWRTradeOrderStatusName, getWRTradeOrderStatusList } from '@/constants/order'
-import { useTableColumnsStore } from '@/stores'
+import { useTableColumnsStore, i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -52,6 +52,7 @@ const currentDate = new Date()
 const tableColumns = ref<Model.TableColumn[]>([])
 const dataList = ref<Model.HisTradeOrderDetailRsp[]>([])
 const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYY-MM-DD'))
+const { global: { t} } = i18n
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryHisTradeOrderDetail, {
     manual: true,
@@ -82,7 +83,7 @@ filterOptons.selectList = [
 
 filterOptons.buttonList = [
     {
-        lable: '查询',
+        lable: t('operation.search'),
         className: 'el-button--info',
         onClick: () => {
             pageIndex.value = 1

+ 3 - 2
src/packages/pc/views/query/order/spot/history/index.vue

@@ -38,7 +38,7 @@ import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
 import { queryWrOrderDetail } from '@/services/api/order'
 import { getWrTradeTypeName, getWrPriceTypeName, getWRTradeOrderStatusName } from '@/constants/order'
-import { useTableColumnsStore } from '@/stores'
+import { useTableColumnsStore, i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -48,6 +48,7 @@ const currentDate = new Date()
 const tableColumns = ref<Model.TableColumn[]>([])
 const dataList = ref<Model.WrOrderDetailRsp[]>([])
 const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYYMMDD'))
+const { global: { t } } = i18n
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryWrOrderDetail, {
     manual: true,
@@ -81,7 +82,7 @@ filterOptons.selectList = [
 
 filterOptons.buttonList = [
     {
-        lable: '查询',
+        lable: t('operation.search'),
         className: 'el-button--info',
         onClick: () => {
             pageIndex.value = 1

+ 3 - 2
src/packages/pc/views/query/order/swap/history/index.vue

@@ -42,7 +42,7 @@ import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeOrderDetail } from '@/services/api/order'
 import { getBuyOrSellName, getWRTradeOrderStatusName, getWRTradeOrderStatusList } from '@/constants/order'
-import { useTableColumnsStore } from '@/stores'
+import { useTableColumnsStore, i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -52,6 +52,7 @@ const currentDate = new Date()
 const tableColumns = ref<Model.TableColumn[]>([])
 const dataList = ref<Model.HisTradeOrderDetailRsp[]>([])
 const dateValue = ref(formatDate(currentDate.toISOString(), 'YYYY-MM-DD'))
+const { global: { t } } = i18n
 
 const { loading, run, pageIndex, pageCount } = useRequest(queryHisTradeOrderDetail, {
     manual: true,
@@ -82,7 +83,7 @@ filterOptons.selectList = [
 
 filterOptons.buttonList = [
     {
-        lable: '查询',
+        lable: t('operation.search'),
         className: 'el-button--info',
         onClick: () => {
             pageIndex.value = 1