Handy_Cao před 8 měsíci
rodič
revize
8007fa53a1

+ 125 - 29
public/locales/en-US.json

@@ -528,7 +528,17 @@
                 "handlestatus": "处理状态",
                 "handlestatus1": "交易商状态",
                 "auditlogincode": "审核人",
-                "audittime": "审核时间"
+                "audittime": "审核时间",
+                "details": {
+                    "title": "详情",
+                    "userid": "用户账号",
+                    "applytime": "申请时间",
+                    "handlestatus": "审核状态",
+                    "auditusername": "审核人",
+                    "audittime": "审核时间",
+                    "auditremark": "审核备注",
+                    "imageurl": "确认半身照"
+                }
             },
             "modification": {
                 "userid": "Trader Code",
@@ -551,7 +561,19 @@
                 }
             },
             "swapprotocol": {},
-            "transfer": {},
+            "transfer": {
+                "transfertype": "转移类型",
+                "outmemberusername": "转出所属会员",
+                "outparentusername": "转出所属机构",
+                "outinvestorname": "转出交易商",
+                "outinvestor": "转出交易商",
+                "inmemberusername": "转入所属会员",
+                "inuseridname": "转入所属机构",
+                "transferstatus": "转移状态",
+                "createtime": "申请时间",
+                "outmemberuserid": "转出方",
+                "inuserid": "转入方"
+            },
             "user": {
                 "accountName": "Trader Name",
                 "loginId": "Login Account",
@@ -996,7 +1018,15 @@
                 "accountid": "Fund Account",
                 "accountstatus": "Organization Status",
                 "operation": "Operator",
-                "rolemodifytime": "Role Creation Time"
+                "rolemodifytime": "Role Creation Time",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle1": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "goodscfg": {
                 "membername": "Member Organization",
@@ -1125,29 +1155,38 @@
                 "rolemodifytime": "Role Creation Time"
             },
             "riskcfg": {
-                "title": "编辑",
-                "subtitle": "基本信息设置",
-                "subtitle1": "风险率信息",
-                "username": "交易商:",
-                "accountid": "资金账户:",
-                "customertype": "风险率类型:",
-                "riskcontrolmode": "风控模式:",
-                "riskcontrolmode1": "交易商",
-                "riskcontrolmode2": "做市会员",
-                "customertype1": "客户类别:",
-                "riskratiocalcmode": "风险率计算方式:",
-                "riskratiocalcmode1": "占用/净值",
-                "riskratiocalcmode2": "值/占用",
-                "notemarginriskratio": "提示保证金风险率:",
-                "addmarginriskratio": "追加保证金风险率:",
-                "cutriskratio": "斩仓风险率:",
-                "cutbackriskratio": "斩仓恢复风险率:",
-                "notesaferatio": "提示安全度:",
-                "addsaferatio": "追加安全度:",
-                "recoversaferatio": "恢复正常安全度:",
-                "cutsaferatio": "斩仓安全度:",
-                "isdefault": "是否默认:",
-                "markets": "斩仓市场顺序:"
+                "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",
+                "details": {
+                    "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",
@@ -1161,9 +1200,51 @@
                 "accountid": "Fund Account",
                 "accountstatus": "Organization Status",
                 "operation": "Operator",
-                "rolemodifytime": "Role Creation Time"
+                "rolemodifytime": "Role Creation Time",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "market": "市场",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
+            },
+            "tradecfg": {
+                "subtitle": "基本信息",
+                "traderule": "交易规则",
+                "tradefee": "交易服务费",
+                "name1": "自营会员账户个性化设置",
+                "name2": "做市会员账户个性化设置",
+                "userName": "自营",
+                "userName1": "做市",
+                "userName2": "会员",
+                "accountName": "资金账户",
+                "goodsName": "商品",
+                "customerType": "保证金类别",
+                "rulename": "扩展项",
+                "paramvalue": "平台",
+                "cvalue": "个性化",
+                "tradefeename": "费用项",
+                "exchangevalue": "平台",
+                "add": {
+                    "subtitle": "个性化设置",
+                    "userid1": "自营会员",
+                    "userid2": "做市会员",
+                    "accountid": "资金账户",
+                    "marketid": "市场",
+                    "goodsid": "商品",
+                    "paramid": "保证金类别",
+                    "rulename": "扩展项",
+                    "paramvalue": "平台",
+                    "cvalue": "个性化",
+                    "tradefeename": "费用项",
+                    "exchangevalue": "平台",
+                    "feealgorithm": "费用算法",
+                    "fee": "服务费",
+                    "tips1": "保证金类别,交易规则,交易服务费均未设置"
+                }
             },
-            "tradecfg": {},
             "user": {
                 "enddate": "End Time",
                 "startdate": "Start Time",
@@ -1474,7 +1555,22 @@
                 "tips2": "Enter Trader ID",
                 "tips3": "Please Enter Complete Fund Accounts, Separate Multiple With Commas"
             },
-            "deliveryorder": {},
+            "deliveryorder": {
+                "date": "日期",
+                "startdate": "开始时间",
+                "enddate": "结束时间",
+                "wrstandardid": "现货商品",
+                "ishis": "历史查询",
+                "deliveryticket": "申报流水",
+                "deliveryorderid": "申报单号",
+                "accountidname": "申报人",
+                "xgoodsname": "主商品",
+                "xdeliveryqty": "主商品手数",
+                "deliverygoodsname": "现货商品",
+                "deliveryqty": "现货数量",
+                "deliveryorderstatus": "状态",
+                "ordertime": "申报时间"
+            },
             "deliverytrade": {
                 "startDate":"开始时间",
                 "endDate":"结束时间",

+ 125 - 29
public/locales/th-TH.json

@@ -528,7 +528,17 @@
                 "handlestatus": "处理状态",
                 "handlestatus1": "交易商状态",
                 "auditlogincode": "审核人",
-                "audittime": "审核时间"
+                "audittime": "审核时间",
+                "details": {
+                    "title": "详情",
+                    "userid": "用户账号",
+                    "applytime": "申请时间",
+                    "handlestatus": "审核状态",
+                    "auditusername": "审核人",
+                    "audittime": "审核时间",
+                    "auditremark": "审核备注",
+                    "imageurl": "确认半身照"
+                }
             },
             "modification": {
                 "userid": "รหัสผู้ค้า",
@@ -551,7 +561,19 @@
                 }
             },
             "swapprotocol": {},
