Handy_Cao 11 月之前
父节点
当前提交
8ba3033f93

+ 94 - 12
public/locales/en-US.json

@@ -15,21 +15,21 @@
             "currency": "Currency",
             "accountName": "所属用户",
             "bankinout": {
-                "title": "出入金",
+                "title": "InOutAmount",
                 "accountId": "TaAccountID",
-                "enableAmount": "可出金额",
+                "enableAmount": "EnableAmount",
                 "inOutAmount": "InOutAmount",
                 "inAmount": "InAmount",
                 "outAmount": "OutAmount",
                 "amount": "Amount",
                 "cusbankid": "CusBankID",
-                "accpwd": "资金密码",
-                "accounttype": "账户类型",
+                "accpwd": "TaAccountPassword",
+                "accounttype": "AccountType",
                 "cardtype": "CardType",
                 "cardno": "CardNum",
                 "bankname": "开户银行",
                 "bankaccountno": "BankAccountNo",
-                "bankaccountname": "银行卡户名",
+                "bankaccountname": "BankAccountName",
                 "mobilephone": "Mobile",
                 "remark": "Remark"
             },
@@ -214,9 +214,9 @@
         "tips3": "Save successfully",
         "tips4": "Save failure:",
         "tips5": "Successful deletion",
-        "tips6": "删除失败:",
+        "tips6": "Delete failure:",
         "tips7": "Submission is successful",
-        "tips8": "提交失败:",
+        "tips8": "Submission failure:",
         "tips9": "Successful withdrawal",
         "tips10": "撤回失败:",
         "tips11": "Successful cancellation",
@@ -1786,7 +1786,24 @@
                 "decreaseqty": "DecreaseQty"
             }
         },
-        "bank": {},
+        "bank": {
+            "tradedate": "TradeDate",
+            "cusbankname": "CusBankName",
+            "balance": "Balance",
+            "totalinamout": "TotalInAmount",
+            "inamoutcout": "InAmountCount",
+            "totalincharge": "TotalInCharge",
+            "totaloutamount": "TotalOutAmount",
+            "outamountcout": "OutAmountCount",
+            "totaloutcharge": "TotalOutCharge",
+            "currentbalance": "CurrentBalance",
+            "totalpl": "TotalPL",
+            "totalcharge": "TotalCharge",
+            "date": "Date",
+            "startdate": "StartDate",
+            "enddate": "EndDate",
+            "tips1": "Name/number fuzzy matching"
+        },
         "broker": {
             "cycletype": "ReportType",
             "reckondate": "Date",
@@ -1808,9 +1825,65 @@
             "investorBuyHoldQty": "InvestorBuyHoldQty",
             "investorSellHoldQty": "InvestorSellHoldQty"
         },
-        "fee": {},
-        "goods": {},
-        "institution": {},
+        "fee": {
+            "tradedate": "TradeDate",
+            "areaname": "AreaName",
+            "areatype": "AreaType",
+            "bankname": "BankName",
+            "totalcount": "TotalCount",
+            "totalfee": "TotalFee",
+            "cusbankname": "CusBankName",
+            "date": "Date",
+            "startdate": "StartDate",
+            "enddate": "EndDate",
+            "tips1": "Name/number fuzzy matching"
+        },
+        "goods": {
+            "marketname": "MarketName",
+            "goodsname": "Name/Code",
+            "totalorderqty": "TotalOrderQty",
+            "tradeqty": "TradeQty",
+            "totalholdqty": "TotalHoldQty",
+            "tradelot": "TradeLot",
+            "tradeamount": "TradeAmount",
+            "totalcharge": "TotalCharge",
+            "totalinterest": "TotalInterest",
+            "orderaccountcount": "OrderAccountCount",
+            "tradeaccountcount": "TraeAccountCount",
+            "holdaccountcount": "HoldAccountCount",
+            "markettradeqty": "MarketTradeQty",
+            "cycletype": "CycleType",
+            "reckondate": "ReckonDate",
+            "quarter": "Quarter",
+            "sum": "Sum"
+        },
+        "institution": {
+            "reckondate": "ReckonDate",
+            "accountid": "AccountID",
+            "accountname": "AccountName",
+            "balance": "Balance",
+            "currentbalance": "CurrentBalance",
+            "inamount": "InAmount",
+            "outamount": "OutAmount",
+            "closepl": "ClosePL",
+            "floatpl": "FloatPL",
+            "reckonpl": "ReckonPL",
+            "paycharge": "PayCharge",
+            "interestCharge": "InterestCharge",
+            "otherincome": "OtherInCome",
+            "usedmargin": "UsedMargin",
+            "freezemargin": "FreezeMargin",
+            "outamountfreeze": "OutAmountFreeze",
+            "avaiablemoney": "AvaiableMoney",
+            "avaiableoutmoney": "AvaiableOutMoney",
+            "floatnetvalues": "FloatNetValues",
+            "cycletype": "CycleType",
+            "quarter": "Quarter",
+            "quarterend": "QuarterEnd",
+            "accountstatus": "AccountStatus",
+            "roles": "Roles",
+            "tips1": "Query >= subvalue"
+        },
         "investor": {
             "cycletype": "ReportType",
             "reckondate": "Date",
@@ -1858,7 +1931,16 @@
             "totalfee": "TotalFee",
             "divideamount": "分润金额"
         },
