Handy_Cao преди 8 месеца
родител
ревизия
a5a5d7069d

+ 132 - 11
public/locales/en-US.json

@@ -520,7 +520,16 @@
             }
         },
         "manage": {
-            "cancelapply": {},
+            "cancelapply": {
+                "accountname": "交易商",
+                "userid": "交易商名称",
+                "applystatus": "申请状态",
+                "applytime": "申请时间",
+                "handlestatus": "处理状态",
+                "handlestatus1": "交易商状态",
+                "auditlogincode": "审核人",
+                "audittime": "审核时间"
+            },
             "modification": {
                 "userid": "Trader Code",
                 "accountnamedisplay": "Trader",
@@ -1116,13 +1125,29 @@
                 "rolemodifytime": "Role Creation Time"
             },
             "riskcfg": {
-                "memberuserid": "Member",
-                "userid": "Member Code",
-                "username": "Member Name",
-                "accountid": "Fund Account",
-                "customertype": "Risk Rate Type (Customer Category)",
-                "tips1": "Please select member",
-                "tips2": "Enter code or name"
+                "title": "编辑",
+                "subtitle": "基本信息设置",
+                "subtitle1": "风险率信息",
+                "username": "交易商:",
+                "accountid": "资金账户:",
+                "customertype": "风险率类型:",
+                "riskcontrolmode": "风控模式:",
+                "riskcontrolmode1": "交易商",
+                "riskcontrolmode2": "做市会员",
+                "customertype1": "客户类别:",
+                "riskratiocalcmode": "风险率计算方式:",
+                "riskratiocalcmode1": "占用/净值",
+                "riskratiocalcmode2": "值/占用",
+                "notemarginriskratio": "提示保证金风险率:",
+                "addmarginriskratio": "追加保证金风险率:",
+                "cutriskratio": "斩仓风险率:",
+                "cutbackriskratio": "斩仓恢复风险率:",
+                "notesaferatio": "提示安全度:",
+                "addsaferatio": "追加安全度:",
+                "recoversaferatio": "恢复正常安全度:",
+                "cutsaferatio": "斩仓安全度:",
+                "isdefault": "是否默认:",
+                "markets": "斩仓市场顺序:"
             },
             "role": {
                 "rolename": "Role Name",
@@ -1450,7 +1475,67 @@
                 "tips3": "Please Enter Complete Fund Accounts, Separate Multiple With Commas"
             },
             "deliveryorder": {},
-            "deliverytrade": {},
+            "deliverytrade": {
+                "startDate":"开始时间",
+                "endDate":"结束时间",
+                "date":"日期",
+                "deliveryid": "交收单号",
+                "tradedate": "交易日",
+                "buyorsell": "方向",
+                "accountid": "买方",
+                "matchaccountid": "卖方",
+                "deliverygoodsname": "现货商品",
+                "deliveryqty": "现货数量",
+                "deliveryprice": "交收单价",
+                "deliveryamount": "货款总金额",
+                "deliverypricemove": "升贴水总金额",
+                "deliverycharge": "交收服务费",
+                "deliveryorderid": "委托单号",
+                "wrstandardid": "现货商品",
+                "xgoodsid": "主商品",
+                "accountid1": "资金账户",
+                "ishis": "交收数据类型",
+                "tips1": "请输入商品ID",
+                "tips2": "请输入资金账户ID",
+                "details": {
+                    "title": "详细",
+                    "subtitle1": "交收单信息",
+                    "subtitle2": "仓单信息",
+                    "subtitle3": "交易合约",
+                    "subtitle4": "辅助合约一",
+                    "subtitle5": "辅助合约二",
+                    "deliveryid": "交收单号:",
+                    "tradedate": "交易日:",
+                    "buyorsell": "方向:",
+                    "accountid": "买方(账号):",
+                    "matchaccountid": "卖方(账号):",
+                    "deliverytotalamount": "交收总金额:",
+                    "deliveryprice": "交收单价:",
+                    "deliverycharge": "交收服务费:",
+                    "deliverypricemove": "升贴水总额:",
+                    "remaintotalamount": "剩余总金额:",
+                    "deliverystatus": "状态:",
+                    "deliverytime": "成交时间:",
+                    "feealgorithm": "服务费收取方式:",
+                    "memberchargevalue": "会员服务费设置值:",
+                    "exchchargevalue": "平台服务费设置值:",
+                    "deliveryorderid": "申报单号:",
+                    "wrstandardcode": "现货商品:",
+                    "deliveryqty": "申报数量:",
+                    "deliveryrtradeqty": "成交数量:",
+                    "xgoodsname": "交易合约:",
+                    "xdeliveryprice": "交收单价:",
+                    "xdeliverycloseqty": "订单手数:",
+                    "ppricemode": "价格方式:",
+                    "pgoodsname": "辅助合约一:",
+                    "pdeliveryprice": "交收价格:",
+                    "pdeliverycloseqty": "订单手数:",
+                    "p2pricemode": "价格方式:",
+                    "p2goodsname": "辅助合约二:",
+                    "p2deliveryprice": "交收价格:",
+                    "p2deliverycloseqty": "订单手数:"
+                }
+            },
             "goodssumm": {
                 "marketid": "Market",
                 "date": "Date",
@@ -1481,7 +1566,20 @@
                 "closeplsum": "Total Transfer Profit/Loss",
                 "chargesum": "Total Service Fee"
             },
-            "liquidation": {},
+            "liquidation": {
+                "orderId": "委托单号",
+                "accountNameId": "账户",
+                "goodsCodeName": "商品代码/名称",
+                "buyOrSell": "方向",
+                "orderPrice": "斩仓委托价",
+                "orderQty": "斩仓数量",
+                "orderAccount": "斩仓金额",
+                "orderTime": "斩仓时间",
+                "marketId": "市场",
+                "goodsId": "商品",
+                "accountId": "账户",
+                "tips1": "请输入商品ID"
+            },
             "offlinedelivery": {},
             "order": {
                 "marketid": "Market",
@@ -1744,7 +1842,30 @@
                     "tips": "Confirm Export Table Data?"
                 }
             },