-            "transfer": {},
+            "transfer": {
+                "transfertype": "转移类型",
+                "outmemberusername": "转出所属会员",
+                "outparentusername": "转出所属机构",
+                "outinvestorname": "转出交易商",
+                "outinvestor": "转出交易商",
+                "inmemberusername": "转入所属会员",
+                "inuseridname": "转入所属机构",
+                "transferstatus": "转移状态",
+                "createtime": "申请时间",
+                "outmemberuserid": "转出方",
+                "inuserid": "转入方"
+            },
             "user": {
                 "accountName": "ชื่อผู้ค้า",
                 "loginId": "บัญชีเข้าสู่ระบบ",
@@ -996,7 +1018,15 @@
                 "accountid": "บัญชีเงินทุน",
                 "accountstatus": "สถานะองค์กร",
                 "operation": "ผู้ดำเนินการ",
-                "rolemodifytime": "เวลาสร้างบทบาท"
+                "rolemodifytime": "เวลาสร้างบทบาท",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle1": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "goodscfg": {
                 "membername": "องค์กรสมาชิก",
@@ -1125,29 +1155,38 @@
                 "rolemodifytime": "เวลาสร้างบทบาท"
             },
             "riskcfg": {
-                "title": "编辑",
-                "subtitle": "基本信息设置",
-                "subtitle1": "风险率信息",
-                "username": "交易商:",
-                "accountid": "资金账户:",
-                "customertype": "风险率类型:",
-                "riskcontrolmode": "风控模式:",
-                "riskcontrolmode1": "交易商",
-                "riskcontrolmode2": "做市会员",
-                "customertype1": "客户类别:",
-                "riskratiocalcmode": "风险率计算方式:",
-                "riskratiocalcmode1": "占用/净值",
-                "riskratiocalcmode2": "值/占用",
-                "notemarginriskratio": "提示保证金风险率:",
-                "addmarginriskratio": "追加保证金风险率:",
-                "cutriskratio": "斩仓风险率:",
-                "cutbackriskratio": "斩仓恢复风险率:",
-                "notesaferatio": "提示安全度:",
-                "addsaferatio": "追加安全度:",
-                "recoversaferatio": "恢复正常安全度:",
-                "cutsaferatio": "斩仓安全度:",
-                "isdefault": "是否默认:",
-                "markets": "斩仓市场顺序:"
+                "memberuserid": "สมาชิก",
+                "userid": "รหัสสมาชิก",
+                "username": "ชื่อสมาชิก",
+                "accountid": "บัญชีเงินทุน",
+                "customertype": "ประเภทอัตราความเสี่ยง (ประเภทลูกค้า)",
+                "tips1": "กรุณาเลือกสมาชิก",
+                "tips2": "ป้อนรหัสหรือชื่อ",
+                "details": {
+                    "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": "ชื่อบทบาท",
@@ -1161,9 +1200,51 @@
                 "accountid": "บัญชีเงินทุน",
                 "accountstatus": "สถานะองค์กร",
                 "operation": "ผู้ดำเนินการ",
-                "rolemodifytime": "เวลาสร้างบทบาท"
+                "rolemodifytime": "เวลาสร้างบทบาท",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "market": "市场",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
+            },
+            "tradecfg": {
+                "subtitle": "基本信息",
+                "traderule": "交易规则",
+                "tradefee": "交易服务费",
+                "name1": "自营会员账户个性化设置",
+                "name2": "做市会员账户个性化设置",
+                "userName": "自营",
+                "userName1": "做市",
+                "userName2": "会员",
+                "accountName": "资金账户",
+                "goodsName": "商品",
+                "customerType": "保证金类别",
+                "rulename": "扩展项",
+                "paramvalue": "平台",
+                "cvalue": "个性化",
+                "tradefeename": "费用项",
+                "exchangevalue": "平台",
+                "add": {
+                    "subtitle": "个性化设置",
+                    "userid1": "自营会员",
+                    "userid2": "做市会员",
+                    "accountid": "资金账户",
+                    "marketid": "市场",
+                    "goodsid": "商品",
+                    "paramid": "保证金类别",
+                    "rulename": "扩展项",
+                    "paramvalue": "平台",
+                    "cvalue": "个性化",
+                    "tradefeename": "费用项",
+                    "exchangevalue": "平台",
+                    "feealgorithm": "费用算法",
+                    "fee": "服务费",
+                    "tips1": "保证金类别,交易规则,交易服务费均未设置"
+                }
             },
-            "tradecfg": {},
             "user": {
                 "enddate": "เวลาสิ้นสุด",
                 "startdate": "เวลาเริ่มต้น",
@@ -1474,7 +1555,22 @@
                 "tips2": "ป้อนรหัสผู้ค้า",
                 "tips3": "กรุณาป้อนบัญชีเงินทุนครบถ้วน คั่นหลายรายการด้วยเครื่องหมายจุลภาค"
             },
-            "deliveryorder": {},
+            "deliveryorder": {
+                "date": "日期",
+                "startdate": "开始时间",
+                "enddate": "结束时间",
+                "wrstandardid": "现货商品",
+                "ishis": "历史查询",
+                "deliveryticket": "申报流水",
+                "deliveryorderid": "申报单号",
+                "accountidname": "申报人",
+                "xgoodsname": "主商品",
+                "xdeliveryqty": "主商品手数",
+                "deliverygoodsname": "现货商品",
+                "deliveryqty": "现货数量",
+                "deliveryorderstatus": "状态",
+                "ordertime": "申报时间"
+            },
             "deliverytrade": {
                 "startDate":"开始时间",
                 "endDate":"结束时间",

+ 125 - 29
public/locales/vi-VN.json

@@ -528,7 +528,17 @@
                 "handlestatus": "处理状态",
                 "handlestatus1": "交易商状态",
                 "auditlogincode": "审核人",
-                "audittime": "审核时间"
+                "audittime": "审核时间",
+                "details": {
+                    "title": "详情",
+                    "userid": "用户账号",
+                    "applytime": "申请时间",
+                    "handlestatus": "审核状态",
+                    "auditusername": "审核人",
+                    "audittime": "审核时间",
+                    "auditremark": "审核备注",
+                    "imageurl": "确认半身照"
+                }
             },
             "modification": {
                 "userid": "交易商代码",
@@ -551,7 +561,19 @@
                 }
             },
             "swapprotocol": {},
