Handy_Cao преди 1 година
родител
ревизия
141638490c
променени са 97 файла, в които са добавени 1607 реда и са изтрити 782 реда
  1. 801 15
      public/locales/zh-CN.json
  2. 10 10
      src/packages/pc/views/account/tradeacct/components/sign/edit/index.vue
  3. 2 2
      src/packages/pc/views/admin/role/components/delete/index.vue
  4. 7 7
      src/packages/pc/views/admin/role/components/edit/index.vue
  5. 5 5
      src/packages/pc/views/admin/role/index.vue
  6. 7 7
      src/packages/pc/views/admin/user/components/edit/index.vue
  7. 6 6
      src/packages/pc/views/admin/user/components/status/index.vue
  8. 9 9
      src/packages/pc/views/admin/user/index.vue
  9. 5 1
      src/packages/pc/views/error/404.vue
  10. 1 1
      src/packages/pc/views/investor/custom/group/components/delete/index.vue
  11. 1 1
      src/packages/pc/views/investor/custom/group/components/user/delete/index.vue
  12. 1 1
      src/packages/pc/views/investor/custom/group/components/user/index.vue
  13. 1 1
      src/packages/pc/views/investor/custom/group/index.vue
  14. 1 1
      src/packages/pc/views/investor/custom/riskcfg/components/delete/index.vue
  15. 1 1
      src/packages/pc/views/investor/custom/riskcfg/index.vue
  16. 1 1
      src/packages/pc/views/investor/custom/tradecfg/components/delete/index.vue
  17. 1 1
      src/packages/pc/views/investor/manage/modification/index.vue
  18. 1 1
      src/packages/pc/views/investor/manage/user/components/account/index.vue
  19. 1 1
      src/packages/pc/views/investor/manage/user/components/cancel/index.vue
  20. 1 1
      src/packages/pc/views/investor/manage/user/components/delete/index.vue
  21. 8 8
      src/packages/pc/views/investor/manage/user/components/edit/index.vue
  22. 1 1
      src/packages/pc/views/investor/manage/user/components/export/index.vue
  23. 1 1
      src/packages/pc/views/investor/manage/user/components/login/delete/index.vue
  24. 1 1
      src/packages/pc/views/investor/manage/user/components/login/index.vue
  25. 1 1
      src/packages/pc/views/investor/manage/user/components/login/lock/index.vue
  26. 1 1
      src/packages/pc/views/investor/manage/user/components/login/password/index.vue
  27. 1 1
      src/packages/pc/views/investor/manage/user/components/login/recover/index.vue
  28. 1 1
      src/packages/pc/views/investor/manage/user/components/recover/index.vue
  29. 1 1
      src/packages/pc/views/investor/manage/user/index.vue
  30. 1 1
      src/packages/pc/views/investor/user/initreview/index.vue
  31. 1 1
      src/packages/pc/views/investor/user/open/components/cancel/index.vue
  32. 1 1
      src/packages/pc/views/investor/user/open/components/delete/index.vue
  33. 3 1
      src/packages/pc/views/investor/user/open/components/details/index.vue
  34. 6 6
      src/packages/pc/views/investor/user/open/components/edit/index.vue
  35. 1 1
      src/packages/pc/views/investor/user/open/index.vue
  36. 1 1
      src/packages/pc/views/investor/user/rereview/index.vue
  37. 2 2
      src/packages/pc/views/marketrun/monitor/account/index.vue
  38. 1 1
      src/packages/pc/views/marketrun/monitor/user/components/alloffline/index.vue
  39. 1 1
      src/packages/pc/views/marketrun/monitor/user/components/offline/index.vue
  40. 1 1
      src/packages/pc/views/marketrun/monitor/user/index.vue
  41. 1 1
      src/packages/pc/views/member/institution/open/components/cancel/index.vue
  42. 1 1
      src/packages/pc/views/member/institution/open/components/delete/index.vue
  43. 7 7
      src/packages/pc/views/member/institution/open/components/edit/index.vue
  44. 1 1
      src/packages/pc/views/member/institution/open/index.vue
  45. 1 1
      src/packages/pc/views/member/institution/role/index.vue
  46. 1 1
      src/packages/pc/views/member/subinstitution/manage/components/cancel/index.vue
  47. 1 1
      src/packages/pc/views/member/subinstitution/manage/components/delete/index.vue
  48. 7 7
      src/packages/pc/views/member/subinstitution/manage/components/edit/index.vue
  49. 1 1
      src/packages/pc/views/member/subinstitution/manage/components/recover/index.vue
  50. 1 1
      src/packages/pc/views/member/subinstitution/manage/index.vue
  51. 7 7
      src/packages/pc/views/member/subinstitution/user/components/edit/index.vue
  52. 1 1
      src/packages/pc/views/member/subinstitution/user/index.vue
  53. 1 1
      src/packages/pc/views/profitshare/institution/config/components/delete/index.vue
  54. 1 1
      src/packages/pc/views/profitshare/institution/config/index.vue
  55. 1 1
      src/packages/pc/views/profitshare/institution/group/components/delete/index.vue
  56. 2 2
      src/packages/pc/views/profitshare/institution/group/components/member/index.vue
  57. 1 1
      src/packages/pc/views/profitshare/institution/group/index.vue
  58. 22 22
      src/packages/pc/views/query/order/accountsumm/index.vue
  59. 15 15
      src/packages/pc/views/query/order/goodssumm/index.vue
  60. 13 13
      src/packages/pc/views/query/order/institutionsumm/index.vue
  61. 60 58
      src/packages/pc/views/query/order/order/components/details/index.vue
  62. 4 2
      src/packages/pc/views/query/order/order/components/export/index.vue
  63. 25 25
      src/packages/pc/views/query/order/order/index.vue
  64. 25 23
      src/packages/pc/views/query/order/position/components/details/index.vue
  65. 1 1
      src/packages/pc/views/query/order/position/components/export/index.vue
  66. 33 33
      src/packages/pc/views/query/order/position/index.vue
  67. 4 2
      src/packages/pc/views/query/order/positionsumm/components/export/index.vue
  68. 24 23
      src/packages/pc/views/query/order/positionsumm/index.vue
  69. 54 52
      src/packages/pc/views/query/order/trade/components/details/index.vue
  70. 1 1
      src/packages/pc/views/query/order/trade/components/export/index.vue
  71. 40 40
      src/packages/pc/views/query/order/trade/index.vue
  72. 47 45
      src/packages/pc/views/query/other/bank_inout/components/details/index.vue
  73. 23 23
      src/packages/pc/views/query/other/bank_inout/index.vue
  74. 4 2
      src/packages/pc/views/query/other/bank_statement/components/export/index.vue
  75. 15 15
      src/packages/pc/views/query/other/bank_statement/index.vue
  76. 12 10
      src/packages/pc/views/query/warehouse_receipt/wrsumm/components/details/index.vue
  77. 16 14
      src/packages/pc/views/query/warehouse_receipt/wrsumm/index.vue
  78. 1 1
      src/packages/pc/views/query/warehouse_receipt_order/order/index.vue
  79. 1 1
      src/packages/pc/views/query/warehouse_receipt_order/trade/index.vue
  80. 14 14
      src/packages/pc/views/report/account/components/bank/index.vue
  81. 5 5
      src/packages/pc/views/report/account/components/performance/index.vue
  82. 10 10
      src/packages/pc/views/report/account/components/position/index.vue
  83. 10 10
      src/packages/pc/views/report/account/components/trade/index.vue
  84. 8 8
      src/packages/pc/views/report/account/components/wrorder/index.vue
  85. 11 10
      src/packages/pc/views/report/account/index.vue
  86. 22 20
      src/packages/pc/views/report/broker/index.vue
  87. 39 37
      src/packages/pc/views/report/investor/index.vue
  88. 14 12
      src/packages/pc/views/report/profitshare/index.vue
  89. 16 14
      src/packages/pc/views/report/trade/index.vue
  90. 13 11
      src/packages/pc/views/settlement/profitsharepay/components/details/details/index.vue
  91. 15 15
      src/packages/pc/views/settlement/profitsharepay/components/details/index.vue
  92. 9 7
      src/packages/pc/views/settlement/profitsharepay/index.vue
  93. 6 6
      src/packages/pc/views/system/login_failed/index.vue
  94. 2 2
      src/packages/pc/views/system/menu/components/delete/index.vue
  95. 21 21
      src/packages/pc/views/system/menu/components/edit/index.vue
  96. 9 8
      src/packages/pc/views/system/menu/index.vue
  97. 9 9
      src/packages/pc/views/system/operation_log/index.vue

+ 801 - 15
public/locales/zh-CN.json

@@ -4,6 +4,9 @@
         "left1": "欢迎使用",
         "left2": "MTP管理系统"
     },
+    "error": {
+        "tips": "页面不存在"
+    },
     "common": {
         "pleaseenter": "请输入",
         "pleasechoice": "请选择",
@@ -14,6 +17,15 @@
         "extendinfo": "扩展信息",
         "pleasechoicedate": "请选择日期",
         "alert": "提示",
+        "annex": "附件",
+        "annex1": "附件1",
+        "annex2": "附件2",
+        "closeall": "全部收起",
+        "expandall": "全部展开",
+        "start": "开始",
+        "end": "结束",
+        "startdate": "开始日期",
+        "enddate": "结束日期",
         "tips1": "提交成功",
         "tips2": "提交失败:",
         "tips3": "保存成功",
@@ -33,7 +45,9 @@
         "tips17": "操作成功",
         "tips18": "操作失败:",
         "tips19": "重置成功",
-        "tips20": "重置失败:"
+        "tips20": "重置失败:",
+        "tips21": "请选择正确的图片类型",
+        "tips22": "确认失败:"
     },
     "operation": {
         "login": "登录",
@@ -45,20 +59,12 @@
         "upload": "上传",
         "aduit": "审核",
         "save": "保存",
+        "batchconfirm": "批量确认",
         "confirm": "确认",
         "export": "导出",
         "close": "关闭",
         "add": "新增"
     },
-    "auth": {
-        "login": {
-            "title": "账号登录",
-            "accountCode": "用户名/账号/手机号",
-            "password": "请输入您的登录密码",
-            "verifyCode": "请输入验证码",
-            "loading": "正在登录"
-        }
-    },
     "account": {
         "tradeacct": {
             "accountId": "资金账号",
@@ -167,14 +173,794 @@
                 },
                 "edit": {
                     "title": "编辑",
-                    "title": "编辑",
-                    "title": "编辑",
-                    "title": "编辑",
-                    "title": "编辑"
+                    "userinfotype": "账户类型",
+                    "cardtypeid": "证件类型",
+                    "cusbankid": "托管银行",
+                    "certid": "证件号码",
+                    "exbankname": "开户银行",
+                    "bankaccountno": "银行帐号",
+                    "bankaccountno1": "对公账号",
+                    "bankaccountname": "银行卡户主名",
+                    "mobilephone": "手机号"
+                }
+            }
+        }
+    },
+    "admin": {
+        "role": {
+            "rolename": "角色名称",
+            "modifiername": "创建人",
+            "modifytime": "创建时间",
+            "rolestatus": "状态",
+            "edit": {
+                "title": "编辑",
+                "rolename": "角色名称",
+                "sensitivefields": "敏感词权限",
+                "mobilephone": "客户手机号码",
+                "cardtypeid": "客户证件号码",
+                "email": "客户邮箱",
+                "menuids": "管理权限"
+            },
+            "delete": {
+                "tips1": "是否删除该角色?"
+            }
+        },
+        "user": {
+            "logincode": "登录账号",
+            "username": "用户名称",
+            "areaName": "所属机构",
+            "roleName": "角色",
+            "managerstatus": "账户状态",
+            "modifytime": "创建时间",
+            "status": "状态",
+            "loginCode": "账户",
+            "edit": {
+                "title": "编辑",
+                "logincode": "编辑",
+                "password": "默认密码",
+                "username": "用户名称",
+                "roleId": "角色",
+                "remark": "备注"
+            },
+            "status1": {
+                "tips1": "是否确认重置密码?",
+                "tips2": "是否确认停用账户?",
+                "tips3": "是否确认启用账户?",
+                "tips4": "是否确认解锁账户?",
+                "tips5": "发生错误,请联系管理员。"
+            }
+        }
+    },
+    "auth": {
+        "login": {
+            "title": "账号登录",
+            "accountCode": "用户名/账号/手机号",
+            "password": "请输入您的登录密码",
+            "verifyCode": "请输入验证码",
+            "loading": "正在登录"
+        }
+    },
+    "bank": {
+        "cus_config": {},
+        "sys_config": {}
+    },
+    "base": {
+        "sys_params": {}
+    },
+    "investor": {
+        "custom": {},
+        "manage": {},
+        "user": {}
+    },
+    "market": {
+        "exception": {},
+        "market": {},
+        "monitor": {}
+    },
+    "member": {
+        "institution": {},
+        "subinstitution": {}
+    },
+    "notice": {
+        "manage": {}
+    },
+    "performance": {},
+    "profitshare": {},
+    "query": {
+        "order": {
+            "accountsumm": {
+                "marketid": "市场",
+                "summode": "汇总方式",
+                "summode1": "按账户汇总",
+                "summode2": "按账户+日期汇总",
+                "date": "日期",
+                "goodsid": "商品",
+                "accountid": "交易商",
+                "excludeaccountidsstr": "排除资金账户",
+                "tradeDate": "交易日",
+                "userfullname": "账户",
+                "goodsfullname": "商品代码名称",
+                "membername": "所属会员",
+                "parentname": "所属机构",
+                "tradeqtysum": "总成交量",
+                "tradeamountsum": "总成交额",
+                "closeplsum": "总转让损益",
+                "chargesum": "总手续费",
+                "tips1": "请输入商品ID",
+                "tips2": "输入交易商ID",
+                "tips3": "请输入完整资金账户,多个逗号分隔"
+            },
+            "deliveryorder": {},
+            "deliverytrade": {},
+            "goodssumm": {
+                "marketid": "市场",
+                "date": "日期",
+                "summode": "汇总方式",
+                "summode1": "按账户汇总",
+                "summode2": "按账户+日期汇总",
+                "goodsid": "商品",
+                "excludeaccountidsstr": "排除资金账户",
+                "tradeDate": "交易日",
+                "goodsfullname": "商品代码名称",
+                "tradeqtysum": "总成交量",
+                "tradeamountsum": "总成交额",
+                "closeplsum": "总转让损益",
+                "chargesum": "总手续费",
+                "tips1": "请输入完整资金账户,多个逗号分隔"
+            },
+            "institutionsumm": {
+                "marketid": "市场",
+                "date": "日期",
+                "goodsid": "商品",
+                "parentuserid": "所属机构",
+                "userid": "账户ID",
+                "accountname": "账户名称",
+                "goodscode": "商品代码",
+                "goodsname": "商品名称",
+                "tradeqtysum": "总成交量",
+                "tradeamountsum": "总成交额",
+                "closeplsum": "总转让损益",
+                "chargesum": "总手续费"
+            },
+            "liquidation": {},
+            "offlinedelivery": {},
+            "order": {
+                "marketid": "市场",
+                "isHis": "查询类型",
+                "date": "日期",
+                "buildType": "单据类型",
+                "orderStatus": "状态",
+                "orderId": "委托单号",
+                "goodsId": "商品",
+                "accountName": "账户",
+                "excludeAccountIdsStr": "排除资金账户",
+                "accountNameId": "账户",
+                "goodsCodeName": "商品代码/名称",
+                "buyOrSell": "方向",
+                "orderPrice": "委托价格",
+                "orderQty": "委托数量",
+                "tradeQty": "成交数量",
+                "orderTime": "委托时间",
+                "tradeDate": "交易日",
+                "tips1": "请输入完整资金账户,多个逗号分隔",
+                "tips2": "请输入商品ID",
+                "tips3": "输入账户ID",
+                "details": {
+                    "title": "详情",
+                    "subtitle1": "委托单信息",
+                    "subtitle2": "费用相关配置及收取值",
+                    "tradelist1": "成交单列表(历史)",
+                    "tradelist2": "成交单列表(当日)",
+                    "orderid": "委托单号:",
+                    "accountname": "委托账户:",
+                    "parentusername": "所属机构",
+                    "memberaccountname": "所属会员",
+                    "marketname": "市场",
+                    "goodsname": "商品:", 
+                    "listingselecttype": "挂牌点选类型:",
+                    "delistingtype": "摘牌类型:",
+                    "buildtype": "委托类型:",
+                    "buyorsell": "方向:",
+                    "orderprice": "委托价格:",
+                    "optiontype": "期权类型:",
+                    "orderprice1": "行权价:",
+                    "premium": "订货金:",
+                    "orderqty": "委托数量",
+                    "openqty": "开仓数量",
+                    "closeqty": "平仓数量",
+                    "cancelqty": "撤单数量",
+                    "pricemode": "取价方式:",
+                    "validtype": "有效期类型:",
+                    "validtime": "有效期限:'",
+                    "operatetype": "操作类型:",
+                    "orderstatus": "委托状态:",
+                    "ordertime": "委托时间:",
+                    "clientticket": "客户端流水号",
+                    "cancelorderid": "撤单单号:",
+                    "preorderid": "关联预埋单号:",
+                    "relatedid": "关联单号:",
+                    "retcode": "错误码:",
+                    "refgoodsid": "参考商品:",
+                    "swapdays": "掉期天数:",
+                    "marginvalue": "即市保证金设置值:",
+                    "openexchagechargevalue": "开仓交易所手续费设置值:",
+                    "openmemberchargevalue": "开仓会员手续费设置值:",
+                    "closeexchagechargevalue": "平仓交易所手续费设置值:",
+                    "closememberchargevalue": "平仓会员手续费设置值:",
+                    "freezemargin": "冻结保证金",
+                    "freezecharge": "冻结服务费",
+                    "openfreezecharge": "开仓冻结服务费",
+                    "closefreezecharge": "平仓解冻服务费",
+                    "unfreezemargin": "解冻保证金",
+                    "unfreezecharge": "解冻服务费",
+                    "openunfreezecharge": "开仓解冻服务费",
+                    "closeunfreezecharge": "平仓解冻服务费",
+                    "tradeid": "成交单号",
+                    "matchaccountid": "对手账户",
+                    "tradeqty": "成交数量",
+                    "tradeprice": "成交价格",
+                    "tradeamount": "成交金额",
+                    "tradeprice1": "行权价",
+                    "chargevalue": "服务费",
+                    "tradetime": "成交时间"
+                },
+                "export": {
+                    "tips": "确定导出表格数据?"
+                }
+            },
+            "position": {
+                "marketid": "市场",
+                "buyOrSell": "方向",
+                "isHis": "单据类型",
+                "date": "日期",
+                "tradeId": "成交单号",
+                "goodsId": "商品",
+                "loginId": "登录账号",
+                "accountId": "账户",
+                "parentAreaId": "所属机构",
+                "validHolderQty": "有效持仓",
+                "tradeid": "成交单号",
+                "tradedate": "交易日",
+                "accountNameId": "账户",
+                "goodsCodeName": "商品代码/名称",
+                "buyorsell": "方向",
+                "openqty": "订立数量",
+                "openprice": "订立价格",
+                "tradeamount": "订立金额",
+                "holderqty": "持仓数量",
+                "holderprice": "持仓价格",
+                "holderamount": "持仓金额",
+                "actuallYplS": "浮动损益",
+                "holderdays": "T+N",
+                "tradetime": "交易时间",
+                "usertype": "账户类型",
+                "memberusername": "所属会员",
+                "parentusername": "所属上级",
+                "marketname": "市场",
+                "tips1": "请输入商品ID",
+                "tips2": "输入账户或名称",
+                "tips3": "请输入机构ID",
+                "details": {
+                    "tradeid": "成交单号:",
+                    "tradedate": "交易日:",
+                    "accountid": "账户:",
+                    "parentusername": "所属机构:",
+                    "memberusername": "所属会员:",
+                    "marketname": "市场:",
+                    "goodsname": "商品:",
+                    "optiontype": "期权类型:",
+                    "buyorsell": "方向:",
+                    "holderdays": "T+N:",
+                    "tradetime": "交易时间:",
+                    "openprice": "建仓价格:",
+                    "holderprice": "持仓价格:",
+                    "openprice1": "行权价:",
+                    "premium": "定货金:",
+                    "openqty": "建仓数量:",
+                    "holderqty": "持仓数量:",
+                    "expiretype": "行权日类型:",
+                    "expirecycle": "行权周期:",
+                    "expiredate": "行权日:",
+                    "refgoodsid": "参考商品:",
+                    "swapdays": "掉期天数:",
+                    "title":"详情"
+                },
+                "export": {
+                    "tips": "确定导出表格数据?"
+                }
+            },
+            "positionsumm": {
+                "marketid": "市场",
+                "goodsid": "商品",
+                "accname": "用户",
+                "areauserid": "机构",
+                "loginid": "登录账号",
+                "goodsCodeName": "商品代码/名称",
+                "accountidname": "账户",
+                "loginids": "登录账号",
+                "buycurpositionqty": "买持仓总数量",
+                "buycurholderamount": "买持仓总金额",
+                "buycuravgprice": "买持仓均价",
+                "buyFloatPL": "持仓损益(买)",
+                "sellcurpositionqty": "卖持仓总数量",
+                "sellcurholderamount": "卖持仓总金额",
+                "sellcuravgprice": "卖持仓均价",
+                "sellFloatPL": "持仓损益(卖)",
+                "qty": "净持仓量",
+                "buyorsell": "净持仓方向",
+                "floatPL": "持仓损益(总)",
+                "tips1": "请输入商品ID",
+                "tips2": "账户或名称模糊匹配",
+                "tips3": "请输入机构ID",
+                "export": {
+                    "tips": "确定导出表格数据?"
+                }
+            },
+            "trade": {
+                "marketid": "市场",
+                "isHis": "查询类型",
+                "date": "日期",
+                "buyOrSell": "方向",
+                "buildType": "类型",
+                "tradeTypes": "成交类别",
+                "tradeTypes1": "交易成交",
+                "tradeTypes2": "交收成交",
+                "tradeTypes3": "风控斩仓",
+                "tradeTypes4": "协议成交",
+                "tradeTypes5": "持仓过户",
+                "tradeTypes6": "系统强平",
+                "tradeTypes7": "其他成交",
+                "feeSearchType": "手续费",
+                "feeSearchType1": "等于0",
+                "feeSearchType2": "不等于0",
+                "tradeId": "成交单号",
+                "goodsId": "商品",
+                "accountId": "账户",
+                "areaUserName": "所属机构",
+                "tradeid": "成交单号",
+                "loginid": "登录账号",
+                "accountid": "资金账户",
+                "currentname": "账户",
+                "membername": "所属会员",
+                "goodsCodeName": "商品代码/名称",
+                "buyorsell": "方向",
+                "buildtype": "类型",
+                "tradetype": "成交类别",
+                "tradeprice": "成交价格",
+                "tradeqty": "成交数量",
+                "tradeamount": "成交金额",
+                "chargevalue": "手续费",
+                "closepl": "转让损益",
+                "tradetime": "成交时间",
+                "tips1": "请输入商品ID",
+                "tips2": "请输入账户ID",
+                "tips3": "请输入代码或名称",
+                "details": {
+                    "title": "详情",
+                    "subtitle1": "成交单信息",
+                    "subtitle2": "费用相关配置及收取值",
+                    "subtitle3": "平仓单明细",
+                    "tradeid": "成交单号:",
+                    "tradedate": "成交日:",
+                    "accountid": "账户:",
+                    "orderid": "委托单号:",
+                    "parentusername": "所属机构:",
+                    "membername": "所属会员:",
+                    "marketname": "市场:",
+                    "goodsname": "商品:",
+                    "buildtype": "成交单类型:",
+                    "buyorsell": "方向:",
+                    "tradeprice": "成交价格:",
+                    "optiontype": "类型:",
+                    "isconfirmexercise": "是否确认行权:",
+                    "tradeprice1": "成交价:",
+                    "premium": "定货金:",
+                    "tradeqty": "成交数量:",
+                    "tradeamount": "成交金额:",
+                    "closepl": "平仓盈亏:",
+                    "actuallypl": "实际盈亏:",
+                    "tradetype": "成交类别:",
+                    "tradetime": "成交时间:",
+                    "matchaccountname": "对手账户:",
+                    "refgoodsid": "参考商品:",
+                    "swapdays": "掉期天数:",
+                    "opencharge": "建仓手续费:",
+                    "openexchagechargevalue": "开仓交易所手续费设置值:",
+                    "openmemberchargevalue": "开仓会员手续费设置值:",
+                    "closeqty": "平仓数量:",
+                    "openqty": "开仓数量:",
+                    "closecharge": "平仓手续费:",
+                    "openfeealgorithm": "建仓手续费收取方式:",
+                    "closefeealgorithm": "平仓手续费收取方式:",
+                    "closeexchagechargevalue": "平仓会员手续费设置值:",
+                    "closememberchargevalue": "平仓会员手续费设置值:",
+                    "opentradeid": "关联建仓成交单号",
+                    "buyorsell1": "方向",
+                    "openprice": "建仓价格",
+                    "holderprice": "持仓价格",
+                    "closeprice": "平仓价格",
+                    "closetime": "平仓时间"
+                },
+                "export": {
+                    "tips": "确定导出表格数据?"
+                }
+            },
+            "tradesumm": {}
+        },
+        "other": {
+            "bank_inout": {
+                "date": "交易日",
+                "accountcode": "资金账户",
+                "accountname": "用户/机构",
+                "usertype": "账户类型",
+                "parentaccountname": "所属机构",
+                "cusbankname": "托管银行",
+                "tradedate": "交易日",
+                "amount": "金额",
+                "charge": "出入金服务费",
+                "currency": "币种",
+                "executetype": "类型",
+                "applystatus": "状态",
+                "updatetime": "更新时间",
+                "loginid": "登录账号",
+                "accountname1": "交易商",
+                "tips1": "输入交易商ID",
+                "details": {
+                    "title": "详情",
+                    "subtitle1": "出入金请求信息",
+                    "flag1": "审核不通过",
+                    "flag2": "审核通过",
+                    "flag3": "复审不通过",
+                    "flag4": "复审通过",
+                    "accountcode": "资金账户:",
+                    "balance": "上一日总资产:",
+                    "usedmargin": "当前交易保证金:",
+                    "cusbankname": "托管银行:",
+                    "bankaccountno": "银行卡号:",
+                    "bankid": "开户行:",
+                    "branchbankname": "银行支行名称:",
+                    "bankaccountname": "银行卡开户户名:",
+                    "tradedate": "交易日:",
+                    "executetype": "申请类型:",
+                    "amount": "金额:",
+                    "charge": "出入金服务费:",
+                    "currency": "币种:",
+                    "extoperateid": "账户服务流水号:",
+                    "exchticket": "银行服务流水号:",
+                    "bankticket": "银行流水号:",
+                    "extoperateid1": "交易服务流水号:",
+                    "curdebt": "欠款:",
+                    "updatetime": "更新时间:",
+                    "applyremark": "备注:",
+                    "applystatus": "状态:",
+                    "remark2": "拒绝/失败原因:",
+                    "username": "审核人:",
+                    "audittime": "审核时间:",
+                    "checkerrorflag": "对账差错标志:",
+                    "sex": "性别:",
+                    "legal_name": "法人姓名:",
+                    "legal_cert_type": "法人证件类型:",
+                    "legal_cert_code": "法人证件号码:",
+                    "agent_name": "经办人姓名:",
+                    "agent_cert_type": "经办人证件类型:",
+                    "agent_cert_code": "经办人证件号码:",
+                    "member_code": "所属会员代码:",
+                    "legal_contact": "法人联系号码:",
+                    "agent_contact": "经办人联系号码:",
+                    "bank_branch_name": "银行卡支行名称:",
+                    "attachment": "附件:",
+                    "certificate_photo_url": "查看:"
+                }
+            },
+            "bank_statement": {
+                "logType": "查询类型",
+                "operatetype": "业务类型",
+                "date": "日期",
+                "accountName": "账户",
+                "accountId": "资金账户",
+                "memberName": "所属机构",
+                "amount": "金额",
+                "businessCodeName": "业务类型",
+                "operateType": "操作时间",
+                "marketName": "市场",
+                "relationOrderId": "关联单号",
+                "tips1": "输入资金账户ID",
+                "export": {
+                    "tips":"确定导出表格数据?"
+                }
+            },
+            "config": {},
+            "esign": {},
+            "institution_bank": {},
+            "investor_bank": {}
+        },
+        "warehouse_receipt": {
+            "wrsumm": {
+                "isHis": "查询类型",
+                "date": "日期",
+                "wrsids": "仓库标准",
+                "wareids": "仓库",
+                "wrstandardname": "现货商品",
+                "warehousename": "仓库",
+                "totalqty": "总数量",
+                "avaliableqty": "正常",
+                "freezeqty": "冻结",
+                "increaseqty": "今日增加",
+                "decreaseqty": "今日减少",
+                "enumdicname": "单位",
+                "details": {
+                    "wrstandardname": "现货商品:",
+                    "warehousename": "仓库:",
+                    "enumdicname": "单位:",
+                    "selectedUsers": "请选择持有人",
+                    "accountname": "持有人",
+                    "accountid": "资金帐号",
+                    "ladingbillid": "仓单号",
+                    "qty": "数量",
+                    "freezerqty": "冻结",
+                    "wrfactortypename": "现货商品项值"
                 }
             }
+        },
+        "warehouse_receipt_order": {
+            "order": {},
+            "trade": {}
         }
     },
