Handy_Cao hai 1 ano
pai
achega
cd6cd73cb4

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

@@ -70,16 +70,16 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodsname', label: t('order.goodsorder.goodsname') },
-    { 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: 'freezemargin', label: t('order.goodsorder.freezemargin') },
-    { field: 'orderid', label: t('order.goodsorder.orderid') },
-    { field: 'ordertime', label: t('order.goodsorder.ordertime') },
-    { field: 'orderstatus', label: t('order.goodsorder.orderstatus') }
+    { field: 'goodsname', label: 'order.goodsorder.goodsname' },
+    { 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: 'freezemargin', label: 'order.goodsorder.freezemargin' },
+    { field: 'orderid', label: 'order.goodsorder.orderid' },
+    { field: 'ordertime', label: 'order.goodsorder.ordertime' },
+    { field: 'orderstatus', label: 'order.goodsorder.orderstatus' }
 ])
 
 /// 双击单据撤销

+ 9 - 9
src/packages/pc/views/footer/goods/trade/index.vue

@@ -60,16 +60,16 @@ const { dataList, loading, runAsync } = useRequest(queryTradeDetail, {
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { 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: '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' }
 ])
 
 // 数量汇总

+ 2 - 4
src/stores/modules/table.ts

@@ -2,14 +2,12 @@ import { shallowRef } from 'vue'
 import { defineStore } from '../store'
 import axios from 'axios'
 import tableColumns from '@public/config/columns.json'
-import { i18n } from "@/stores";
+
 interface Table {
     tableKey: string;
     columns: TableColumn[];
 }
 
-const { global: { t } } = i18n
-
 interface TableColumn {
     field: string;
     label: string;
@@ -41,7 +39,7 @@ export const useTableColumnsStore = defineStore(() => {
                     if (operateColumn) {
                         baseColumns.push({
                             field: 'operate',
-                            label: t('common.operate'),
+                            label: 'common.operate',
                             fixed: 'right'
                         })
                     }