-        "recalculate": {},
+        "recalculate": {
+            "date": "Date",
+            "startDate": "TradeDate",
+            "startdate": "StartDate",
+            "enddate": "EndDate",
+            "tips1": "Report Recalculation",
+            "tips2": "*Select the trading day, and the weekly, monthly, quarterly and annual report data of the current trading day will be recalculated!",
+            "tips3": "*Wait 10 to 20 minutes to check!",
+            "tips4": "Recalculate"
+        },
         "trade": {
             "cycletype": "ReportType",
             "cycletime": "CycleTime",

+ 87 - 5
public/locales/th-TH.json

@@ -1786,7 +1786,24 @@
                 "decreaseqty": "销售数量"
             }
         },
-        "bank": {},
+        "bank": {
+            "tradedate": "交易日",
+            "cusbankname": "结算银行",
+            "balance": "上日余额",
+            "totalinamout": "入金总金额",
+            "inamoutcout": "入金总笔数",
+            "totalincharge": "入金服务费",
+            "totaloutamount": "出金总金额",
+            "outamountcout": "出金总笔数",
+            "totaloutcharge": "出金服务费",
+            "currentbalance": "今日余额",
+            "totalpl": "盈亏",
+            "totalcharge": "平台总服务费",
+            "date": "日期",
+            "startdate": "开始日期",
+            "enddate": "结束日期",
+            "tips1": "名称/编号模糊匹配"
+        },
         "broker": {
             "cycletype": "报表类型",
             "reckondate": "日期",
@@ -1808,9 +1825,65 @@
             "investorBuyHoldQty": "买持仓数量",
             "investorSellHoldQty": "卖持仓数量"
         },
-        "fee": {},
-        "goods": {},
-        "institution": {},
+        "fee": {
+            "tradedate": "交易日",
+            "areaname": "名称",
+            "areatype": "角色",
+            "bankname": "结算银行",
+            "totalcount": "总笔数",
+            "totalfee": "总手续费",
+            "cusbankname": "结算银行",
+            "date": "日期",
+            "startdate": "开始日期",
+            "enddate": "结束日期",
+            "tips1": "名称/编号模糊匹配"
+        },
+        "goods": {
+            "marketname": "市场",
+            "goodsname": "商品/代码",
+            "totalorderqty": "总委托量",
+            "tradeqty": "总成交量",
+            "totalholdqty": "总持仓量",
+            "tradelot": "总成交笔数",
+            "tradeamount": "总成交金额",
+            "totalcharge": "总手续费",
+            "totalinterest": "总递延费",
+            "orderaccountcount": "委托账户数",
+            "tradeaccountcount": "成交账户数",
+            "holdaccountcount": "持仓账户数",
+            "markettradeqty": "成交市场占比",
+            "cycletype": "报表类型",
+            "reckondate": "日期",
+            "quarter": "季度",
+            "sum": "汇总"
+        },
+        "institution": {
+            "reckondate": "日期",
+            "accountid": "资金账户",
+            "accountname": "账户",
+            "balance": "期初余额",
+            "currentbalance": "期末余额",
+            "inamount": "入金金额",
+            "outamount": "出金金额",
+            "closepl": "转让损益",
+            "floatpl": "浮动损益",
+            "reckonpl": "结算损益",
+            "paycharge": "手续费",
+            "interestCharge": "递延费",
+            "otherincome": "分润收入",
+            "usedmargin": "占用资金",
+            "freezemargin": "冻结资金",
+            "outamountfreeze": "出金冻结",
+            "avaiablemoney": "可用资金",
+            "avaiableoutmoney": "可出资金",
+            "floatnetvalues": "当前净值",
+            "cycletype": "报表类型",
+            "quarter": "开始季度",
+            "quarterend": "结束季度",
+            "accountstatus": "机构状态",
+            "roles": "机构角色",
+            "tips1": "查询>=次数值"
+        },
         "investor": {
             "cycletype": "报表类型",
             "reckondate": "日期",
@@ -1858,7 +1931,16 @@
             "totalfee": "总手续费",
             "divideamount": "分润金额"
         },