-    
+    "report": {
+        "account": {
+            "cycletype": "报表类型",
+            "cycletime": "日期",
+            "quarter": "季度",
+            "accountid": "资金账户",
+            "relatedname": "账户:",
+            "accountid1": "资金账户:",
+            "invloginids": "登录账号:",
+            "tips1": "请输入资金账户",
+            "bank": {
+                "balance": "期初余额",
+                "currentbalance": "期末余额",
+                "inamount": "期间入金",
+                "outamount": "期间出金",
+                "otherincome": "其他收入",
+                "otherpay": "其它支出",
+                "closepl": "平仓盈亏",
+                "reckonpl": "结算盈亏",
+                "usedmargin": "占用保证金",
+                "freezemargin": "冻结保证金",
+                "otherfreezemargin": "其它冻结",
+                "paycharge": "总服务费支出",
+                "tradecharge": "交易手续费",
+                "deliverycharge": "交收手续费"
+            },
+            "performance": {
+                "amount": "履约总金额",
+                "buypaidamount": "已冻/已扣金额",
+                "sellreceivedamount": "已收金额",
+                "buytodayamount": "扣/冻金额",
+                "selltodayamount": "收取金额"
+            },
+            "position": {
+                "goodscode": "代码",
+                "goodsname": "商品",
+                "buypositionqty": "买期初持仓数量",
+                "buyholderamount": "买持仓期初总金额",
+                "buycurpositionqty": "买当前持仓总数量",
+                "buycurholderamount": "买当前持仓总金额",
+                "sellpositionqty": "卖持仓期初数",
+                "sellholderamount": "卖持仓期初总金额",
+                "sellcurpositionqty": "卖当前持仓数量",
+                "sellcurholderamount": "卖当前持仓总金额"
+            },
+            "trade": {
+                "goodscode": "代码",
+                "goodsname": "商品",
+                "marketname": "市场",
+                "tradeqty": "成交量",
+                "openqty": "建仓数量",
+                "closeqty": "平仓数量",
+                "tradeamount": "成交金额",
+                "closepl": "平仓盈亏",
+                "opencharge": "建仓手续费",
+                "closecharge": "平仓手续费"
+            },
+            "wrorder": {
+                "deliverygoodsname": "现货品种",
+                "wrstandardname": "现货商品",
+                "startqty": "期初数量",
+                "totalqty": "期末数量",
+                "usedqty": "可用数量",
+                "freezeqty": "冻结数量",
+                "increaseqty": "采购数量",
+                "decreaseqty": "销售数量"
+            }
+        },
+        "bank": {},
+        "broker": {
+            "cycletype": "报表类型",
+            "reckondate": "日期",
+            "quarter": "季度",
+            "accountid": "所属机构",
+            "isson": "是否包含子机构",
+            "cycleTime": "日期",
+            "accountName": "经纪会员",
+            "investorTotalNum": "交易商开户数量",
+            "investorTrialNum": "交易商开户待初审数量",
+            "investorRetrialNum": "交易商开户待复审数量",
+            "investorAmount": "期末余额",
+            "investorusedmargin": "占用保证金",
+            "investorClosePl": "转让损益",
+            "investorReckonPl": "结算损益",
+            "investorBuyDeliveryAmount": "交收金额",
+            "investorBuyTradeQty": "买交易数量",
+            "investorSellTradeQty": "卖交易数量",
+            "investorBuyHoldQty": "买持仓数量",
+            "investorSellHoldQty": "卖持仓数量"
+        },
+        "fee": {},
+        "goods": {},
+        "institution": {},
+        "investor": {
+            "cycletype": "报表类型",
+            "reckondate": "日期",
+            "quarter": "季度",
+            "accountid": "交易商",
+            "memberid": "所属会员",
+            "subareaid": "所属子机构",
+            "brokerid": "所属经纪人",
+            "inamount": "入金金额",
+            "outamount": "出金金额",
+            "loginids": "登录账号",
+            "accountid1": "资金账户",
+            "accountname": "账户名称",
+            "memberaccountname": "所属会员",
+            "balance": "期初余额",
+            "currentbalance": "期末余额",
+            "closepl": "转让损益",
+            "floatpl": "浮动损益",
+            "reckonpl": "结算损益",
+            "paycharge": "手续费",
+            "interestCharge": "递延费",
+            "usedmargin": "占用资金",
+            "freezemargin": "冻结资金",
+            "otherfreezemargin": "其他冻结资金",
+            "outamountfreeze": "出金冻结",
+            "avaiablemoney": "可用资金",
+            "avaiableoutmoney": "可出资金",
+            "riskrate": "风险率",
+            "tips1": "查询大于等于此数值的数据",
+            "tips2": "请输入交易商ID",
+            "tips3": "请输入会员ID",
+            "tips4": "请输入子机构ID",
+            "tips5": "请输入经纪人ID"
+        },
+        "profitshare": {
+            "cycletype": "报表类型",
+            "tradedate": "日期",
+            "quarter": "季度",
+            "isson": "是否包含子机构",
+            "areatype": "角色",
+            "areaaccountid": "结算资金账户",
+            "goodsname": "商品/市场",
+            "searchtype": "费用类型",
+            "totalcount": "总笔数",
+            "totalfee": "总手续费",
+            "divideamount": "分润金额"
+        },
+        "recalculate": {},
+        "trade": {
+            "cycletype": "报表类型",
+            "cycletime": "日期",
+            "quarter": "季度",
+            "userid": "推荐账户",
+            "goodsname": "商品代码/名称",
+            "marketname": "市场",
+            "tradeqty": "成交量",
+            "openqty": "订立数量",
+            "closeqty": "转让数量",
+            "tradeamount": "成交金额",
+            "opencharge": "订立手续费",
+            "closecharge": "转让手续费",
+            "tips1": "请输入账户ID"
+        }
+    },
+    "settlement": {
+        "holdtransfer": {},
+        "profitsharepay": {
+            "date": "日期",
+            "tradedate": "交易日",
+            "totalcount": "总笔数",
+            "divideamount": "总分润金额",
+            "totalpay": "总已付",
+            "details": {
+                "tradedate": "交易日:",
+                "shareorgname": "分润机构",
+                "areatype": "分润机构角色",
+                "totalcount": "总笔数",
+                "totalfee": "总手续费",
+                "divideamount": "总分润金额",
+                "status": "状态",
+                "paystatus": "支付状态",
+                "tips1": "请勾选要确认的分润付款",
+                "tips2": "批量确认?",
+                "details": {
+                    "title": "详情",
+                    "tradedate": "交易日:",
+                    "areaid": "分润机构:",
+                    "areatype": "分润机构角色:",
+                    "totalcount": "总笔数:",
+                    "totalfee": "总手续费:",
+                    "divideamount": "总分润金额:",
+                    "paystatus": "状态:",
+                    "payerid": "付款人:",
+                    "paytime": "付款时间:",
+                    "remark": "描述:"
+                }
+            }
+        }
+    },
+    "system": {
+        "client_log": {},
+        "exrate": {},
+        "ip_blacklist": {},
+        "login_failed": {
+            "loginaccount": "登录账号",
+            "operatetime": "登录时间",
+            "lienttype": "客户端类型",
+            "loginip": "登录ip",
+            "description": "失败原因",
+            "tips1": "登录人:",
+            "tips2": "请输入账号或用户名"
+        },
+        "menu": {
+            "title": "菜单",
+            "resourceCode": "代码",
+            "url": "路径",
+            "icon": "图标",
+            "edit": {
+                "title": "编辑",
+                "authType": "权限类型",
+                "resourceCode": "权限代码",
+                "resourceTitle": "权限标题",
+                "resourceLevel": "所属层级",
+                "invalidTitle": "[无效的标题]",
+                "parentitle": "一级菜单",
+                "icon": "图标",
+                "url": "链接地址",
+                "component": "组件地址",
+                "remark": "备注",
+                "sort": "排序",
+                "show": "是否显示",
+                "buttontype": "按钮样式",
+                "default": "默认",
+                "primary": "主要",
+                "success": "成功",
+                "info": "信息",
+                "warning": "警告",
+                "danger": "危险",
+                "exist": " 已存在",
+                "code": "代码 "
+            },
+            "delete": {
+                "tips": "是否删除该菜单?"
+            }
+        },
+        "operation_log": {
+            "resourcecode": "操作模块代码",
+            "resourcename": "操作模块名称",
+            "logincode": "登录账户",
+            "username": "操作人",
+            "areaname": "所属机构",
+            "content": "操作内容",
+            "operatetime": "操作时间",
+            "tips1": "请输入用户名模糊查询",
+            "tips2": "请输入操作内容模糊查询",
+            "tips3": "操作内容:",
+            "tips4": "操作人:"
+        },
+        "service_log": {},
+        "setting": {},
+        "user_blacklist": {}
+    },
     "routes": {}
 }

+ 10 - 10
src/packages/pc/views/account/tradeacct/components/sign/edit/index.vue

@@ -4,36 +4,36 @@
         <el-form ref="formRef" class="el-form--horizontal" label-width="140px" :model="formData" :rules="formRules"
             :show-message="false">
             <fieldset class="g-fieldset el-form--horizontal">
-                <legend class="g-fieldset__legend">基本信息</legend>
-                <el-form-item label="账户类型" v-if="userInfo">
+                <legend class="g-fieldset__legend">{{ t('common.baseinfo') }}</legend>
+                <el-form-item :label="t('account.tradeacct.sign.edit.userinfotype')" v-if="userInfo">
                     {{ getUserInfoTypeName(userInfo.userinfotype) }}
                 </el-form-item>
-                <el-form-item label="证件类型" v-if="userInfo">
+                <el-form-item :label="t('account.tradeacct.sign.edit.cardtypeid')" v-if="userInfo">
                     {{ userInfo.cardtypeid }}
                 </el-form-item>
-                <el-form-item label="托管银行" prop="cusbankid">
+                <el-form-item :label="t('account.tradeacct.sign.edit.cusbankid')" prop="cusbankid">
                     <app-select-cusbank v-model="formData.cusbankid" @change="onCusBankChange" />
                 </el-form-item>
-                <el-form-item label="证件号码" v-if="userInfo">
+                <el-form-item :label="t('account.tradeacct.sign.edit.certid')" v-if="userInfo">
                     {{ handleNoneValue(formData.certid) }}
                 </el-form-item>
-                <el-form-item label="开户银行" prop="exbankname">
+                <el-form-item :label="t('account.tradeacct.sign.edit.exbankname')" prop="exbankname">
                     <app-select-bank v-model:selected="selectedBank" :cusbankid="formData.cusbankid"
                         @change="onBankChange" />
                 </el-form-item>
-                <el-form-item :label="userInfo.userinfotype === UserInfoType.Personal ? '银行帐号' : '对公账号'"
+                <el-form-item :label="userInfo.userinfotype === UserInfoType.Personal ? t('account.tradeacct.sign.edit.bankaccountno') : t('account.tradeacct.sign.edit.bankaccountno1')"
                     prop="bankaccountno" v-if="userInfo">
                     <el-input v-model="formData.bankaccountno" maxlength="50" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item label="银行卡户主名" prop="bankaccountname">
+                <el-form-item :label="t('account.tradeacct.sign.edit.bankaccountname')" prop="bankaccountname">
                     <el-input v-model="formData.bankaccountname" maxlength="50" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item label="手机号" prop="mobilephone">
+                <el-form-item :label="t('account.tradeacct.sign.edit.mobilephone')" prop="mobilephone">
                     <el-input type="number" v-model="formData.mobilephone" maxlength="50" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
             </fieldset>
             <fieldset class="g-fieldset el-form--horizontal" v-if="expandableList.length">
-                <legend class="g-fieldset__legend">扩展信息</legend>
+                <legend class="g-fieldset__legend">{{ t('common.extendinfo') }}</legend>
                 <template v-for="(item, index) in expandableList" :key="index">
                     <el-form-item :label="item.fieldname" :prop="item.fieldcode">
                         <el-input v-model="formData.extend[item.fieldcode]" maxlength="50" :placeholder="t('common.pleaseenter')" />

+ 2 - 2
src/packages/pc/views/admin/role/components/delete/index.vue

@@ -1,7 +1,7 @@
 <!-- 管理员管理-管理员角色管理-删除 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">是否删除该角色?</div>
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
+        <div class="g-text-message">{{ t('admin.role.delete.tips1') }}</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operate.confirm') }}</el-button>

+ 7 - 7
src/packages/pc/views/admin/role/components/edit/index.vue

@@ -1,19 +1,19 @@
 <!-- 管理员管理-管理员角色管理-编辑 -->
 <template>
-    <app-drawer title="编辑" width="680" v-model:show="show" :refresh="refresh" :loading="loading">
+    <app-drawer :title="t('admin.role.edit.title')" width="680" v-model:show="show" :refresh="refresh" :loading="loading">
         <el-form ref="formRef" class="el-form--vertical" label-width="90px" :model="formData" :rules="formRules"
             :show-message="false">
-            <el-form-item label="角色名称" prop="rolename">
+            <el-form-item :label="t('admin.role.edit.rolename')" prop="rolename">
                 <el-input v-model="formData.rolename" :placeholder="t('common.pleaseenter')" :disabled="!!record?.autoid" />
             </el-form-item>
-            <el-form-item label="敏感词权限" prop="sensitivefields">
+            <el-form-item :label="t('admin.role.edit.sensitivefields')" prop="sensitivefields">
                 <el-checkbox-group v-model="checkedValue">
-                    <el-checkbox label="客户手机号码" value="1" />
-                    <el-checkbox label="客户证件号码" value="2" />
-                    <el-checkbox label="客户邮箱" value="3" />
+                    <el-checkbox :label="t('admin.role.edit.mobilephone')" value="1" />
+                    <el-checkbox :label="t('admin.role.edit.cardtypeid')" value="2" />
+                    <el-checkbox :label="t('admin.role.edit.email')" value="3" />
                 </el-checkbox-group>
             </el-form-item>
-            <el-form-item label="管理权限" prop="menuids">
+            <el-form-item :label="t('admin.role.edit.menuids')" prop="menuids">
                 <el-scrollbar max-height="300px" style="width: 100%;">
                     <el-tree ref="treeRef" :data="routerStore.userRoutes" :props="{ label: 'title' }"
                         node-key="resourceCode" show-checkbox check-strictly @check="handleCheck" />

+ 5 - 5
src/packages/pc/views/admin/role/index.vue