-            "transfer": {},
+            "transfer": {
+                "transfertype": "转移类型",
+                "outmemberusername": "转出所属会员",
+                "outparentusername": "转出所属机构",
+                "outinvestorname": "转出交易商",
+                "outinvestor": "转出交易商",
+                "inmemberusername": "转入所属会员",
+                "inuseridname": "转入所属机构",
+                "transferstatus": "转移状态",
+                "createtime": "申请时间",
+                "outmemberuserid": "转出方",
+                "inuserid": "转入方"
+            },
             "user": {
                 "accountName": "交易商名称",
                 "loginId": "登陆账号",
@@ -996,7 +1018,15 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle1": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "goodscfg": {
                 "membername": "会员机构",
@@ -1125,29 +1155,38 @@
                 "rolemodifytime": "角色创建时间"
             },
             "riskcfg": {
-                "title": "编辑",
-                "subtitle": "基本信息设置",
-                "subtitle1": "风险率信息",
-                "username": "交易商:",
-                "accountid": "资金账户:",
-                "customertype": "风险率类型:",
-                "riskcontrolmode": "风控模式:",
-                "riskcontrolmode1": "交易商",
-                "riskcontrolmode2": "做市会员",
-                "customertype1": "客户类别:",
-                "riskratiocalcmode": "风险率计算方式:",
-                "riskratiocalcmode1": "占用/净值",
-                "riskratiocalcmode2": "值/占用",
-                "notemarginriskratio": "提示保证金风险率:",
-                "addmarginriskratio": "追加保证金风险率:",
-                "cutriskratio": "斩仓风险率:",
-                "cutbackriskratio": "斩仓恢复风险率:",
-                "notesaferatio": "提示安全度:",
-                "addsaferatio": "追加安全度:",
-                "recoversaferatio": "恢复正常安全度:",
-                "cutsaferatio": "斩仓安全度:",
-                "isdefault": "是否默认:",
-                "markets": "斩仓市场顺序:"
+                "memberuserid": "会员",
+                "userid": "会员代码",
+                "username": "会员名称",
+                "accountid": "资金账户",
+                "customertype": "风险率类型(客户类别)",
+                "tips1": "请选择会员",
+                "tips2": "输入代码或名称",
+                "details": {
+                    "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": "角色名称",
@@ -1161,9 +1200,51 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "market": "市场",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
+            },
+            "tradecfg": {
+                "subtitle": "基本信息",
+                "traderule": "交易规则",
+                "tradefee": "交易服务费",
+                "name1": "自营会员账户个性化设置",
+                "name2": "做市会员账户个性化设置",
+                "userName": "自营",
+                "userName1": "做市",
+                "userName2": "会员",
+                "accountName": "资金账户",
+                "goodsName": "商品",
+                "customerType": "保证金类别",
+                "rulename": "扩展项",
+                "paramvalue": "平台",
+                "cvalue": "个性化",
+                "tradefeename": "费用项",
+                "exchangevalue": "平台",
+                "add": {
+                    "subtitle": "个性化设置",
+                    "userid1": "自营会员",
+                    "userid2": "做市会员",
+                    "accountid": "资金账户",
+                    "marketid": "市场",
+                    "goodsid": "商品",
+                    "paramid": "保证金类别",
+                    "rulename": "扩展项",
+                    "paramvalue": "平台",
+                    "cvalue": "个性化",
+                    "tradefeename": "费用项",
+                    "exchangevalue": "平台",
+                    "feealgorithm": "费用算法",
+                    "fee": "服务费",
+                    "tips1": "保证金类别,交易规则,交易服务费均未设置"
+                }
             },
-            "tradecfg": {},
             "user": {
                 "enddate": "结束时间",
                 "startdate": "开始时间",
@@ -1474,7 +1555,22 @@
                 "tips2": "输入交易商ID",
                 "tips3": "请输入完整资金账户,多个逗号分隔"
             },
-            "deliveryorder": {},
+            "deliveryorder": {
+                "date": "日期",
+                "startdate": "开始时间",
+                "enddate": "结束时间",
+                "wrstandardid": "现货商品",
+                "ishis": "历史查询",
+                "deliveryticket": "申报流水",
+                "deliveryorderid": "申报单号",
+                "accountidname": "申报人",
+                "xgoodsname": "主商品",
+                "xdeliveryqty": "主商品手数",
+                "deliverygoodsname": "现货商品",
+                "deliveryqty": "现货数量",
+                "deliveryorderstatus": "状态",
+                "ordertime": "申报时间"
+            },
             "deliverytrade": {
                 "startDate":"开始时间",
                 "endDate":"结束时间",

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

@@ -528,7 +528,17 @@
                 "handlestatus": "处理状态",
                 "handlestatus1": "交易商状态",
                 "auditlogincode": "审核人",
-                "audittime": "审核时间"
+                "audittime": "审核时间",
+                "details": {
+                    "title": "详情",
+                    "userid": "用户账号",
+                    "applytime": "申请时间",
+                    "handlestatus": "审核状态",
+                    "auditusername": "审核人",
+                    "audittime": "审核时间",
+                    "auditremark": "审核备注",
+                    "imageurl": "确认半身照"
+                }
             },
             "modification": {
                 "userid": "交易商代码",
@@ -551,7 +561,19 @@
                 }
             },
             "swapprotocol": {},