-            "tradesumm": {}
+            "tradesumm": {
+                "tradeDate": "交易日",
+                "loginid": "登录账号",
+                "currentname": "用户名称",
+                "parentusername": "所属机构",
+                "goodscode": "商品代码",
+                "goodsname": "商品名称",
+                "buyorselldisplay": "方向",
+                "tradeqty": "成交数量",
+                "tradepriceavg": "成交价格",
+                "tradeamount": "成交金额",
+                "totalcharge": "手续费",
+                "cycletime": "日期",
+                "goodsid": "商品",
+                "tips1": "请输入商品ID",
+                "tradetypes": "成交类别",
+                "tradetypes1": "交易成交",
+                "tradetypes2": "交收成交",
+                "tradetypes3": "风控斩仓",
+                "tradetypes4": "协议成交",
+                "tradetypes5": "持仓过户",
+                "tradetypes6": "系统强平",
+                "tradetypes7": "其它成交"
+            }
         },
         "order": {
             "close": {

+ 132 - 11
public/locales/th-TH.json

@@ -520,7 +520,16 @@
             }
         },
         "manage": {
-            "cancelapply": {},
+            "cancelapply": {
+                "accountname": "交易商",
+                "userid": "交易商名称",
+                "applystatus": "申请状态",
+                "applytime": "申请时间",
+                "handlestatus": "处理状态",
+                "handlestatus1": "交易商状态",
+                "auditlogincode": "审核人",
+                "audittime": "审核时间"
+            },
             "modification": {
                 "userid": "รหัสผู้ค้า",
                 "accountnamedisplay": "ผู้ค้า",
@@ -1116,13 +1125,29 @@
                 "rolemodifytime": "เวลาสร้างบทบาท"
             },
             "riskcfg": {
-                "memberuserid": "สมาชิก",
-                "userid": "รหัสสมาชิก",
-                "username": "ชื่อสมาชิก",
-                "accountid": "บัญชีเงินทุน",
-                "customertype": "ประเภทอัตราความเสี่ยง (ประเภทลูกค้า)",
-                "tips1": "กรุณาเลือกสมาชิก",
-                "tips2": "ป้อนรหัสหรือชื่อ"
+                "title": "编辑",
+                "subtitle": "基本信息设置",
+                "subtitle1": "风险率信息",
+                "username": "交易商:",
+                "accountid": "资金账户:",
+                "customertype": "风险率类型:",
+                "riskcontrolmode": "风控模式:",
+                "riskcontrolmode1": "交易商",
+                "riskcontrolmode2": "做市会员",
+                "customertype1": "客户类别:",
+                "riskratiocalcmode": "风险率计算方式:",
+                "riskratiocalcmode1": "占用/净值",
+                "riskratiocalcmode2": "值/占用",
+                "notemarginriskratio": "提示保证金风险率:",
+                "addmarginriskratio": "追加保证金风险率:",
+                "cutriskratio": "斩仓风险率:",
+                "cutbackriskratio": "斩仓恢复风险率:",
+                "notesaferatio": "提示安全度:",
+                "addsaferatio": "追加安全度:",
+                "recoversaferatio": "恢复正常安全度:",
+                "cutsaferatio": "斩仓安全度:",
+                "isdefault": "是否默认:",
+                "markets": "斩仓市场顺序:"
             },
             "role": {
                 "rolename": "ชื่อบทบาท",
@@ -1450,7 +1475,67 @@
                 "tips3": "กรุณาป้อนบัญชีเงินทุนครบถ้วน คั่นหลายรายการด้วยเครื่องหมายจุลภาค"
             },
             "deliveryorder": {},
-            "deliverytrade": {},
+            "deliverytrade": {
+                "startDate":"开始时间",
+                "endDate":"结束时间",
+                "date":"日期",
+                "deliveryid": "交收单号",
+                "tradedate": "交易日",
+                "buyorsell": "方向",
+                "accountid": "买方",
+                "matchaccountid": "卖方",
+                "deliverygoodsname": "现货商品",
+                "deliveryqty": "现货数量",
+                "deliveryprice": "交收单价",
+                "deliveryamount": "货款总金额",
+                "deliverypricemove": "升贴水总金额",
+                "deliverycharge": "交收服务费",
+                "deliveryorderid": "委托单号",
+                "wrstandardid": "现货商品",
+                "xgoodsid": "主商品",
+                "accountid1": "资金账户",
+                "ishis": "交收数据类型",
+                "tips1": "请输入商品ID",
+                "tips2": "请输入资金账户ID",
+                "details": {
+                    "title": "详细",
+                    "subtitle1": "交收单信息",
+                    "subtitle2": "仓单信息",
+                    "subtitle3": "交易合约",
+                    "subtitle4": "辅助合约一",
+                    "subtitle5": "辅助合约二",
+                    "deliveryid": "交收单号:",
+                    "tradedate": "交易日:",
+                    "buyorsell": "方向:",
+                    "accountid": "买方(账号):",
+                    "matchaccountid": "卖方(账号):",
+                    "deliverytotalamount": "交收总金额:",
+                    "deliveryprice": "交收单价:",
+                    "deliverycharge": "交收服务费:",
+                    "deliverypricemove": "升贴水总额:",
+                    "remaintotalamount": "剩余总金额:",
+                    "deliverystatus": "状态:",
+                    "deliverytime": "成交时间:",
+                    "feealgorithm": "服务费收取方式:",
+                    "memberchargevalue": "会员服务费设置值:",
+                    "exchchargevalue": "平台服务费设置值:",
+                    "deliveryorderid": "申报单号:",
+                    "wrstandardcode": "现货商品:",
+                    "deliveryqty": "申报数量:",
+                    "deliveryrtradeqty": "成交数量:",
+                    "xgoodsname": "交易合约:",
+                    "xdeliveryprice": "交收单价:",
+                    "xdeliverycloseqty": "订单手数:",
+                    "ppricemode": "价格方式:",
+                    "pgoodsname": "辅助合约一:",
+                    "pdeliveryprice": "交收价格:",
+                    "pdeliverycloseqty": "订单手数:",
+                    "p2pricemode": "价格方式:",
+                    "p2goodsname": "辅助合约二:",
+                    "p2deliveryprice": "交收价格:",
+                    "p2deliverycloseqty": "订单手数:"
+                }
+            },
             "goodssumm": {
                 "marketid": "ตลาด",
                 "date": "วันที่",
@@ -1481,7 +1566,20 @@
                 "closeplsum": "กำไร/ขาดทุนจากการโอนรวม",
                 "chargesum": "ค่าธรรมเนียมรวม"
             },
-            "liquidation": {},
+            "liquidation": {
+                "orderId": "委托单号",
+                "accountNameId": "账户",
+                "goodsCodeName": "商品代码/名称",
+                "buyOrSell": "方向",
+                "orderPrice": "斩仓委托价",
+                "orderQty": "斩仓数量",
+                "orderAccount": "斩仓金额",
+                "orderTime": "斩仓时间",
+                "marketId": "市场",
+                "goodsId": "商品",
+                "accountId": "账户",
+                "tips1": "请输入商品ID"
+            },
             "offlinedelivery": {},
             "order": {
                 "marketid": "ตลาด",
@@ -1744,7 +1842,30 @@
                     "tips": "ยืนยันการส่งออกข้อมูลตารางหรือไม่?"
                 }
             },