@@ -56,11 +56,11 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryR
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'autoid', label: 'ID' },
-    { field: 'rolename', label: '角色名称' },
-    { field: 'modifiername', label: '创建人' },
-    { field: 'modifytime', label: '创建时间' },
-    { field: 'rolestatus', label: '状态', formatValue: (val) => userstatusEnum.getEnumTypeName(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'rolename', label: 'admin.role.rolename' },
+    { field: 'modifiername', label: 'admin.role.modifiername' },
+    { field: 'modifytime', label: 'admin.role.modifytime' },
+    { field: 'rolestatus', label: 'admin.role.rolestatus', formatValue: (val) => userstatusEnum.getEnumTypeName(val) },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 const onRefresh = () => {

+ 7 - 7
src/packages/pc/views/admin/user/components/edit/index.vue

@@ -1,26 +1,26 @@
 <!-- 管理员管理-管理员管理-编辑 -->
 <template>
-    <app-drawer title="编辑" width="480" v-model:show="show" :refresh="refresh" :loading="loading">
+    <app-drawer :title="t('admin.user.edit.title')" width="480" v-model:show="show" :refresh="refresh" :loading="loading">
         <el-form ref="formRef" class="el-form--vertical" label-width="80px" :model="formData" :rules="formRules"
             :show-message="false">
-            <el-form-item label="登录账号" prop="logincode">
+            <el-form-item :label="t('admin.user.edit.logincode')" prop="logincode">
                 <el-input v-model="formData.logincode" maxlength="50" :placeholder="t('common.pleaseenter')"
                     :disabled="!!record?.autoid" />
             </el-form-item>
-            <el-form-item label="默认密码" prop="password" v-if="!record?.autoid">
+            <el-form-item :label="t('admin.user.edit.password')" prop="password" v-if="!record?.autoid">
                 <el-input v-model="formData.password" :placeholder="t('common.pleaseenter')" disabled />
             </el-form-item>
-            <el-form-item label="用户名称" prop="username">
+            <el-form-item :label="t('admin.user.edit.username')" prop="username">
                 <el-input v-model="formData.username" maxlength="50" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <el-form-item label="角色" prop="roleId">
-                <el-select v-model="formData.roleId" placeholder="请选择">
+            <el-form-item :label="t('admin.user.edit.roleId')" prop="roleId">
+                <el-select v-model="formData.roleId" :placeholder="t('common.pleasechoice')">
                     <template v-for="item in dataList" :key="item.autoid">
                         <el-option :label="item.rolename" :value="item.autoid" />
                     </template>
                 </el-select>
             </el-form-item>
-            <el-form-item label="备注" prop="remark">
+            <el-form-item :label="t('admin.user.edit.remark')" prop="remark">
                 <el-input type="textarea" v-model="formData.remark" maxlength="200" :rows="2" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
         </el-form>

+ 6 - 6
src/packages/pc/views/admin/user/components/status/index.vue

@@ -1,6 +1,6 @@
 <!-- 管理员管理-管理员管理-变更状态 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">{{ status.message }}</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>
@@ -33,27 +33,27 @@ const status = computed(() => {
     switch (props.code) {
         case 'admin_user_reset':
             return {
-                message: '是否确认重置密码?',
+                message: t('admin.user.status1.tips1'),
                 type: 0
             }
         case 'admin_user_disable':
             return {
-                message: '是否确认停用账户?',
+                message: t('admin.user.status1.tips2'),
                 type: 1
             }
         case 'admin_user_enable':
             return {
-                message: '是否确认启用账户?',
+                message: t('admin.user.status1.tips3'),
                 type: 2
             }
         case 'admin_user_unlock':
             return {
-                message: '是否确认解锁账户?',
+                message: t('admin.user.status1.tips4'),
                 type: 3
             }
         default:
             return {
-                message: '发生错误,请联系管理员。',
+                message: t('admin.user.status1.tips5'),
                 type: -1
             }
     }

+ 9 - 9
src/packages/pc/views/admin/user/index.vue

@@ -83,18 +83,18 @@ const { dataList: selectList } = useRequest(queryOrganSelect, {
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'autoid', label: 'ID' },
-    { field: 'logincode', label: '登录账号' },
-    { field: 'username', label: '用户名称' },
-    { field: 'areaName', label: '所属机构' },
-    { field: 'roleName', label: '角色' },
-    { field: 'managerstatus', label: '账户状态', formatValue: (val) => getAdminStatusName(val) },
-    { field: 'modifytime', label: '创建时间' },
-    { field: 'operate', label: '操作', fixed: 'right', width: 150 }
+    { field: 'logincode', label: 'admin.user.logincode' },
+    { field: 'username', label: 'admin.user.username' },
+    { field: 'areaName', label: 'admin.user.areaName' },
+    { field: 'roleName', label: 'admin.user.roleName' },
+    { field: 'managerstatus', label: 'admin.user.managerstatus', formatValue: (val) => getAdminStatusName(val) },
+    { field: 'modifytime', label: 'admin.user.modifytime' },
+    { field: 'operate', label: 'common.operate', fixed: 'right', width: 150 }
 ])
 
 filterOptons.selectList = [
     {
-        label: '状态',
+        label: t('admin.user.status'),
         key: 'managerStatus',
         options: () => getAdminStatusList()
     }
@@ -102,7 +102,7 @@ filterOptons.selectList = [
 
 filterOptons.inputList = [
     {
-        label: '账户', keys: ['loginCode']
+        label: t('admin.user.loginCode'), keys: ['loginCode']
     }
 ]
 

+ 5 - 1
src/packages/pc/views/error/404.vue

@@ -2,11 +2,15 @@
   <app-view class="system-menu">
     <div style="display: flex;align-items:center;gap: 5px;color: #dd2222;">
       <Icon icon="CircleCloseFilled" />
-      <span>页面不存在</span>
+      <span>{{ t('error.tips') }}</span>
     </div>
   </app-view>
 </template>
 
 <script lang="ts" setup>
+import { i18n } from '@/stores';
 import Icon from '@pc/components/base/icon/index.vue'
+
+const { global: { t } }= i18n
+
 </script>

+ 1 - 1
src/packages/pc/views/investor/custom/group/components/delete/index.vue

@@ -1,6 +1,6 @@
 <!-- 交易商管理-个性化管理-交易商分组管理-删除 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认删除该分组?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/investor/custom/group/components/user/delete/index.vue

@@ -1,6 +1,6 @@
 <!-- 交易商管理-个性化管理-交易商分组管理-分组交易商-删除 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认将{{ selectedItem.userid }}移除分组吗?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/investor/custom/group/components/user/index.vue

@@ -79,7 +79,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'userid', label: '交易商代码' },
     { field: 'accountname', label: '交易商名称' },
     { field: 'createtime', label: '创建时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.inputList = [

+ 1 - 1
src/packages/pc/views/investor/custom/group/index.vue

@@ -65,7 +65,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'groupname', label: '分组名称' },
     { field: 'customertype', label: '风险客户类别', formatValue: (val) => customerTypeEnum.getEnumTypeName(val) },
     { field: 'createtime', label: '创建时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.inputList = [

+ 1 - 1
src/packages/pc/views/investor/custom/riskcfg/components/delete/index.vue

@@ -1,6 +1,6 @@
 <!-- 交易商管理-个性化管理-风控个性化-删除 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认删除该配置?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/investor/custom/riskcfg/index.vue

@@ -66,7 +66,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'username', label: '交易商名称' },
     { field: 'accountid', label: '资金账户' },
     { field: 'customertype', label: '风险率类型(客户类别)', formatValue: (val) => customerTypeEnum.getEnumTypeName(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.inputList = [

+ 1 - 1
src/packages/pc/views/investor/custom/tradecfg/components/delete/index.vue

@@ -1,6 +1,6 @@
 <!-- 交易商管理-个性化管理-交易商个性化-删除 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">是否确认删除该商品个性化配置?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/investor/manage/modification/index.vue

@@ -63,7 +63,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'parentname', label: '所属机构' },
     { field: 'modifystatus', label: '变更状态', formatValue: (val) => modifystatusEnum.getEnumTypeName(val) },
     { field: 'audittime', label: '最后更新时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.inputList = [

+ 1 - 1
src/packages/pc/views/investor/manage/user/components/account/index.vue

@@ -86,7 +86,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'tradestatus', label: '交易状态', formatValue: (val) => tradestatusEnum.getEnumTypeName(val) },
     { field: 'currencyid', label: '币种', formatValue: (val) => currencyEnum.getEnumTypeName(val) },
     { field: 'cur_risk_rate', label: '风险率(%)' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOption.items = [

+ 1 - 1
src/packages/pc/views/investor/manage/user/components/cancel/index.vue

@@ -1,6 +1,6 @@
 <!-- 交交易商管理-交易商管理-交易商管理-撤回 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认撤回变更?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/investor/manage/user/components/delete/index.vue

@@ -1,6 +1,6 @@
 <!-- 交交易商管理-交易商管理-交易商管理-注销 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认注销该交易商?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 8 - 8
src/packages/pc/views/investor/manage/user/components/edit/index.vue

@@ -4,7 +4,7 @@
         <el-form ref="formRef" class="el-form--horizontal" label-width="140px" :model="formData.userinfoDetailVo"
             :rules="formRules" :show-message="false">
             <fieldset class="g-fieldset el-form--horizontal">
-                <legend class="g-fieldset__legend">基本信息</legend>
+                <legend class="g-fieldset__legend">{{ t('common.baseinfo') }}</legend>
                 <el-form-item label="交易商代码" prop="userId">
                     {{ formData.userAccountDetailVo.userId }}
                 </el-form-item>
@@ -91,32 +91,32 @@
                 <template v-if="isPerson">
                     <el-form-item label="证件照正面" prop="cardFrontPhotoUrl">
                         <app-upload v-model="uploadFiles.cardFrontPhotoUrl" :file-types="['image']"
-                            type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                     </el-form-item>
                     <el-form-item label="证件照反面" prop="cardBackPhotoUrl">
                         <app-upload v-model="uploadFiles.cardBackPhotoUrl" :file-types="['image']"
-                            type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                     </el-form-item>
                 </template>
                 <template v-else>
                     <el-form-item label="营业执照" prop="cardFrontPhotoUrl">
                         <app-upload v-model="uploadFiles.cardFrontPhotoUrl" :file-types="['image']"
-                            type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                     </el-form-item>
                     <el-form-item label="手持证件照" prop="halfBodyPhotoUrl">
                         <app-upload v-model="uploadFiles.halfBodyPhotoUrl" :file-types="['image']"
-                            type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                     </el-form-item>
                     <el-form-item label="法人身份证正面" prop="legalCardFrontPhotoUrl">
                         <app-upload v-model="uploadFiles.legalCardFrontPhotoUrl" :file-types="['image']"
-                            type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                     </el-form-item>
                     <el-form-item label="法人身份证反面" prop="legalCardFrontPhotoUrl">
                         <app-upload v-model="uploadFiles.legalCardFrontPhotoUrl" :file-types="['image']"
-                            type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                     </el-form-item>
                     <el-form-item label="法人授权书" prop="otherUrl">
-                        <app-upload v-model="uploadFiles.otherUrl" :file-types="['image']" type-message="请选择正确的图片类型" />
+                        <app-upload v-model="uploadFiles.otherUrl" :file-types="['image']" :type-message="t('common.tips21')" />
                     </el-form-item>
                 </template>
                 <el-form-item class="el-form-item--row" label="备注" prop="remark">

+ 1 - 1
src/packages/pc/views/investor/manage/user/components/export/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading">
         <div class="g-text-message">确定导出表格数据?</div>
         <template #footer>
             <el-button @click="onCancel">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/investor/manage/user/components/login/delete/index.vue

@@ -1,6 +1,6 @@
 <!-- 交易商管理-交易商管理-交易商管理-登录账户-注销停用 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认将账户停用?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/investor/manage/user/components/login/index.vue

@@ -99,7 +99,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'loginstatus', label: '账号状态', formatValue: (val) => loginstatusEnum.getEnumTypeName(val) },
     { field: 'modifytime', label: '修改时间', formatValue: (val) => formatDate(val) },
     { field: 'modifiername', label: '修改人' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOption.items = [

+ 1 - 1
src/packages/pc/views/investor/manage/user/components/login/lock/index.vue

@@ -1,6 +1,6 @@
 <!-- 交易商管理-交易商管理-交易商管理-登录账户-锁定 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message" v-if="selectedItem.loginstatus === 1">确认锁定该账户?</div>
         <div class="g-text-message" v-else>确认解锁该账户?</div>
         <template #footer>

+ 1 - 1
src/packages/pc/views/investor/manage/user/components/login/password/index.vue

@@ -1,6 +1,6 @@
 <!-- 交易商管理-交易商管理-交易商管理-登录账户-重置密码 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认将密码重置?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/investor/manage/user/components/login/recover/index.vue

@@ -1,6 +1,6 @@
 <!-- 交易商管理-交易商管理-交易商管理-登录账户-恢复 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认恢复账户?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/investor/manage/user/components/recover/index.vue

@@ -1,6 +1,6 @@
 <!-- 交易商管理-交易商管理-交易商管理-恢复 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认恢复该交易商?<br />相关登录账户的账号状态在登录账户中另行恢复。</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/investor/manage/user/index.vue

@@ -78,7 +78,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'modifyTime', label: '最后更新时间', formatValue: (val) => formatDate(val) },
     { field: 'auditTime', label: '审核时间', formatValue: (val) => formatDate(val) },
     { field: 'cancelTime', label: '销户时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right', width: 260 }
+    { field: 'operate', label: 'common.operate', fixed: 'right', width: 260 }
 ])
 
 filterOptons.inputList = [

+ 1 - 1
src/packages/pc/views/investor/user/initreview/index.vue

@@ -71,7 +71,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'openMode', label: '开户方式', formatValue: (val) => openmodeEnum.getEnumTypeName(val) },
     { field: 'userState', label: '开户状态', formatValue: (val) => userstateEnum.getEnumTypeName(val) },
     { field: 'createTime', label: '申请时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.inputList = [

+ 1 - 1
src/packages/pc/views/investor/user/open/components/cancel/index.vue

@@ -1,6 +1,6 @@
 <!-- 交易商管理-开户管理-交易商开户-撤回 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认撤回开户审核?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/investor/user/open/components/delete/index.vue

@@ -1,6 +1,6 @@
 <!-- 交易商管理-开户管理-交易商开户-删除 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认删除该开户信息?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 3 - 1
src/packages/pc/views/investor/user/open/components/details/index.vue

@@ -53,6 +53,7 @@ import { CellProp } from '@pc/components/base/table-details/types'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTableDetails from '@pc/components/base/table-details/index.vue'
 import service from '@/services'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
@@ -62,6 +63,7 @@ const props = defineProps({
     audit: Boolean
 })
 
+const { global: { t } } = i18n
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 
@@ -134,7 +136,7 @@ const detailProps = computed(() => {
 
 const onAudit = (auditflag: number) => {
     ElMessageBox({
-        title: '提示',
+        title: t('common.alert'),
         message: '确认提交审核吗?',
         showCancelButton: true,
         beforeClose: (action, instance, done) => {

+ 6 - 6
src/packages/pc/views/investor/user/open/components/edit/index.vue

@@ -52,28 +52,28 @@
             <template v-if="isPerson">
                 <el-form-item label="证件照正面" prop="cardfrontphotourl">
                     <app-upload v-model="uploadFiles.cardfrontphotourl" :file-types="['image']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
                 <el-form-item label="证件照反面" prop="cardbackphotourl">
                     <app-upload v-model="uploadFiles.cardbackphotourl" :file-types="['image']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
             </template>
             <template v-else>
                 <el-form-item label="营业执照" prop="cardfrontphotourl">
                     <app-upload v-model="uploadFiles.cardfrontphotourl" :file-types="['image']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
                 <el-form-item label="法人身份证正面" prop="legalcardfrontphotourl">
                     <app-upload v-model="uploadFiles.legalcardfrontphotourl" :file-types="['image']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
                 <el-form-item label="法人身份证反面" prop="legalcardbackphotourl">
                     <app-upload v-model="uploadFiles.legalcardbackphotourl" :file-types="['image']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
                 <el-form-item label="法人授权书" prop="otherurl">
-                    <app-upload v-model="uploadFiles.otherurl" :file-types="['image']" type-message="请选择正确的图片类型" />
+                    <app-upload v-model="uploadFiles.otherurl" :file-types="['image']" :type-message="t('common.tips21')" />
                 </el-form-item>
             </template>
             <el-form-item class="el-form-item--row">

+ 1 - 1
src/packages/pc/views/investor/user/open/index.vue

@@ -69,7 +69,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'openMode', label: '开户方式', formatValue: (val) => openmodeEnum.getEnumTypeName(val) },
     { field: 'userState', label: '开户状态', formatValue: (val) => userstateEnum.getEnumTypeName(val) },
     { field: 'createTime', label: '申请时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.inputList = [

+ 1 - 1
src/packages/pc/views/investor/user/rereview/index.vue

@@ -68,7 +68,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'openMode', label: '开户方式', formatValue: (val) => openmodeEnum.getEnumTypeName(val) },
     { field: 'userState', label: '开户状态', formatValue: (val) => userstateEnum.getEnumTypeName(val) },
     { field: 'createTime', label: '申请时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.inputList = [

+ 2 - 2
src/packages/pc/views/marketrun/monitor/account/index.vue

@@ -84,7 +84,7 @@ const tableColumns = computed<Model.TableColumn[]>(() => {
             { field: 'credit', label: '授信资金' },
             { field: 'curriskrate', label: '当前风险率(%)' },
             { field: 'currisklv', label: '当前风险等级' },
-            { field: 'operate', label: '操作', fixed: 'right' }
+            { field: 'operate', label: 'common.operate', fixed: 'right' }
         ]
     }
     return [
@@ -103,7 +103,7 @@ const tableColumns = computed<Model.TableColumn[]>(() => {
         { field: 'currisklv', label: '当前风险等级' },
         { field: 'currisksaferate', label: '当前安全度(%)' },
         { field: 'currisksafelv', label: '当前安全等级' },
-        { field: 'operate', label: '操作', fixed: 'right' }
+        { field: 'operate', label: 'common.operate', fixed: 'right' }
     ]
 })
 

+ 1 - 1
src/packages/pc/views/marketrun/monitor/user/components/alloffline/index.vue

@@ -1,6 +1,6 @@
 <!-- 市场运行管理-监控管理-在线用户查询-强制所有用户下线 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">是否将用户全部强制下线?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/marketrun/monitor/user/components/offline/index.vue

@@ -1,6 +1,6 @@
 <!-- 市场运行管理-监控管理-在线用户查询-强制下线 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">是否将用户[{{ record.loginid }}]强制下线?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/marketrun/monitor/user/index.vue

@@ -66,7 +66,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'softversion', label: '软件版本' },
     { field: 'areaname', label: '所属机构' },
     { field: 'membername', label: '所属会员' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.inputList = [

+ 1 - 1
src/packages/pc/views/member/institution/open/components/cancel/index.vue

@@ -1,6 +1,6 @@
 <!-- 会员机构管理-机构管理-机构开户申请-撤回 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认撤回开户审核?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/member/institution/open/components/delete/index.vue

@@ -1,6 +1,6 @@
 <!-- 会员机构管理-机构管理-机构开户申请-删除 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认删除该机构资料开户信息?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 7 - 7
src/packages/pc/views/member/institution/open/components/edit/index.vue

@@ -3,7 +3,7 @@
     <app-drawer title="编辑" width="900" v-model:show="show" :refresh="refresh" :loading="loading">
         <el-form ref="formRef" label-width="140px" :model="formData" :rules="formRules" :show-message="false">
             <fieldset class="g-fieldset el-form--horizontal">
-                <legend class="g-fieldset__legend">基本信息</legend>
+                <legend class="g-fieldset__legend">{{ t('common.baseinfo') }}</legend>
                 <el-form-item label="机构名称" prop="username">
                     <el-input v-model="formData.username" maxlength="50" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
@@ -38,11 +38,11 @@
                 </el-form-item>
                 <el-form-item label="证件照正面" prop="cardfrontphotourl">
                     <app-upload v-model="uploadFiles.cardfrontphotourl" :file-types="['image']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
                 <el-form-item label="证件照反面" prop="cardbackphotourl" v-if="isPerson">
                     <app-upload v-model="uploadFiles.cardbackphotourl" :file-types="['image']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
                 <template v-if="!isPerson">
                     <el-form-item label="法人姓名" prop="legalpersonname">
@@ -50,11 +50,11 @@
                     </el-form-item>
                     <el-form-item label="法人身份证正面" prop="legalcardfrontphotourl">
                         <app-upload v-model="uploadFiles.legalcardfrontphotourl" :file-types="['image']"
-                            type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                     </el-form-item>
                     <el-form-item label="法人身份证反面" prop="legalcardbackphotourl">
                         <app-upload v-model="uploadFiles.legalcardbackphotourl" :file-types="['image']"
-                            type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                     </el-form-item>
                     <el-form-item label="联系人" prop="contactname">
                         <el-input v-model="formData.contactname" maxlength="50" :placeholder="t('common.pleaseenter')" />
@@ -94,11 +94,11 @@
                 <legend class="g-fieldset__legend">附件</legend>
                 <el-form-item label="附件1" prop="attachment1">
                     <app-upload v-model="uploadFiles.attachment1" :file-types="['image', 'pdf']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
                 <el-form-item label="附件2" prop="attachment2">
                     <app-upload v-model="uploadFiles.attachment2" :file-types="['image', 'pdf']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
             </fieldset>
         </el-form>

+ 1 - 1
src/packages/pc/views/member/institution/open/index.vue

@@ -79,7 +79,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'openmode', label: '开户方式' },
     { field: 'userstate', label: '开户状态' },
     { field: 'createtime', label: '申请时间' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.inputList = [

+ 1 - 1
src/packages/pc/views/member/institution/role/index.vue

@@ -53,7 +53,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'modifiername', label: '创建人' },
     { field: 'modifytime', label: '创建时间' },
     { field: 'rolestatus', label: '状态' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 const onRefresh = () => {

+ 1 - 1
src/packages/pc/views/member/subinstitution/manage/components/cancel/index.vue

@@ -1,6 +1,6 @@
 <!-- 会员机构管理-子机构管理-子机构管理-撤回 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认撤回变更?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/member/subinstitution/manage/components/delete/index.vue

@@ -1,6 +1,6 @@
 <!-- 会员机构管理-子机构管理-子机构管理-注销 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认注销该机构?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 7 - 7
src/packages/pc/views/member/subinstitution/manage/components/edit/index.vue

@@ -3,7 +3,7 @@
     <app-drawer title="编辑" width="900" v-model:show="show" :refresh="refresh" :loading="loading">
         <el-form ref="formRef" label-width="140px" :model="formData" :rules="formRules" :show-message="false">
             <fieldset class="g-fieldset el-form--horizontal">
-                <legend class="g-fieldset__legend">基本信息</legend>
+                <legend class="g-fieldset__legend">{{ t('common.baseinfo') }}</legend>
                 <el-form-item label="上级机构" prop="referral">
                     {{ selectedParent?.accountname }}
                 </el-form-item>
@@ -44,11 +44,11 @@
                 </el-form-item>
                 <el-form-item label="证件照正面" prop="cardfrontphotourl">
                     <app-upload v-model="uploadFiles.cardfrontphotourl" :file-types="['image']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
                 <el-form-item label="证件照反面" prop="cardbackphotourl" v-if="isPerson">
                     <app-upload v-model="uploadFiles.cardbackphotourl" :file-types="['image']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
                 <template v-if="!isPerson">
                     <el-form-item label="法人姓名" prop="legalpersonname">
@@ -56,11 +56,11 @@
                     </el-form-item>
                     <el-form-item label="法人身份证正面" prop="legalcardfrontphotourl">
                         <app-upload v-model="uploadFiles.legalcardfrontphotourl" :file-types="['image']"
-                            type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                     </el-form-item>
                     <el-form-item label="法人身份证反面" prop="legalcardbackphotourl">
                         <app-upload v-model="uploadFiles.legalcardbackphotourl" :file-types="['image']"
-                            type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                     </el-form-item>
                     <el-form-item label="联系人" prop="contactname">
                         <el-input v-model="formData.contactname" maxlength="50" :placeholder="t('common.pleaseenter')" />
@@ -112,11 +112,11 @@
                 <legend class="g-fieldset__legend">附件</legend>
                 <el-form-item label="附件1" prop="attachment1">
                     <app-upload v-model="uploadFiles.attachment1" :file-types="['image', 'pdf']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
                 <el-form-item label="附件2" prop="attachment2">
                     <app-upload v-model="uploadFiles.attachment2" :file-types="['image', 'pdf']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
             </fieldset>
         </el-form>

+ 1 - 1
src/packages/pc/views/member/subinstitution/manage/components/recover/index.vue

@@ -1,6 +1,6 @@
 <!-- 会员机构管理-子机构管理-子机构管理-恢复 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认恢复该机构机构?同时恢复默认管理员账户。</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/member/subinstitution/manage/index.vue

@@ -112,7 +112,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'userinfotype', label: '所有者类型', formatValue: (val) => getUserInfoTypeName(val) },
     { field: 'userName', label: '操作员' },
     { field: 'modifytime', label: '最后更新时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', width: 140, fixed: 'right' }
+    { field: 'operate', label: 'common.operate', width: 140, fixed: 'right' }
 ])
 
 // 处理操作按钮

+ 7 - 7
src/packages/pc/views/member/subinstitution/user/components/edit/index.vue

@@ -3,7 +3,7 @@
     <app-drawer title="编辑" width="900" v-model:show="show" :refresh="refresh" :loading="loading">
         <el-form ref="formRef" label-width="140px" :model="formData" :rules="formRules" :show-message="false">
             <fieldset class="g-fieldset el-form--horizontal">
-                <legend class="g-fieldset__legend">基本信息</legend>
+                <legend class="g-fieldset__legend">{{ t('common.baseinfo') }}</legend>
                 <el-form-item label="上级机构" prop="referral">
                     <app-select-member v-model="formData.referral" />
                 </el-form-item>
@@ -41,11 +41,11 @@
                 </el-form-item>
                 <el-form-item label="证件照正面" prop="cardfrontphotourl">
                     <app-upload v-model="uploadFiles.cardfrontphotourl" :file-types="['image']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
                 <el-form-item label="证件照反面" prop="cardbackphotourl" v-if="isPerson">
                     <app-upload v-model="uploadFiles.cardbackphotourl" :file-types="['image']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
                 <template v-if="!isPerson">
                     <el-form-item label="法人姓名" prop="legalpersonname">
@@ -53,11 +53,11 @@
                     </el-form-item>
                     <el-form-item label="法人身份证正面" prop="legalcardfrontphotourl">
                         <app-upload v-model="uploadFiles.legalcardfrontphotourl" :file-types="['image']"
-                            type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                     </el-form-item>
                     <el-form-item label="法人身份证反面" prop="legalcardbackphotourl">
                         <app-upload v-model="uploadFiles.legalcardbackphotourl" :file-types="['image']"
-                            type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                     </el-form-item>
                     <el-form-item label="联系人" prop="contactname">
                         <el-input v-model="formData.contactname" maxlength="50" :placeholder="t('common.pleaseenter')" />
@@ -109,11 +109,11 @@
                 <legend class="g-fieldset__legend">附件</legend>
                 <el-form-item label="附件1" prop="attachment1">
                     <app-upload v-model="uploadFiles.attachment1" :file-types="['image', 'pdf']"
-                        type-message="请选择正确的图片类型" />
+                        :type-message="t('common.tips21')" />
                 </el-form-item>
                 <el-form-item label="附件2" prop="attachment2">
                     <app-upload v-model="uploadFiles.attachment2" :file-types="['image', 'pdf']"
-                        type-message="请选择正确的图片类型" />
+                    :type-message="t('common.tips21')" />
                 </el-form-item>
             </fieldset>
         </el-form>

+ 1 - 1
src/packages/pc/views/member/subinstitution/user/index.vue

@@ -84,7 +84,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'operate', label: '所有者类型' },
     { field: 'operate', label: '操作员' },
     { field: 'operate', label: '最后更新时间' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.inputList = [

+ 1 - 1
src/packages/pc/views/profitshare/institution/config/components/delete/index.vue

@@ -1,6 +1,6 @@
 <!-- 分润管理-机构分润配置-子机构分润配置-删除 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认删除该配置?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 1 - 1
src/packages/pc/views/profitshare/institution/config/index.vue

@@ -106,7 +106,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'dividevalue', label: '分润值', formatValue: (val) => parsePercent(val) },
     { field: 'username', label: '创建人' },
     { field: 'createtime', label: '创建时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 const showComponent = (code: string, data: Data, row?: Model.InitProfitShareConfig) => {

+ 1 - 1
src/packages/pc/views/profitshare/institution/group/components/delete/index.vue

@@ -1,6 +1,6 @@
 <!-- 分润管理-机构分润配置-子机构分组管理-删除 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">确认删除分组?</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>

+ 2 - 2
src/packages/pc/views/profitshare/institution/group/components/member/index.vue

@@ -75,7 +75,7 @@ const { dataList, total, pageSize, pageIndex, run } = useRequest(profitShareMemb
 
 const tableColumns = ref<Model.TableColumn[]>([
     { field: 'accountname', label: '子机构' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 // 添加
@@ -102,7 +102,7 @@ const onSubmit = () => {
 // 删除
 const onDelete = (row: Model.ProfitShareMemberQueryRsp) => {
     ElMessageBox({
-        title: '提示',
+        title: t('common.alert'),
         message: '确认删除分组子机构?',
         showCancelButton: true,
         beforeClose: (action, instance, done) => {

+ 1 - 1
src/packages/pc/views/profitshare/institution/group/index.vue

@@ -64,7 +64,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'remark', label: '备注' },
     { field: 'username', label: '创建人' },
     { field: 'createtime', label: '创建时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.inputList = [

+ 22 - 22
src/packages/pc/views/query/order/accountsumm/index.vue

@@ -4,7 +4,7 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item label="市场" prop="marketid">
+                <el-form-item :label="t('query.order.accountsumm.marketid')" prop="marketid">
                     <el-select v-model="queryParams.marketid">
                         <template v-for="item in getMarketOptions([15, 40, 41, 48, 51, 71, 97, 99], true)"
                             :key="item.value">
@@ -12,24 +12,24 @@
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="汇总方式" prop="summode">
+                <el-form-item :label="t('query.order.accountsumm.summode')" prop="summode">
                     <el-select v-model="queryParams.summode">
-                        <el-option label="按账户汇总" :value="1" />
-                        <el-option label="按账户+日期汇总" :value="2" />
+                        <el-option :label="t('query.order.accountsumm.summode1')" :value="1" />
+                        <el-option :label="t('query.order.accountsumm.summode2')" :value="2" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="日期" prop="date">
-                    <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD" start-placeholder="开始"
-                        end-placeholder="结束" @change="onDateChange" />
+                <el-form-item :label="t('query.order.accountsumm.date')" prop="date">
+                    <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD" :start-placeholder="t('common.start')"
+                        :end-placeholder="t('common.end')" @change="onDateChange" />
                 </el-form-item>
-                <el-form-item label="商品" prop="goodsid">
-                    <el-input type="number" v-model="queryParams.goodsid" placeholder="请输入商品ID" />
+                <el-form-item :label="t('query.order.accountsumm.goodsid')" prop="goodsid">
+                    <el-input type="number" v-model="queryParams.goodsid" :placeholder="t('query.order.accountsumm.tips1')" />
                 </el-form-item>
-                <el-form-item label="交易商" prop="accountid">
-                    <el-input type="number" v-model="queryParams.accountid" placeholder="输入交易商ID" />
+                <el-form-item :label="t('query.order.accountsumm.accountid')" prop="accountid">
+                    <el-input type="number" v-model="queryParams.accountid" :placeholder="t('query.order.accountsumm.tips2')" />
                 </el-form-item>
-                <el-form-item label="排除资金账户" prop="excludeaccountidsstr">
-                    <el-input v-model="queryParams.excludeaccountidsstr" placeholder="请输入完整资金账户,多个逗号分隔"
+                <el-form-item :label="t('query.order.accountsumm.excludeaccountidsstr')" prop="excludeaccountidsstr">
+                    <el-input v-model="queryParams.excludeaccountidsstr" :placeholder="t('query.order.accountsumm.tips3')"
                         style="width: 260px;" />
                 </el-form-item>
                 <el-form-item>
@@ -88,15 +88,15 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(accoun
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'tradeDate', label: '交易日' },
-    { field: 'userfullname', label: '账户' },
-    { field: 'goodsfullname', label: '商品代码名称' },
-    { field: 'membername', label: '所属会员' },
-    { field: 'parentname', label: '所属机构' },
-    { field: 'tradeqtysum', label: '总成交量' },
-    { field: 'tradeamountsum', label: '总成交额' },
-    { field: 'closeplsum', label: '总转让损益' },
-    { field: 'chargesum', label: '总手续费' }
+    { field: 'tradeDate', label: 'query.order.accountsumm.tradeDate' },
+    { field: 'userfullname', label: 'query.order.accountsumm.userfullname' },
+    { field: 'goodsfullname', label: 'query.order.accountsumm.goodsfullname' },
+    { field: 'membername', label: 'query.order.accountsumm.membername' },
+    { field: 'parentname', label: 'query.order.accountsumm.parentname' },
+    { field: 'tradeqtysum', label: 'query.order.accountsumm.tradeqtysum' },
+    { field: 'tradeamountsum', label: 'query.order.accountsumm.tradeamountsum' },
+    { field: 'closeplsum', label: 'query.order.accountsumm.closeplsum' },
+    { field: 'chargesum', label: 'query.order.accountsumm.chargesum' }
 ])
 
 // 表单验证规则

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

@@ -4,27 +4,27 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item label="市场" prop="marketid">
+                <el-form-item :label="t('query.order.goodssumm.marketid')" prop="marketid">
                     <el-select v-model="queryParams.marketid">
                         <el-option v-for="item in getMarketOptions()" :key="item.value" :label="item.label"
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="日期" prop="date">
+                <el-form-item :label="t('query.order.goodssumm.date')" prop="date">
                     <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
-                        start-placeholder="开始日期" end-placeholder="结束日期" />
+                        :start-placeholder="t('common.startdate')" :end-placeholder="t('common.enddate')" />
                 </el-form-item>
-                <el-form-item label="汇总方式" prop="summode">
+                <el-form-item :label="t('query.order.goodssumm.summode')" prop="summode">
                     <el-select v-model="queryParams.summode">
-                        <el-option label="按商品汇总" :value="1" />
-                        <el-option label="按商品+日期汇总" :value="2" />
+                        <el-option :label="t('query.order.goodssumm.summode1')" :value="1" />
+                        <el-option :label="t('query.order.goodssumm.summode2')" :value="2" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="商品" prop="goodsid">
+                <el-form-item :label="t('query.order.goodssumm.goodsid')" prop="goodsid">
                     <app-select-goods v-model="queryParams.goodsid" :market-id="queryParams.marketid" status="3,6,7" />
                 </el-form-item>
-                <el-form-item label="排除资金账户" prop="excludeaccountidsstr">
-                    <el-input v-model="queryParams.excludeaccountidsstr" placeholder="请输入完整资金账户,多个逗号分隔" style="width: 260px;" />
+                <el-form-item :label="t('query.order.goodssumm.excludeaccountidsstr')" prop="excludeaccountidsstr">
+                    <el-input v-model="queryParams.excludeaccountidsstr" :placeholder="t('query.order.goodssumm.tips1')" style="width: 260px;" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="onSearch">{{ t('operate.search') }}</el-button>
@@ -82,12 +82,12 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryG
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'tradeDate', label: '交易日' },
-    { field: 'goodsfullname', label: '商品代码名称' },
-    { field: 'tradeqtysum', label: '总成交量' },
-    { field: 'tradeamountsum', label: '总成交额' },
-    { field: 'closeplsum', label: '总转让损益' },
-    { field: 'chargesum', label: '总手续费' },
+    { field: 'tradeDate', label: 'query.order.goodssumm.tradeDate' },
+    { field: 'goodsfullname', label: 'query.order.goodssumm.goodsfullname' },
+    { field: 'tradeqtysum', label: 'query.order.goodssumm.tradeqtysum' },
+    { field: 'tradeamountsum', label: 'query.order.goodssumm.tradeamountsum' },
+    { field: 'closeplsum', label: 'query.order.goodssumm.closeplsum' },
+    { field: 'chargesum', label: 'query.order.goodssumm.chargesum' },
 ])
 
 // 表单验证规则

+ 13 - 13
src/packages/pc/views/query/order/institutionsumm/index.vue

@@ -4,20 +4,20 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item label="市场">
+                <el-form-item :label="t('query.order.institutionsumm.marketid')">
                     <el-select v-model="marketId">
                         <el-option v-for="item in getMarketOptions([15, 40, 41, 48, 51, 71, 97, 99], true)"
                             :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="商品" prop="goodsid">
+                <el-form-item :label="t('query.order.institutionsumm.goodsid')" prop="goodsid">
                     <app-select-goods v-model="queryParams.goodsid" :market-id="marketId" status="3,6,7" />
                 </el-form-item>
-                <el-form-item label="日期" prop="date">
+                <el-form-item :label="t('query.order.institutionsumm.date')" prop="date">
                     <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
-                        start-placeholder="开始日期" end-placeholder="结束日期" />
+                    :start-placeholder="t('common.startdate')" :end-placeholder="t('common.enddate')" />
                 </el-form-item>
-                <el-form-item label="所属机构" prop="parentuserid">
+                <el-form-item :label="t('query.order.institutionsumm.parentuserid')" prop="parentuserid">
                     <app-select-member v-model="queryParams.parentuserid" usertype="2,3" />
                 </el-form-item>
                 <el-form-item>
@@ -77,14 +77,14 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryI
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'userid', label: '账户ID' },
-    { field: 'accountname', label: '账户名称' },
-    { field: 'goodscode', label: '商品代码' },
-    { field: 'goodsname', label: '商品名称' },
-    { field: 'tradeqtysum', label: '总成交量' },
-    { field: 'tradeamountsum', label: '总成交额' },
-    { field: 'chargesum', label: '总转让损益' },
-    { field: 'chargesum', label: '总手续费' },
+    { field: 'userid', label: 'query.order.institutionsumm.userid' },
+    { field: 'accountname', label: 'query.order.institutionsumm.accountname' },
+    { field: 'goodscode', label: 'query.order.institutionsumm.goodscode' },
+    { field: 'goodsname', label: 'query.order.institutionsumm.goodsname' },
+    { field: 'tradeqtysum', label: 'query.order.institutionsumm.tradeqtysum' },
+    { field: 'tradeamountsum', label: 'query.order.institutionsumm.tradeamountsum' },
+    { field: 'closeplsum', label: 'query.order.institutionsumm.closeplsum' },
+    { field: 'chargesum', label: 'query.order.institutionsumm.chargesum' },
 ])
 
 // 表单验证规则

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

@@ -1,17 +1,17 @@
 <!-- 查询管理-内部订单查询-委托单查询-详情 -->
 <template>
-    <app-drawer title="详情" width="960" v-model:show="show">
-        <app-table-details title="委托单信息" :data="data" :label-width="200" :cell-props="detailProps1" :column="2" />
-        <app-table-details title="费用相关配置及收取值" :data="data" :label-width="200" :cell-props="detailProps2" :column="2" />
+    <app-drawer :title="t('query.order.order.details.title')" width="960" v-model:show="show">
+        <app-table-details :title="t('query.order.order.details.subtitle1')" :data="data" :label-width="200" :cell-props="detailProps1" :column="2" />
+        <app-table-details :title="t('query.order.order.details.subtitle2')" :data="data" :label-width="200" :cell-props="detailProps2" :column="2" />
         <template v-if="data && [7, 8, 9].includes(data.orderstatus)">
             <app-table :data="data.tradeHisResultList" :columns="tableColumns" v-if="record.isHis">
                 <template #headerLeft>
-                    <b>成交单列表(历史)</b>
+                    <b>{{ t('query.order.order.details.tradelist1') }}</b>
                 </template>
             </app-table>
             <app-table :data="data.tradeResultList" :columns="tableColumns" v-else>
                 <template #headerLeft>
-                    <b>成交单列表(当日)</b>
+                    <b>{{ t('query.order.order.details.tradelist2') }}</b>
                 </template>
             </app-table>
         </template>
@@ -33,6 +33,7 @@ import { CellProp } from '@pc/components/base/table-details/types'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppTableDetails from '@pc/components/base/table-details/index.vue'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
@@ -41,6 +42,7 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 
@@ -73,38 +75,38 @@ const detailProps1 = computed<CellProp[]>(() => {
     const isTradeMode18Or26 = [18, 26].includes(trademode)
 
     return [
-        { prop: 'orderid', label: '委托单号:' },
-        { prop: 'accountname', label: '委托账户:', formatValue: (val) => val && `${val} (${accountid})` },
-        { prop: 'parentusername', label: '所属机构:' },
-        { prop: 'memberaccountname', label: '所属会员:' },
-        { prop: 'marketname', label: '市场:' },
-        { prop: 'goodsname', label: '商品:', formatValue: (val) => val && `${val}/${goodscode}` },
-        { prop: 'listingselecttype', label: '挂牌点选类型:', show: isTradeMode16 },
-        { prop: 'delistingtype', label: '摘牌类型:', show: isTradeMode16 },
-        { prop: 'buildtype', label: '委托类型:', formatValue: (val) => buildtypeEnum.getEnumTypeName(val) },
-        { prop: 'buyorsell', label: '方向:', formatValue: (val) => getBuyOrSellName(val) },
-        { prop: 'orderprice', label: '委托价格:', show: !isTradeMode18Or26 },
-        { prop: 'optiontype', label: '期权类型:', show: isTradeMode18Or26 },
-        { prop: 'orderprice', label: '行权价:', show: isTradeMode18Or26 },
-        { prop: 'premium', label: '订货金:', show: isTradeMode18Or26 },
-        { prop: 'orderqty', label: '委托数量:' },
-        { prop: 'tradeqty', label: '成交数量:' },
-        { prop: 'openqty', label: '开仓数量:' },
-        { prop: 'closeqty', label: '平仓数量:' },
-        { prop: 'cancelqty', label: '撤单数量:' },
-        { prop: 'pricemode', label: '取价方式:', formatValue: (val) => Pricemode2Enum.getEnumTypeName(val), show: !isTradeMode18Or26 },
-        { prop: 'validtype', label: '有效期类型:', formatValue: (val) => ValidTypeEnum.getEnumTypeName(val), show: !isTradeMode18Or26 },
-        { prop: 'validtime', label: '有效期限:', show: !isTradeMode18Or26 },
-        { prop: 'operatetype', label: '操作类型:', formatValue: (val) => orderoperatetypeEnum.getEnumTypeName(val), show: !isTradeMode18Or26 },
-        { prop: 'orderstatus', label: '委托状态:', formatValue: (val) => orderstatusEnum.getEnumTypeName(val) },
-        { prop: 'ordertime', label: '委托时间:', formatValue: (val) => formatDate(val) },
-        { prop: 'clientticket', label: '客户端流水号:' },
-        { prop: 'cancelorderid', label: '撤单单号:', show: !!cancelorderid },
-        { prop: 'preorderid', label: '关联预埋单号:', show: !!preorderid },
-        { prop: 'relatedid', label: '关联单号:', show: !!relatedid },
-        { prop: 'retcode', label: '错误码:', show: !!retcode },
-        { prop: 'refgoodsid', label: '参考商品:', show: isTradeMode46 },
-        { prop: 'swapdays', label: '掉期天数:', show: isTradeMode46 },
+        { prop: 'orderid', label: 'query.order.order.details.orderid' },
+        { prop: 'accountname', label: 'query.order.order.details.accountname', formatValue: (val) => val && `${val} (${accountid})` },
+        { prop: 'parentusername', label: 'query.order.order.details.parentusername' },
+        { prop: 'memberaccountname', label: 'query.order.order.details.memberaccountname' },
+        { prop: 'marketname', label: 'query.order.order.details.marketname' },
+        { prop: 'goodsname', label: 'query.order.order.details.goodsname', formatValue: (val) => val && `${val}/${goodscode}` },
+        { prop: 'listingselecttype', label: 'query.order.order.details.listingselecttype', show: isTradeMode16 },
+        { prop: 'delistingtype', label: 'query.order.order.details.delistingtype', show: isTradeMode16 },
+        { prop: 'buildtype', label: 'query.order.order.details.buildtype', formatValue: (val) => buildtypeEnum.getEnumTypeName(val) },
+        { prop: 'buyorsell', label: 'query.order.order.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+        { prop: 'orderprice', label: 'query.order.order.details.orderprice', show: !isTradeMode18Or26 },
+        { prop: 'optiontype', label: 'query.order.order.details.optiontype', show: isTradeMode18Or26 },
+        { prop: 'orderprice', label: 'query.order.order.details.orderprice1', show: isTradeMode18Or26 },
+        { prop: 'premium', label: 'query.order.order.details.premium', show: isTradeMode18Or26 },
+        { prop: 'orderqty', label: 'query.order.order.details.orderqty' },
+        { prop: 'tradeqty', label: 'query.order.order.details.tradeqty' },
+        { prop: 'openqty', label: 'query.order.order.details.openqty' },
+        { prop: 'closeqty', label: 'query.order.order.details.closeqty' },
+        { prop: 'cancelqty', label: 'query.order.order.details.cancelqty' },
+        { prop: 'pricemode', label: 'query.order.order.details.pricemode', formatValue: (val) => Pricemode2Enum.getEnumTypeName(val), show: !isTradeMode18Or26 },
+        { prop: 'validtype', label: 'query.order.order.details.validtype', formatValue: (val) => ValidTypeEnum.getEnumTypeName(val), show: !isTradeMode18Or26 },
+        { prop: 'validtime', label: 'query.order.order.details.validtime', show: !isTradeMode18Or26 },
+        { prop: 'operatetype', label: 'query.order.order.details.operatetype', formatValue: (val) => orderoperatetypeEnum.getEnumTypeName(val), show: !isTradeMode18Or26 },
+        { prop: 'orderstatus', label: 'query.order.order.details.orderstatus', formatValue: (val) => orderstatusEnum.getEnumTypeName(val) },
+        { prop: 'ordertime', label: 'query.order.order.details.ordertime', formatValue: (val) => formatDate(val) },
+        { prop: 'clientticket', label: 'query.order.order.details.clientticket' },
+        { prop: 'cancelorderid', label: 'query.order.order.details.cancelorderid', show: !!cancelorderid },
+        { prop: 'preorderid', label: 'query.order.order.details.preorderid', show: !!preorderid },
+        { prop: 'relatedid', label: 'query.order.order.details.relatedid', show: !!relatedid },
+        { prop: 'retcode', label: 'query.order.order.details.retcode', show: !!retcode },
+        { prop: 'refgoodsid', label: 'query.order.order.details.refgoodsid', show: isTradeMode46 },
+        { prop: 'swapdays', label: 'query.order.order.details.swapdays', show: isTradeMode46 },
     ]
 })
 
@@ -116,31 +118,31 @@ const detailProps2 = computed<CellProp[]>(() => {
     const result: CellProp[] = [
         {
             prop: 'marginvalue',
-            label: '即市保证金设置值:',
+            label: t('query.order.order.details.marginvalue'),
             formatValue: (val) => marginalgorithm ? marginalgorithm === 1 ? parsePercent(val) : val : '',
             show: isBuildType1Or3
         },
         {
             prop: 'openexchagechargevalue',
-            label: '开仓交易所手续费设置值:',
+            label: t('query.order.order.details.openexchagechargevalue'),
             formatValue: (val) => marginalgorithm ? marginalgorithm === 1 ? parseTenThousand(val) : val : '',
             show: isBuildType1Or3
         },
         {
             prop: 'openmemberchargevalue',
-            label: '开仓会员手续费设置值:',
+            label: t('query.order.order.details.openmemberchargevalue'),
             formatValue: (val) => marginalgorithm ? marginalgorithm === 1 ? parseTenThousand(val) : val : '',
             show: isBuildType1Or3
         },
         {
             prop: 'closeexchagechargevalue',
-            label: '平仓交易所手续费设置值:',
+            label: t('query.order.order.details.closeexchagechargevalue'),
             formatValue: (val) => marginalgorithm ? marginalgorithm === 1 ? parseTenThousand(val) : val : '',
             show: isBuildType2Or3
         },
         {
             prop: 'closememberchargevalue',
-            label: '平仓会员手续费设置值:',
+            label: t('query.order.order.details.closememberchargevalue'),
             formatValue: (val) => marginalgorithm ? marginalgorithm === 1 ? parseTenThousand(val) : val : '',
             show: isBuildType2Or3
         },
@@ -148,14 +150,14 @@ const detailProps2 = computed<CellProp[]>(() => {
 
     if ([3, 5].includes(orderstatus)) {
         result.push(
-            { prop: 'freezemargin', label: '冻结保证金:' },
-            { prop: 'freezecharge', label: '冻结服务费:' },
-            { prop: 'openfreezecharge', label: '开仓冻结服务费:' },
-            { prop: 'closefreezecharge', label: '平仓解冻服务费:' },
-            { prop: 'unfreezemargin', label: '解冻保证金:' },
-            { prop: 'unfreezecharge', label: '解冻服务费:' },
-            { prop: 'openunfreezecharge', label: '开仓解冻服务费:' },
-            { prop: 'closeunfreezecharge', label: '平仓解冻服务费:' },
+            { prop: 'freezemargin', label: 'query.order.order.details.freezemargin' },
+            { prop: 'freezecharge', label: 'query.order.order.details.freezecharge' },
+            { prop: 'openfreezecharge', label: 'query.order.order.details.openfreezecharge' },
+            { prop: 'closefreezecharge', label: 'query.order.order.details.closefreezecharge' },
+            { prop: 'unfreezemargin', label: 'query.order.order.details.unfreezemargin' },
+            { prop: 'unfreezecharge', label: 'query.order.order.details.unfreezecharge' },
+            { prop: 'openunfreezecharge', label: 'query.order.order.details.openunfreezecharge' },
+            { prop: 'closeunfreezecharge', label: 'query.order.order.details.closeunfreezecharge' },
         )
     }
 
@@ -167,14 +169,14 @@ const tableColumns = computed<Model.TableColumn[]>(() => {
     const isTradeMode18Or26 = [18, 26].includes(trademode)
 
     return [
-        { field: 'tradeid', label: '成交单号' },
-        { field: 'matchaccountid', label: '对手账户' },
-        { field: 'tradeqty', label: '成交数量' },
-        { field: 'tradeprice', label: '成交价格', show: !isTradeMode18Or26 },
-        { field: 'tradeamount', label: '成交金额', show: !isTradeMode18Or26 },
-        { field: 'tradeprice', label: '行权价', show: isTradeMode18Or26 },
-        { field: 'chargevalue', label: '服务费' },
-        { field: 'tradetime', label: '成交时间', formatValue: (val) => formatDate(val) },
+        { field: 'tradeid', label: 'query.order.order.details.tradeid' },
+        { field: 'matchaccountid', label: 'query.order.order.details.matchaccountid' },
+        { field: 'tradeqty', label: 'query.order.order.details.tradeqty' },
+        { field: 'tradeprice', label: 'query.order.order.details.tradeprice', show: !isTradeMode18Or26 },
+        { field: 'tradeamount', label: 'query.order.order.details.tradeamount', show: !isTradeMode18Or26 },
+        { field: 'tradeprice', label: 'query.order.order.details.tradeprice1', show: isTradeMode18Or26 },
+        { field: 'chargevalue', label: 'query.order.order.details.chargevalue' },
+        { field: 'tradetime', label: 'query.order.order.details.tradetime', formatValue: (val) => formatDate(val) },
     ]
 })
 

+ 4 - 2
src/packages/pc/views/query/order/order/components/export/index.vue

@@ -1,6 +1,6 @@
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading">
-        <div class="g-text-message">确定导出表格数据?</div>
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading">
+        <div class="g-text-message">{{ t('query.order.order.export.tips')}}</div>
         <template #footer>
             <el-button @click="onCancel">{{ t('operate.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operate.confirm') }}</el-button>
@@ -14,6 +14,7 @@ import { ElMessage } from 'element-plus'
 import { base64ToBlob, downloadFile } from '@/filters'
 import { commissionExport } from '@/services/api/order'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     queryParams: {
@@ -22,6 +23,7 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const show = shallowRef(true)
 const loading = shallowRef(false)
 

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

@@ -4,48 +4,48 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item label="市场" prop="marketId">
+                <el-form-item :label="t('query.order.order.marketid')" prop="marketId">
                     <el-select v-model="queryParams.marketId" @change="onMarketChange">
                         <template v-for="item in getMarketOptions([15, 97, 99], true)" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="查询类型" prop="isHis">
+                <el-form-item :label="t('query.order.order.isHis')" prop="isHis">
                     <el-select v-model="queryParams.isHis" @change="onTypeChange">
                         <el-option :label="t('common.current')" :value="0" />
                         <el-option :label="t('common.history')" :value="1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="日期" prop="date" v-if="queryParams.isHis === 1">
+                <el-form-item :label="t('query.order.order.date')" prop="date" v-if="queryParams.isHis === 1">
                     <el-date-picker type="daterange" v-model="dateValue" value-format="YYYY-MM-DD"
-                        start-placeholder="开始" end-placeholder="结束" @change="onDateChange" />
+                    :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" @change="onDateChange" />
                 </el-form-item>
-                <el-form-item label="单据类型" prop="buildType">
+                <el-form-item :label="t('query.order.order.buildType')" prop="buildType">
                     <el-select v-model="queryParams.buildType" clearable>
                         <template v-for="item in buildtypeEnum.getEnumOptions()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="状态" prop="orderStatus">
+                <el-form-item :label="t('query.order.order.orderStatus')" prop="orderStatus">
                     <el-select v-model="queryParams.orderStatus" clearable>
                         <template v-for="item in orderstatusEnum.getEnumOptions()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="委托单号" prop="orderId">
+                <el-form-item :label="t('query.order.order.orderId')" prop="orderId">
                     <el-input type="number" v-model="queryParams.orderId" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item label="商品" prop="goodsId">
-                    <el-input type="number" v-model="queryParams.goodsId" placeholder="请输入商品ID" />
+                <el-form-item :label="t('query.order.order.goodsId')" prop="goodsId">
+                    <el-input type="number" v-model="queryParams.goodsId" :placeholder="t('query.order.order.tips3')" />
                 </el-form-item>
-                <el-form-item label="账户" prop="accountName">
-                    <el-input type="number" v-model="queryParams.accountName" placeholder="输入账户ID" />
+                <el-form-item :label="t('query.order.order.accountName')" prop="accountName">
+                    <el-input type="number" v-model="queryParams.accountName" :placeholder="t('query.order.order.tips2')" />
                 </el-form-item>
-                <el-form-item label="排除资金账户" prop="excludeAccountIdsStr">
-                    <el-input v-model="queryParams.excludeAccountIdsStr" placeholder="请输入完整资金账户,多个逗号分隔"
+                <el-form-item :label="t('query.order.order.excludeAccountIdsStr')" prop="excludeAccountIdsStr">
+                    <el-input v-model="queryParams.excludeAccountIdsStr" :placeholder="t('query.order.order.tips1')"
                         style="width: 260px;" />
                 </el-form-item>
                 <el-form-item>
@@ -119,18 +119,18 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryC
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'orderId', label: '委托单号' },
-    { field: 'accountNameId', label: '账户' },
-    { field: 'goodsCodeName', label: '商品代码/名称' },
-    { field: 'buildType', label: '单据类型', formatValue: (val) => buildtypeEnum.getEnumTypeName(val) },
-    { field: 'buyOrSell', label: '方向', formatValue: (val) => getBuyOrSellName(val) },
-    { field: 'orderPrice', label: '委托价格' },
-    { field: 'orderQty', label: '委托数量' },
-    { field: 'tradeQty', label: '成交数量' },
-    { field: 'orderStatus', label: '状态', formatValue: (val) => orderstatusEnum.getEnumTypeName(val) },
-    { field: 'orderTime', label: '委托时间', formatValue: (val) => formatDate(val) },
-    { field: 'tradeDate', label: '交易日' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'orderId', label: 'query.order.order.orderId' },
+    { field: 'accountNameId', label: 'query.order.order.accountNameId' },
+    { field: 'goodsCodeName', label: 'query.order.order.goodsCodeName' },
+    { field: 'buildType', label: 'query.order.order.buildType', formatValue: (val) => buildtypeEnum.getEnumTypeName(val) },
+    { field: 'buyOrSell', label: 'query.order.order.buyOrSell', formatValue: (val) => getBuyOrSellName(val) },
+    { field: 'orderPrice', label: 'query.order.order.orderPrice' },
+    { field: 'orderQty', label: 'query.order.order.orderQty' },
+    { field: 'tradeQty', label: 'query.order.order.tradeQty' },
+    { field: 'orderStatus', label: 'query.order.order.orderStatus', formatValue: (val) => orderstatusEnum.getEnumTypeName(val) },
+    { field: 'orderTime', label: 'query.order.order.orderTime', formatValue: (val) => formatDate(val) },
+    { field: 'tradeDate', label: 'query.order.order.tradeDate' },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 // 表单验证规则

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

@@ -1,6 +1,6 @@
 <!-- 查询管理-内部订单查询-持仓单查询-详情 -->
 <template>
-    <app-drawer title="详情" width="900" v-model:show="show">
+    <app-drawer :title="t('query.order.position.details.title')" width="900" v-model:show="show">
         <app-table-details :data="data" :label-width="120" :cell-props="detailProps" :column="2" />
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.close') }}</el-button>
@@ -18,6 +18,7 @@ import { queryPositionSheetDetail } from '@/services/api/order'
 import { CellProp } from '@pc/components/base/table-details/types'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTableDetails from '@pc/components/base/table-details/index.vue'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
@@ -26,6 +27,7 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 
@@ -47,28 +49,28 @@ const detailProps = computed<CellProp[]>(() => {
     const isTradeMode18Or26 = [18, 26].includes(trademode)
 
     return [
-        { prop: 'tradeid', label: '成交单号:' },
-        { prop: 'tradedate', label: '交易日:' },
-        { prop: 'accountid', label: '账户:', formatValue: (val) => val && `${accountname} (${val})` },
-        { prop: 'parentusername', label: '所属机构:' },
-        { prop: 'memberusername', label: '所属会员:' },
-        { prop: 'marketname', label: '市场:' },
-        { prop: 'goodsname', label: '商品:', formatValue: (val) => val && `${val}/${goodscode}` },
-        { prop: 'optiontype', label: '期权类型:', show: isTradeMode18Or26 },
-        { prop: 'buyorsell', label: '方向:', formatValue: (val) => getBuyOrSellName(val) },
-        { prop: 'holderdays', label: 'T+N:', show: !isTradeMode18Or26 },
-        { prop: 'tradetime', label: '交易时间:', formatValue: (val) => formatDate(val) },
-        { prop: 'openprice', label: '建仓价格:', show: !isTradeMode18Or26 },
-        { prop: 'holderprice', label: '持仓价格:', show: !isTradeMode18Or26 },
-        { prop: 'openprice', label: '行权价:', show: isTradeMode18Or26 },
-        { prop: 'premium', label: '定货金:', show: isTradeMode18Or26 },
-        { prop: 'openqty', label: '建仓数量:' },
-        { prop: 'holderqty', label: '持仓数量:' },
-        { prop: 'expiretype', label: '行权日类型:', show: isTradeMode18Or26 },
-        { prop: 'expirecycle', label: '行权周期:', show: isTradeMode18Or26 && expiretype === 1, formatValue: (val) => val && `${val}天` },
-        { prop: 'expiredate', label: '行权日:', show: isTradeMode18Or26 && expiretype === 2 },
-        { prop: 'refgoodsid', label: '参考商品:', show: isTradeMode46 },
-        { prop: 'swapdays', label: '掉期天数:', show: isTradeMode46 },
+        { prop: 'tradeid', label: 'query.order.position.details.tradeid' },
+        { prop: 'tradedate', label: 'query.order.position.details.tradedate' },
+        { prop: 'accountid', label: 'query.order.position.details.accountid', formatValue: (val) => val && `${accountname} (${val})` },
+        { prop: 'parentusername', label: 'query.order.position.details.parentusername' },
+        { prop: 'memberusername', label: 'query.order.position.details.memberusername' },
+        { prop: 'marketname', label: 'query.order.position.details.marketname' },
+        { prop: 'goodsname', label: 'query.order.position.details.goodsname', formatValue: (val) => val && `${val}/${goodscode}` },
+        { prop: 'optiontype', label: 'query.order.position.details.optiontype', show: isTradeMode18Or26 },
+        { prop: 'buyorsell', label: 'query.order.position.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+        { prop: 'holderdays', label: 'query.order.position.details.holderdays', show: !isTradeMode18Or26 },
+        { prop: 'tradetime', label: 'query.order.position.details.tradetime', formatValue: (val) => formatDate(val) },
+        { prop: 'openprice', label: 'query.order.position.details.openprice', show: !isTradeMode18Or26 },
+        { prop: 'holderprice', label: 'query.order.position.details.holderprice', show: !isTradeMode18Or26 },
+        { prop: 'openprice', label: 'query.order.position.details.openprice1', show: isTradeMode18Or26 },
+        { prop: 'premium', label: 'query.order.position.details.premium', show: isTradeMode18Or26 },
+        { prop: 'openqty', label: 'query.order.position.details.openqty' },
+        { prop: 'holderqty', label: 'query.order.position.details.holderqty' },
+        { prop: 'expiretype', label: 'query.order.position.details.expiretype', show: isTradeMode18Or26 },
+        { prop: 'expirecycle', label: 'query.order.position.details.expirecycle', show: isTradeMode18Or26 && expiretype === 1, formatValue: (val) => val && `${val}天` },
+        { prop: 'expiredate', label: 'query.order.position.details.expiredate', show: isTradeMode18Or26 && expiretype === 2 },
+        { prop: 'refgoodsid', label: 'query.order.position.details.refgoodsid', show: isTradeMode46 },
+        { prop: 'swapdays', label: 'query.order.position.details.swapdays', show: isTradeMode46 },
     ]
 })
 

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

@@ -1,5 +1,5 @@
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading">
         <div class="g-text-message">确定导出表格数据?</div>
         <template #footer>
             <el-button @click="onCancel">{{ t('operate.cancel') }}</el-button>

+ 33 - 33
src/packages/pc/views/query/order/position/index.vue

@@ -4,7 +4,7 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item label="市场" prop="marketId">
+                <el-form-item :label="t('query.order.position.marketid')" prop="marketId">
                     <el-select v-model="queryParams.marketId">
                         <template v-for="item in getMarketOptions([15, 40, 41, 48, 51, 71, 97, 99], true)"
                             :key="item.value">
@@ -12,39 +12,39 @@
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="方向" prop="buyOrSell">
+                <el-form-item :label="t('query.order.position.buyOrSell')" prop="buyOrSell">
                     <el-select v-model="queryParams.buyOrSell" clearable>
                         <template v-for="item in getBuyOrSellList()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="单据类型" prop="isHis">
+                <el-form-item :label="t('query.order.position.isHis')" prop="isHis">
                     <el-select v-model="queryParams.isHis" @change="onTypeChange">
                         <el-option :label="t('common.current')" :value="0" />
                         <el-option :label="t('common.history')" :value="1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="日期" prop="date" v-if="queryParams.isHis === 1">
+                <el-form-item :label="t('query.order.position.date')" prop="date" v-if="queryParams.isHis === 1">
                     <el-date-picker type="daterange" v-model="dateValue" value-format="YYYY-MM-DD"
-                        start-placeholder="开始" end-placeholder="结束" @change="onDateChange" />
+                    :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" @change="onDateChange" />
                 </el-form-item>
-                <el-form-item label="成交单号" prop="tradeId">
+                <el-form-item :label="t('query.order.position.tradeId')" prop="tradeId">
                     <el-input type="number" v-model="queryParams.tradeId" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item label="商品" prop="goodsId">
-                    <el-input type="number" v-model="queryParams.goodsId" placeholder="请输入商品ID" />
+                <el-form-item :label="t('query.order.position.goodsId')" prop="goodsId">
+                    <el-input type="number" v-model="queryParams.goodsId" :placeholder="t('query.order.position.tips1')" />
                 </el-form-item>
-                <el-form-item label="登录账号" prop="loginId">
+                <el-form-item :label="t('query.order.position.loginId')" prop="loginId">
                     <el-input v-model="queryParams.loginId" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item label="账户" prop="loginId">
-                    <el-input v-model="queryParams.accountId" placeholder="输入账户或名称" />
+                <el-form-item :label="t('query.order.position.accountId')" prop="accountId">
+                    <el-input v-model="queryParams.accountId" :placeholder="t('query.order.position.tips2')" />
                 </el-form-item>
-                <el-form-item label="所属机构" prop="parentAreaId">
-                    <el-input type="number" v-model="queryParams.parentAreaId" placeholder="请输入机构ID" />
+                <el-form-item :label="t('query.order.position.parentAreaId')" prop="parentAreaId">
+                    <el-input type="number" v-model="queryParams.parentAreaId" :placeholder="t('query.order.position.tips3')" />
                 </el-form-item>
-                <el-form-item label="有效持仓" prop="validHolderQty">
+                <el-form-item :label="t('query.order.position.validHolderQty')" prop="validHolderQty">
                     <el-switch v-model="queryParams.validHolderQty" active-value="1" inactive-value="0" />
                 </el-form-item>
                 <el-form-item>
@@ -118,25 +118,25 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryP
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'tradeid', label: '成交单号' },
-    { field: 'tradedate', label: '交易日' },
-    { field: 'accountNameId', label: '账户' },
-    { field: 'goodsCodeName', label: '商品代码/名称' },
-    { field: 'buyorsell', label: '方向', formatValue: (val) => getBuyOrSellName(val) },
-    { field: 'openqty', label: '订立数量' },
-    { field: 'openprice', label: '订立价格' },
-    { field: 'tradeamount', label: '订立金额' },
-    { field: 'holderqty', label: '持仓数量' },
-    { field: 'holderprice', label: '持仓价格' },
-    { field: 'holderamount', label: '持仓金额' },
-    { field: 'actuallYplS', label: '浮动损益' },
-    { field: 'holderdays', label: 'T+N' },
-    { field: 'tradetime', label: '交易时间', formatValue: (val) => formatDate(val) },
-    { field: 'usertype', label: '账户类型', formatValue: (val) => usertype2Enum.getEnumTypeName(val) },
-    { field: 'memberusername', label: '所属会员' },
-    { field: 'parentusername', label: '所属上级' },
-    { field: 'marketname', label: '市场' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'tradeid', label: 'query.order.position.tradeid' },
+    { field: 'tradedate', label: 'query.order.position.tradedate' },
+    { field: 'accountNameId', label: 'query.order.position.accountNameId' },
+    { field: 'goodsCodeName', label: 'query.order.position.goodsCodeName' },
+    { field: 'buyorsell', label: 'query.order.position.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { field: 'openqty', label: 'query.order.position.openqty' },
+    { field: 'openprice', label: 'query.order.position.openprice' },
+    { field: 'tradeamount', label: 'query.order.position.tradeamount' },
+    { field: 'holderqty', label: 'query.order.position.holderqty' },
+    { field: 'holderprice', label: 'query.order.position.holderprice' },
+    { field: 'holderamount', label: 'query.order.position.holderamount' },
+    { field: 'actuallYplS', label: 'query.order.position.actuallYplS' },
+    { field: 'holderdays', label: 'query.order.position.holderdays' },
+    { field: 'tradetime', label: 'query.order.position.tradetime', formatValue: (val) => formatDate(val) },
+    { field: 'usertype', label: 'query.order.position.usertype', formatValue: (val) => usertype2Enum.getEnumTypeName(val) },
+    { field: 'memberusername', label: 'query.order.position.memberusername' },
+    { field: 'parentusername', label: 'query.order.position.parentusername' },
+    { field: 'marketname', label: 'query.order.position.marketname' },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 // 表单验证规则

+ 4 - 2
src/packages/pc/views/query/order/positionsumm/components/export/index.vue

@@ -1,6 +1,6 @@
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading">
-        <div class="g-text-message">确定导出表格数据?</div>
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading">
+        <div class="g-text-message">{{ t('query.order.positionsumm.export.tips') }}</div>
         <template #footer>
             <el-button @click="onCancel">{{ t('operate.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operate.confirm') }}</el-button>
@@ -14,6 +14,7 @@ import { ElMessage } from 'element-plus'
 import { base64ToBlob, downloadFile } from '@/filters'
 import { positionSumSheetExport } from '@/services/api/order'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     queryParams: {
@@ -22,6 +23,7 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const show = shallowRef(true)
 const loading = shallowRef(false)
 

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

@@ -4,7 +4,7 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item label="市场" prop="marketid">
+                <el-form-item :label="t('query.order.positionsumm.marketid')" prop="marketid">
                     <el-select v-model="queryParams.marketid">
                         <template v-for="item in getMarketOptions([15, 40, 41, 48, 51, 71, 97, 99], true)"
                             :key="item.value">
@@ -12,16 +12,16 @@
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="商品" prop="goodsid">
-                    <el-input type="number" v-model="queryParams.goodsid" placeholder="请输入商品ID" />
+                <el-form-item :label="t('query.order.positionsumm.goodsid')" prop="goodsid">
+                    <el-input type="number" v-model="queryParams.goodsid" :placeholder="t('query.order.positionsumm.tips1')" />
                 </el-form-item>
-                <el-form-item label="用户" prop="accname">
-                    <el-input v-model="queryParams.accname" placeholder="账户或名称模糊匹配" />
+                <el-form-item :label="t('query.order.positionsumm.accname')" prop="accname">
+                    <el-input v-model="queryParams.accname" :placeholder="t('query.order.positionsumm.tips2')" />
                 </el-form-item>
-                <el-form-item label="机构" prop="areauserid" v-if="userStore.userInfo.releType === 1">
-                    <el-input type="number" v-model="queryParams.areauserid" placeholder="请输入机构ID" />
+                <el-form-item :label="t('query.order.positionsumm.areauserid')" prop="areauserid" v-if="userStore.userInfo.releType === 1">
+                    <el-input type="number" v-model="queryParams.areauserid" :placeholder="t('query.order.positionsumm.tips3')" />
                 </el-form-item>
-                <el-form-item label="登录账号" prop="loginid">
+                <el-form-item :label="t('query.order.positionsumm.loginid')" prop="loginid">
                     <el-input v-model="queryParams.loginid" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
                 <el-form-item>
@@ -53,7 +53,7 @@ import { useMarket } from '@/hooks/market'
 import { useRequest } from '@/hooks/request'
 import { useOperation } from '@/hooks/operation'
 import { queryPositionSumSheet } from '@/services/api/order'
-import { useUserStore } from '@/stores'
+import { i18n, useUserStore } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
@@ -61,6 +61,7 @@ import AppOperation from '@pc/components/base/operation/index.vue'
 const { getMarketOptions } = useMarket()
 
 const userStore = useUserStore()
+const { global: { t } } = i18n
 const formRef = ref<FormInstance>()
 
 const queryParams = ref<Partial<Model.PositionSumSheetReq>>({})
@@ -81,20 +82,20 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryP
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'goodsCodeName', label: '商品代码/名称' },
-    { field: 'accountidname', label: '账户' },
-    { field: 'loginids', label: '登录账号' },
-    { field: 'buycurpositionqty', label: '买持仓总数量' },
-    { field: 'buycurholderamount', label: '买持仓总金额' },
-    { field: 'buycuravgprice', label: '买持仓均价' },
-    { field: 'buyFloatPL', label: '持仓损益(买)' },
-    { field: 'sellcurpositionqty', label: '卖持仓总数量' },
-    { field: 'sellcurholderamount', label: '卖持仓总金额' },
-    { field: 'sellcuravgprice', label: '卖持仓均价' },
-    { field: 'sellFloatPL', label: '持仓损益(卖)' },
-    { field: 'qty', label: '净持仓量' },
-    { field: 'buyorsell', label: '净持仓方向', formatValue: (val) => getBuyOrSellName(val) },
-    { field: 'floatPL', label: '持仓损益(总)' }
+    { field: 'goodsCodeName', label: 'query.order.positionsumm.goodsCodeName' },
+    { field: 'accountidname', label: 'query.order.positionsumm.accountidname' },
+    { field: 'loginids', label: 'query.order.positionsumm.loginids' },
+    { field: 'buycurpositionqty', label: 'query.order.positionsumm.buycurpositionqty' },
+    { field: 'buycurholderamount', label: 'query.order.positionsumm.buycurholderamount' },
+    { field: 'buycuravgprice', label: 'query.order.positionsumm.buycuravgprice' },
+    { field: 'buyFloatPL', label: 'query.order.positionsumm.buyFloatPL' },
+    { field: 'sellcurpositionqty', label: 'query.order.positionsumm.sellcurpositionqty' },
+    { field: 'sellcurholderamount', label: 'query.order.positionsumm.sellcurholderamount' },
+    { field: 'sellcuravgprice', label: 'query.order.positionsumm.sellcuravgprice' },
+    { field: 'sellFloatPL', label: 'query.order.positionsumm.sellFloatPL' },
+    { field: 'qty', label: 'query.order.positionsumm.qty' },
+    { field: 'buyorsell', label: 'query.order.positionsumm.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { field: 'floatPL', label: 'query.order.positionsumm.floatPL' }
 ])
 
 // 表单验证规则

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

@@ -1,11 +1,11 @@
 <!-- 查询管理-内部订单查询-成交单查询-详情 -->
 <template>
-    <app-drawer title="详情" width="960" v-model:show="show">
-        <app-table-details title="成交单信息" :data="data" :label-width="200" :cell-props="detailProps1" :column="2" />
-        <app-table-details title="费用相关配置及收取值" :data="data" :label-width="200" :cell-props="detailProps2" :column="2" />
+    <app-drawer :title="t('query.order.trade.details.title')" width="960" v-model:show="show">
+        <app-table-details :title="t('query.order.trade.details.subtitle1')" :data="data" :label-width="200" :cell-props="detailProps1" :column="2" />
+        <app-table-details :title="t('query.order.trade.details.subtitle2')" :data="data" :label-width="200" :cell-props="detailProps2" :column="2" />
         <app-table :data="data.resultList" :columns="tableColumns" v-if="data?.buildtype === 2">
             <template #headerLeft>
-                <b>平仓单明细</b>
+                <b>{{ t('query.order.trade.details.subtitle3') }}</b>
             </template>
         </app-table>
         <template #footer>
@@ -26,6 +26,7 @@ import { CellProp } from '@pc/components/base/table-details/types'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppTableDetails from '@pc/components/base/table-details/index.vue'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
@@ -34,6 +35,7 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 
@@ -57,29 +59,29 @@ const detailProps1 = computed<CellProp[]>(() => {
     const isTradeMode18Or26 = [18, 26].includes(trademode)
 
     return [
-        { prop: 'tradeid', label: '成交单号:' },
-        { prop: 'tradedate', label: '成交日:' },
-        { prop: 'accountid', label: '账户:', formatValue: (val) => `${nameType === 2 ? membername : accountname} (${val})` },
-        { prop: 'orderid', label: '委托单号:' },
-        { prop: 'parentusername', label: '所属机构:' },
-        { prop: 'membername', label: '所属会员:' },
-        { prop: 'marketname', label: '市场:' },
-        { prop: 'goodsname', label: '商品:', formatValue: (val) => val && `${val}/${goodscode}` },
-        { prop: 'buildtype', label: '成交单类型:', formatValue: (val) => tradetype3 === 1 && val === 3 ? '执行交割' : buildtypeEnum.getEnumTypeName(val) },
-        { prop: 'buyorsell', label: '方向:', formatValue: (val) => getBuyOrSellName(val) },
-        { prop: 'tradeprice', label: '成交价格:', show: !isTradeMode18Or26 },
-        { prop: 'optiontype', label: '类型:', show: isTradeMode18Or26 },
-        { prop: 'isconfirmexercise', label: '是否确认行权:', show: isTradeMode18Or26 },
-        { prop: 'tradeprice', label: '成交价:', show: isTradeMode18Or26 },
-        { prop: 'premium', label: '定货金:', show: isTradeMode18Or26 },
-        { prop: 'tradeqty', label: '成交数量:' },
-        { prop: 'tradeamount', label: '成交金额:' },
-        { prop: 'closepl', label: '平仓盈亏:' },
-        { prop: 'tradetype', label: '成交类别:', formatValue: (val) => tradetypeEnum.getEnumTypeName(val) },
-        { prop: 'tradetime', label: '成交时间:', formatValue: (val) => formatDate(val) },
-        { prop: 'matchaccountname', label: '对手账户:', formatValue: (val) => val && `${val} (${matchaccountid})` },
-        { prop: 'refgoodsid', label: '参考商品:', show: isTradeMode46 },
-        { prop: 'swapdays', label: '掉期天数:', show: isTradeMode46 },
+        { prop: 'tradeid', label: 'query.order.trade.details.tradeid' },
+        { prop: 'tradedate', label: 'query.order.trade.details.tradedate' },
+        { prop: 'accountid', label: 'query.order.trade.details.accountid', formatValue: (val) => `${nameType === 2 ? membername : accountname} (${val})` },
+        { prop: 'orderid', label: 'query.order.trade.details.orderid' },
+        { prop: 'parentusername', label: 'query.order.trade.details.parentusername' },
+        { prop: 'membername', label: 'query.order.trade.details.membername' },
+        { prop: 'marketname', label: 'query.order.trade.details.marketname' },
+        { prop: 'goodsname', label: 'query.order.trade.details.goodsname', formatValue: (val) => val && `${val}/${goodscode}` },
+        { prop: 'buildtype', label: 'query.order.trade.details.buildtype', formatValue: (val) => tradetype3 === 1 && val === 3 ? '执行交割' : buildtypeEnum.getEnumTypeName(val) },
+        { prop: 'buyorsell', label: 'query.order.trade.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+        { prop: 'tradeprice', label: 'query.order.trade.details.tradeprice', show: !isTradeMode18Or26 },
+        { prop: 'optiontype', label: 'query.order.trade.details.optiontype', show: isTradeMode18Or26 },
+        { prop: 'isconfirmexercise', label: 'query.order.trade.details.isconfirmexercise', show: isTradeMode18Or26 },
+        { prop: 'tradeprice', label: 'query.order.trade.details.tradeprice1', show: isTradeMode18Or26 },
+        { prop: 'premium', label: 'query.order.trade.details.premium', show: isTradeMode18Or26 },
+        { prop: 'tradeqty', label: 'query.order.trade.details.tradeqty' },
+        { prop: 'tradeamount', label: 'query.order.trade.details.tradeamount' },
+        { prop: 'closepl', label: 'query.order.trade.details.closepl' },
+        { prop: 'tradetype', label: 'query.order.trade.details.tradetype', formatValue: (val) => tradetypeEnum.getEnumTypeName(val) },
+        { prop: 'tradetime', label: 'query.order.trade.details.tradetime', formatValue: (val) => formatDate(val) },
+        { prop: 'matchaccountname', label: 'query.order.trade.details.matchaccountname', formatValue: (val) => val && `${val} (${matchaccountid})` },
+        { prop: 'refgoodsid', label: 'query.order.trade.details.refgoodsid', show: isTradeMode46 },
+        { prop: 'swapdays', label: 'query.order.trade.details.swapdays', show: isTradeMode46 },
     ]
 })
 
@@ -90,15 +92,15 @@ const detailProps2 = computed<CellProp[]>(() => {
 
     if (buildtype === 1) {
         result.push(
-            { prop: 'opencharge', label: '建仓手续费:' },
+            { prop: 'opencharge', label: 'query.order.trade.details.opencharge' },
             {
                 prop: 'openexchagechargevalue',
-                label: '开仓交易所手续费设置值:',
+                label: 'query.order.trade.details.openexchagechargevalue',
                 formatValue: (val) => openfeealgorithm ? openfeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
             {
                 prop: 'openmemberchargevalue',
-                label: '开仓会员手续费设置值:',
+                label: 'query.order.trade.details.openmemberchargevalue',
                 formatValue: (val) => openfeealgorithm ? openfeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
         )
@@ -106,10 +108,10 @@ const detailProps2 = computed<CellProp[]>(() => {
 
     if (buildtype === 2) {
         result.push(
-            { prop: 'closepl', label: '平仓盈亏:' },
+            { prop: 'closepl', label: 'query.order.trade.details.closepl' },
             {
                 prop: 'actuallypl',
-                label: '实际盈亏:',
+                label: 'query.order.trade.details.actuallypl',
                 formatValue: () => {
                     if (isconfirmexercise === 1) return 0
                     const direction = buyorsell ? -1 : 1
@@ -123,45 +125,45 @@ const detailProps2 = computed<CellProp[]>(() => {
 
     if (buildtype === 3) {
         result.push(
-            { prop: 'closeqty', label: '平仓数量:' },
-            { prop: 'openqty', label: '开仓数量:' },
-            { prop: 'closepl', label: '平仓盈亏:' },
-            { prop: 'opencharge', label: '建仓手续费:' },
-            { prop: 'closecharge', label: '平仓手续费:' },
-            { prop: 'openfeealgorithm', label: '建仓手续费收取方式:' },
+            { prop: 'closeqty', label: 'query.order.trade.details.closeqty' },
+            { prop: 'openqty', label: 'query.order.trade.details.openqty' },
+            { prop: 'closepl', label: 'query.order.trade.details.closepl' },
+            { prop: 'opencharge', label: 'query.order.trade.details.opencharge' },
+            { prop: 'closecharge', label: 'query.order.trade.details.closecharge' },
+            { prop: 'openfeealgorithm', label: 'query.order.trade.details.openfeealgorithm' },
             {
                 prop: 'openmemberchargevalue',
-                label: '开仓会员手续费设置值:',
+                label: 'query.order.trade.details.openmemberchargevalue',
                 formatValue: (val) => openfeealgorithm ? openfeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
             {
                 prop: 'openmemberchargevalue',
-                label: '开仓会员手续费设置值:',
+                label: 'query.order.trade.details.openmemberchargevalue',
                 formatValue: (val) => openfeealgorithm ? openfeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
-            { prop: 'closefeealgorithm', label: '平仓手续费收取方式:' },
+            { prop: 'closefeealgorithm', label: 'query.order.trade.details.closefeealgorithm' },
             {
                 prop: 'closeexchagechargevalue',
-                label: '平仓会员手续费设置值:',
+                label: 'query.order.trade.details.closeexchagechargevalue',
                 formatValue: (val) => closefeealgorithm ? closefeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
             {
                 prop: 'closememberchargevalue',
-                label: '平仓会员手续费设置值:',
+                label: 'query.order.trade.details.closememberchargevalue',
                 formatValue: (val) => closefeealgorithm ? closefeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
         )
     } else {
         result.push(
-            { prop: 'closecharge', label: '平仓手续费:' },
+            { prop: 'closecharge', label: 'query.order.trade.details.closecharge' },
             {
                 prop: 'closeexchagechargevalue',
-                label: '平仓会员手续费设置值:',
+                label: 'query.order.trade.details.closeexchagechargevalue',
                 formatValue: (val) => closefeealgorithm ? closefeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
             {
                 prop: 'closememberchargevalue',
-                label: '平仓会员手续费设置值:',
+                label: 'query.order.trade.details.closememberchargevalue',
                 formatValue: (val) => closefeealgorithm ? closefeealgorithm === 1 ? parseTenThousand(val) : val : '',
             },
         )
@@ -175,12 +177,12 @@ const tableColumns = computed<Model.TableColumn[]>(() => {
     const isTradeMode18Or26 = [18, 26].includes(trademode)
 
     return [
-        { field: 'opentradeid', label: '关联建仓成交单号' },
-        { field: 'buyorsell', label: '方向', formatValue: (val) => getBuyOrSellName(val) },
-        { field: 'openprice', label: '建仓价格', show: !isTradeMode18Or26 },
-        { field: 'holderprice', label: '持仓价格', show: !isTradeMode18Or26 },
-        { field: 'closeprice', label: '平仓价格', show: isTradeMode18Or26 },
-        { field: 'closetime', label: '平仓时间', formatValue: (val) => formatDate(val) },
+        { field: 'opentradeid', label: 'query.order.trade.details.opentradeid' },
+        { field: 'buyorsell', label: 'query.order.trade.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+        { field: 'openprice', label: 'query.order.trade.details.openprice', show: !isTradeMode18Or26 },
+        { field: 'holderprice', label: 'query.order.trade.details.holderprice', show: !isTradeMode18Or26 },
+        { field: 'closeprice', label: 'query.order.trade.details.closeprice', show: isTradeMode18Or26 },
+        { field: 'closetime', label: 'query.order.trade.details.closetime', formatValue: (val) => formatDate(val) },
     ]
 })
 

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

@@ -1,5 +1,5 @@
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading">
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading">
         <div class="g-text-message">确定导出表格数据?</div>
         <template #footer>
             <el-button @click="onCancel">{{ t('operate.cancel') }}</el-button>

+ 40 - 40
src/packages/pc/views/query/order/trade/index.vue

@@ -4,65 +4,65 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item label="市场" prop="marketId">
+                <el-form-item :label="t('query.order.trade.marketid')" prop="marketId">
                     <el-select v-model="queryParams.marketId">
                         <template v-for="item in getMarketOptions([15, 97, 99], true)" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="查询类型" prop="isHis">
+                <el-form-item :label="t('query.order.trade.isHis')" prop="isHis">
                     <el-select v-model="queryParams.isHis" @change="onTypeChange">
                         <el-option :label="t('common.current')" :value="0" />
                         <el-option :label="t('common.history')" :value="1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="日期" prop="date" v-if="queryParams.isHis === 1">
+                <el-form-item :label="t('query.order.trade.date')" prop="date" v-if="queryParams.isHis === 1">
                     <el-date-picker type="daterange" v-model="dateValue" value-format="YYYY-MM-DD"
-                        start-placeholder="开始" end-placeholder="结束" @change="onDateChange" />
+                    :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" @change="onDateChange" />
                 </el-form-item>
-                <el-form-item label="方向" prop="buyOrSell">
+                <el-form-item :label="t('query.order.trade.buyOrSell')" prop="buyOrSell">
                     <el-select v-model="queryParams.buyOrSell" clearable>
                         <template v-for="item in getBuyOrSellList()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="类型" prop="buildType">
+                <el-form-item :label="t('query.order.trade.buildType')" prop="buildType">
                     <el-select v-model="queryParams.buildType" clearable>
                         <template v-for="item in buildtypeEnum.getEnumOptions()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="成交类别" prop="tradeTypes">
+                <el-form-item :label="t('query.order.trade.tradeTypes')" prop="tradeTypes">
                     <el-select v-model="queryParams.tradeTypes" clearable>
-                        <el-option label="交易成交" value="1,2,10" />
-                        <el-option label="交收成交" value="3,4" />
-                        <el-option label="风控斩仓" value="6" />
-                        <el-option label="协议成交" value="7,9,11" />
-                        <el-option label="持仓过户" value="29" />
-                        <el-option label="系统强平" value="12" />
-                        <el-option label="其他成交" value="5,8,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
+                        <el-option :label="t('query.order.trade.tradeTypes1')" value="1,2,10" />
+                        <el-option :label="t('query.order.trade.tradeTypes2')" value="3,4" />
+                        <el-option :label="t('query.order.trade.tradeTypes3')" value="6" />
+                        <el-option :label="t('query.order.trade.tradeTypes4')" value="7,9,11" />
+                        <el-option :label="t('query.order.trade.tradeTypes5')" value="29" />
+                        <el-option :label="t('query.order.trade.tradeTypes6')" value="12" />
+                        <el-option :label="t('query.order.trade.tradeTypes7')" value="5,8,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="手续费" prop="feeSearchType">
+                <el-form-item :label="t('query.order.trade.feeSearchType')" prop="feeSearchType">
                     <el-select v-model="queryParams.feeSearchType" clearable>
-                        <el-option label="等于0" :value="1" />
-                        <el-option label="不等于0" :value="2" />
+                        <el-option :label="t('query.order.trade.feeSearchType1')" :value="1" />
+                        <el-option :label="t('query.order.trade.feeSearchType2')" :value="2" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="成交单号" prop="tradeId">
+                <el-form-item :label="t('query.order.trade.tradeId')" prop="tradeId">
                     <el-input type="number" v-model="queryParams.tradeId" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item label="商品" prop="goodsId">
-                    <el-input type="number" v-model="queryParams.goodsId" placeholder="请输入商品ID" />
+                <el-form-item :label="t('query.order.trade.goodsId')" prop="goodsId">
+                    <el-input type="number" v-model="queryParams.goodsId" :placeholder="t('query.order.trade.tips1')" />
                 </el-form-item>
-                <el-form-item label="账户" prop="accountId">
-                    <el-input type="number" v-model="queryParams.accountId" placeholder="请输入账户ID" />
+                <el-form-item :label="t('query.order.trade.accountId')" prop="accountId">
+                    <el-input type="number" v-model="queryParams.accountId" :placeholder="t('query.order.trade.tips2')" />
                 </el-form-item>
-                <el-form-item label="所属机构" prop="areaUserName">
-                    <el-input v-model="queryParams.areaUserName" placeholder="请输入代码或名称" />
+                <el-form-item :label="t('query.order.trade.areaUserName')" prop="areaUserName">
+                    <el-input v-model="queryParams.areaUserName" :placeholder="t('query.order.trade.tips3')" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="onSearch(false)">{{ t('operate.search') }}</el-button>
@@ -134,22 +134,22 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryC
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'tradeid', label: '成交单号' },
-    { field: 'loginid', label: '登录账号' },
-    { field: 'accountid', label: '资金账户' },
-    { field: 'currentname', label: '账户' },
-    { field: 'membername', label: '所属会员' },
-    { field: 'goodsCodeName', label: '商品代码/名称' },
-    { field: 'buyorsell', label: '方向', formatValue: (val) => getBuyOrSellName(val) },
-    { field: 'buildtype', label: '类型', formatValue: (val) => buildtypeEnum.getEnumTypeName(val) },
-    { field: 'tradetype', label: '成交类别', formatValue: (val) => tradetypeEnum.getEnumTypeName(val) },
-    { field: 'tradeprice', label: '成交价格' },
-    { field: 'tradeqty', label: '成交数量' },
-    { field: 'tradeamount', label: '成交金额' },
-    { field: 'chargevalue', label: '手续费' },
-    { field: 'closepl', label: '转让损益' },
-    { field: 'tradetime', label: '成交时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'tradeid', label: 'query.order.trade.tradeid' },
+    { field: 'loginid', label: 'query.order.trade.loginid' },
+    { field: 'accountid', label: 'query.order.trade.accountid' },
+    { field: 'currentname', label: 'query.order.trade.currentname' },
+    { field: 'membername', label: 'query.order.trade.membername' },
+    { field: 'goodsCodeName', label: 'query.order.trade.goodsCodeName' },
+    { field: 'buyorsell', label: 'query.order.trade.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { field: 'buildtype', label: 'query.order.trade.buildtype', formatValue: (val) => buildtypeEnum.getEnumTypeName(val) },
+    { field: 'tradetype', label: 'query.order.trade.tradetype', formatValue: (val) => tradetypeEnum.getEnumTypeName(val) },
+    { field: 'tradeprice', label: 'query.order.trade.tradeprice' },
+    { field: 'tradeqty', label: 'query.order.trade.tradeqty' },
+    { field: 'tradeamount', label: 'query.order.trade.tradeamount' },
+    { field: 'chargevalue', label: 'query.order.trade.chargevalue' },
+    { field: 'closepl', label: 'query.order.trade.closepl' },
+    { field: 'tradetime', label: 'query.order.trade.tradetime', formatValue: (val) => formatDate(val) },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 // 表单验证规则

+ 47 - 45
src/packages/pc/views/query/other/bank_inout/components/details/index.vue

@@ -1,18 +1,18 @@
 <!-- 查询管理-其它查询-出入金查询-详情 -->
 <template>
-    <app-drawer title="详情" width="960" v-model:show="show">
-        <app-table-details title="出入金请求信息" :data="data" :label-width="200" :cell-props="detailProps1" :column="2" />
-        <app-table-details title="扩展信息" :data="data?.bankSignExtendInfo" :label-width="200" :cell-props="detailProps2"
+    <app-drawer :title="t('query.other.bank_inout.details.title')" width="960" v-model:show="show">
+        <app-table-details :title="t('query.other.bank_inout.details.subtitle1')" :data="data" :label-width="200" :cell-props="detailProps1" :column="2" />
+        <app-table-details :title="t('common.extendinfo')" :data="data?.bankSignExtendInfo" :label-width="200" :cell-props="detailProps2"
             :column="2" v-if="detailProps2.length" />
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.close') }}</el-button>
             <template v-if="flag === 0">
-                <el-button type="primary">审核不通过</el-button>
-                <el-button type="primary">审核通过</el-button>
+                <el-button type="primary">{{ t('query.other.bank_inout.details.flag1') }}</el-button>
+                <el-button type="primary">{{ t('query.other.bank_inout.details.flag2') }}</el-button>
             </template>
             <template v-if="flag === 3">
-                <el-button type="primary">复审不通过</el-button>
-                <el-button type="primary">复审通过</el-button>
+                <el-button type="primary">{{ t('query.other.bank_inout.details.flag3') }}</el-button>
+                <el-button type="primary">{{ t('query.other.bank_inout.details.flag4') }}</el-button>
             </template>
         </template>
     </app-drawer>
@@ -29,6 +29,7 @@ import { queryPutOrInDetail } from '@/services/api/account'
 import { CellProp } from '@pc/components/base/table-details/types'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTableDetails from '@pc/components/base/table-details/index.vue'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
@@ -41,6 +42,7 @@ const props = defineProps({
     },
 })
 
+const { global: { t } } = i18n
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 const executetypeEnum = useEnum('executetype') // 申请类型
@@ -62,35 +64,35 @@ const detailProps1 = computed<CellProp[]>(() => {
     const { bankname, applystatus = 0 } = data.value ?? {}
 
     const result: CellProp[] = [
-        { prop: 'accountcode', label: '资金账户:' },
-        { prop: 'balance', label: '上一日总资产:' },
-        { prop: 'usedmargin', label: '当前交易保证金:' },
-        { prop: 'cusbankname', label: '托管银行:' },
-        { prop: 'bankaccountno', label: '银行卡号:', formatValue: (val) => decryptAES(val) },
-        { prop: 'bankid', label: '开户行:', formatValue: (val) => val && `${val} - ${bankname}` },
-        { prop: 'branchbankname', label: '银行支行名称:' },
-        { prop: 'bankaccountname', label: '银行卡开户户名:', formatValue: (val) => decryptAES(val) },
-        { prop: 'tradedate', label: '交易日:' },
-        { prop: 'executetype', label: '申请类型:', formatValue: (val) => executetypeEnum.getEnumTypeName(val) },
-        { prop: 'amount', label: '金额:' },
-        { prop: 'charge', label: '出入金服务费:' },
-        { prop: 'currency', label: '币种:' },
-        { prop: 'extoperateid', label: '账户服务流水号:' },
-        { prop: 'exchticket', label: '银行服务流水号:' },
-        { prop: 'bankticket', label: '银行流水号:' },
-        { prop: 'extoperateid', label: '交易服务流水号:' },
-        { prop: 'curdebt', label: '欠款:' },
-        { prop: 'updatetime', label: '更新时间:', formatValue: (val) => formatDate(val) },
-        { prop: 'applyremark', label: '备注:' },
+        { prop: 'accountcode', label: 'query.other.bank_inout.details.accountcode' },
+        { prop: 'balance', label: 'query.other.bank_inout.details.balance' },
+        { prop: 'usedmargin', label: 'query.other.bank_inout.details.usedmargin' },
+        { prop: 'cusbankname', label: 'query.other.bank_inout.details.cusbankname' },
+        { prop: 'bankaccountno', label: 'query.other.bank_inout.details.bankaccountno', formatValue: (val) => decryptAES(val) },
+        { prop: 'bankid', label: 'query.other.bank_inout.details.bankid', formatValue: (val) => val && `${val} - ${bankname}` },
+        { prop: 'branchbankname', label: 'query.other.bank_inout.details.branchbankname' },
+        { prop: 'bankaccountname', label: 'query.other.bank_inout.details.bankaccountname', formatValue: (val) => decryptAES(val) },
+        { prop: 'tradedate', label: 'query.other.bank_inout.details.tradedate' },
+        { prop: 'executetype', label: 'query.other.bank_inout.details.executetype', formatValue: (val) => executetypeEnum.getEnumTypeName(val) },
+        { prop: 'amount', label: 'query.other.bank_inout.details.amount' },
+        { prop: 'charge', label: 'query.other.bank_inout.details.charge' },
+        { prop: 'currency', label: 'query.other.bank_inout.details.currency' },
+        { prop: 'extoperateid', label: 'query.other.bank_inout.details.extoperateid' },
+        { prop: 'exchticket', label: 'query.other.bank_inout.details.exchticket' },
+        { prop: 'bankticket', label: 'query.other.bank_inout.details.bankticket' },
+        { prop: 'extoperateid', label: 'query.other.bank_inout.details.extoperateid' },
+        { prop: 'curdebt', label: 'query.other.bank_inout.details.curdebt' },
+        { prop: 'updatetime', label: 'query.other.bank_inout.details.updatetime', formatValue: (val) => formatDate(val) },
+        { prop: 'applyremark', label: 'query.other.bank_inout.details.applyremark' },
     ]
 
     if (props.flag === 1) {
         result.push(
-            { prop: 'applystatus', label: '状态:', formatValue: (val) => applystatusEnum.getEnumTypeName(val) },
-            { prop: 'remark2', label: '拒绝/失败原因:', show: [3, 12, 14, 15, 16, 17].includes(applystatus) },
-            { prop: 'username', label: '审核人:', show: applystatus !== 1 },
-            { prop: 'audittime', label: '审核时间:', formatValue: (val) => formatDate(val), show: applystatus !== 1 },
-            { prop: 'checkerrorflag', label: '对账差错标志:' },
+            { prop: 'applystatus', label: 'query.other.bank_inout.details.applystatus', formatValue: (val) => applystatusEnum.getEnumTypeName(val) },
+            { prop: 'remark2', label: 'query.other.bank_inout.details.remark2', show: [3, 12, 14, 15, 16, 17].includes(applystatus) },
+            { prop: 'username', label: 'query.other.bank_inout.details.username', show: applystatus !== 1 },
+            { prop: 'audittime', label: 'query.other.bank_inout.details.audittime', formatValue: (val) => formatDate(val), show: applystatus !== 1 },
+            { prop: 'checkerrorflag', label: 'query.other.bank_inout.details.checkerrorflag' },
         )
     }
 
@@ -101,19 +103,19 @@ const detailProps2 = computed<CellProp[]>(() => {
     const extendInfo = data.value?.bankSignExtendInfo
     if (extendInfo) {
         const result: CellProp[] = [
-            { prop: 'sex', label: '性别:' },
-            { prop: 'legal_name', label: '法人姓名:' },
-            { prop: 'legal_cert_type', label: '法人证件类型:' },
-            { prop: 'legal_cert_code', label: '法人证件号码:' },
-            { prop: 'agent_name', label: '经办人姓名:' },
-            { prop: 'agent_cert_type', label: '经办人证件类型:' },
-            { prop: 'agent_cert_code', label: '经办人证件号码:' },
-            { prop: 'member_code', label: '所属会员代码:' },
-            { prop: 'legal_contact', label: '法人联系号码:' },
-            { prop: 'agent_contact', label: '经办人联系号码:' },
-            { prop: 'bank_branch_name', label: '银行卡支行名称:' },
-            { prop: 'attachment', label: '附件:' },
-            { prop: 'certificate_photo_url', label: '查看:' },
+            { prop: 'sex', label: 'query.other.bank_inout.details.sex' },
+            { prop: 'legal_name', label: 'query.other.bank_inout.details.legal_name' },
+            { prop: 'legal_cert_type', label: 'query.other.bank_inout.details.legal_cert_type' },
+            { prop: 'legal_cert_code', label: 'query.other.bank_inout.details.legal_cert_code' },
+            { prop: 'agent_name', label: 'query.other.bank_inout.details.agent_name' },
+            { prop: 'agent_cert_type', label: 'query.other.bank_inout.details.agent_cert_type' },
+            { prop: 'agent_cert_code', label: 'query.other.bank_inout.details.agent_cert_code' },
+            { prop: 'member_code', label: 'query.other.bank_inout.details.member_code' },
+            { prop: 'legal_contact', label: 'query.other.bank_inout.details.legal_contact' },
+            { prop: 'agent_contact', label: 'query.other.bank_inout.details.agent_contact' },
+            { prop: 'bank_branch_name', label: 'query.other.bank_inout.details.bank_branch_name' },
+            { prop: 'attachment', label: 'query.other.bank_inout.details.attachment' },
+            { prop: 'certificate_photo_url', label: 'query.other.bank_inout.details.certificate_photo_url' },
         ]
         return result.filter((item) => {
             const prop = item.prop as keyof Model.PutOrInDetailRsp['bankSignExtendInfo']

+ 23 - 23
src/packages/pc/views/query/other/bank_inout/index.vue

@@ -4,9 +4,9 @@
         <template #header>
             <app-filter :option="filterOption">
                 <template #after>
-                    <el-form-item label="交易日" prop="date">
+                    <el-form-item :label="t('query.other.bank_inout.date')" prop="date">
                         <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
-                            start-placeholder="开始" end-placeholder="结束" />
+                        :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" />
                     </el-form-item>
                 </template>
             </app-filter>
@@ -71,35 +71,35 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryP
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'accountcode', label: '资金账户' },
-    { field: 'accountname', label: '用户/机构' },
-    { field: 'usertype', label: '账户类型', formatValue: (val) => usertype2Enum.getEnumTypeName(val) },
-    { field: 'parentaccountname', label: '所属机构' },
-    { field: 'cusbankname', label: '托管银行' },
-    { field: 'tradedate', label: '交易日' },
-    { field: 'amount', label: '金额' },
-    { field: 'charge', label: '出入金服务费' },
-    { field: 'currency', label: '币种' },
-    { field: 'executetype', label: '类型', formatValue: (val) => executetypeEnum.getEnumTypeName(val) },
-    { field: 'applystatus', label: '状态', formatValue: (val) => applystatusEnum.getEnumTypeName(val) },
-    { field: 'updatetime', label: '更新时间', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'accountcode', label: 'query.other.bank_inout.accountcode' },
+    { field: 'accountname', label: 'query.other.bank_inout.accountname' },
+    { field: 'usertype', label: 'query.other.bank_inout.usertype', formatValue: (val) => usertype2Enum.getEnumTypeName(val) },
+    { field: 'parentaccountname', label: 'query.other.bank_inout.parentaccountname' },
+    { field: 'cusbankname', label: 'query.other.bank_inout.cusbankname' },
+    { field: 'tradedate', label: 'query.other.bank_inout.tradedate' },
+    { field: 'amount', label: 'query.other.bank_inout.amount' },
+    { field: 'charge', label: 'query.other.bank_inout.charge' },
+    { field: 'currency', label: 'query.other.bank_inout.currency' },
+    { field: 'executetype', label: 'query.other.bank_inout.executetype', formatValue: (val) => executetypeEnum.getEnumTypeName(val) },
+    { field: 'applystatus', label: 'query.other.bank_inout.applystatus', formatValue: (val) => applystatusEnum.getEnumTypeName(val) },
+    { field: 'updatetime', label: 'query.other.bank_inout.updatetime', formatValue: (val) => formatDate(val) },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOption.items = [
     {
         key: 'executetype',
-        label: '类型',
+        label: t('query.other.bank_inout.executetype'),
         options: () => executetypeEnum.getEnumOptions()
     },
     {
         key: 'applystatus',
-        label: '状态',
+        label: t('query.other.bank_inout.applystatus'),
         options: () => applystatusEnum.getEnumOptions()
     },
     {
         key: 'cusbankid',
-        label: '托管银行',
+        label: t('query.other.bank_inout.cusbankname'),
         options: () => bankList.value.map((e) => ({
             label: e.cusbankname,
             value: e.cusbankid
@@ -107,21 +107,21 @@ filterOption.items = [
     },
     {
         key: 'usertype',
-        label: '账户类型',
+        label: t('query.other.bank_inout.usertype'),
         options: () => usertype2Enum.getEnumOptions()
     },
     {
-        label: '登录账号',
+        label: t('query.other.bank_inout.loginid'),
         key: 'loginid'
     },
     {
-        label: '资金账户',
+        label: t('query.other.bank_inout.accountcode'),
         key: 'accountcode'
     },
     {
-        label: '交易商',
+        label: t('query.other.bank_inout.accountname1'),
         key: 'accountname',
-        placeholder: '输入交易商ID',
+        placeholder: t('query.other.bank_inout.tips1'),
     }
 ]
 

+ 4 - 2
src/packages/pc/views/query/other/bank_statement/components/export/index.vue

@@ -1,6 +1,6 @@
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading">
-        <div class="g-text-message">确定导出表格数据?</div>
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading">
+        <div class="g-text-message">{{ t('query.other.bank_statement.export.tips') }}</div>
         <template #footer>
             <el-button @click="onCancel">{{ t('operate.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operate.confirm') }}</el-button>
@@ -14,6 +14,7 @@ import { ElMessage } from 'element-plus'
 import { base64ToBlob, downloadFile } from '@/filters'
 import { queryAmountStreamExport } from '@/services/api/account'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     queryParams: {
@@ -22,6 +23,7 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const show = shallowRef(true)
 const loading = shallowRef(false)
 

+ 15 - 15
src/packages/pc/views/query/other/bank_statement/index.vue

@@ -4,15 +4,15 @@
         <template #header>
             <app-filter :option="filterOption" :rules="filterRules">
                 <template #logType="{ item }">
-                    <el-form-item label="查询类型">
+                    <el-form-item :label="t('query.other.bank_statement.logType')">
                         <el-select v-model="item.value">
                             <el-option v-for="(option, i) in item.options?.()" :key="i" :label="option.label"
                                 :value="option.value" />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="日期" prop="date" v-if="item.value === 2">
+                    <el-form-item :label="t('query.other.bank_statement.date')" prop="date" v-if="item.value === 2">
                         <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
-                            start-placeholder="开始" end-placeholder="结束" />
+                        :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" />
                     </el-form-item>
                 </template>
             </app-filter>
@@ -70,14 +70,14 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryA
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'accountName', label: '账户' },
-    { field: 'accountId', label: '资金账户' },
-    { field: 'memberName', label: '所属机构' },
-    { field: 'amount', label: '金额' },
-    { field: 'businessCodeName', label: '业务类型' },
-    { field: 'operateType', label: '操作时间' },
-    { field: 'marketName', label: '市场' },
-    { field: 'relationOrderId', label: '关联单号' },
+    { field: 'accountName', label: 'query.other.bank_statement.accountName' },
+    { field: 'accountId', label: 'query.other.bank_statement.accountId' },
+    { field: 'memberName', label: 'query.other.bank_statement.memberName' },
+    { field: 'amount', label: 'query.other.bank_statement.amount' },
+    { field: 'businessCodeName', label: 'query.other.bank_statement.businessCodeName' },
+    { field: 'operateType', label: 'query.other.bank_statement.operateType' },
+    { field: 'marketName', label: 'query.other.bank_statement.marketName' },
+    { field: 'relationOrderId', label: 'query.other.bank_statement.relationOrderId' },
 ])
 
 // 表单验证规则
@@ -97,7 +97,7 @@ const filterRules: FormRules = {
 filterOption.items = [
     {
         key: 'logType',
-        label: '查询类型',
+        label: t('query.other.bank_statement.logType'),
         value: 1,
         locked: true,
         options: () => [
@@ -107,13 +107,13 @@ filterOption.items = [
     },
     {
         key: 'operatetype',
-        label: '业务类型',
+        label: t('query.other.bank_statement.operatetype'),
         options: () => getEnumOptions()
     },
     {
-        label: '账户',
+        label: t('query.other.bank_statement.accountId'),
         key: 'accountId',
-        placeholder: '输入资金账户ID',
+        placeholder: t('query.other.bank_statement.tips1'),
         required: true
     }
 ]

+ 12 - 10
src/packages/pc/views/query/warehouse_receipt/wrsumm/components/details/index.vue

@@ -4,13 +4,13 @@
         <app-view>
             <app-table :data="dataList" :columns="tableColumns">
                 <template #headerLeft>
-                    <span>现货商品:{{ record.wrstandardname }}</span>
-                    <span>仓库:{{ record.warehousename }}</span>
-                    <span>单位:{{ record.enumdicname }}</span>
+                    <span>{{ t('query.warehouse_receipt.wrsumm.details.wrstandardname') }}{{ record.wrstandardname }}</span>
+                    <span>{{ t('query.warehouse_receipt.wrsumm.details.warehousename') }}{{ record.warehousename }}</span>
+                    <span>{{ t('query.warehouse_receipt.wrsumm.details.enumdicname') }} }}{{ record.enumdicname }}</span>
                 </template>
                 <template #headerRight>
                     <div style="display: flex;">
-                        <el-select v-model="selectedUsers" placeholder="请选择持有人" multiple style="width: 180px;margin-right: 12px;">
+                        <el-select v-model="selectedUsers" :placeholder="t('query.warehouse_receipt.wrsumm.details.selectedUsers')" multiple style="width: 180px;margin-right: 12px;">
                             <el-option v-for="item in userList" :key="item.userid" :label="item.accountname"
                                 :value="item.userid">
                                 <div style="display: flex;justify-content: space-between;">
@@ -39,6 +39,7 @@ import { useRequest } from '@/hooks/request'
 import { summaryQueryInit, summaryQueryDetail } from '@/services/api/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
@@ -47,6 +48,7 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const emit = defineEmits(['closed'])
 const loading = shallowRef(false)
 const selectedUsers = shallowRef<string[]>([])
@@ -66,12 +68,12 @@ const { dataList, total, pageSize, pageIndex, run } = useRequest(summaryQueryDet
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'accountname', label: '持有人' },
-    { field: 'accountid', label: '资金帐号' },
-    { field: 'ladingbillid', label: '仓单号' },
-    { field: 'qty', label: '数量' },
-    { field: 'freezerqty', label: '冻结' },
-    { field: 'wrfactortypename', label: '现货商品项值' },
+    { field: 'accountname', label: 'query.warehouse_receipt.wrsumm.details.accountname' },
+    { field: 'accountid', label: 'query.warehouse_receipt.wrsumm.details.accountid' },
+    { field: 'ladingbillid', label: 'query.warehouse_receipt.wrsumm.details.ladingbillid' },
+    { field: 'qty', label: 'query.warehouse_receipt.wrsumm.details.qty' },
+    { field: 'freezerqty', label: 'query.warehouse_receipt.wrsumm.details.freezerqty' },
+    { field: 'wrfactortypename', label: 'query.warehouse_receipt.wrsumm.details.wrfactortypename' },
 ])
 
 const onSearch = () => {

+ 16 - 14
src/packages/pc/views/query/warehouse_receipt/wrsumm/index.vue

@@ -3,24 +3,24 @@
     <app-view>
         <template #header>
             <el-form class="el-form--filter" :model="queryParams">
-                <el-form-item label="查询类型" prop="ishis">
+                <el-form-item :label="t('query.warehouse_receipt.wrsumm.isHis')" prop="ishis">
                     <el-select v-model="queryParams.ishis" @change="onTypeChange">
                         <el-option :label="t('common.current')" :value="0" />
                         <el-option :label="t('common.history')" :value="1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="日期" prop="date" v-if="queryParams.ishis === 1">
+                <el-form-item :label="t('query.warehouse_receipt.wrsumm.date')" prop="date" v-if="queryParams.ishis === 1">
                     <el-date-picker type="daterange" v-model="dateValue" value-format="YYYY-MM-DD"
-                        start-placeholder="开始" end-placeholder="结束" @change="onDateChange" />
+                    :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" @change="onDateChange" />
                 </el-form-item>
-                <el-form-item label="仓库标准" prop="wrsids" v-if="warehouse">
+                <el-form-item :label="t('query.warehouse_receipt.wrsumm.wrsids')" prop="wrsids" v-if="warehouse">
                     <el-select v-model="wrsids" multiple collapse-tags>
                         <template v-for="item in warehouse.wrStandardList" :key="item.wrstandardid">
                             <el-option :label="item.wrstandardname" :value="item.wrstandardid" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="仓库" prop="wareids" v-if="warehouse">
+                <el-form-item :label="t('query.warehouse_receipt.wrsumm.wareids')" prop="wareids" v-if="warehouse">
                     <el-select v-model="wareids" multiple collapse-tags>
                         <template v-for="item in warehouse.warehouseInfoList" :key="item.autoid">
                             <el-option :label="item.warehousename" :value="item.autoid" />
@@ -58,7 +58,9 @@ import { initWarehouse, summaryQuery } from '@/services/api/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
+import { i18n } from '@/stores'
 
+const { global: { t } } = i18n
 const dateValue = ref<string[] | null>([])
 const wrsids = ref<number[]>([])
 const wareids = ref<number[]>([])
@@ -88,15 +90,15 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(summar
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'wrstandardname', label: '现货商品' },
-    { field: 'warehousename', label: '仓库' },
-    { field: 'totalqty', label: '总数量' },
-    { field: 'avaliableqty', label: '正常' },
-    { field: 'freezeqty', label: '冻结' },
-    { field: 'increaseqty', label: '今日增加' },
-    { field: 'decreaseqty', label: '今日减少' },
-    { field: 'enumdicname', label: '单位' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'wrstandardname', label: 'query.warehouse_receipt.wrsumm.wrstandardname' },
+    { field: 'warehousename', label: 'query.warehouse_receipt.wrsumm.warehousename' },
+    { field: 'totalqty', label: 'query.warehouse_receipt.wrsumm.totalqty' },
+    { field: 'avaliableqty', label: 'query.warehouse_receipt.wrsumm.avaliableqty' },
+    { field: 'freezeqty', label: 'query.warehouse_receipt.wrsumm.freezeqty' },
+    { field: 'increaseqty', label: 'query.warehouse_receipt.wrsumm.increaseqty' },
+    { field: 'decreaseqty', label: 'query.warehouse_receipt.wrsumm.decreaseqty' },
+    { field: 'enumdicname', label: 'query.warehouse_receipt.wrsumm.enumdicname' },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 // 选择查询类型

+ 1 - 1
src/packages/pc/views/query/warehouse_receipt_order/order/index.vue

@@ -83,7 +83,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'validtime', label: '有效时间' },
     { field: 'ordertime', label: '委托时间' },
     { field: 'tradedate', label: '交易日', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.selectList = [

+ 1 - 1
src/packages/pc/views/query/warehouse_receipt_order/trade/index.vue

@@ -79,7 +79,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'handlestatus', label: '履约状态' },
     { field: 'tradetime', label: '成交时间' },
     { field: 'tradedate', label: '交易日', formatValue: (val) => formatDate(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOptons.selectList = [

+ 14 - 14
src/packages/pc/views/report/account/components/bank/index.vue

@@ -29,20 +29,20 @@ const { dataList, run } = useRequest(taaccountReportQuery, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'balance', label: '期初余额' },
-    { field: 'currentbalance', label: '期末余额' },
-    { field: 'inamount', label: '期间入金' },
-    { field: 'outamount', label: '期间出金' },
-    { field: 'otherincome', label: '其他收入' },
-    { field: 'otherpay', label: '其它支出' },
-    { field: 'closepl', label: '平仓盈亏' },
-    { field: 'reckonpl', label: '结算盈亏' },
-    { field: 'usedmargin', label: '占用保证金' },
-    { field: 'freezemargin', label: '冻结保证金' },
-    { field: 'otherfreezemargin', label: '其它冻结' },
-    { field: 'paycharge', label: '总服务费支出' },
-    { field: 'tradecharge', label: '交易手续费' },
-    { field: 'deliverycharge', label: '交收手续费' },
+    { field: 'balance', label: 'report.account.bank.balance' },
+    { field: 'currentbalance', label: 'report.account.bank.currentbalance' },
+    { field: 'inamount', label: 'report.account.bank.inamount' },
+    { field: 'outamount', label: 'report.account.bank.outamount' },
+    { field: 'otherincome', label: 'report.account.bank.otherincome' },
+    { field: 'otherpay', label: 'report.account.bank.otherpay' },
+    { field: 'closepl', label: 'report.account.bank.closepl' },
+    { field: 'reckonpl', label: 'report.account.bank.reckonpl' },
+    { field: 'usedmargin', label: 'report.account.bank.usedmargin' },
+    { field: 'freezemargin', label: 'report.account.bank.freezemargin' },
+    { field: 'otherfreezemargin', label: 'report.account.bank.otherfreezemargin' },
+    { field: 'paycharge', label: 'report.account.bank.paycharge' },
+    { field: 'tradecharge', label: 'report.account.bank.tradecharge' },
+    { field: 'deliverycharge', label: 'report.account.bank.deliverycharge' },
 ])
 
 defineExpose({

+ 5 - 5
src/packages/pc/views/report/account/components/performance/index.vue

@@ -29,11 +29,11 @@ const { dataList, run } = useRequest(accountppQuery, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'amount', label: '履约总金额' },
-    { field: 'buypaidamount', label: '已冻/已扣金额' },
-    { field: 'sellreceivedamount', label: '已收金额' },
-    { field: 'buytodayamount', label: '扣/冻金额' },
-    { field: 'selltodayamount', label: '收取金额' },
+    { field: 'amount', label: 'report.account.performance.amount' },
+    { field: 'buypaidamount', label: 'report.account.performance.buypaidamount' },
+    { field: 'sellreceivedamount', label: 'report.account.performance.sellreceivedamount' },
+    { field: 'buytodayamount', label: 'report.account.performance.buytodayamount' },
+    { field: 'selltodayamount', label: 'report.account.performance.selltodayamount' },
 ])
 
 defineExpose({

+ 10 - 10
src/packages/pc/views/report/account/components/position/index.vue

@@ -31,16 +31,16 @@ const { dataList, total, pageSize, pageIndex, run } = useRequest(holderTotalQuer
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodscode', label: '代码' },
-    { field: 'goodsname', label: '商品' },
-    { field: 'buypositionqty', label: '买期初持仓数量', width: 140 },
-    { field: 'buyholderamount', label: '买持仓期初总金额', width: 140 },
-    { field: 'buycurpositionqty', label: '买当前持仓总数量', width: 140 },
-    { field: 'buycurholderamount', label: '买当前持仓总金额', width: 140 },
-    { field: 'sellpositionqty', label: '卖持仓期初数' },
-    { field: 'sellholderamount', label: '卖持仓期初总金额', width: 140 },
-    { field: 'sellcurpositionqty', label: '卖当前持仓数量', width: 140 },
-    { field: 'sellcurholderamount', label: '卖当前持仓总金额', width: 140 },
+    { field: 'goodscode', label: 'report.account.position.goodscode' },
+    { field: 'goodsname', label: 'report.account.position.goodsname' },
+    { field: 'buypositionqty', label: 'report.account.position.buypositionqty', width: 140 },
+    { field: 'buyholderamount', label: 'report.account.position.buyholderamount', width: 140 },
+    { field: 'buycurpositionqty', label: 'report.account.position.buycurpositionqty', width: 140 },
+    { field: 'buycurholderamount', label: 'report.account.position.buycurholderamount', width: 140 },
+    { field: 'sellpositionqty', label: 'report.account.position.sellpositionqty' },
+    { field: 'sellholderamount', label: 'report.account.position.sellholderamount', width: 140 },
+    { field: 'sellcurpositionqty', label: 'report.account.position.sellcurpositionqty', width: 140 },
+    { field: 'sellcurholderamount', label: 'report.account.position.sellcurholderamount', width: 140 },
 ])
 
 defineExpose({

+ 10 - 10
src/packages/pc/views/report/account/components/trade/index.vue

@@ -31,16 +31,16 @@ const { dataList, total, pageSize, pageIndex, run } = useRequest(tradeQuery, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodscode', label: '代码' },
-    { field: 'goodsname', label: '商品' },
-    { field: 'marketname', label: '市场' },
-    { field: 'tradeqty', label: '成交量' },
-    { field: 'openqty', label: '建仓数量' },
-    { field: 'closeqty', label: '平仓数量' },
-    { field: 'tradeamount', label: '成交金额' },
-    { field: 'closepl', label: '平仓盈亏' },
-    { field: 'opencharge', label: '建仓手续费' },
-    { field: 'closecharge', label: '平仓手续费' },
+    { field: 'goodscode', label: 'report.account.trade.goodscode' },
+    { field: 'goodsname', label: 'report.account.trade.goodsname' },
+    { field: 'marketname', label: 'report.account.trade.marketname' },
+    { field: 'tradeqty', label: 'report.account.trade.tradeqty' },
+    { field: 'openqty', label: 'report.account.trade.openqty' },
+    { field: 'closeqty', label: 'report.account.trade.closeqty' },
+    { field: 'tradeamount', label: 'report.account.trade.tradeamount' },
+    { field: 'closepl', label: 'report.account.trade.closepl' },
+    { field: 'opencharge', label: 'report.account.trade.opencharge' },
+    { field: 'closecharge', label: 'report.account.trade.closecharge' },
 ])
 
 defineExpose({

+ 8 - 8
src/packages/pc/views/report/account/components/wrorder/index.vue

@@ -31,14 +31,14 @@ const { dataList, total, pageSize, pageIndex, run } = useRequest(wrPositionQuery
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'deliverygoodsname', label: '现货品种' },
-    { field: 'wrstandardname', label: '现货商品' },
-    { field: 'startqty', label: '期初数量' },
-    { field: 'totalqty', label: '期末数量' },
-    { field: 'usedqty', label: '可用数量' },
-    { field: 'freezeqty', label: '冻结数量' },
-    { field: 'increaseqty', label: '采购数量' },
-    { field: 'decreaseqty', label: '销售数量' },
+    { field: 'deliverygoodsname', label: 'report.account.wrorder.deliverygoodsname' },
+    { field: 'wrstandardname', label: 'report.account.wrorder.wrstandardname' },
+    { field: 'startqty', label: 'report.account.wrorder.startqty' },
+    { field: 'totalqty', label: 'report.account.wrorder.totalqty' },
+    { field: 'usedqty', label: 'report.account.wrorder.usedqty' },
+    { field: 'freezeqty', label: 'report.account.wrorder.freezeqty' },
+    { field: 'increaseqty', label: 'report.account.wrorder.increaseqty' },
+    { field: 'decreaseqty', label: 'report.account.wrorder.decreaseqty' },
 ])
 
 defineExpose({

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

@@ -4,23 +4,23 @@
         <template #header>
             <el-form ref="formRef" class="report-account__filter" :model="params" :rules="formRules"
                 :show-message="false">
-                <el-form-item label="报表类型" prop="cycletype">
+                <el-form-item :label="t('report.account.cycletype')" prop="cycletype">
                     <el-select v-model="params.cycletype" @change="onTypeChange">
                         <el-option v-for="item in getReportTypeList()" :key="item.value" :label="item.label"
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="日期" prop="cycletime">
+                <el-form-item :label="t('report.account.cycletime')" prop="cycletime">
                     <el-date-picker :type="dateType" v-model="params.cycletime" :format="dateFormat"
-                        :value-format="dateFormat" placeholder="请选择" />
+                        :value-format="dateFormat" :placeholder="t('common.pleasechoice')" />
                 </el-form-item>
-                <el-form-item label="季度" prop="quarter" v-if="params.cycletype === ReportType.Quarter">
+                <el-form-item :label="t('report.account.quarter')" prop="quarter" v-if="params.cycletype === ReportType.Quarter">
                     <el-select v-model="params.quarter">
                         <el-option v-for="item in getQuarterList()" :key="item.value" :label="item.label"
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="资金账户" prop="accountid">
+                <el-form-item :label="t('report.account.accountid')" prop="accountid">
                     <app-select-account v-model="params.accountid" @change="onAccountChange" />
                 </el-form-item>
                 <el-form-item>
@@ -28,9 +28,9 @@
                 </el-form-item>
             </el-form>
             <div class="report-account__info" v-if="selectedAccount">
-                <span>账户:{{ selectedAccount.relatedname }}</span>
-                <span>资金账户:{{ selectedAccount.accountid }}</span>
-                <span>登录账号:{{ selectedAccount.invloginids }}</span>
+                <span>{{ t('report.account.accountid1') }}{{ selectedAccount.relatedname }}</span>
+                <span>{{ t('report.account.accountid') }}{{ selectedAccount.accountid }}</span>
+                <span>{{ t('report.account.invloginids') }}{{ selectedAccount.invloginids }}</span>
             </div>
         </template>
         <el-tabs v-model="componentIndex" v-if="children.length" @tab-change="onSearch">
@@ -50,11 +50,12 @@ import { findTreeNodeById, formatDate } from '@/filters'
 import { ReportType, getReportTypeList, getQuarterList } from '@/constants/report'
 import { useRequest } from '@/hooks/request'
 import { queryCommonFlag } from '@/services/api/account'
-import { useRouterStore } from '@/stores'
+import { i18n, useRouterStore } from '@/stores'
 import AppSelectAccount from '@pc/components/modules/select-account/index.vue'
 
 const route = useRoute()
 const routerStore = useRouterStore()
+const { global: { t } } = i18n
 const formRef = shallowRef<FormInstance>()
 const componentRef = shallowRef()
 const componentIndex = shallowRef(0)
@@ -115,7 +116,7 @@ const formRules: FormRules = {
             if (value) {
                 callback()
             } else {
-                callback(new Error('请输入资金账户'))
+                callback(new Error( t('report.account.tips1')))
             }
         },
     }],

+ 22 - 20
src/packages/pc/views/report/broker/index.vue

@@ -4,27 +4,27 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item label="报表类型" prop="cycletype">
+                <el-form-item :label="t('report.broker.cycletype')" prop="cycletype">
                     <el-select v-model="queryParams.cycletype" @change="onTypeChange">
                         <el-option v-for="item in getReportTypeList()" :key="item.value" :label="item.label"
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="日期" prop="reckondate">
+                <el-form-item :label="t('report.broker.reckondate')" prop="reckondate">
                     <el-date-picker :type="dateType" v-model="dateValue" :format="dateFormat" :value-format="dateFormat"
-                        placeholder="请选择" start-placeholder="开始" end-placeholder="结束" @change="onDateChange" />
+                    :placeholder="t('common.pleasechoice')" :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" @change="onDateChange" />
                 </el-form-item>
-                <el-form-item label="季度" prop="quarter" v-if="queryParams.cycletype === ReportType.Quarter">
+                <el-form-item :label="t('report.broker.quarter')" prop="quarter" v-if="queryParams.cycletype === ReportType.Quarter">
                     <el-select v-model="queryParams.quarter" @change="onQuarterChange">
                         <template v-for="item in getQuarterList()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="所属机构" prop="accountid">
+                <el-form-item :label="t('report.broker.accountid')" prop="accountid">
                     <app-select-account v-model="queryParams.accountid" />
                 </el-form-item>
-                <el-form-item label="是否包含子机构" prop="isson">
+                <el-form-item :label="t('report.broker.isson')" prop="isson">
                     <el-switch v-model="queryParams.type" active-value="1" inactive-value="0" />
                 </el-form-item>
                 <el-form-item>
@@ -59,7 +59,9 @@ import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
 import AppSelectAccount from '@pc/components/modules/select-account/index.vue'
+import { i18n } from '@/stores'
 
+const { global: { t } } = i18n
 const formRef = ref<FormInstance>()
 const dateValue = ref<string[] | string>([])
 
@@ -113,20 +115,20 @@ const dateFormat = computed(() => {
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'cycleTime', label: '日期' },
-    { field: 'accountName', label: '经纪会员' },
-    { field: 'investorTotalNum', label: '交易商开户数量', width: 160 },
-    { field: 'investorTrialNum', label: '交易商开户待初审数量', width: 180 },
-    { field: 'investorRetrialNum', label: '交易商开户待复审数量', width: 180 },
-    { field: 'investorAmount', label: '期末余额' },
-    { field: 'investorusedmargin', label: '占用保证金' },
-    { field: 'investorClosePl', label: '转让损益' },
-    { field: 'investorReckonPl', label: '结算损益' },
-    { field: 'investorBuyDeliveryAmount', label: '交收金额' },
-    { field: 'investorBuyTradeQty', label: '买交易数量' },
-    { field: 'investorSellTradeQty', label: '卖交易数量' },
-    { field: 'investorBuyHoldQty', label: '买持仓数量' },
-    { field: 'investorSellHoldQty', label: '卖持仓数量' }
+    { field: 'cycleTime', label: 'report.broker.cycleTime' },
+    { field: 'accountName', label: 'report.broker.accountName' },
+    { field: 'investorTotalNum', label: 'report.broker.investorTotalNum', width: 160 },
+    { field: 'investorTrialNum', label: 'report.broker.investorTrialNum', width: 180 },
+    { field: 'investorRetrialNum', label: 'report.broker.investorRetrialNum', width: 180 },
+    { field: 'investorAmount', label: 'report.broker.investorAmount' },
+    { field: 'investorusedmargin', label: 'report.broker.investorusedmargin' },
+    { field: 'investorClosePl', label: 'report.broker.investorClosePl' },
+    { field: 'investorReckonPl', label: 'report.broker.investorReckonPl' },
+    { field: 'investorBuyDeliveryAmount', label: 'report.broker.investorBuyDeliveryAmount' },
+    { field: 'investorBuyTradeQty', label: 'report.broker.investorBuyTradeQty' },
+    { field: 'investorSellTradeQty', label: 'report.broker.investorSellTradeQty' },
+    { field: 'investorBuyHoldQty', label: 'report.broker.investorBuyHoldQty' },
+    { field: 'investorSellHoldQty', label: 'report.broker.investorSellHoldQty' }
 ])
 
 // 表单验证规则

+ 39 - 37
src/packages/pc/views/report/investor/index.vue

@@ -4,42 +4,42 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item label="报表类型" prop="cycletype">
+                <el-form-item :label="t('report.investor.cycletype')" prop="cycletype">
                     <el-select v-model="queryParams.cycletype" @change="onTypeChange">
                         <el-option v-for="item in getReportTypeList()" :key="item.value" :label="item.label"
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="日期" prop="reckondate">
+                <el-form-item :label="t('report.investor.reckondate')" prop="reckondate">
                     <el-date-picker :type="dateType" v-model="dateValue" :format="dateFormat" :value-format="dateFormat"
-                        placeholder="请选择" start-placeholder="开始" end-placeholder="结束" @change="onDateChange" />
+                    :placeholder="t('common.pleasechoice')" :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" @change="onDateChange" />
                 </el-form-item>
-                <el-form-item label="季度" prop="quarter" v-if="queryParams.cycletype === ReportType.Quarter">
+                <el-form-item :label="t('report.investor.quarter')" prop="quarter" v-if="queryParams.cycletype === ReportType.Quarter">
                     <el-select v-model="queryParams.quarter" @change="onQuarterChange">
                         <template v-for="item in getQuarterList()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="交易商" prop="accountid">
-                    <el-input v-model="queryParams.accountid" placeholder="请输入交易商ID" />
+                <el-form-item :label="t('report.investor.accountid')" prop="accountid">
+                    <el-input v-model="queryParams.accountid" :placeholder="t('report.investor.tips2')" />
                 </el-form-item>
-                <el-form-item label="所属会员" prop="memberid">
-                    <el-input v-model="queryParams.memberid" placeholder="请输入会员ID" />
+                <el-form-item :label="t('report.investor.memberid')" prop="memberid">
+                    <el-input v-model="queryParams.memberid" :placeholder="t('report.investor.tips3')" />
                 </el-form-item>
-                <el-form-item label="所属子机构" prop="subareaid">
-                    <el-input v-model="queryParams.subareaid" placeholder="请输入子机构ID" />
+                <el-form-item :label="t('report.investor.subareaid')" prop="subareaid">
+                    <el-input v-model="queryParams.subareaid" :placeholder="t('report.investor.tips4')" />
                 </el-form-item>
-                <el-form-item label="所属经纪人" prop="brokerid">
-                    <el-input v-model="queryParams.brokerid" placeholder="请输入经纪人ID" />
+                <el-form-item :label="t('report.investor.brokerid')" prop="brokerid">
+                    <el-input v-model="queryParams.brokerid" :placeholder="t('report.investor.tips5')" />
                 </el-form-item>
-                <el-form-item label="入金金额" prop="inamount">
+                <el-form-item :label="t('report.investor.inamount')" prop="inamount">
                     <el-input-number v-model="queryParams.inamount" :min="0" controls-position="right"
-                        placeholder="查询大于等于此数值的数据" style="width: 240px;" />
+                        :placeholder="t('report.investor.tips1')" style="width: 240px;" />
                 </el-form-item>
-                <el-form-item label="出金金额" prop="outamount">
+                <el-form-item :label="t('report.investor.outamount')" prop="outamount">
                     <el-input-number v-model="queryParams.outamount" :min="0" controls-position="right"
-                        placeholder="查询大于等于此数值的数据" style="width: 240px;" />
+                        :placeholder="t('report.investor.tips1')" style="width: 240px;" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="onSearch(false)">{{ t('operate.search') }}</el-button>
@@ -72,7 +72,9 @@ import { getReportTypeList, ReportType, getQuarterList } from '@/constants/repor
 import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
+import { i18n } from '@/stores'
 
+const { global: { t } } = i18n
 const formRef = ref<FormInstance>()
 const dateValue = ref<string[] | string>([])
 
@@ -125,27 +127,27 @@ const dateFormat = computed(() => {
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'reckondate', label: '日期' },
-    { field: 'loginids', label: '登录账号' },
-    { field: 'accountid', label: '资金账户' },
-    { field: 'accountname', label: '账户名称' },
-    { field: 'memberaccountname', 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: 'usedmargin', label: '占用资金' },
-    { field: 'freezemargin', label: '冻结资金' },
-    { field: 'otherfreezemargin', label: '其他冻结资金' },
-    { field: 'outamountfreeze', label: '出金冻结' },
-    { field: 'avaiablemoney', label: '可用资金' },
-    { field: 'avaiableoutmoney', label: '可出资金' },
-    { field: 'riskrate', label: '风险率' }
+    { field: 'reckondate', label: 'report.investor.reckondate' },
+    { field: 'loginids', label: 'report.investor.loginids' },
+    { field: 'accountid', label: 'report.investor.accountid1' },
+    { field: 'accountname', label: 'report.investor.accountname' },
+    { field: 'memberaccountname', label: 'report.investor.memberaccountname' },
+    { field: 'balance', label: 'report.investor.balance' },
+    { field: 'currentbalance', label: 'report.investor.currentbalance' },
+    { field: 'inamount', label: 'report.investor.inamount' },
+    { field: 'outamount', label: 'report.investor.outamount' },
+    { field: 'closepl', label: 'report.investor.closepl' },
+    { field: 'floatpl', label: 'report.investor.floatpl' },
+    { field: 'reckonpl', label: 'report.investor.reckonpl' },
+    { field: 'paycharge', label: 'report.investor.paycharge' },
+    { field: 'interestCharge', label: 'report.investor.interestCharge' },
+    { field: 'usedmargin', label: 'report.investor.usedmargin' },
+    { field: 'freezemargin', label: 'report.investor.freezemargin' },
+    { field: 'otherfreezemargin', label: 'report.investor.otherfreezemargin' },
+    { field: 'outamountfreeze', label: 'report.investor.outamountfreeze' },
+    { field: 'avaiablemoney', label: 'report.investor.avaiablemoney' },
+    { field: 'avaiableoutmoney', label: 'report.investor.avaiableoutmoney' },
+    { field: 'riskrate', label: 'report.investor.riskrate' }
 ])
 
 // 表单验证规则

+ 14 - 12
src/packages/pc/views/report/profitshare/index.vue

@@ -4,23 +4,23 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item label="报表类型" prop="cycletype">
+                <el-form-item :label="t('report.profitshare.cycletype')" prop="cycletype">
                     <el-select v-model="queryParams.cycletype">
                         <el-option v-for="item in getReportTypeList()" :key="item.value" :label="item.label"
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="日期" prop="tradedate">
+                <el-form-item :label="t('report.profitshare.tradedate')" prop="tradedate">
                     <el-date-picker :type="dateType" v-model="queryParams.tradedate" :format="dateFormat"
-                        placeholder="请选择" />
+                    :placeholder="t('common.pleasechoice')" />
                 </el-form-item>
-                <el-form-item label="季度" prop="quarter" v-if="queryParams.cycletype === ReportType.Quarter">
+                <el-form-item :label="t('report.profitshare.quarter')" prop="quarter" v-if="queryParams.cycletype === ReportType.Quarter">
                     <el-select v-model="queryParams.quarter">
                         <el-option v-for="item in getQuarterList()" :key="item.value" :label="item.label"
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="是否包含子机构" prop="isson">
+                <el-form-item :label="t('report.profitshare.isson')" prop="isson">
                     <el-switch v-model="queryParams.isson" active-value="1" inactive-value="0" />
                 </el-form-item>
                 <el-form-item>
@@ -56,9 +56,11 @@ import { getReportTypeList, ReportType, getQuarterList } from '@/constants/repor
 import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
+import { i18n } from '@/stores'
 
 const roleTypeEnum = useEnum('roleType') // 角色
 
+const { global: { t } } = i18n
 const formRef = ref<FormInstance>()
 
 const queryParams = ref<Partial<Model.ShareAmountQueryReq>>({
@@ -111,13 +113,13 @@ const dateFormat = computed(() => {
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'areatype', label: '角色', formatValue: (val) => roleTypeEnum.getEnumTypeName(val) },
-    { field: 'areaaccountid', label: '结算资金账户' },
-    { field: 'goodsname', label: '商品/市场' },
-    { field: 'searchtype', label: '费用类型' },
-    { field: 'totalcount', label: '总笔数' },
-    { field: 'totalfee', label: '总手续费' },
-    { field: 'divideamount', label: '分润金额' }
+    { field: 'areatype', label: 'report.profitshare.areatype', formatValue: (val) => roleTypeEnum.getEnumTypeName(val) },
+    { field: 'areaaccountid', label: 'report.profitshare.areaaccountid' },
+    { field: 'goodsname', label: 'report.profitshare.goodsname' },
+    { field: 'searchtype', label: 'report.profitshare.searchtype' },
+    { field: 'totalcount', label: 'report.profitshare.totalcount' },
+    { field: 'totalfee', label: 'report.profitshare.totalfee' },
+    { field: 'divideamount', label: 'report.profitshare.divideamount' }
 ])
 
 // 表单验证规则

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

@@ -4,24 +4,24 @@
         <template #header>
             <el-form ref="formRef" class="el-form--filter" :model="queryParams" :rules="formRules"
                 :show-message="false">
-                <el-form-item label="报表类型" prop="cycletype">
+                <el-form-item :label="t('report.trade.cycletype')" prop="cycletype">
                     <el-select v-model="queryParams.cycletype">
                         <el-option v-for="item in getReportTypeList()" :key="item.value" :label="item.label"
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="日期" prop="cycletime">
+                <el-form-item :label="t('report.trade.cycletime')" prop="cycletime">
                     <el-date-picker :type="dateType" v-model="queryParams.cycletime" :format="dateFormat"
-                        placeholder="请选择" />
+                    :placeholder="t('common.pleasechoice')" />
                 </el-form-item>
-                <el-form-item label="季度" prop="quarter" v-if="queryParams.cycletype === ReportType.Quarter">
+                <el-form-item :label="t('report.trade.quarter')" prop="quarter" v-if="queryParams.cycletype === ReportType.Quarter">
                     <el-select v-model="queryParams.quarter">
                         <el-option v-for="item in getQuarterList()" :key="item.value" :label="item.label"
                             :value="item.value" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="推荐账户" prop="userid">
-                    <el-input v-model="queryParams.userid" placeholder="请输入账户ID" />
+                <el-form-item :label="t('report.trade.userid')" prop="userid">
+                    <el-input v-model="queryParams.userid" :placeholder="t('report.trade.tips1')" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="onSearch(false)">{{ t('operate.search') }}</el-button>
@@ -55,7 +55,9 @@ import { getReportTypeList, ReportType, getQuarterList } from '@/constants/repor
 import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
+import { i18n } from '@/stores'
 
+const { global: { t } } = i18n
 const formRef = shallowRef<FormInstance>()
 
 const queryParams = ref<Partial<Model.TradeReq>>({
@@ -107,14 +109,14 @@ const dateFormat = computed(() => {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'goodsname', label: '商品代码/名称	' },
-    { field: 'marketname', label: '市场' },
-    { field: 'tradeqty', label: '成交量' },
-    { field: 'openqty', label: '订立数量' },
-    { field: 'closeqty', label: '转让数量' },
-    { field: 'tradeamount', label: '成交金额' },
-    { field: 'opencharge', label: '订立手续费' },
-    { field: 'closecharge', label: '转让手续费' }
+    { field: 'goodsname', label: 'report.trade.goodsname' },
+    { field: 'marketname', label: 'report.trade.marketname' },
+    { field: 'tradeqty', label: 'report.trade.tradeqty' },
+    { field: 'openqty', label: 'report.trade.openqty' },
+    { field: 'closeqty', label: 'report.trade.closeqty' },
+    { field: 'tradeamount', label: 'report.trade.tradeamount' },
+    { field: 'opencharge', label: 'report.trade.opencharge' },
+    { field: 'closecharge', label: 'report.trade.closecharge' }
 ])
 
 // 表单验证规则

+ 13 - 11
src/packages/pc/views/settlement/profitsharepay/components/details/details/index.vue

@@ -1,6 +1,6 @@
 <!-- 结算管理-分润付款确认-详情-详情 -->
 <template>
-    <app-drawer title="详情" width="800" v-model:show="show">
+    <app-drawer :title="t('settlement.profitsharepay.details.details.title')" width="800" v-model:show="show">
         <app-table-details :data="data" :label-width="160" :cell-props="detailProps" :column="2" />
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.close') }}</el-button>
@@ -18,6 +18,7 @@ import { settlementDetail } from '@/services/api/settlement'
 import { CellProp } from '@pc/components/base/table-details/types'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTableDetails from '@pc/components/base/table-details/index.vue'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     selectedItem: {
@@ -29,6 +30,7 @@ const props = defineProps({
 const roleTypeEnum = useEnum('roleType') // 分润机构角色
 const ePayFlagEnum = useEnum('ePayFlag') // 支付状态
 
+const { global: { t } } = i18n
 const show = shallowRef(true)
 const refresh = shallowRef(false)
 
@@ -44,16 +46,16 @@ const { data } = useRequest(settlementDetail, {
 })
 
 const detailProps: CellProp[] = [
-    { prop: 'tradedate', label: '交易日:' },
-    { prop: 'areaid', label: '分润机构:' },
-    { prop: 'areatype', label: '分润机构角色:', formatValue: (val) => roleTypeEnum.getEnumTypeName(val) },
-    { prop: 'totalcount', label: '总笔数:' },
-    { prop: 'totalfee', label: '总手续费:' },
-    { prop: 'divideamount', label: '总分润金额:' },
-    { prop: 'paystatus', label: '状态:', formatValue: (val) => ePayFlagEnum.getEnumTypeName(val) },
-    { prop: 'payerid', label: '付款人:', formatValue: (val) => handleNumberValue(val) },
-    { prop: 'paytime', label: '付款时间:', formatValue: (val) => formatDate(val) },
-    { prop: 'remark', label: '描述:' },
+    { prop: 'tradedate', label: 'settlement.profitsharepay.details.details.tradedate' },
+    { prop: 'areaid', label: 'settlement.profitsharepay.details.details.areaid' },
+    { prop: 'areatype', label: 'settlement.profitsharepay.details.details.areatype', formatValue: (val) => roleTypeEnum.getEnumTypeName(val) },
+    { prop: 'totalcount', label: 'settlement.profitsharepay.details.details.totalcount' },
+    { prop: 'totalfee', label: 'settlement.profitsharepay.details.details.totalfee' },
+    { prop: 'divideamount', label: 'settlement.profitsharepay.details.details.divideamount' },
+    { prop: 'paystatus', label: 'settlement.profitsharepay.details.details.paystatus', formatValue: (val) => ePayFlagEnum.getEnumTypeName(val) },
+    { prop: 'payerid', label: 'settlement.profitsharepay.details.details.payerid', formatValue: (val) => handleNumberValue(val) },
+    { prop: 'paytime', label: 'settlement.profitsharepay.details.details.paytime', formatValue: (val) => formatDate(val) },
+    { prop: 'remark', label: 'settlement.profitsharepay.details.details.remark' },
 ]
 
 const onCancel = (isRefresh = false) => {

+ 15 - 15
src/packages/pc/views/settlement/profitsharepay/components/details/index.vue

@@ -8,11 +8,11 @@
             <app-table :data="dataList" :columns="tableColumns" selection-type="multiple" :loading="loading"
                 @select="onSelect" @selectable="onSelectable">
                 <template #headerLeft>
-                    <span>交易日:{{ record.tradedate }}</span>
+                    <span>{{ t('settlement.profitsharepay.details.tradedate') }}{{ record.tradedate }}</span>
                 </template>
                 <template #headerRight>
                     <div>
-                        <el-button type="primary" @click="onBatchClick">批量确认</el-button>
+                        <el-button type="primary" @click="onBatchClick">{{ t('operation.batchconfirm') }}</el-button>
                         <el-button @click="emit('closed')">{{ t('operate.close') }}</el-button>
                     </div>
                 </template>
@@ -87,24 +87,24 @@ const { dataList, total, pageSize, pageIndex, run } = useRequest(viewTradingDay,
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'shareorgname', label: '分润机构' },
-    { field: 'areatype', label: '分润机构角色', formatValue: (val) => roleTypeEnum.getEnumTypeName(val) },
-    { field: 'totalcount', label: '总笔数' },
-    { field: 'totalfee', label: '总手续费' },
-    { field: 'divideamount', label: '总分润金额' },
-    { field: 'paystatus', label: '状态', formatValue: (val) => ePayFlagEnum.getEnumTypeName(val) },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'shareorgname', label: 'settlement.profitsharepay.details.shareorgname' },
+    { field: 'areatype', label: 'settlement.profitsharepay.details.areatype', formatValue: (val) => roleTypeEnum.getEnumTypeName(val) },
+    { field: 'totalcount', label: 'settlement.profitsharepay.details.totalcount' },
+    { field: 'totalfee', label: 'settlement.profitsharepay.details.totalfee' },
+    { field: 'divideamount', label: 'settlement.profitsharepay.details.divideamount' },
+    { field: 'paystatus', label: 'settlement.profitsharepay.details.status', formatValue: (val) => ePayFlagEnum.getEnumTypeName(val) },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 filterOption.items = [
     {
         key: 'paystatus',
-        label: '支付状态',
+        label: t('settlement.profitsharepay.details.paystatus'),
         options: () => ePayFlagEnum.getEnumOptions()
     },
     {
         key: 'shareorgname',
-        label: '分润机构',
+        label: t('settlement.profitsharepay.details.shareorgname'),
     }
 ]
 
@@ -135,8 +135,8 @@ const onSearch = () => {
 const onBatchClick = () => {
     if (selectedItems.value.length) {
         ElMessageBox({
-            title: '提示',
-            message: '批量确认?',
+            title: t('common.alert'),
+            message: t('settlement.profitsharepay.details.tips2'),
             showCancelButton: true,
             beforeClose: (action, instance, done) => {
                 if (action === 'confirm') {
@@ -150,7 +150,7 @@ const onBatchClick = () => {
                         ElMessage.warning(res.message)
                         onSearch()
                     }).catch((err) => {
-                        ElMessage.error('确认失败:' + err)
+                        ElMessage.error(t('common.tips22') + err)
                     }).finally(() => {
                         done()
                     })
@@ -160,7 +160,7 @@ const onBatchClick = () => {
             }
         })
     } else {
-        ElMessage.warning('请勾选要确认的分润付款')
+        ElMessage.warning(t('settlement.profitsharepay.details.tips1'))
     }
 }
 </script>

+ 9 - 7
src/packages/pc/views/settlement/profitsharepay/index.vue

@@ -3,8 +3,8 @@
     <app-view>
         <template #header>
             <el-form ref="formRef" class="el-form--filter">
-                <el-form-item label="日期" prop="date">
-                    <el-date-picker v-model="queryParams.tradedate" placeholder="请选择" value-format="YYYYMMDD" />
+                <el-form-item :label="t('settlement.profitsharepay.date')" prop="date">
+                    <el-date-picker v-model="queryParams.tradedate" :placeholder="t('common.pleasechoice')" value-format="YYYYMMDD" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="onSearch()">{{ t('operate.search') }}</el-button>
@@ -41,7 +41,9 @@ import { useOperation } from '@/hooks/operation'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
+import { i18n } from '@/stores'
 
+const { global: { t } } = i18n
 const queryParams = ref<Model.ShareDayQueryReq>({})
 
 const { componentMap, componentId, record, openComponent, closeComponent, getFilteredButtons } = useOperation<Model.ShareDayQueryReq>({
@@ -59,11 +61,11 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(shared
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'tradedate', label: '交易日' },
-    { field: 'totalcount', label: '总笔数	' },
-    { field: 'divideamount', label: '总分润金额	' },
-    { field: 'totalpay', label: '总已付	' },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'tradedate', label: 'settlement.profitsharepay.tradedate' },
+    { field: 'totalcount', label: 'settlement.profitsharepay.totalcount' },
+    { field: 'divideamount', label: 'settlement.profitsharepay.divideamount' },
+    { field: 'totalpay', label: 'settlement.profitsharepay.totalpay' },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 const onSearch = () => {

+ 6 - 6
src/packages/pc/views/system/login_failed/index.vue

@@ -53,16 +53,16 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryE
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'loginaccount', label: '登录账号' },
-    { field: 'operatetime', label: '登录时间', formatValue: (val) => formatDate(val) },
-    { field: 'lienttype', label: '客户端类型' },
-    { field: 'loginip', label: '登录ip' },
-    { field: 'description', label: '失败原因' }
+    { field: 'loginaccount', label: 'system.login_failed.loginaccount' },
+    { field: 'operatetime', label: 'system.login_failed.operatetime', formatValue: (val) => formatDate(val) },
+    { field: 'lienttype', label: 'system.login_failed.lienttype' },
+    { field: 'loginip', label: 'system.login_failed.loginip' },
+    { field: 'description', label: 'system.login_failed.description' }
 ])
 
 filterOptons.inputList = [
     {
-        label: '登录人:', placeholder: '请输入账号或用户名', keys: ['userName']
+        label: t('system.login_failed.tips1'), placeholder: t('system.login_failed.tips2'), keys: ['userName']
     }
 ]
 

+ 2 - 2
src/packages/pc/views/system/menu/components/delete/index.vue

@@ -1,7 +1,7 @@
 <!-- 系统管理-菜单管理-删除 -->
 <template>
-    <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">是否删除该菜单?</div>
+    <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
+        <div class="g-text-message">{{ t('system.menu.delete.tips') }}</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operate.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operate.confirm') }}</el-button>

+ 21 - 21
src/packages/pc/views/system/menu/components/edit/index.vue

@@ -1,37 +1,37 @@
 <template>
-    <app-drawer title="编辑" width="600" v-model:show="show" :refresh="refresh">
+    <app-drawer :title="t('system.menu.edit.title')" width="600" v-model:show="show" :refresh="refresh">
         <el-form ref="formRef" class="el-form--vertical" label-width="90px" :model="formData" :rules="formRules"
             :show-message="false">
-            <el-form-item label="权限类型" prop="authType">
+            <el-form-item :label="t('system.menu.edit.authType')" prop="authType">
                 <el-radio-group v-model="formData.authType">
                     <template v-for="(item, index) in getAuthTypeList()" :key="index">
                         <el-radio :label="item.label" :value="item.value" />
                     </template>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item label="所属层级">
+            <el-form-item :label="t('system.menu.edit.resourceLevel')">
                 <el-tree-select v-model="formData.parentCode" :data="menus" :empty-values="[null, undefined]"
                     value-key="resourceCode" default-expand-all>
                     <template #default="{ data }">
-                        <el-option :label="data.title || '[无效的标题]'" :value="data.resourceCode" />
+                        <el-option :label="data.title || t('system.menu.edit.invalidTitle')" :value="data.resourceCode" />
                     </template>
                 </el-tree-select>
             </el-form-item>
-            <el-form-item label="权限标题" prop="title">
+            <el-form-item :label="t('system.menu.edit.resourceTitle')" prop="title">
                 <el-input v-model="formData.title" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <el-form-item label="权限代码" prop="resourceCode">
+            <el-form-item :label="t('system.menu.edit.resourceCode')" prop="resourceCode">
                 <el-input v-model="formData.resourceCode" :placeholder="t('common.pleaseenter')" :disabled="!!record?.resourceCode" />
             </el-form-item>
-            <el-form-item label="按钮样式" v-if="formData.authType === AuthType.Operate">
+            <el-form-item :label="t('system.menu.edit.buttontype')" v-if="formData.authType === AuthType.Operate">
                 <div class="el-form-item--col">
                     <el-select v-model="formData.className" clearable>
-                        <el-option label="默认" value="default" />
-                        <el-option label="主要" value="primary" />
-                        <el-option label="成功" value="success" />
-                        <el-option label="信息" value="info" />
-                        <el-option label="警告" value="warning" />
-                        <el-option label="危险" value="danger" />
+                        <el-option :label="t('system.menu.edit.default')" value="default" />
+                        <el-option :label="t('system.menu.edit.primary')" value="primary" />
+                        <el-option :label="t('system.menu.edit.success')" value="success" />
+                        <el-option :label="t('system.menu.edit.info')" value="info" />
+                        <el-option :label="t('system.menu.edit.warning')" value="warning" />
+                        <el-option :label="t('system.menu.edit.danger')" value="danger" />
                     </el-select>
                     <el-button :type="formData.className">
                         <component :is="components.appIcon" :icon="formData.icon" />
@@ -39,10 +39,10 @@
                     </el-button>
                 </div>
             </el-form-item>
-            <el-form-item label="图标">
+            <el-form-item :label="t('system.menu.edit.icon')">
                 <component :is="components.appIconSelect" v-model="formData.icon" />
             </el-form-item>
-            <el-form-item label="链接地址" prop="url" v-if="formData.authType === AuthType.Menu">
+            <el-form-item :label="t('system.menu.edit.url')" prop="url" v-if="formData.authType === AuthType.Menu">
                 <el-input v-model="formData.url" :placeholder="t('common.pleaseenter')">
                     <template #prepend>
                         <el-select v-model="formData.urlType" style="width: 120px">
@@ -52,17 +52,17 @@
                     </template>
                 </el-input>
             </el-form-item>
-            <el-form-item label="组件地址" prop="component"
+            <el-form-item :label="t('system.menu.edit.component')" prop="component"
                 v-if="formData.authType !== AuthType.Menu || formData.urlType === UrlType.Path">
                 <el-input v-model="formData.component" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <!-- <el-form-item label="备注" prop="remark">
+            <!-- <el-form-item :label="t('system.menu.edit.remark')" prop="remark">
                     <el-input type="textarea" :rows="2" v-model="formData.remark" :placeholder="t('common.pleaseenter')" />
                 </el-form-item> -->
-            <el-form-item label="排序" prop="sort">
+            <el-form-item :label="t('system.menu.edit.sort')" prop="sort">
                 <el-input-number v-model="formData.sort" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <el-form-item label="是否显示">
+            <el-form-item :label="t('system.menu.edit.show')">
                 <el-switch v-model="formData.show" :active-value="1" :inactive-value="0" />
             </el-form-item>
         </el-form>
@@ -104,7 +104,7 @@ const menus = computed(() => {
         resourceCode: '',
         parentCode: '',
         authType: AuthType.Menu,
-        title: '一级菜单',
+        title: t('system.menu.edit.parentitle'),
         urlType: UrlType.Path,
         url: '',
         component: '',
@@ -187,7 +187,7 @@ const onSubmit = () => {
                     ElMessage.error(t('common.tips4') + err)
                 })
             } else {
-                ElMessage.warning('代码 ' + rawData.resourceCode + ' 已存在')
+                ElMessage.warning(t('system.menu.edit.code') + rawData.resourceCode + t('system.menu.edit.exist'))
             }
         }
     })

+ 9 - 8
src/packages/pc/views/system/menu/index.vue

@@ -6,8 +6,8 @@
                     <el-button icon="Plus" @click="showComponent('edit')">{{ t('operate.add') }}</el-button>
                 </div>
                 <el-button type="primary" :icon="isRowExpansion ? 'FolderOpened' : 'Folder'" @click="tableExpandAll">
-                    <span v-if="isRowExpansion">全部收起</span>
-                    <span v-else>全部展开</span>
+                    <span v-if="isRowExpansion">{{ t('common.closeall') }}</span>
+                    <span v-else>{{ t('common.expandall') }}</span>
                 </el-button>
             </template>
             <template #operate="{ row }">
@@ -23,7 +23,7 @@
 <script lang="ts" setup>
 import { shallowRef, defineAsyncComponent } from 'vue'
 import { useComponent } from '@/hooks/component'
-import { useRouterStore } from '@/stores'
+import { i18n, useRouterStore } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const componentMap = new Map<string, unknown>([
@@ -31,6 +31,7 @@ const componentMap = new Map<string, unknown>([
     ['delete', defineAsyncComponent(() => import('./components/delete/index.vue'))], // 删除
 ])
 
+const { global: { t } } = i18n 
 const routerStore = useRouterStore()
 const record = shallowRef<Model.MenusRsp>()
 const tableRef = shallowRef()
@@ -41,11 +42,11 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const columns = shallowRef([
-    { field: 'title', label: '菜单', align: 'left' },
-    { field: 'resourceCode', label: '代码', },
-    { field: 'url', label: '路径', },
-    { field: 'icon', label: '图标', },
-    { field: 'operate', label: '操作', fixed: 'right' }
+    { field: 'title', label: 'system.menu.title', align: 'left' },
+    { field: 'resourceCode', label: 'system.menu.resourceCode', },
+    { field: 'url', label: 'system.menu.url', },
+    { field: 'icon', label: 'system.menu.icon', },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
 const showComponent = (componentName: string, row?: Model.MenusRsp) => {

+ 9 - 9
src/packages/pc/views/system/operation_log/index.vue

@@ -51,21 +51,21 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryL
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'resourcecode', label: '操作模块代码' },
-    { field: 'resourcename', label: '操作模块名称' },
-    { field: 'logincode', label: '登录账户' },
-    { field: 'username', label: '操作人' },
-    { field: 'areaname', label: '所属机构' },
-    { field: 'content', label: '操作内容' },
-    { field: 'operatetime', label: '操作时间', formatValue: (val) => formatDate(val) }
+    { field: 'resourcecode', label: 'system.operation_log.resourcecode' },
+    { field: 'resourcename', label: 'system.operation_log.resourcename' },
+    { field: 'logincode', label: 'system.operation_log.logincode' },
+    { field: 'username', label: 'system.operation_log.username' },
+    { field: 'areaname', label: 'system.operation_log.areaname' },
+    { field: 'content', label: 'system.operation_log.content' },
+    { field: 'operatetime', label: 'system.operation_log.operatetime', formatValue: (val) => formatDate(val) }
 ])
 
 filterOptons.inputList = [
     {
-        label: '操作人:', placeholder: '请输入用户名模糊查询', keys: ['userName']
+        label: t('system.operation_log.tips3'), placeholder: t('system.operation_log.tips1'), keys: ['userName']
     },
     {
-        label: '操作内容:', placeholder: '请输入操作内容模糊查询', keys: ['content']
+        label: t('system.operation_log.tips4'), placeholder: t('system.operation_log.tips2'), keys: ['content']
     }
 ]