-            "transfer": {},
+            "transfer": {
+                "transfertype": "转移类型",
+                "outmemberusername": "转出所属会员",
+                "outparentusername": "转出所属机构",
+                "outinvestorname": "转出交易商",
+                "outinvestor": "转出交易商",
+                "inmemberusername": "转入所属会员",
+                "inuseridname": "转入所属机构",
+                "transferstatus": "转移状态",
+                "createtime": "申请时间",
+                "outmemberuserid": "转出方",
+                "inuserid": "转入方"
+            },
             "user": {
                 "accountName": "交易商名称",
                 "loginId": "登陆账号",
@@ -996,7 +1018,15 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle1": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "goodscfg": {
                 "membername": "会员机构",
@@ -1125,29 +1155,38 @@
                 "rolemodifytime": "角色创建时间"
             },
             "riskcfg": {
-                "title": "编辑",
-                "subtitle": "基本信息设置",
-                "subtitle1": "风险率信息",
-                "username": "交易商:",
-                "accountid": "资金账户:",
-                "customertype": "风险率类型:",
-                "riskcontrolmode": "风控模式:",
-                "riskcontrolmode1": "交易商",
-                "riskcontrolmode2": "做市会员",
-                "customertype1": "客户类别:",
-                "riskratiocalcmode": "风险率计算方式:",
-                "riskratiocalcmode1": "占用/净值",
-                "riskratiocalcmode2": "值/占用",
-                "notemarginriskratio": "提示保证金风险率:",
-                "addmarginriskratio": "追加保证金风险率:",
-                "cutriskratio": "斩仓风险率:",
-                "cutbackriskratio": "斩仓恢复风险率:",
-                "notesaferatio": "提示安全度:",
-                "addsaferatio": "追加安全度:",
-                "recoversaferatio": "恢复正常安全度:",
-                "cutsaferatio": "斩仓安全度:",
-                "isdefault": "是否默认:",
-                "markets": "斩仓市场顺序:"
+                "memberuserid": "会员",
+                "userid": "会员代码",
+                "username": "会员名称",
+                "accountid": "资金账户",
+                "customertype": "风险率类型(客户类别)",
+                "tips1": "请选择会员",
+                "tips2": "输入代码或名称",
+                "details": {
+                    "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": "角色名称",
@@ -1161,9 +1200,51 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "market": "市场",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
+            },
+            "tradecfg": {
+                "subtitle": "基本信息",
+                "traderule": "交易规则",
+                "tradefee": "交易服务费",
+                "name1": "自营会员账户个性化设置",
+                "name2": "做市会员账户个性化设置",
+                "userName": "自营",
+                "userName1": "做市",
+                "userName2": "会员",
+                "accountName": "资金账户",
+                "goodsName": "商品",
+                "customerType": "保证金类别",
+                "rulename": "扩展项",
+                "paramvalue": "平台",
+                "cvalue": "个性化",
+                "tradefeename": "费用项",
+                "exchangevalue": "平台",
+                "add": {
+                    "subtitle": "个性化设置",
+                    "userid1": "自营会员",
+                    "userid2": "做市会员",
+                    "accountid": "资金账户",
+                    "marketid": "市场",
+                    "goodsid": "商品",
+                    "paramid": "保证金类别",
+                    "rulename": "扩展项",
+                    "paramvalue": "平台",
+                    "cvalue": "个性化",
+                    "tradefeename": "费用项",
+                    "exchangevalue": "平台",
+                    "feealgorithm": "费用算法",
+                    "fee": "服务费",
+                    "tips1": "保证金类别,交易规则,交易服务费均未设置"
+                }
             },
-            "tradecfg": {},
             "user": {
                 "enddate": "结束时间",
                 "startdate": "开始时间",
@@ -1474,7 +1555,22 @@
                 "tips2": "输入交易商ID",
                 "tips3": "请输入完整资金账户,多个逗号分隔"
             },
-            "deliveryorder": {},
+            "deliveryorder": {
+                "date": "日期",
+                "startdate": "开始时间",
+                "enddate": "结束时间",
+                "wrstandardid": "现货商品",
+                "ishis": "历史查询",
+                "deliveryticket": "申报流水",
+                "deliveryorderid": "申报单号",
+                "accountidname": "申报人",
+                "xgoodsname": "主商品",
+                "xdeliveryqty": "主商品手数",
+                "deliverygoodsname": "现货商品",
+                "deliveryqty": "现货数量",
+                "deliveryorderstatus": "状态",
+                "ordertime": "申报时间"
+            },
             "deliverytrade": {
                 "startDate":"开始时间",
                 "endDate":"结束时间",
@@ -1580,7 +1676,20 @@
                 "accountId": "账户",
                 "tips1": "请输入商品ID"
             },
-            "offlinedelivery": {},
+            "offlinedelivery": {
+                "deliveryorderid": "交收单号",
+                "username": "申请人",
+                "goodsdisplay": "交收商品",
+                "buyorselldisplay": "方向",
+                "deliveryqty": "申请交收数量",
+                "sucdeliveryqty": "实际交收数量",
+                "deliveryprice": "交收价格",
+                "deliveryamount": "交收货款",
+                "matchname": "对手方",
+                "reqtime": "申请时间",
+                "orderstatusdisplay": "交收状态",
+                "deliveryorderstatus": "单据状态"
+            },
             "order": {
                 "marketid": "市场",
                 "isHis": "查询类型",

+ 125 - 29
public/locales/zh-TW.json

@@ -528,7 +528,17 @@
                 "handlestatus": "处理状态",
                 "handlestatus1": "交易商状态",
                 "auditlogincode": "审核人",
-                "audittime": "审核时间"
+                "audittime": "审核时间",
+                "details": {
+                    "title": "详情",
+                    "userid": "用户账号",
+                    "applytime": "申请时间",
+                    "handlestatus": "审核状态",
+                    "auditusername": "审核人",
+                    "audittime": "审核时间",
+                    "auditremark": "审核备注",
+                    "imageurl": "确认半身照"
+                }
             },
             "modification": {
                 "userid": "交易商代碼",
@@ -551,7 +561,19 @@
                 }
             },
             "swapprotocol": {},