-            "tradesumm": {}
+            "tradesumm": {
+                "tradeDate": "交易日",
+                "loginid": "登录账号",
+                "currentname": "用户名称",
+                "parentusername": "所属机构",
+                "goodscode": "商品代码",
+                "goodsname": "商品名称",
+                "buyorselldisplay": "方向",
+                "tradeqty": "成交数量",
+                "tradepriceavg": "成交价格",
+                "tradeamount": "成交金额",
+                "totalcharge": "手续费",
+                "cycletime": "日期",
+                "goodsid": "商品",
+                "tips1": "请输入商品ID",
+                "tradetypes": "成交类别",
+                "tradetypes1": "交易成交",
+                "tradetypes2": "交收成交",
+                "tradetypes3": "风控斩仓",
+                "tradetypes4": "协议成交",
+                "tradetypes5": "持仓过户",
+                "tradetypes6": "系统强平",
+                "tradetypes7": "其它成交"
+            }
         },
         "order": {
             "close": {

+ 132 - 11
public/locales/vi-VN.json

@@ -520,7 +520,16 @@
             }
         },
         "manage": {
-            "cancelapply": {},
+            "cancelapply": {
+                "accountname": "交易商",
+                "userid": "交易商名称",
+                "applystatus": "申请状态",
+                "applytime": "申请时间",
+                "handlestatus": "处理状态",
+                "handlestatus1": "交易商状态",
+                "auditlogincode": "审核人",
+                "audittime": "审核时间"
+            },
             "modification": {
                 "userid": "交易商代码",
                 "accountnamedisplay": "交易商",
@@ -1116,13 +1125,29 @@
                 "rolemodifytime": "角色创建时间"
             },
             "riskcfg": {
-                "memberuserid": "会员",
-                "userid": "会员代码",
-                "username": "会员名称",
-                "accountid": "资金账户",
-                "customertype": "风险率类型(客户类别)",
-                "tips1": "请选择会员",
-                "tips2": "输入代码或名称"
+                "title": "编辑",
+                "subtitle": "基本信息设置",
+                "subtitle1": "风险率信息",
+                "username": "交易商:",
+                "accountid": "资金账户:",
+                "customertype": "风险率类型:",
+                "riskcontrolmode": "风控模式:",
+                "riskcontrolmode1": "交易商",
+                "riskcontrolmode2": "做市会员",
+                "customertype1": "客户类别:",
+                "riskratiocalcmode": "风险率计算方式:",
+                "riskratiocalcmode1": "占用/净值",
+                "riskratiocalcmode2": "值/占用",
+                "notemarginriskratio": "提示保证金风险率:",
+                "addmarginriskratio": "追加保证金风险率:",
+                "cutriskratio": "斩仓风险率:",
+                "cutbackriskratio": "斩仓恢复风险率:",
+                "notesaferatio": "提示安全度:",
+                "addsaferatio": "追加安全度:",
+                "recoversaferatio": "恢复正常安全度:",
+                "cutsaferatio": "斩仓安全度:",
+                "isdefault": "是否默认:",
+                "markets": "斩仓市场顺序:"
             },
             "role": {
                 "rolename": "角色名称",
@@ -1450,7 +1475,67 @@
                 "tips3": "请输入完整资金账户,多个逗号分隔"
             },
             "deliveryorder": {},
-            "deliverytrade": {},
+            "deliverytrade": {
+                "startDate":"开始时间",
+                "endDate":"结束时间",
+                "date":"日期",
+                "deliveryid": "交收单号",
+                "tradedate": "交易日",
+                "buyorsell": "方向",
+                "accountid": "买方",
+                "matchaccountid": "卖方",
+                "deliverygoodsname": "现货商品",
+                "deliveryqty": "现货数量",
+                "deliveryprice": "交收单价",
+                "deliveryamount": "货款总金额",
+                "deliverypricemove": "升贴水总金额",
+                "deliverycharge": "交收服务费",
+                "deliveryorderid": "委托单号",
+                "wrstandardid": "现货商品",
+                "xgoodsid": "主商品",
+                "accountid1": "资金账户",
+                "ishis": "交收数据类型",
+                "tips1": "请输入商品ID",
+                "tips2": "请输入资金账户ID",
+                "details": {
+                    "title": "详细",
+                    "subtitle1": "交收单信息",
+                    "subtitle2": "仓单信息",
+                    "subtitle3": "交易合约",
+                    "subtitle4": "辅助合约一",
+                    "subtitle5": "辅助合约二",
+                    "deliveryid": "交收单号:",
+                    "tradedate": "交易日:",
+                    "buyorsell": "方向:",
+                    "accountid": "买方(账号):",
+                    "matchaccountid": "卖方(账号):",
+                    "deliverytotalamount": "交收总金额:",
+                    "deliveryprice": "交收单价:",
+                    "deliverycharge": "交收服务费:",
+                    "deliverypricemove": "升贴水总额:",
+                    "remaintotalamount": "剩余总金额:",
+                    "deliverystatus": "状态:",
+                    "deliverytime": "成交时间:",
+                    "feealgorithm": "服务费收取方式:",
+                    "memberchargevalue": "会员服务费设置值:",
+                    "exchchargevalue": "平台服务费设置值:",
+                    "deliveryorderid": "申报单号:",
+                    "wrstandardcode": "现货商品:",
+                    "deliveryqty": "申报数量:",
+                    "deliveryrtradeqty": "成交数量:",
+                    "xgoodsname": "交易合约:",
+                    "xdeliveryprice": "交收单价:",
+                    "xdeliverycloseqty": "订单手数:",
+                    "ppricemode": "价格方式:",
+                    "pgoodsname": "辅助合约一:",
+                    "pdeliveryprice": "交收价格:",
+                    "pdeliverycloseqty": "订单手数:",
+                    "p2pricemode": "价格方式:",
+                    "p2goodsname": "辅助合约二:",
+                    "p2deliveryprice": "交收价格:",
+                    "p2deliverycloseqty": "订单手数:"
+                }
+            },
             "goodssumm": {
                 "marketid": "市场",
                 "date": "日期",
@@ -1481,7 +1566,20 @@
                 "closeplsum": "总转让损益",
                 "chargesum": "总手续费"
             },
-            "liquidation": {},
+            "liquidation": {
+                "orderId": "委托单号",
+                "accountNameId": "账户",
+                "goodsCodeName": "商品代码/名称",
+                "buyOrSell": "方向",
+                "orderPrice": "斩仓委托价",
+                "orderQty": "斩仓数量",
+                "orderAccount": "斩仓金额",
+                "orderTime": "斩仓时间",
+                "marketId": "市场",
+                "goodsId": "商品",
+                "accountId": "账户",
+                "tips1": "请输入商品ID"
+            },
             "offlinedelivery": {},
             "order": {
                 "marketid": "市场",
@@ -1744,7 +1842,30 @@
                     "tips": "确定导出表格数据?"
                 }
             },