-        "recalculate": {},
+        "recalculate": {
+            "date": "日期",
+            "startDate": "交易日",
+            "startdate": "开始日期",
+            "enddate": "结束日期",
+            "tips1": "报表重算",
+            "tips2": "*选择交易日,当前交易日的所在周报表数据,月报表数据,季报表数据,年报表数据都会重算!",
+            "tips3": "*等待10~20分钟后查看!",
+            "tips4": "重新计算"
+        },
         "trade": {
             "cycletype": "报表类型",
             "cycletime": "日期",

+ 87 - 5
public/locales/zh-CN.json

@@ -1786,7 +1786,24 @@
                 "decreaseqty": "销售数量"
             }
         },
-        "bank": {},
+        "bank": {
+            "tradedate": "交易日",
+            "cusbankname": "结算银行",
+            "balance": "上日余额",
+            "totalinamout": "入金总金额",
+            "inamoutcout": "入金总笔数",
+            "totalincharge": "入金服务费",
+            "totaloutamount": "出金总金额",
+            "outamountcout": "出金总笔数",
+            "totaloutcharge": "出金服务费",
+            "currentbalance": "今日余额",
+            "totalpl": "盈亏",
+            "totalcharge": "平台总服务费",
+            "date": "日期",
+            "startdate": "开始日期",
+            "enddate": "结束日期",
+            "tips1": "名称/编号模糊匹配"
+        },
         "broker": {
             "cycletype": "报表类型",
             "reckondate": "日期",
@@ -1808,9 +1825,65 @@
             "investorBuyHoldQty": "买持仓数量",
             "investorSellHoldQty": "卖持仓数量"
         },
-        "fee": {},
-        "goods": {},
-        "institution": {},
+        "fee": {
+            "tradedate": "交易日",
+            "areaname": "名称",
+            "areatype": "角色",
+            "bankname": "结算银行",
+            "totalcount": "总笔数",
+            "totalfee": "总手续费",
+            "cusbankname": "结算银行",
+            "date": "日期",
+            "startdate": "开始日期",
+            "enddate": "结束日期",
+            "tips1": "名称/编号模糊匹配"
+        },
+        "goods": {
+            "marketname": "市场",
+            "goodsname": "商品/代码",
+            "totalorderqty": "总委托量",
+            "tradeqty": "总成交量",
+            "totalholdqty": "总持仓量",
+            "tradelot": "总成交笔数",
+            "tradeamount": "总成交金额",
+            "totalcharge": "总手续费",
+            "totalinterest": "总递延费",
+            "orderaccountcount": "委托账户数",
+            "tradeaccountcount": "成交账户数",
+            "holdaccountcount": "持仓账户数",
+            "markettradeqty": "成交市场占比",
+            "cycletype": "报表类型",
+            "reckondate": "日期",
+            "quarter": "季度",
+            "sum": "汇总"
+        },
+        "institution": {
+            "reckondate": "日期",
+            "accountid": "资金账户",
+            "accountname": "账户",
+            "balance": "期初余额",
+            "currentbalance": "期末余额",
+            "inamount": "入金金额",
+            "outamount": "出金金额",
+            "closepl": "转让损益",
+            "floatpl": "浮动损益",
+            "reckonpl": "结算损益",
+            "paycharge": "手续费",
+            "interestCharge": "递延费",
+            "otherincome": "分润收入",
+            "usedmargin": "占用资金",
+            "freezemargin": "冻结资金",
+            "outamountfreeze": "出金冻结",
+            "avaiablemoney": "可用资金",
+            "avaiableoutmoney": "可出资金",
+            "floatnetvalues": "当前净值",
+            "cycletype": "报表类型",
+            "quarter": "开始季度",
+            "quarterend": "结束季度",
+            "accountstatus": "机构状态",
+            "roles": "机构角色",
+            "tips1": "查询>=次数值"
+        },
         "investor": {
             "cycletype": "报表类型",
             "reckondate": "日期",
@@ -1858,7 +1931,16 @@
             "totalfee": "总手续费",
             "divideamount": "分润金额"
         },