-            "transfer": {},
+            "transfer": {
+                "transfertype": "转移类型",
+                "outmemberusername": "转出所属会员",
+                "outparentusername": "转出所属机构",
+                "outinvestorname": "转出交易商",
+                "outinvestor": "转出交易商",
+                "inmemberusername": "转入所属会员",
+                "inuseridname": "转入所属机构",
+                "transferstatus": "转移状态",
+                "createtime": "申请时间",
+                "outmemberuserid": "转出方",
+                "inuserid": "转入方"
+            },
             "user": {
                 "accountName": "交易商名稱",
                 "loginId": "登陸賬號",
@@ -996,7 +1018,15 @@
                 "accountid": "資金賬戶",
                 "accountstatus": "機構狀態",
                 "operation": "操作員",
-                "rolemodifytime": "角色創建時間"
+                "rolemodifytime": "角色創建時間",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle1": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "goodscfg": {
                 "membername": "會員機構",
@@ -1125,29 +1155,38 @@
                 "rolemodifytime": "角色創建時間"
             },
             "riskcfg": {
-                "title": "编辑",
-                "subtitle": "基本信息设置",
-                "subtitle1": "风险率信息",
-                "username": "交易商:",
-                "accountid": "资金账户:",
-                "customertype": "风险率类型:",
-                "riskcontrolmode": "风控模式:",
-                "riskcontrolmode1": "交易商",
-                "riskcontrolmode2": "做市会员",
-                "customertype1": "客户类别:",
-                "riskratiocalcmode": "风险率计算方式:",
-                "riskratiocalcmode1": "占用/净值",
-                "riskratiocalcmode2": "值/占用",
-                "notemarginriskratio": "提示保证金风险率:",
-                "addmarginriskratio": "追加保证金风险率:",
-                "cutriskratio": "斩仓风险率:",
-                "cutbackriskratio": "斩仓恢复风险率:",
-                "notesaferatio": "提示安全度:",
-                "addsaferatio": "追加安全度:",
-                "recoversaferatio": "恢复正常安全度:",
-                "cutsaferatio": "斩仓安全度:",
-                "isdefault": "是否默认:",
-                "markets": "斩仓市场顺序:"
+                "memberuserid": "會員",
+                "userid": "會員代碼",
+                "username": "會員名稱",
+                "accountid": "資金賬戶",
+                "customertype": "風險率類型(客戶類別)",
+                "tips1": "請選擇會員",
+                "tips2": "輸入代碼或名稱",
+                "details": {
+                    "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": "角色名稱",
@@ -1161,9 +1200,51 @@
                 "accountid": "資金賬戶",
                 "accountstatus": "機構狀態",
                 "operation": "操作員",
-                "rolemodifytime": "角色創建時間"
+                "rolemodifytime": "角色創建時間",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "market": "市场",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
+            },
+            "tradecfg": {
+                "subtitle": "基本信息",
+                "traderule": "交易规则",
+                "tradefee": "交易服务费",
+                "name1": "自营会员账户个性化设置",
+                "name2": "做市会员账户个性化设置",
+                "userName": "自营",
+                "userName1": "做市",
+                "userName2": "会员",
+                "accountName": "资金账户",
+                "goodsName": "商品",
+                "customerType": "保证金类别",
+                "rulename": "扩展项",
+                "paramvalue": "平台",
+                "cvalue": "个性化",
+                "tradefeename": "费用项",
+                "exchangevalue": "平台",
+                "add": {
+                    "subtitle": "个性化设置",
+                    "userid1": "自营会员",
+                    "userid2": "做市会员",
+                    "accountid": "资金账户",
+                    "marketid": "市场",
+                    "goodsid": "商品",
+                    "paramid": "保证金类别",
+                    "rulename": "扩展项",
+                    "paramvalue": "平台",
+                    "cvalue": "个性化",
+                    "tradefeename": "费用项",
+                    "exchangevalue": "平台",
+                    "feealgorithm": "费用算法",
+                    "fee": "服务费",
+                    "tips1": "保证金类别,交易规则,交易服务费均未设置"
+                }
             },
-            "tradecfg": {},
             "user": {
                 "enddate": "結束時間",
                 "startdate": "開始時間",
@@ -1474,7 +1555,22 @@
                 "tips2": "輸入交易商ID",
                 "tips3": "請輸入完整資金賬戶,多個逗號分隔"
             },
-            "deliveryorder": {},
+            "deliveryorder": {
+                "date": "日期",
+                "startdate": "开始时间",
+                "enddate": "结束时间",
+                "wrstandardid": "现货商品",
+                "ishis": "历史查询",
+                "deliveryticket": "申报流水",
+                "deliveryorderid": "申报单号",
+                "accountidname": "申报人",
+                "xgoodsname": "主商品",
+                "xdeliveryqty": "主商品手数",
+                "deliverygoodsname": "现货商品",
+                "deliveryqty": "现货数量",
+                "deliveryorderstatus": "状态",
+                "ordertime": "申报时间"
+            },
             "deliverytrade": {
                 "startDate":"开始时间",
                 "endDate":"结束时间",

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

@@ -1,6 +1,6 @@
 <!-- 交易商管理-交易商管理-交易商销户审核-详情 -->
 <template>
-    <app-drawer :title="t('investor.user.open.details.title')" width="900" v-model:show="show">
+    <app-drawer :title="t('investor.manage.cancelapply.details.title')" width="900" v-model:show="show">
         <app-table-details :data="data" :label-width="120" :cell-props="detailProps" :column="2">
             <!-- 确认半身照 -->
             <template #imageurl="{ value }">
@@ -49,13 +49,13 @@ const { data } = useRequest(investorCancelview, {
 })
 
 const detailProps = computed<CellProp[]>(() => [
-    { prop: 'userid', label: '用户账号', formatValue: (val) => val && `(${val})${data.value?.accountname}` },
-    { prop: 'applytime', label: '申请时间', formatValue: (val) => formatDate(val) },
-    { prop: 'handlestatus', label: '审核状态', formatValue: (val) => handlestatusEnum.getEnumTypeName(val) },
-    { prop: 'auditusername', label: '审核人' },
-    { prop: 'audittime', label: '审核时间', formatValue: (val) => formatDate(val) },
-    { prop: 'auditremark', label: '审核备注' },
-    { prop: 'imageurl', label: '确认半身照' },
+    { prop: 'userid', label: 'investor.manage.cancelapply.details.userid', formatValue: (val) => val && `(${val})${data.value?.accountname}` },
+    { prop: 'applytime', label: 'investor.manage.cancelapply.details.applytime', formatValue: (val) => formatDate(val) },
+    { prop: 'handlestatus', label: 'investor.manage.cancelapply.details.handlestatus', formatValue: (val) => handlestatusEnum.getEnumTypeName(val) },
+    { prop: 'auditusername', label: 'investor.manage.cancelapply.details.auditusername' },
+    { prop: 'audittime', label: 'investor.manage.cancelapply.details.audittime', formatValue: (val) => formatDate(val) },
+    { prop: 'auditremark', label: 'investor.manage.cancelapply.details.auditremark' },
+    { prop: 'imageurl', label: 'investor.manage.cancelapply.details.imageurl' },
 ])
 
 const getImageUrl = (path: string) => {

+ 12 - 12
src/packages/pc/views/investor/manage/transfer/index.vue

@@ -82,14 +82,14 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryO
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'transfertype', label: '转移类型', formatValue: (val) => investortransfertypeEnum.getEnumTypeName(val) },
-    { field: 'outmemberusername', label: '转出所属会员' },
-    { field: 'outparentusername', label: '转出所属机构' },
-    { field: 'outinvestorname', label: '转出交易商' },
-    { field: 'inmemberusername', label: '转入所属会员' },
-    { field: 'inuseridname', label: '转入所属机构' },
-    { field: 'transferstatus', label: '转移状态', formatValue: (val) => transferstatusEnum.getEnumTypeName(val) },
-    { field: 'createtime', label: '申请时间', formatValue: (val) => formatDate(val) },
+    { field: 'transfertype', label: 'investor.manage.transfer.transfertype', formatValue: (val) => investortransfertypeEnum.getEnumTypeName(val) },
+    { field: 'outmemberusername', label: 'investor.manage.transfer.outmemberusername' },
+    { field: 'outparentusername', label: 'investor.manage.transfer.outparentusername' },
+    { field: 'outinvestorname', label: 'investor.manage.transfer.outinvestorname' },
+    { field: 'inmemberusername', label: 'investor.manage.transfer.inmemberusername' },
+    { field: 'inuseridname', label: 'investor.manage.transfer.inuseridname' },
+    { field: 'transferstatus', label: 'investor.manage.transfer.transferstatus', formatValue: (val) => transferstatusEnum.getEnumTypeName(val) },
+    { field: 'createtime', label: 'investor.manage.transfer.createtime', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
@@ -97,19 +97,19 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.Orga
     filters: [
         {
             field: 'outinvestor',
-            label: '转出交易商'
+            label: t('investor.manage.transfer.outinvestor')
         },
         {
             field: 'outmemberuserid',
-            label: '转出方'
+            label: t('investor.manage.transfer.outmemberuserid')
         },
         {
             field: 'inuserid',
-            label: '转入方'
+            label: t('investor.manage.transfer.inuserid')
         },
         {
             field: 'transferstatus',
-            label: '转移状态',
+            label: t('investor.manage.transfer.transferstatus'),
             options: () => transferstatusEnum.getEnumOptions()
         },
     ],

+ 6 - 6
src/packages/pc/views/member/institution/broker/components/details/index.vue

@@ -1,12 +1,12 @@
 <!-- 会员机构管理-机构管理-经纪会员管理-详情 -->
 <template>
-    <app-drawer title="详情" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
-        <app-table-details title="基本信息" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
+    <app-drawer :title="t('member.institution.broker.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
+        <app-table-details :title="t('member.institution.broker.details.subtitle')" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
         <!-- <app-table-details title="商品查询权限" :data="goodslimit" :label-width="160" :cell-props="detailProps2" :column="1">
             
         </app-table-details> -->
         <span>
-            <span>商品查询权限</span>
+            <span>{{ t('member.institution.broker.details.subtitle1') }}</span>
             <span v-for="item in goodslimit" v-bind:key="item.id">
                 <span>{{ item.title }}: </span>
                 <span>{{ item.value }}</span>
@@ -53,11 +53,11 @@ const { data } = useRequest(queryRoleDetail, {
 })
 
 const detailProps1: CellProp[] = [
-    { prop: 'accountname', label: '名称' },
-    { prop: 'userName', label: '管理员', formatValue: () => {
+    { prop: 'accountname', label: 'member.institution.broker.details.accountname' },
+    { prop: 'userName', label: 'member.institution.broker.details.userName', formatValue: () => {
         return data.value?.users.username
     }, },
-    { prop: 'reckonaccountid', label: '资金账户' }
+    { prop: 'reckonaccountid', label: 'member.institution.broker.details.reckonaccountid' }
 ]
 
 const goodslimit = computed(() => {

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

@@ -1,8 +1,8 @@
 <!-- 会员机构管理-机构管理-风控个性化设置-详情 -->
 <template>
-    <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" />
+    <app-drawer :title="t('member.institution.riskcfg.details.title')" width="900" v-model:show="show" :refresh="refresh">
+        <app-table-details :title="t('member.institution.riskcfg.details.subtitle')" :data="record" :label-width="160" :cell-props="detailProps1" :column="2" />
+        <app-table-details :title="t('member.institution.riskcfg.details.subtitle1')" :data="data" :label-width="160" :cell-props="detailProps2" :column="2" />
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
         </template>
@@ -47,27 +47,27 @@ const { data } = useRequest(getRiskRatioTypeForMarketer, {
 })
 
 const detailProps1: CellProp[] = [
-    { 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) },
+    { prop: 'username', label: 'member.institution.riskcfg.details.username', },
+    { prop: 'accountid', label: 'member.institution.riskcfg.details.accountid', },
+    { prop: 'customertype', label: 'member.institution.riskcfg.details.customertype', formatValue: (val) => marketerTypeEnum.getEnumTypeName(val) },
 ]
 
 const detailProps2 = computed<CellProp[]>(() => {
     const { notesaferatio } = data.value ?? {}
     return [
-        { 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' },
+        { prop: 'riskcontrolmode', label: 'member.institution.riskcfg.details.riskcontrolmode', formatValue: (val) => val === 1 ? 'member.institution.riskcfg.details.riskcontrolmode1' : 'member.institution.riskcfg.details.riskcontrolmode2' },
+        { prop: 'customertype', label: 'member.institution.riskcfg.details.customertype1', formatValue: (val) => marketerTypeEnum.getEnumTypeName(val) },
+        { prop: 'riskratiocalcmode', label: 'member.institution.riskcfg.details.riskratiocalcmode', formatValue: (val) => val === 1 ? 'member.institution.riskcfg.details.riskratiocalcmode1' : 'member.institution.riskcfg.details.riskratiocalcmode2' },
+        { prop: 'notemarginriskratio', label: 'member.institution.riskcfg.details.notemarginriskratio', formatValue: (val) => val + '%', show: !notesaferatio },
+        { prop: 'addmarginriskratio', label: 'member.institution.riskcfg.details.addmarginriskratio', formatValue: (val) => val + '%', show: !notesaferatio },
+        { prop: 'cutriskratio', label: 'member.institution.riskcfg.details.cutriskratio', formatValue: (val) => val + '%', show: !notesaferatio },
+        { prop: 'cutbackriskratio', label: 'member.institution.riskcfg.details.cutbackriskratio', formatValue: (val) => val + '%', show: !notesaferatio },
+        { prop: 'notesaferatio', label: 'member.institution.riskcfg.details.notesaferatio', formatValue: (val) => val + '%', show: !!notesaferatio },
+        { prop: 'addsaferatio', label: 'member.institution.riskcfg.details.addsaferatio', formatValue: (val) => val + '%', show: !!notesaferatio },
+        { prop: 'recoversaferatio', label: 'member.institution.riskcfg.details.recoversaferatio', formatValue: (val) => val + '%', show: !!notesaferatio },
+        { prop: 'cutsaferatio', label: 'member.institution.riskcfg.details.cutsaferatio', formatValue: (val) => val + '%', show: !!notesaferatio },
+        { prop: 'isdefault', label: 'member.institution.riskcfg.details.isdefault', formatValue: (val) => getConfirmationName(val) },
+        { prop: 'markets', label: 'member.institution.riskcfg.details.markets' },
     ]
 })
 

+ 6 - 6
src/packages/pc/views/member/institution/self/components/details/index.vue

@@ -1,12 +1,12 @@
 <!-- 会员机构管理-机构管理-自营会员管理-详情 -->
 <template>
-    <app-drawer title="详情" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
-        <app-table-details title="基本信息" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
+    <app-drawer :title="t('member.institution.self.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
+        <app-table-details :title="t('member.institution.self.details.subtitle')" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
         <!-- <app-table-details title="商品查询权限" :data="goodslimit" :label-width="160" :cell-props="detailProps2" :column="1">
             
         </app-table-details> -->
         <span>
-            <span>市场</span>
+            <span>{{ t('member.institution.self.details.market') }}</span>
             <span v-for="item in goodslimit" v-bind:key="item.id">
                 <span>{{ item.title }}: </span>
                 <span>{{ item.value }}</span>
@@ -53,11 +53,11 @@ const { data } = useRequest(queryRoleDetail, {
 })
 
 const detailProps1: CellProp[] = [
-    { prop: 'accountname', label: '名称' },
-    { prop: 'userName', label: '管理员', formatValue: () => {
+    { prop: 'accountname', label: 'member.institution.self.details.accountname' },
+    { prop: 'userName', label: 'member.institution.self.details.userName', formatValue: () => {
         return data.value?.users.username
     }, },
-    { prop: 'reckonaccountid', label: '资金账户' }
+    { prop: 'reckonaccountid', label: 'member.institution.self.details.reckonaccountid' }
 ]
 
 const goodslimit = computed(() => {

+ 17 - 17
src/packages/pc/views/member/institution/tradecfg/components/add/index.vue

@@ -5,42 +5,42 @@
         <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">{{ t('investor.custom.tradecfg.edit.subtitle1') }}</legend>
-                <el-form-item label="个性化设置" @change="onTradeTypeChange">
+                <el-form-item :label="t('member.institution.tradecfg.add.subtitle1')" @change="onTradeTypeChange">
                     <el-radio-group v-model="formData.tradetype">
-                        <el-radio label="自营会员" :value="1" />
-                        <el-radio label="做市会员" :value="2" />
+                        <el-radio :label="t('member.institution.tradecfg.add.userid1')" :value="1" />
+                        <el-radio :label="t('member.institution.tradecfg.add.userid2')" :value="2" />
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="自营会员" prop="userid" v-if="formData.tradetype === 1">
+                <el-form-item :label="t('member.institution.tradecfg.add.userid1')" prop="userid" v-if="formData.tradetype === 1">
                     <app-select-member v-model="formData.userid" :params="{ usertype: '2', roles: '6' }"
                         @change="onMemberChange" />
                 </el-form-item>
-                <el-form-item label="做市会员" prop="userid" v-if="formData.tradetype === 2">
+                <el-form-item :label="t('member.institution.tradecfg.add.userid2')" prop="userid" v-if="formData.tradetype === 2">
                     <app-select-member v-model="formData.userid" :params="{ usertype: '2', roles: '8' }"
                         @change="onMemberChange" />
                 </el-form-item>
-                <el-form-item label="资金账户" prop="accountid">
+                <el-form-item :label="t('member.institution.tradecfg.add.accountid')" prop="accountid">
                     <el-select v-model="formData.accountid" @change="onAccountChange">
                         <template v-for="(value, index) in accountData?.accountids" :key="index">
                             <el-option :label="value" :value="value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="市场" prop="marketid">
+                <el-form-item :label="t('member.institution.tradecfg.add.marketid')" prop="marketid">
                     <el-select v-model="formData.marketid" @change="onMarketChange">
                         <template v-for="(item, index) in marketData?.markets" :key="index">
                             <el-option :label="item.marketname" :value="item.marketid" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="商品" prop="goodsid">
+                <el-form-item :label="t('member.institution.tradecfg.add.goodsid')" prop="goodsid">
                     <el-select v-model="formData.goodsid" @change="onGoodsChange">
                         <template v-for="(item, index) in goodsData?.goods" :key="index">
                             <el-option :label="item.goodsname" :value="item.goodsid" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="保证金类别" prop="paramid">
+                <el-form-item :label="t('member.institution.tradecfg.add.paramid')" prop="paramid">
                     <el-select v-model="formData.paramid" @change="onResultChange" clearable>
                         <template v-for="(item, index) in resultData?.results" :key="index">
                             <el-option :label="item.enumdicname" :value="item.enumitemname" />
@@ -172,16 +172,16 @@ const { data: resultData, run: getResultList } = useRequest(loadSelectOption, {
 })
 
 const ruleColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'rulename', label: '扩展项' },
-    { field: 'paramvalue', label: '平台' },
-    { field: 'cvalue', label: '个性化' },
+    { field: 'rulename', label: 'member.institution.tradecfg.add.rulename' },
+    { field: 'paramvalue', label: 'member.institution.tradecfg.add.paramvalue' },
+    { field: 'cvalue', label: 'member.institution.tradecfg.add.cvalue' },
 ])
 
 const feeColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'tradefeename', label: '费用项' },
-    { field: 'exchangevalue', label: '平台' },
-    { field: 'feealgorithm', label: '费用算法', formatValue: (val) => scfRiskMode.getEnumTypeName(val) },
-    { field: 'fee', label: '服务费', width: 200 },
+    { field: 'tradefeename', label: 'member.institution.tradecfg.add.tradefeename' },
+    { field: 'exchangevalue', label: 'member.institution.tradecfg.add.exchangevalue' },
+    { field: 'feealgorithm', label: 'member.institution.tradecfg.add.feealgorithm', formatValue: (val) => scfRiskMode.getEnumTypeName(val) },
+    { field: 'fee', label: 'member.institution.tradecfg.add.fee', width: 200 },
 ])
 
 // 表单验证规则
@@ -291,7 +291,7 @@ const onSubmit = () => {
                     loading.value = false
                 })
             } else {
-                ElMessage.warning('保证金类别,交易规则,交易服务费均未设置')
+                ElMessage.warning(t('member.institution.tradecfg.add.tips1'))
             }
         }
     })