-            "tradesumm": {}
+            "tradesumm": {
+                "tradeDate": "交易日",
+                "loginid": "登录账号",
+                "currentname": "用户名称",
+                "parentusername": "所属机构",
+                "goodscode": "商品代码",
+                "goodsname": "商品名称",
+                "buyorselldisplay": "方向",
+                "tradeqty": "成交数量",
+                "tradepriceavg": "成交价格",
+                "tradeamount": "成交金额",
+                "totalcharge": "手续费",
+                "cycletime": "日期",
+                "goodsid": "商品",
+                "tips1": "请输入商品ID",
+                "tradetypes": "成交类别",
+                "tradetypes1": "交易成交",
+                "tradetypes2": "交收成交",
+                "tradetypes3": "风控斩仓",
+                "tradetypes4": "协议成交",
+                "tradetypes5": "持仓过户",
+                "tradetypes6": "系统强平",
+                "tradetypes7": "其它成交"
+            }
         },
         "order": {
             "close": {

+ 132 - 11
public/locales/zh-CN.json

@@ -520,7 +520,16 @@
             }
         },
         "manage": {
-            "cancelapply": {},
+            "cancelapply": {
+                "accountname": "交易商",
+                "userid": "交易商名称",
+                "applystatus": "申请状态",
+                "applytime": "申请时间",
+                "handlestatus": "处理状态",
+                "handlestatus1": "交易商状态",
+                "auditlogincode": "审核人",
+                "audittime": "审核时间"
+            },
             "modification": {
                 "userid": "交易商代码",
                 "accountnamedisplay": "交易商",
@@ -1116,13 +1125,29 @@
                 "rolemodifytime": "角色创建时间"
             },
             "riskcfg": {
-                "memberuserid": "会员",
-                "userid": "会员代码",
-                "username": "会员名称",
-                "accountid": "资金账户",
-                "customertype": "风险率类型(客户类别)",
-                "tips1": "请选择会员",
-                "tips2": "输入代码或名称"
+                "title": "编辑",
+                "subtitle": "基本信息设置",
+                "subtitle1": "风险率信息",
+                "username": "交易商:",
+                "accountid": "资金账户:",
+                "customertype": "风险率类型:",
+                "riskcontrolmode": "风控模式:",
+                "riskcontrolmode1": "交易商",
+                "riskcontrolmode2": "做市会员",
+                "customertype1": "客户类别:",
+                "riskratiocalcmode": "风险率计算方式:",
+                "riskratiocalcmode1": "占用/净值",
+                "riskratiocalcmode2": "值/占用",
+                "notemarginriskratio": "提示保证金风险率:",
+                "addmarginriskratio": "追加保证金风险率:",
+                "cutriskratio": "斩仓风险率:",
+                "cutbackriskratio": "斩仓恢复风险率:",
+                "notesaferatio": "提示安全度:",
+                "addsaferatio": "追加安全度:",
+                "recoversaferatio": "恢复正常安全度:",
+                "cutsaferatio": "斩仓安全度:",
+                "isdefault": "是否默认:",
+                "markets": "斩仓市场顺序:"
             },
             "role": {
                 "rolename": "角色名称",
@@ -1450,7 +1475,67 @@
                 "tips3": "请输入完整资金账户,多个逗号分隔"
             },
             "deliveryorder": {},
-            "deliverytrade": {},
+            "deliverytrade": {
+                "startDate":"开始时间",
+                "endDate":"结束时间",
+                "date":"日期",
+                "deliveryid": "交收单号",
+                "tradedate": "交易日",
+                "buyorsell": "方向",
+                "accountid": "买方",
+                "matchaccountid": "卖方",
+                "deliverygoodsname": "现货商品",
+                "deliveryqty": "现货数量",
+                "deliveryprice": "交收单价",
+                "deliveryamount": "货款总金额",
+                "deliverypricemove": "升贴水总金额",
+                "deliverycharge": "交收服务费",
+                "deliveryorderid": "委托单号",
+                "wrstandardid": "现货商品",
+                "xgoodsid": "主商品",
+                "accountid1": "资金账户",
+                "ishis": "交收数据类型",
+                "tips1": "请输入商品ID",
+                "tips2": "请输入资金账户ID",
+                "details": {
+                    "title": "详细",
+                    "subtitle1": "交收单信息",
+                    "subtitle2": "仓单信息",
+                    "subtitle3": "交易合约",
+                    "subtitle4": "辅助合约一",
+                    "subtitle5": "辅助合约二",
+                    "deliveryid": "交收单号:",
+                    "tradedate": "交易日:",
+                    "buyorsell": "方向:",
+                    "accountid": "买方(账号):",
+                    "matchaccountid": "卖方(账号):",
+                    "deliverytotalamount": "交收总金额:",
+                    "deliveryprice": "交收单价:",
+                    "deliverycharge": "交收服务费:",
+                    "deliverypricemove": "升贴水总额:",
+                    "remaintotalamount": "剩余总金额:",
+                    "deliverystatus": "状态:",
+                    "deliverytime": "成交时间:",
+                    "feealgorithm": "服务费收取方式:",
+                    "memberchargevalue": "会员服务费设置值:",
+                    "exchchargevalue": "平台服务费设置值:",
+                    "deliveryorderid": "申报单号:",
+                    "wrstandardcode": "现货商品:",
+                    "deliveryqty": "申报数量:",
+                    "deliveryrtradeqty": "成交数量:",
+                    "xgoodsname": "交易合约:",
+                    "xdeliveryprice": "交收单价:",
+                    "xdeliverycloseqty": "订单手数:",
+                    "ppricemode": "价格方式:",
+                    "pgoodsname": "辅助合约一:",
+                    "pdeliveryprice": "交收价格:",
+                    "pdeliverycloseqty": "订单手数:",
+                    "p2pricemode": "价格方式:",
+                    "p2goodsname": "辅助合约二:",
+                    "p2deliveryprice": "交收价格:",
+                    "p2deliverycloseqty": "订单手数:"
+                }
+            },
             "goodssumm": {
                 "marketid": "市场",
                 "date": "日期",
@@ -1481,7 +1566,20 @@
                 "closeplsum": "总转让损益",
                 "chargesum": "总手续费"
             },
-            "liquidation": {},
+            "liquidation": {
+                "orderId": "委托单号",
+                "accountNameId": "账户",
+                "goodsCodeName": "商品代码/名称",
+                "buyOrSell": "方向",
+                "orderPrice": "斩仓委托价",
+                "orderQty": "斩仓数量",
+                "orderAccount": "斩仓金额",
+                "orderTime": "斩仓时间",
+                "marketId": "市场",
+                "goodsId": "商品",
+                "accountId": "账户",
+                "tips1": "请输入商品ID"
+            },
             "offlinedelivery": {},
             "order": {
                 "marketid": "市场",
@@ -1744,7 +1842,30 @@
                     "tips": "确定导出表格数据?"
                 }
             },
-            "tradesumm": {}
+            "tradesumm": {
+                "tradeDate": "交易日",
+                "loginid": "登录账号",
+                "currentname": "用户名称",
+                "parentusername": "所属机构",
+                "goodscode": "商品代码",
+                "goodsname": "商品名称",
+                "buyorselldisplay": "方向",
+                "tradeqty": "成交数量",
+                "tradepriceavg": "成交价格",
+                "tradeamount": "成交金额",
+                "totalcharge": "手续费",
+                "cycletime": "日期",
+                "goodsid": "商品",
+                "tips1": "请输入商品ID",
+                "tradetypes": "成交类别",
+                "tradetypes1": "交易成交",
+                "tradetypes2": "交收成交",
+                "tradetypes3": "风控斩仓",
+                "tradetypes4": "协议成交",
+                "tradetypes5": "持仓过户",
+                "tradetypes6": "系统强平",
+                "tradetypes7": "其它成交"
+            }
         },
         "order": {
             "close": {

+ 132 - 11
public/locales/zh-TW.json

@@ -520,7 +520,16 @@
             }
         },
         "manage": {
-            "cancelapply": {},
+            "cancelapply": {
+                "accountname": "交易商",
+                "userid": "交易商名称",
+                "applystatus": "申请状态",
+                "applytime": "申请时间",
+                "handlestatus": "处理状态",
+                "handlestatus1": "交易商状态",
+                "auditlogincode": "审核人",
+                "audittime": "审核时间"
+            },
             "modification": {
                 "userid": "交易商代碼",
                 "accountnamedisplay": "交易商",
@@ -1116,13 +1125,29 @@
                 "rolemodifytime": "角色創建時間"
             },
             "riskcfg": {
-                "memberuserid": "會員",
-                "userid": "會員代碼",
-                "username": "會員名稱",
-                "accountid": "資金賬戶",
-                "customertype": "風險率類型(客戶類別)",
-                "tips1": "請選擇會員",
-                "tips2": "輸入代碼或名稱"
+                "title": "编辑",
+                "subtitle": "基本信息设置",
+                "subtitle1": "风险率信息",
+                "username": "交易商:",
+                "accountid": "资金账户:",
+                "customertype": "风险率类型:",
+                "riskcontrolmode": "风控模式:",
+                "riskcontrolmode1": "交易商",
+                "riskcontrolmode2": "做市会员",
+                "customertype1": "客户类别:",
+                "riskratiocalcmode": "风险率计算方式:",
+                "riskratiocalcmode1": "占用/净值",
+                "riskratiocalcmode2": "值/占用",
+                "notemarginriskratio": "提示保证金风险率:",
+                "addmarginriskratio": "追加保证金风险率:",
+                "cutriskratio": "斩仓风险率:",
+                "cutbackriskratio": "斩仓恢复风险率:",
+                "notesaferatio": "提示安全度:",
+                "addsaferatio": "追加安全度:",
+                "recoversaferatio": "恢复正常安全度:",
+                "cutsaferatio": "斩仓安全度:",
+                "isdefault": "是否默认:",
+                "markets": "斩仓市场顺序:"
             },
             "role": {
                 "rolename": "角色名稱",
@@ -1450,7 +1475,67 @@
                 "tips3": "請輸入完整資金賬戶,多個逗號分隔"
             },
             "deliveryorder": {},
-            "deliverytrade": {},
+            "deliverytrade": {
+                "startDate":"开始时间",
+                "endDate":"结束时间",
+                "date":"日期",
+                "deliveryid": "交收单号",
+                "tradedate": "交易日",
+                "buyorsell": "方向",
+                "accountid": "买方",
+                "matchaccountid": "卖方",
+                "deliverygoodsname": "现货商品",
+                "deliveryqty": "现货数量",
+                "deliveryprice": "交收单价",
+                "deliveryamount": "货款总金额",
+                "deliverypricemove": "升贴水总金额",
+                "deliverycharge": "交收服务费",
+                "deliveryorderid": "委托单号",
+                "wrstandardid": "现货商品",
+                "xgoodsid": "主商品",
+                "accountid1": "资金账户",
+                "ishis": "交收数据类型",
+                "tips1": "请输入商品ID",
+                "tips2": "请输入资金账户ID",
+                "details": {
+                    "title": "详细",
+                    "subtitle1": "交收单信息",
+                    "subtitle2": "仓单信息",
+                    "subtitle3": "交易合约",
+                    "subtitle4": "辅助合约一",
+                    "subtitle5": "辅助合约二",
+                    "deliveryid": "交收单号:",
+                    "tradedate": "交易日:",
+                    "buyorsell": "方向:",
+                    "accountid": "买方(账号):",
+                    "matchaccountid": "卖方(账号):",
+                    "deliverytotalamount": "交收总金额:",
+                    "deliveryprice": "交收单价:",
+                    "deliverycharge": "交收服务费:",
+                    "deliverypricemove": "升贴水总额:",
+                    "remaintotalamount": "剩余总金额:",
+                    "deliverystatus": "状态:",
+                    "deliverytime": "成交时间:",
+                    "feealgorithm": "服务费收取方式:",
+                    "memberchargevalue": "会员服务费设置值:",
+                    "exchchargevalue": "平台服务费设置值:",
+                    "deliveryorderid": "申报单号:",
+                    "wrstandardcode": "现货商品:",
+                    "deliveryqty": "申报数量:",
+                    "deliveryrtradeqty": "成交数量:",
+                    "xgoodsname": "交易合约:",
+                    "xdeliveryprice": "交收单价:",
+                    "xdeliverycloseqty": "订单手数:",
+                    "ppricemode": "价格方式:",
+                    "pgoodsname": "辅助合约一:",
+                    "pdeliveryprice": "交收价格:",
+                    "pdeliverycloseqty": "订单手数:",
+                    "p2pricemode": "价格方式:",
+                    "p2goodsname": "辅助合约二:",
+                    "p2deliveryprice": "交收价格:",
+                    "p2deliverycloseqty": "订单手数:"
+                }
+            },
             "goodssumm": {
                 "marketid": "市場",
                 "date": "日期",
@@ -1481,7 +1566,20 @@
                 "closeplsum": "總轉讓損益",
                 "chargesum": "總手續費"
             },
-            "liquidation": {},
+            "liquidation": {
+                "orderId": "委托单号",
+                "accountNameId": "账户",
+                "goodsCodeName": "商品代码/名称",
+                "buyOrSell": "方向",
+                "orderPrice": "斩仓委托价",
+                "orderQty": "斩仓数量",
+                "orderAccount": "斩仓金额",
+                "orderTime": "斩仓时间",
+                "marketId": "市场",
+                "goodsId": "商品",
+                "accountId": "账户",
+                "tips1": "请输入商品ID"
+            },
             "offlinedelivery": {},
             "order": {
                 "marketid": "市場",
@@ -1744,7 +1842,30 @@
                     "tips": "確定導出表格數據?"
                 }
             },