-        "recalculate": {},
+        "recalculate": {
+            "date": "日期",
+            "startDate": "交易日",
+            "startdate": "开始日期",
+            "enddate": "结束日期",
+            "tips1": "报表重算",
+            "tips2": "*选择交易日,当前交易日的所在周报表数据,月报表数据,季报表数据,年报表数据都会重算!",
+            "tips3": "*等待10~20分钟后查看!",
+            "tips4": "重新计算"
+        },
         "trade": {
             "cycletype": "报表类型",
             "cycletime": "日期",

+ 87 - 5
public/locales/zh-TW.json

@@ -1786,7 +1786,24 @@
                 "decreaseqty": "銷售數量"
             }
         },
-        "bank": {},
+        "bank": {
+            "tradedate": "交易日",
+            "cusbankname": "结算银行",
+            "balance": "上日余额",
+            "totalinamout": "入金总金额",
+            "inamoutcout": "入金总笔数",
+            "totalincharge": "入金服务费",
+            "totaloutamount": "出金总金额",
+            "outamountcout": "出金总笔数",
+            "totaloutcharge": "出金服务费",
+            "currentbalance": "今日余额",
+            "totalpl": "盈亏",
+            "totalcharge": "平台总服务费",
+            "date": "日期",
+            "startdate": "开始日期",
+            "enddate": "结束日期",
+            "tips1": "名称/编号模糊匹配"
+        },
         "broker": {
             "cycletype": "報表類型",
             "reckondate": "日期",
@@ -1808,9 +1825,65 @@
             "investorBuyHoldQty": "買持倉數量",
             "investorSellHoldQty": "賣持倉數量"
         },
-        "fee": {},
-        "goods": {},
-        "institution": {},
+        "fee": {
+            "tradedate": "交易日",
+            "areaname": "名称",
+            "areatype": "角色",
+            "bankname": "结算银行",
+            "totalcount": "总笔数",
+            "totalfee": "总手续费",
+            "cusbankname": "结算银行",
+            "date": "日期",
+            "startdate": "开始日期",
+            "enddate": "结束日期",
+            "tips1": "名称/编号模糊匹配"
+        },
+        "goods": {
+            "marketname": "市场",
+            "goodsname": "商品/代码",
+            "totalorderqty": "总委托量",
+            "tradeqty": "总成交量",
+            "totalholdqty": "总持仓量",
+            "tradelot": "总成交笔数",
+            "tradeamount": "总成交金额",
+            "totalcharge": "总手续费",
+            "totalinterest": "总递延费",
+            "orderaccountcount": "委托账户数",
+            "tradeaccountcount": "成交账户数",
+            "holdaccountcount": "持仓账户数",
+            "markettradeqty": "成交市场占比",
+            "cycletype": "报表类型",
+            "reckondate": "日期",
+            "quarter": "季度",
+            "sum": "汇总"
+        },
+        "institution": {
+            "reckondate": "日期",
+            "accountid": "资金账户",
+            "accountname": "账户",
+            "balance": "期初余额",
+            "currentbalance": "期末余额",
+            "inamount": "入金金额",
+            "outamount": "出金金额",
+            "closepl": "转让损益",
+            "floatpl": "浮动损益",
+            "reckonpl": "结算损益",
+            "paycharge": "手续费",
+            "interestCharge": "递延费",
+            "otherincome": "分润收入",
+            "usedmargin": "占用资金",
+            "freezemargin": "冻结资金",
+            "outamountfreeze": "出金冻结",
+            "avaiablemoney": "可用资金",
+            "avaiableoutmoney": "可出资金",
+            "floatnetvalues": "当前净值",
+            "cycletype": "报表类型",
+            "quarter": "开始季度",
+            "quarterend": "结束季度",
+            "accountstatus": "机构状态",
+            "roles": "机构角色",
+            "tips1": "查询>=次数值"
+        },
         "investor": {
             "cycletype": "報表類型",
             "reckondate": "日期",
@@ -1858,7 +1931,16 @@
             "totalfee": "總手續費",
             "divideamount": "分潤金額"
         },