+ 18 - 15
src/packages/pc/views/member/institution/tradecfg/index.vue

@@ -14,11 +14,11 @@
                     @click="openComponent" v-if="data" />
             </div>
             <template v-if="data">
-                <app-table-details title="基本信息" :data="currentInfo" :label-width="160" :cell-props="detailProps"
+                <app-table-details :title="t('member.institution.tradecfg.subtitle')" :data="currentInfo" :label-width="160" :cell-props="detailProps"
                     :column="2" />
                 <app-table :data="data.druleList" :columns="ruleColumns">
                     <template #headerLeft>
-                        <b>交易规则</b>
+                        <b>{{ t('member.institution.tradecfg.traderule') }}</b>
                     </template>
                     <!-- 平台 -->
                     <template #paramvalue="{ row }">
@@ -35,7 +35,7 @@
                 </app-table>
                 <app-table :data="data.dfeeList" :columns="feeColumns">
                     <template #headerLeft>
-                        <b>交易服务费</b>
+                        <b>{{ t('member.institution.tradecfg.tradefee') }}</b>
                     </template>
                     <!-- 平台 -->
                     <template #exchangevalue="{ row }">
@@ -79,6 +79,9 @@ import { CellProp } from '@pc/components/base/table-details/types'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
 import AppTableDetails from '@pc/components/base/table-details/index.vue'