-            "tradesumm": {}
+            "tradesumm": {
+                "tradeDate": "交易日",
+                "loginid": "登录账号",
+                "currentname": "用户名称",
+                "parentusername": "所属机构",
+                "goodscode": "商品代码",
+                "goodsname": "商品名称",
+                "buyorselldisplay": "方向",
+                "tradeqty": "成交数量",
+                "tradepriceavg": "成交价格",
+                "tradeamount": "成交金额",
+                "totalcharge": "手续费",
+                "cycletime": "日期",
+                "goodsid": "商品",
+                "tips1": "请输入商品ID",
+                "tradetypes": "成交类别",
+                "tradetypes1": "交易成交",
+                "tradetypes2": "交收成交",
+                "tradetypes3": "风控斩仓",
+                "tradetypes4": "协议成交",
+                "tradetypes5": "持仓过户",
+                "tradetypes6": "系统强平",
+                "tradetypes7": "其它成交"
+            }
         },
         "order": {
             "close": {

+ 8 - 8
src/packages/pc/views/investor/manage/cancelapply/index.vue

@@ -61,12 +61,12 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(invest
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'userid', label: '交易商名称' },
-    { field: 'applystatus', label: '申请状态', formatValue: (val) => ucapplystatusEnum.getEnumTypeName(val) },
-    { field: 'applytime', label: '申请时间', formatValue: (val) => formatDate(val) },
-    { field: 'handlestatus', label: '处理状态', formatValue: (val) => handlestatusEnum.getEnumTypeName(val) },
-    { field: 'auditlogincode', label: '审核人' },
-    { field: 'audittime', label: '审核时间', formatValue: (val) => formatDate(val) },
+    { field: 'userid', label: 'investor.manage.cancelapply.userid' },
+    { field: 'applystatus', label: 'investor.manage.cancelapply.applystatus', formatValue: (val) => ucapplystatusEnum.getEnumTypeName(val) },
+    { field: 'applytime', label: 'investor.manage.cancelapply.applytime', formatValue: (val) => formatDate(val) },
+    { field: 'handlestatus', label: 'investor.manage.cancelapply.handlestatus', formatValue: (val) => handlestatusEnum.getEnumTypeName(val) },
+    { field: 'auditlogincode', label: 'investor.manage.cancelapply.auditlogincode' },
+    { field: 'audittime', label: 'investor.manage.cancelapply.audittime', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
@@ -74,11 +74,11 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Investor.In
     filters: [
         {
             field: 'accountname',
-            label: '交易商'
+            label: t('investor.manage.cancelapply.accountname')
         },
         {
             field: 'handlestatus',
-            label: '交易商状态',
+            label: t('investor.manage.cancelapply.handlestatus1'),
             options: () => handlestatusEnum.getEnumOptions()
         },
     ],

+ 23 - 20
src/packages/pc/views/member/institution/riskcfg/components/details/index.vue

@@ -1,10 +1,10 @@
 <!-- 会员机构管理-机构管理-风控个性化设置-详情 -->
 <template>
-    <app-drawer title="编辑" width="900" v-model:show="show" :refresh="refresh">
-        <app-table-details title="基本信息设置" :data="record" :label-width="160" :cell-props="detailProps1" :column="2" />
-        <app-table-details title="风险率信息" :data="data" :label-width="160" :cell-props="detailProps2" :column="2" />
+    <app-drawer :title="t('member.institution.riskcfg.title')" width="900" v-model:show="show" :refresh="refresh">
+        <app-table-details :title="t('member.institution.riskcfg.subtitle')" :data="record" :label-width="160" :cell-props="detailProps1" :column="2" />
+        <app-table-details :title="t('member.institution.riskcfg.subtitle1')" :data="data" :label-width="160" :cell-props="detailProps2" :column="2" />
         <template #footer>
-            <el-button @click="onCancel(false)">关闭</el-button>
+            <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
         </template>
     </app-drawer>
 </template>
@@ -19,6 +19,7 @@ import { getRiskRatioTypeForMarketer } from '@/services/api/investor'
 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: {
@@ -27,6 +28,8 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
+
 // 风险率类型
 const marketerTypeEnum = useEnum('marketerType')
 
@@ -44,27 +47,27 @@ const { data } = useRequest(getRiskRatioTypeForMarketer, {
 })
 
 const detailProps1: CellProp[] = [
-    { prop: 'username', label: '交易商:', },
-    { prop: 'accountid', label: '资金账户:', },
-    { prop: 'customertype', label: '风险率类型:', formatValue: (val) => marketerTypeEnum.getEnumTypeName(val) },
+    { prop: 'username', label: 'member.institution.riskcfg.username', },
+    { prop: 'accountid', label: 'member.institution.riskcfg.accountid', },
+    { prop: 'customertype', label: 'member.institution.riskcfg.customertype', formatValue: (val) => marketerTypeEnum.getEnumTypeName(val) },
 ]
 
 const detailProps2 = computed<CellProp[]>(() => {
     const { notesaferatio } = data.value ?? {}
     return [
-        { prop: 'riskcontrolmode', label: '风控模式:', formatValue: (val) => val === 1 ? '交易商' : '做市会员' },
-        { prop: 'customertype', label: '客户类别:', formatValue: (val) => marketerTypeEnum.getEnumTypeName(val) },
-        { prop: 'riskratiocalcmode', label: '风险率计算方式:', formatValue: (val) => val === 1 ? '占用/净值' : '净值/占用' },
-        { prop: 'notemarginriskratio', label: '提示保证金风险率:', formatValue: (val) => val + '%', show: !notesaferatio },
-        { prop: 'addmarginriskratio', label: '追加保证金风险率:', formatValue: (val) => val + '%', show: !notesaferatio },
-        { prop: 'cutriskratio', label: '斩仓风险率:', formatValue: (val) => val + '%', show: !notesaferatio },
-        { prop: 'cutbackriskratio', label: '斩仓恢复风险率:', formatValue: (val) => val + '%', show: !notesaferatio },
-        { prop: 'notesaferatio', label: '提示安全度:', formatValue: (val) => val + '%', show: !!notesaferatio },
-        { prop: 'addsaferatio', label: '追加安全度:', formatValue: (val) => val + '%', show: !!notesaferatio },
-        { prop: 'recoversaferatio', label: '恢复正常安全度:', formatValue: (val) => val + '%', show: !!notesaferatio },
-        { prop: 'cutsaferatio', label: '斩仓安全度:', formatValue: (val) => val + '%', show: !!notesaferatio },
-        { prop: 'isdefault', label: '是否默认:', formatValue: (val) => getConfirmationName(val) },
-        { prop: 'markets', label: '斩仓市场顺序:' },
+        { prop: 'riskcontrolmode', label: 'member.institution.riskcfg.riskcontrolmode', formatValue: (val) => val === 1 ? 'member.institution.riskcfg.riskcontrolmode1' : 'member.institution.riskcfg.riskcontrolmode2' },
+        { prop: 'customertype', label: 'member.institution.riskcfg.customertype1', formatValue: (val) => marketerTypeEnum.getEnumTypeName(val) },
+        { prop: 'riskratiocalcmode', label: 'member.institution.riskcfg.riskratiocalcmode', formatValue: (val) => val === 1 ? 'member.institution.riskcfg.riskratiocalcmode1' : 'member.institution.riskcfg.riskratiocalcmode2' },
+        { prop: 'notemarginriskratio', label: 'member.institution.riskcfg.notemarginriskratio', formatValue: (val) => val + '%', show: !notesaferatio },
+        { prop: 'addmarginriskratio', label: 'member.institution.riskcfg.addmarginriskratio', formatValue: (val) => val + '%', show: !notesaferatio },
+        { prop: 'cutriskratio', label: 'member.institution.riskcfg.cutriskratio', formatValue: (val) => val + '%', show: !notesaferatio },
+        { prop: 'cutbackriskratio', label: 'member.institution.riskcfg.cutbackriskratio', formatValue: (val) => val + '%', show: !notesaferatio },
+        { prop: 'notesaferatio', label: 'member.institution.riskcfg.notesaferatio', formatValue: (val) => val + '%', show: !!notesaferatio },
+        { prop: 'addsaferatio', label: 'member.institution.riskcfg.addsaferatio', formatValue: (val) => val + '%', show: !!notesaferatio },
+        { prop: 'recoversaferatio', label: 'member.institution.riskcfg.recoversaferatio', formatValue: (val) => val + '%', show: !!notesaferatio },
+        { prop: 'cutsaferatio', label: 'member.institution.riskcfg.cutsaferatio', formatValue: (val) => val + '%', show: !!notesaferatio },
+        { prop: 'isdefault', label: 'member.institution.riskcfg.isdefault', formatValue: (val) => getConfirmationName(val) },
+        { prop: 'markets', label: 'member.institution.riskcfg.markets' },
     ]
 })
 

+ 36 - 36
src/packages/pc/views/query/internal/deliverytrade/components/details/index.vue

@@ -1,7 +1,7 @@
 <!-- 查询管理-内部订单查询-交收成交查询-详情 -->
 <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-drawer :title="t('query.internal.deliverytrade.details.title')" width="960" v-model:show="show">
+        <app-table-details :title="t('query.internal.deliverytrade.details.subtitle1')" :data="data" :label-width="200" :cell-props="detailProps1" :column="2">
             <!-- 会员服务费设置值 -->
             <template #memberchargevalue v-if="data">
                 <template v-if="data.memberchargevalue">
@@ -27,11 +27,11 @@
                 </template>
             </template>
         </app-table-details>
-        <app-table-details title="仓单信息" :data="data" :label-width="200" :cell-props="detailProps2" :column="2" />
-        <app-table-details title="交易合约" :data="data" :label-width="200" :cell-props="detailProps3" :column="2" />
-        <app-table-details title="辅助合约一" :data="data" :label-width="200" :cell-props="detailProps4" :column="2"
+        <app-table-details :title="t('query.internal.deliverytrade.details.subtitle2')" :data="data" :label-width="200" :cell-props="detailProps2" :column="2" />
+        <app-table-details :title="t('query.internal.deliverytrade.details.subtitle3')" :data="data" :label-width="200" :cell-props="detailProps3" :column="2" />
+        <app-table-details :title="t('query.internal.deliverytrade.details.subtitle4')" :data="data" :label-width="200" :cell-props="detailProps4" :column="2"
             v-if="!!data?.ppricemode" />
-        <app-table-details title="辅助合约二" :data="data" :label-width="200" :cell-props="detailProps5" :column="2"
+        <app-table-details :title="t('query.internal.deliverytrade.details.subtitle5')" :data="data" :label-width="200" :cell-props="detailProps5" :column="2"
             v-if="!!data?.p2pricemode" />
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
@@ -82,22 +82,22 @@ const detailProps1 = computed(() => {
     const seller = buyorsell === BuyOrSell.Buy ? `${matchaccountname}(${matchaccountid})` : `${accountname}(${accountid})`
 
     const result: CellProp[] = [
-        { prop: 'deliveryid', label: '交收单号:' },
-        { prop: 'tradedate', label: '交易日:', formatValue: () => formatDate(histradedate || tradedate, 'YYYY-MM-DD') },
-        { prop: 'buyorsell', label: '方向:', formatValue: (val) => getBuyOrSellName(val) },
-        { prop: 'accountid', label: '买方(账号):', formatValue: (val) => val && buyer },
-        { prop: 'matchaccountid', label: '卖方(账号):', formatValue: (val) => val && seller },
-        { prop: 'deliverytotalamount', label: '交收总金额:' },
-        { prop: 'deliveryprice', label: '交收单价:' },
-        { prop: 'deliverycharge', label: '交收服务费:' },
-        { prop: 'deliverypricemove', label: '升贴水总额:' },
-        { prop: 'remaintotalamount', label: '剩余总金额:' },
-        { prop: 'deliverystatus', label: '状态:', formatValue: (val) => deliveryorderstatus1Enum.getEnumTypeName(val) },
-        { prop: 'deliverytime', label: '成交时间:', formatValue: (val) => formatDate(val) },
-        { prop: 'feealgorithm', label: '服务费收取方式:', formatValue: (val) => getFeeAlgorithmName(val) },
-        { prop: 'memberchargevalue', label: '会员服务费设置值:' },
-        { prop: 'exchchargevalue', label: '平台服务费设置值:' },
-        { prop: 'deliveryorderid', label: '申报单号:' },
+        { prop: 'deliveryid', label: 'query.internal.deliverytrade.details.deliveryid' },
+        { prop: 'tradedate', label: 'query.internal.deliverytrade.details.tradedate', formatValue: () => formatDate(histradedate || tradedate, 'YYYY-MM-DD') },
+        { prop: 'buyorsell', label: 'query.internal.deliverytrade.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+        { prop: 'accountid', label: 'query.internal.deliverytrade.details.accountid', formatValue: (val) => val && buyer },
+        { prop: 'matchaccountid', label: 'query.internal.deliverytrade.details.matchaccountid', formatValue: (val) => val && seller },
+        { prop: 'deliverytotalamount', label: 'query.internal.deliverytrade.details.deliverytotalamount' },
+        { prop: 'deliveryprice', label: 'query.internal.deliverytrade.details.deliveryprice' },
+        { prop: 'deliverycharge', label: 'query.internal.deliverytrade.details.deliverycharge' },
+        { prop: 'deliverypricemove', label: 'query.internal.deliverytrade.details.deliverypricemove' },
+        { prop: 'remaintotalamount', label: 'query.internal.deliverytrade.details.remaintotalamount' },
+        { prop: 'deliverystatus', label: 'query.internal.deliverytrade.details.deliverystatus', formatValue: (val) => deliveryorderstatus1Enum.getEnumTypeName(val) },
+        { prop: 'deliverytime', label: 'query.internal.deliverytrade.details.deliverytime', formatValue: (val) => formatDate(val) },
+        { prop: 'feealgorithm', label: 'query.internal.deliverytrade.details.feealgorithm', formatValue: (val) => getFeeAlgorithmName(val) },
+        { prop: 'memberchargevalue', label: 'query.internal.deliverytrade.details.memberchargevalue' },
+        { prop: 'exchchargevalue', label: 'query.internal.deliverytrade.details.exchchargevalue' },
+        { prop: 'deliveryorderid', label: 'query.internal.deliverytrade.details.deliveryorderid' },
     ]
 
     return result
@@ -107,9 +107,9 @@ const detailProps2 = computed(() => {
     const { deliveryqty = 0, deliveryrtradeqty = 0, deliverygoodsunitname = '', wrstandardcode, wrstandardname } = data.value ?? {}
 
     const result: CellProp[] = [
-        { prop: 'wrstandardcode', label: '现货商品:', formatValue: (val) => val && `${wrstandardcode}/${wrstandardname}` },
-        { prop: 'deliveryqty', label: '申报数量:', formatValue: () => deliveryqty + deliverygoodsunitname },
-        { prop: 'deliveryrtradeqty', label: '成交数量:', formatValue: () => deliveryrtradeqty + deliverygoodsunitname },
+        { prop: 'wrstandardcode', label: 'query.internal.deliverytrade.details.wrstandardcode', formatValue: (val) => val && `${wrstandardcode}/${wrstandardname}` },
+        { prop: 'deliveryqty', label: 'query.internal.deliverytrade.details.deliveryqty', formatValue: () => deliveryqty + deliverygoodsunitname },
+        { prop: 'deliveryrtradeqty', label: 'query.internal.deliverytrade.details.deliveryrtradeqty', formatValue: () => deliveryrtradeqty + deliverygoodsunitname },
     ]
 
     data.value?.wrFactorTypeItemList.forEach((item) => {
@@ -123,9 +123,9 @@ const detailProps2 = computed(() => {
 
 const detailProps3 = computed(() => {
     const result: CellProp[] = [
-        { prop: 'xgoodsname', label: '交易合约:' },
-        { prop: 'xdeliveryprice', label: '交收单价:', decimal: 2 },
-        { prop: 'xdeliverycloseqty', label: '订单手数:' },
+        { prop: 'xgoodsname', label: 'query.internal.deliverytrade.details.xgoodsname' },
+        { prop: 'xdeliveryprice', label: 'query.internal.deliverytrade.details.xdeliveryprice', decimal: 2 },
+        { prop: 'xdeliverycloseqty', label: 'query.internal.deliverytrade.details.xdeliverycloseqty' },
     ]
 
     return result
@@ -135,10 +135,10 @@ const detailProps4 = computed(() => {
     const { ppricemode } = data.value ?? {}
 
     const result: CellProp[] = [
-        { prop: 'ppricemode', label: '价格方式:' },
-        { prop: 'pgoodsname', label: '辅助合约一:', show: ppricemode === 1 },
-        { prop: 'pdeliveryprice', label: '交收价格:', decimal: 2 },
-        { prop: 'pdeliverycloseqty', label: '订单手数:' },
+        { prop: 'ppricemode', label: 'query.internal.deliverytrade.details.ppricemode' },
+        { prop: 'pgoodsname', label: 'query.internal.deliverytrade.details.pgoodsname', show: ppricemode === 1 },
+        { prop: 'pdeliveryprice', label: 'query.internal.deliverytrade.details.pdeliveryprice', decimal: 2 },
+        { prop: 'pdeliverycloseqty', label: 'query.internal.deliverytrade.details.pdeliverycloseqty' },
     ]
 
     return result
@@ -148,10 +148,10 @@ const detailProps5 = computed(() => {
     const { p2pricemode } = data.value ?? {}
 
     const result: CellProp[] = [
-        { prop: 'p2pricemode', label: '价格方式:' },
-        { prop: 'p2goodsname', label: '辅助合约二:', show: p2pricemode === 1 },
-        { prop: 'p2deliveryprice', label: '交收价格:', decimal: 2 },
-        { prop: 'p2deliverycloseqty', label: '订单手数:' },
+        { prop: 'p2pricemode', label: 'query.internal.deliverytrade.details.p2pricemode' },
+        { prop: 'p2goodsname', label: 'query.internal.deliverytrade.details.p2goodsname', show: p2pricemode === 1 },
+        { prop: 'p2deliveryprice', label: 'query.internal.deliverytrade.details.p2deliveryprice', decimal: 2 },
+        { prop: 'p2deliverycloseqty', label: 'query.internal.deliverytrade.details.p2deliverycloseqty' },
     ]
 
     return result

+ 27 - 27
src/packages/pc/views/query/internal/deliverytrade/index.vue

@@ -10,9 +10,9 @@
                                 :value="option.value" />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="日期" prop="date" v-if="item.value === 1">
+                    <el-form-item :label="t('query.internal.deliverytrade.date')" prop="date" v-if="item.value === 1">
                         <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
-                            start-placeholder="开始时间" end-placeholder="结束时间" />
+                            :start-placeholder="t('query.internal.deliverytrade.startDate')" :end-placeholder="t('query.internal.deliverytrade.endDate')" />
                     </el-form-item>
                 </template>
             </app-filter>
@@ -70,18 +70,18 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryS
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'deliveryid', label: '交收单号' },
-    { field: 'tradedate', label: '交易日' },
-    { field: 'buyorsell', label: '方向', formatValue: (val) => getBuyOrSellName(val) },
-    { field: 'accountid', label: '买方' },
-    { field: 'matchaccountid', label: '卖方' },
-    { field: 'deliverygoodsname', label: '现货商品' },
-    { field: 'deliveryqty', label: '现货数量' },
-    { field: 'deliveryprice', label: '交收单价' },
-    { field: 'deliveryamount', label: '货款总金额' },
-    { field: 'deliverypricemove', label: '升贴水总金额' },
-    { field: 'deliverycharge', label: '交收服务费' },
-    { field: 'deliveryorderid', label: '委托单号' },
+    { field: 'deliveryid', label: 'query.internal.deliverytrade.deliveryid' },
+    { field: 'tradedate', label: 'query.internal.deliverytrade.tradedate' },
+    { field: 'buyorsell', label: 'query.internal.deliverytrade.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { field: 'accountid', label: 'query.internal.deliverytrade.accountid' },
+    { field: 'matchaccountid', label: 'query.internal.deliverytrade.matchaccountid' },
+    { field: 'deliverygoodsname', label: 'query.internal.deliverytrade.deliverygoodsname' },
+    { field: 'deliveryqty', label: 'query.internal.deliverytrade.deliveryqty' },
+    { field: 'deliveryprice', label: 'query.internal.deliverytrade.deliveryprice' },
+    { field: 'deliveryamount', label: 'query.internal.deliverytrade.deliveryamount' },
+    { field: 'deliverypricemove', label: 'query.internal.deliverytrade.deliverypricemove' },
+    { field: 'deliverycharge', label: 'query.internal.deliverytrade.deliverycharge' },
+    { field: 'deliveryorderid', label: 'query.internal.deliverytrade.deliveryorderid' },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
@@ -99,43 +99,43 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     filters: [
         {
             field: 'deliveryid',
-            label: '交收单号',
+            label: t('query.internal.deliverytrade.deliveryid'),
         },
         {
             field: 'wrstandardid',
-            label: '现货商品',
-            placeholder: '请输入商品ID'
+            label: t('query.internal.deliverytrade.wrstandardid'),
+            placeholder: t('query.internal.deliverytrade.tips1')
         },
         {
             field: 'xgoodsid',
-            label: '主商品',
-            placeholder: '请输入商品ID'
+            label: t('query.internal.deliverytrade.xgoodsid'),
+            placeholder: t('query.internal.deliverytrade.tips1')
         },
         {
             field: 'deliveryorderid',
-            label: '委托单号',
+            label: t('query.internal.deliverytrade.deliveryorderid'),
         },
         {
             field: 'accountid',
-            label: '资金账户',
-            placeholder: '请输入资金账户ID'
+            label: t('query.internal.deliverytrade.accountid1'),
+            placeholder: t('query.internal.deliverytrade.tips2')
         },
         {
             field: 'tradedate',
-            label: '交易日',
+            label: t('query.internal.deliverytrade.tradedate'),
         },
         {
             field: 'buyorsell',
-            label: '方向',
+            label: t('query.internal.deliverytrade.buyorsell'),
             options: () => getBuyOrSellList()
         },
         {
             field: 'ishis',
-            label: '交收数据类型',
+            label: t('query.internal.deliverytrade.ishis'),
             value: 0,
             options: () => [
-                { label: '当前', value: 0 },
-                { label: '历史', value: 1 }
+                { label: t('common.current'), value: 0 },
+                { label: t('common.history'), value: 1 }
             ]
         },
     ],

+ 14 - 14
src/packages/pc/views/query/internal/liquidation/index.vue

@@ -59,14 +59,14 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryC
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'orderId', label: '委托单号' },
-    { field: 'accountNameId', label: '账户' },
-    { field: 'goodsCodeName', label: '商品代码/名称' },
-    { field: 'buyOrSell', label: '方向' },
-    { field: 'orderPrice', label: '斩仓委托价' },
-    { field: 'orderQty', label: '斩仓数量' },
-    { field: 'orderAccount', label: '斩仓金额' },
-    { field: 'orderTime', label: '斩仓时间' },
+    { field: 'orderId', label: 'query.internal.liquidation.orderId' },
+    { field: 'accountNameId', label: 'query.internal.liquidation.accountNameId' },
+    { field: 'goodsCodeName', label: 'query.internal.liquidation.goodsCodeName' },
+    { field: 'buyOrSell', label: 'query.internal.liquidation.buyOrSell' },
+    { field: 'orderPrice', label: 'query.internal.liquidation.orderPrice' },
+    { field: 'orderQty', label: 'query.internal.liquidation.orderQty' },
+    { field: 'orderAccount', label: 'query.internal.liquidation.orderAccount' },
+    { field: 'orderTime', label: 'query.internal.liquidation.orderTime' },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
@@ -74,27 +74,27 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     filters: [
         {
             field: 'marketId',
-            label: '市场',
+            label: t('query.internal.liquidation.marketId'),
             required: true,
             options: () => getMarketOptions()
         },
         {
             field: 'goodsId',
-            label: '商品',
-            placeholder: '请输入商品ID'
+            label: t('query.internal.liquidation.goodsId'),
+            placeholder: t('query.internal.liquidation.tips1'),
         },
         {
             field: 'buyOrSell',
-            label: '方向',
+            label: t('query.internal.liquidation.buyOrSell'),
             options: () => getBuyOrSellList()
         },
         {
             field: 'accountId',
-            label: '账户',
+            label: t('query.internal.liquidation.accountId'),
         },
         {
             field: 'orderId',
-            label: '单号',
+            label: t('query.internal.liquidation.orderId'),
         },
     ],
     buttons: [

+ 24 - 24
src/packages/pc/views/query/internal/tradesumm/index.vue

@@ -57,50 +57,50 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryT
 })
 
 const tableColumns = ref<Model.TableColumn[]>([
-    { field: 'tradeDate', label: '交易日' },
-    { field: 'loginid', label: '登录账号' },
-    { field: 'currentname', label: '用户名称' },
-    { field: 'parentusername', label: '所属机构' },
-    { field: 'goodscode', label: '商品代码' },
-    { field: 'goodsname', label: '商品名称' },
-    { field: 'buyorselldisplay', label: '方向' },
-    { field: 'tradeqty', label: '成交数量' },
-    { field: 'tradepriceavg', label: '成交价格' },
-    { field: 'tradeamount', label: '成交金额' },
-    { field: 'totalcharge', label: '手续费' }
+    { field: 'tradeDate', label: 'query.internal.tradesumm.tradeDate' },
+    { field: 'loginid', label: 'query.internal.tradesumm.loginid' },
+    { field: 'currentname', label: 'query.internal.tradesumm.currentname' },
+    { field: 'parentusername', label: 'query.internal.tradesumm.parentusername' },
+    { field: 'goodscode', label: 'query.internal.tradesumm.goodscode' },
+    { field: 'goodsname', label: 'query.internal.tradesumm.goodsname' },
+    { field: 'buyorselldisplay', label: 'query.internal.tradesumm.buyorselldisplay' },
+    { field: 'tradeqty', label: 'query.internal.tradesumm.tradeqty' },
+    { field: 'tradepriceavg', label: 'query.internal.tradesumm.tradepriceavg' },
+    { field: 'tradeamount', label: 'query.internal.tradesumm.tradeamount' },
+    { field: 'totalcharge', label: 'query.internal.tradesumm.totalcharge' }
 ])
 
 const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilter<Model.TradeSumReq>({
     filters: [
         {
             field: 'cycletime',
-            label: '日期',
+            label: t('query.internal.tradesumm.cycletime'),
         },
         {
             field: 'goodsid',
-            label: '商品',
-            placeholder: '请输入商品ID'
+            label: t('query.internal.tradesumm.goodsid'),
+            placeholder: t('query.internal.tradesumm.tips1')
         },
         {
             field: 'buyorsell',
-            label: '方向',
+            label: t('query.internal.tradesumm.buyorsell'),
             options: () => getBuyOrSellList()
         },
         {
             field: 'loginid',
-            label: '登录账号',
+            label: t('query.internal.tradesumm.loginid'),
         },
         {
             field: 'tradetypes',
-            label: '成交类别',
+            label: t('query.internal.tradesumm.tradetypes'),
             options: () => [
-                { label: '交易成交', value: '1,2,10' },
-                { label: '交收成交', value: '3,4' },
-                { label: '风控斩仓', value: '6' },
-                { label: '协议成交', value: '7,9,11' },
-                { label: '持仓过户', value: '29' },
-                { label: '系统强平', value: '12' },
-                { label: '其它成交', value: '5,8,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28' }
+                { label: t('query.internal.tradesumm.tradetypes1'), value: '1,2,10' },
+                { label: t('query.internal.tradesumm.tradetypes2'), value: '3,4' },
+                { label: t('query.internal.tradesumm.tradetypes3'), value: '6' },
+                { label: t('query.internal.tradesumm.tradetypes4'), value: '7,9,11' },
+                { label: t('query.internal.tradesumm.tradetypes5'), value: '29' },
+                { label: t('query.internal.tradesumm.tradetypes6'), value: '12' },
+                { label: t('query.internal.tradesumm.tradetypes7'), value: '5,8,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28' }
             ]
         },
     ],