-        "recalculate": {},
+        "recalculate": {
+            "date": "日期",
+            "startDate": "交易日",
+            "startdate": "开始日期",
+            "enddate": "结束日期",
+            "tips1": "报表重算",
+            "tips2": "*选择交易日,当前交易日的所在周报表数据,月报表数据,季报表数据,年报表数据都会重算!",
+            "tips3": "*等待10~20分钟后查看!",
+            "tips4": "重新计算"
+        },
         "trade": {
             "cycletype": "報表類型",
             "cycletime": "日期",

+ 16 - 16
src/packages/pc/views/report/bank/index.vue

@@ -4,9 +4,9 @@
         <template #header>
             <app-filter :option="filterOption"  :rules="filterRules">
                 <template #startDate>
-                    <el-form-item label="日期" prop="date">
+                    <el-form-item :label="t('report.bank.date')" prop="date">
                         <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
-                            start-placeholder="开始时间" end-placeholder="结束时间" />
+                            :start-placeholder="t('report.bank.startdate')" :end-placeholder="t('report.bank.enddate')" />
                     </el-form-item>
                 </template>
             </app-filter>
@@ -58,18 +58,18 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(cusban
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'tradedate', label: '交易日' },
-    { field: 'cusbankname', label: '结算银行' },
-    { field: 'balance', label: '上日余额' },
-    { field: 'totalinamout', label: '入金总金额' },
-    { field: 'inamoutcout', label: '入金总笔数' },
-    { field: 'totalincharge', label: '入金服务费' },
-    { field: 'totaloutamount', label: '出金总金额' },
-    { field: 'outamountcout', label: '出金总笔数' },
-    { field: 'totaloutcharge', label: '出金服务费' },
-    { field: 'currentbalance', label: '今日余额' },
-    { field: 'totalpl', label: '盈亏' },
-    { field: 'totalcharge', label: '平台总服务费' },
+    { field: 'tradedate', label: 'report.bank.tradedate' },
+    { field: 'cusbankname', label: 'report.bank.cusbankname' },
+    { field: 'balance', label: 'report.bank.balance' },
+    { field: 'totalinamout', label: 'report.bank.totalinamout' },
+    { field: 'inamoutcout', label: 'report.bank.inamoutcout' },
+    { field: 'totalincharge', label: 'report.bank.totalincharge' },
+    { field: 'totaloutamount', label: 'report.bank.totaloutamount' },
+    { field: 'outamountcout', label: 'report.bank.outamountcout' },
+    { field: 'totaloutcharge', label: 'report.bank.totaloutcharge' },
+    { field: 'currentbalance', label: 'report.bank.currentbalance' },
+    { field: 'totalpl', label: 'report.bank.totalpl' },
+    { field: 'totalcharge', label: 'report.bank.totalcharge' },
 ])
 
 // 表单验证规则