+import { i18n } from '@/stores'
+
+const { global: { t } } = i18n
 
 const customerTypeEnum = useEnum('customerType')
 const feetypeEnum = useEnum('feetype')
@@ -128,7 +131,7 @@ const { run: getNodeList } = useRequest(createTree, {
                 id: '-1',
                 level: 0,
                 marketid: 0,
-                name: '自营会员账户个性化设置',
+                name: t('member.institution.tradecfg.name1'),
                 pid: '0',
                 tradetype: 1,
                 userid: 0,
@@ -139,7 +142,7 @@ const { run: getNodeList } = useRequest(createTree, {
                 id: '-2',
                 level: 0,
                 marketid: 0,
-                name: '做市会员账户个性化设置',
+                name: t('member.institution.tradecfg.name2'),
                 pid: '0',
                 tradetype: 2,
                 userid: 0,
@@ -168,22 +171,22 @@ const { data, run: getDetails } = useRequest(OrganDetailTradeConfigView, {
 })
 
 const detailProps = computed<CellProp[]>(() => [
-    { prop: 'userName', formatLabel: () => (data.value?.tradetype === 1 ? '自营' : '做市') + '会员' },
-    { prop: 'accountName', label: '资金账户' },
-    { prop: 'goodsName', label: '商品' },
-    { prop: 'customerType', label: '保证金类别', formatValue: () => customerTypeEnum.getEnumTypeName(data.value?.paramid) },
+    { prop: 'userName', formatLabel: () => (data.value?.tradetype === 1 ? 'member.institution.tradecfg.userName' : 'member.institution.tradecfg.userName1') + 'member.institution.tradecfg.userName2' },
+    { prop: 'accountName', label: 'member.institution.tradecfg.accountName' },
+    { prop: 'goodsName', label: 'member.institution.tradecfg.goodsName' },
+    { prop: 'customerType', label: 'member.institution.tradecfg.customerType', formatValue: () => customerTypeEnum.getEnumTypeName(data.value?.paramid) },
 ])
 
 const ruleColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'rulename', label: '扩展项' },
-    { field: 'paramvalue', label: '平台' },
-    { field: 'cvalue', label: '个性化' },
+    { field: 'rulename', label: 'member.institution.tradecfg.rulename' },
+    { field: 'paramvalue', label: 'member.institution.tradecfg.paramvalue' },
+    { field: 'cvalue', label: 'member.institution.tradecfg.cvalue' },
 ])
 
 const feeColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'tradefeename', label: '费用项' },
-    { field: 'exchangevalue', label: '平台' },
-    { field: 'cvalue', label: '个性化' },
+    { field: 'tradefeename', label: 'member.institution.tradecfg.tradefeename' },
+    { field: 'exchangevalue', label: 'member.institution.tradecfg.exchangevalue' },
+    { field: 'cvalue', label: 'member.institution.tradecfg.cvalue' },
 ])
 
 const nodeClick = (data: Member.CreateTreeRsp, node: Node) => {

+ 19 - 19
src/packages/pc/views/query/internal/deliveryorder/index.vue

@@ -7,9 +7,9 @@
                     <el-form-item :label="item.label" prop="ishis">
                         <el-switch v-model="item.value" :active-value="1" :inactive-value="0" />
                     </el-form-item>
-                    <el-form-item label="日期" prop="date" v-if="item.value === 1">
+                    <el-form-item :label="t('query.internal.deliveryorder.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.deliveryorder.startdate')" :end-placeholder="t('query.internal.deliveryorder.enddate')" />
                     </el-form-item>
                 </template>
             </app-filter>
@@ -69,15 +69,15 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryD
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'deliveryticket', label: '申报流水' },
-    { field: 'deliveryorderid', label: '申报单号' },
-    { field: 'accountidname', label: '申报人' },
-    { field: 'xgoodsname', label: '主商品' },
-    { field: 'xdeliveryqty', label: '主商品手数' },
-    { field: 'deliverygoodsname', label: '现货商品' },
-    { field: 'deliveryqty', label: '现货数量' },
-    { field: 'deliveryorderstatus', label: '状态', formatValue: (val) => deliveryorderstatus1Enum.getEnumTypeName(val) },
-    { field: 'ordertime', label: '申报时间', formatValue: (val) => formatDate(val) },
+    { field: 'deliveryticket', label: 'query.internal.deliveryorder.deliveryticket' },
+    { field: 'deliveryorderid', label: 'query.internal.deliveryorder.deliveryorderid' },
+    { field: 'accountidname', label: 'query.internal.deliveryorder.accountidname' },
+    { field: 'xgoodsname', label: 'query.internal.deliveryorder.xgoodsname' },
+    { field: 'xdeliveryqty', label: 'query.internal.deliveryorder.xdeliveryqty' },
+    { field: 'deliverygoodsname', label: 'query.internal.deliveryorder.deliverygoodsname' },
+    { field: 'deliveryqty', label: 'query.internal.deliveryorder.deliveryqty' },
+    { field: 'deliveryorderstatus', label: 'query.internal.deliveryorder.deliveryorderstatus', formatValue: (val) => deliveryorderstatus1Enum.getEnumTypeName(val) },
+    { field: 'ordertime', label: 'query.internal.deliveryorder.ordertime', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
@@ -95,32 +95,32 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     filters: [
         {
             field: 'deliveryorderid',
-            label: '申报单号',
+            label: t('query.internal.deliveryorder.deliveryorderid'),
         },
         {
             field: 'accountname',
-            label: '申报人',
+            label: t('query.internal.deliveryorder.accountname'),
         },
         {
             field: 'xgoodsid',
-            label: '主商品',
+            label: t('query.internal.deliveryorder.xgoodsid'),
         },
         {
             field: 'wrstandardid',
-            label: '现货商品',
+            label: t('query.internal.deliveryorder.wrstandardid'),
         },
         {
             field: 'deliveryorderstatus',
-            label: '状态',
+            label: t('query.internal.deliveryorder.deliveryorderstatus'),
             options: () => deliveryorderstatus1Enum.getEnumOptions()
         },
         {
             field: 'ishis',
-            label: '历史查询',
+            label: t('query.internal.deliveryorder.ishis'),
             value: 0,
             options: () => [
-                { label: '当前', value: 0 },
-                { label: '历史', value: 1 }
+                { label: t('common.current'), value: 0 },
+                { label: t('common.history'), value: 1 }
             ]
         },
     ],