@@ -86,8 +86,8 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     filters: [
         {
             field: 'cusbankname',
-            label: '结算银行',
-            placeholder: '名称/编号模糊匹配',
+            label: t('report.bank.cusbankname'),
+            placeholder: t('report.bank.tips1'),
         },
         {
             field: 'startDate',

+ 10 - 10
src/packages/pc/views/report/fee/index.vue

@@ -4,9 +4,9 @@
         <template #header>
             <app-filter :option="filterOption"  :rules="filterRules">
                 <template #startDate>
-                    <el-form-item label="日期" prop="date">
+                    <el-form-item :label="t('report.fee.date')" prop="date">
                         <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
-                            start-placeholder="开始时间" end-placeholder="结束时间" />
+                            :start-placeholder="t('report.fee.startdate')" :end-placeholder="t('report.fee.enddate')" />
                     </el-form-item>
                 </template>
             </app-filter>
@@ -58,12 +58,12 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(manage
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'tradedate', label: '交易日' },
-    { field: 'areaname', label: '名称' },
-    { field: 'areatype', label: '角色' },
-    { field: 'bankname', label: '结算银行' },
-    { field: 'totalcount', label: '总笔数' },
-    { field: 'totalfee', label: '总手续费' }
+    { field: 'tradedate', label: 'report.fee.tradedate' },
+    { field: 'areaname', label: 'report.fee.areaname' },
+    { field: 'areatype', label: 'report.fee.areatype' },
+    { field: 'bankname', label: 'report.fee.bankname' },
+    { field: 'totalcount', label: 'report.fee.totalcount' },
+    { field: 'totalfee', label: 'report.fee.totalfee' }
 ])
 
 // 表单验证规则
@@ -80,8 +80,8 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     filters: [
         {
             field: 'cusbankname',
-            label: '结算银行',
-            placeholder: '名称/编号模糊匹配',
+            label: t('report.fee.cusbankname'),
+            placeholder: t('report.fee.tips1'),
         },
         {
             field: 'startDate',

+ 23 - 20
src/packages/pc/views/report/goods/index.vue

@@ -6,7 +6,7 @@
                 <template #reckondate="{ item }">
                     <el-form-item :label="item.label" prop="reckondate">
                         <el-date-picker :type="dateType" v-model="item.value" :format="dateFormat"
-                            :value-format="dateFormat" placeholder="请选择" />
+                            :value-format="dateFormat" :placeholder="t('common.pleasechoice')" />
                     </el-form-item>
                 </template>
                 <template #quarter="{ item }">
@@ -47,6 +47,9 @@ import { dayGoodsCountReportQuery } from '@/services/api/report'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
 import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
+import { i18n } from '@/stores'
+
+const { global: { t } } = i18n
 
 const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.DayGoodsCountReportRsp>({
     onClose: () => onSearch()
@@ -65,7 +68,7 @@ const dataList = computed<Model.DayGoodsCount[]>(() => {
 
         values.forEach((arr) => {
             const item = {
-                goodsname: '汇总',
+                goodsname: t('report.goods.sum'),
                 holdaccountcount: 0,
                 marketid: 0,
                 marketname: '',
@@ -105,19 +108,19 @@ const dataList = computed<Model.DayGoodsCount[]>(() => {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'marketname', label: '市场' },
-    { field: 'goodsname', label: '商品/代码' },
-    { field: 'totalorderqty', label: '总委托量' },
-    { field: 'tradeqty', label: '总成交量' },
-    { field: 'totalholdqty', label: '总持仓量' },
-    { field: 'tradelot', label: '总成交笔数' },
-    { field: 'tradeamount', label: '总成交金额', decimal: 2 },
-    { field: 'totalcharge', label: '总手续费', decimal: 2 },
-    { field: 'totalinterest', label: '总递延费', decimal: 2 },
-    { field: 'orderaccountcount', label: '委托账户数' },
-    { field: 'tradeaccountcount', label: '成交账户数' },
-    { field: 'holdaccountcount', label: '持仓账户数' },
-    { field: 'markettradeqty', label: '成交市场占比', formatValue: (val) => val ? parsePercent(val, 2, true) : handleNumberValue() }
+    { field: 'marketname', label: 'report.goods.marketname' },
+    { field: 'goodsname', label: 'report.goods.goodsname' },
+    { field: 'totalorderqty', label: 'report.goods.totalorderqty' },
+    { field: 'tradeqty', label: 'report.goods.tradeqty' },
+    { field: 'totalholdqty', label: 'report.goods.totalholdqty' },
+    { field: 'tradelot', label: 'report.goods.tradelot' },
+    { field: 'tradeamount', label: 'report.goods.tradeamount', decimal: 2 },
+    { field: 'totalcharge', label: 'report.goods.totalcharge', decimal: 2 },
+    { field: 'totalinterest', label: 'report.goods.totalinterest', decimal: 2 },
+    { field: 'orderaccountcount', label: 'report.goods.orderaccountcount' },
+    { field: 'tradeaccountcount', label: 'report.goods.tradeaccountcount' },
+    { field: 'holdaccountcount', label: 'report.goods.holdaccountcount' },
+    { field: 'markettradeqty', label: 'report.goods.markettradeqty', formatValue: (val) => val ? parsePercent(val, 2, true) : handleNumberValue() }
 ])
 
 // 日期类型
@@ -196,24 +199,24 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     filters: [
         {
             field: 'cycletype',
-            label: '报表类型',
+            label: t('report.goods.cycletype'),
             value: 0,
             options: () => getReportTypeList()
         },
         {
             field: 'reckondate',
-            label: '日期',
+            label: t('report.goods.reckondate'),
             required: true
         },
         {
             field: 'quarter',
-            label: '季度',
+            label: t('report.goods.quarter'),
             required: true
         }
     ],
     buttons: [
-        { label: '查询', className: 'el-button--primary', onClick: () => onSearch() },
-        { label: '重置', className: 'el-button--primary', validateEvent: false, onClick: () => resetFilters() }
+        { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },
+        { label: t('operation.reset'), className: 'el-button--primary', validateEvent: false, onClick: () => resetFilters() }
     ]
 })
 

+ 29 - 29
src/packages/pc/views/report/institution/index.vue

@@ -48,7 +48,7 @@
                     </el-form-item>
                 </template>
                 <template #roles>
-                    <el-form-item label="机构角色" prop="roles">
+                    <el-form-item :label="t('report.institution.roles')" prop="roles">
                         <el-checkbox-group v-model="roles">
                             <el-checkbox label="运营机构" value="2" />
                             <el-checkbox label="经纪会员" value="7" />
@@ -169,25 +169,25 @@ const onDateChange = () => {
 }
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'reckondate', label: '日期' },
-    { field: 'accountid', label: '资金账户' },
-    { field: 'accountname', label: '账户' },
-    { field: 'balance', label: '期初余额' },
-    { field: 'currentbalance', label: '期末余额' },
-    { field: 'inamount', label: '入金金额' },
-    { field: 'outamount', label: '出金金额' },
-    { field: 'closepl', label: '转让损益' },
-    { field: 'floatpl', label: '浮动损益' },
-    { field: 'reckonpl', label: '结算损益' },
-    { field: 'paycharge', label: '手续费' },
-    { field: 'interestCharge', label: '递延费' },
-    { field: 'otherincome', label: '分润收入' },
-    { field: 'usedmargin', label: '占用资金' },
-    { field: 'freezemargin', label: '冻结资金' },
-    { field: 'outamountfreeze', label: '出金冻结' },
-    { field: 'avaiablemoney', label: '可用资金' },
-    { field: 'avaiableoutmoney', label: '可出资金' },
-    { field: 'floatnetvalues', label: '当前净值' },
+    { field: 'reckondate', label: 'report.institution.reckondate' },
+    { field: 'accountid', label: 'report.institution.accountid' },
+    { field: 'accountname', label: 'report.institution.accountname' },
+    { field: 'balance', label: 'report.institution.balance' },
+    { field: 'currentbalance', label: 'report.institution.currentbalance' },
+    { field: 'inamount', label: 'report.institution.inamount' },
+    { field: 'outamount', label: 'report.institution.outamount' },
+    { field: 'closepl', label: 'report.institution.closepl' },
+    { field: 'floatpl', label: 'report.institution.floatpl' },
+    { field: 'reckonpl', label: 'report.institution.reckonpl' },
+    { field: 'paycharge', label: 'report.institution.paycharge' },
+    { field: 'interestCharge', label: 'report.institution.interestCharge' },
+    { field: 'otherincome', label: 'report.institution.otherincome' },
+    { field: 'usedmargin', label: 'report.institution.usedmargin' },
+    { field: 'freezemargin', label: 'report.institution.freezemargin' },
+    { field: 'outamountfreeze', label: 'report.institution.outamountfreeze' },
+    { field: 'avaiablemoney', label: 'report.institution.avaiablemoney' },
+    { field: 'avaiableoutmoney', label: 'report.institution.avaiableoutmoney' },
+    { field: 'floatnetvalues', label: 'report.institution.floatnetvalues' },
 ])
 
 // 表单验证规则
@@ -204,7 +204,7 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     filters: [
         {
             field: 'cycletype',
-            label: '报表类型',
+            label: t('report.institution.cycletype'),
             required: true,
             options: () => getReportTypeList(),
             onChange: () => onTypeChange
@@ -214,32 +214,32 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
         },
         {
             field: 'quarter',
-            label: '开始季度',
+            label: t('report.institution.quarter'),
             required: true
         },
         {
             field: 'quarterend',
-            label: '结束季度',
+            label: t('report.institution.quarterend'),
             required: true
         },
         {
             field: 'inamount',
-            label: '入金金额',
-            placeholder: '查询>=次数值'
+            label: t('report.institution.inamount'),
+            placeholder: t('report.institution.tips1')
         },
         {
             field: 'outamount',
-            label: '出金金额',
-            placeholder: '查询>=次数值'
+            label: t('report.institution.outamount'),
+            placeholder: t('report.institution.tips1')
         },
         {
             field: 'accountstatus',
-            label: '机构状态',
+            label: t('report.institution.accountstatus'),
             options: () => accountstatusEnum.getEnumOptions()
         },
         {
             field: 'roles',
-            label: '机构角色',
+            label: t('report.institution.roles'),
         }
     ],
     buttons: [

+ 10 - 8
src/packages/pc/views/report/recalculate/index.vue

@@ -4,18 +4,18 @@
         <template #header>
             <app-filter :option="filterOption"  :rules="filterRules">
                 <template #startDate>
-                    <el-form-item label="交易日" prop="date">
+                    <el-form-item :label="t('report.recalculate.date')" prop="date">
                         <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
-                            start-placeholder="开始时间" end-placeholder="结束时间" />
+                            :start-placeholder="t('report.recalculate.startdate')" :end-placeholder="t('report.recalculate.enddate')" />
                     </el-form-item>
                 </template>
                 <fieldset class="g-fieldset el-form--vertical">
-                    <legend class="g-fieldset__legend">报表重算</legend>
+                    <legend class="g-fieldset__legend">{{ t('report.recalculate.tips1') }}</legend>
                     <el-form-item>
-                        <span>*选择交易日,当前交易日的所在周报表数据,月报表数据,季报表数据,年报表数据都会重算!</span>
+                        <span>{{ t('report.recalculate.tips2') }}</span>
                     </el-form-item>
                     <el-form-item>
-                        <span>*等待10~20分钟后查看!</span>
+                        <span>{{ t('report.recalculate.tips3') }}</span>
                     </el-form-item>
                 </fieldset>
             </app-filter>
@@ -31,7 +31,9 @@ import { useOperation } from '@/hooks/operation'
 import { rerun } from '@/services/api/report'
 import { useRequest } from '@/hooks/request'
 import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
+import { i18n } from '@/stores'
 
+const { global: { t } } = i18n
 const dateValue = shallowRef<string[] | null>([])
 
 const { run } = useRequest(rerun, {
@@ -41,7 +43,7 @@ const { run } = useRequest(rerun, {
         pageSize: 20
     },
     onSuccess: () => {
-        ElMessage.success('操作成功!')
+        ElMessage.success(t('common.tips17'))
     },
     onError: (err) => {
         ElMessage.error(err)
@@ -66,11 +68,11 @@ const { filterOption, getQueryParams } = useDataFilter<Model.ReturnReq>({
     filters: [
         {
             field: 'startDate',
-            label: '交易日',
+            label: t('report.recalculate.startDate'),
         },
     ],
     buttons: [
-        { label: '重新计算', className: 'el-button--primary', onClick: () => onSearch() }
+        { label: t('report.recalculate.tips4'), className: 'el-button--primary', onClick: () => onSearch() }
     ]
 })