Handy_Cao 8 mesi fa
parent
commit
cb89ece059
23 ha cambiato i file con 1595 aggiunte e 330 eliminazioni
  1. 272 19
      public/locales/en-US.json
  2. 272 19
      public/locales/th-TH.json
  3. 271 18
      public/locales/vi-VN.json
  4. 271 18
      public/locales/zh-CN.json
  5. 272 19
      public/locales/zh-TW.json
  6. 6 6
      src/packages/pc/views/member/institution/industry/components/details/index.vue
  7. 6 6
      src/packages/pc/views/member/institution/marketer/components/details/index.vue
  8. 6 6
      src/packages/pc/views/member/institution/marketing/components/details/index.vue
  9. 6 6
      src/packages/pc/views/member/institution/operation/components/details/index.vue
  10. 15 15
      src/packages/pc/views/member/institution/riskcfg/components/edit/index.vue
  11. 12 12
      src/packages/pc/views/member/institution/tradecfg/components/edit/index.vue
  12. 10 10
      src/packages/pc/views/member/institution/user/components/account/index.vue
  13. 12 12
      src/packages/pc/views/member/institution/user/components/account/signstatement/index.vue
  14. 41 41
      src/packages/pc/views/member/institution/user/components/details/index.vue
  15. 7 7
      src/packages/pc/views/member/institution/user/components/login/index.vue
  16. 6 6
      src/packages/pc/views/member/institution/user/components/terminal/index.vue
  17. 7 7
      src/packages/pc/views/member/institution/warehouse/components/details/index.vue
  18. 12 12
      src/packages/pc/views/member/subinstitution/user/index.vue
  19. 13 13
      src/packages/pc/views/notice/manage/index.vue
  20. 30 30
      src/packages/pc/views/query/internal/deliveryorder/components/details/index.vue
  21. 18 18
      src/packages/pc/views/query/internal/offlinedelivery/components/cancel/index.vue
  22. 13 13
      src/packages/pc/views/query/internal/offlinedelivery/components/confirm/index.vue
  23. 17 17
      src/packages/pc/views/query/internal/offlinedelivery/components/details/index.vue

+ 272 - 19
public/locales/en-US.json

@@ -1047,7 +1047,15 @@
                 "accountid": "Fund Account",
                 "accountstatus": "Organization Status",
                 "operation": "Operator",
-                "rolemodifytime": "Role Creation Time"
+                "rolemodifytime": "Role Creation Time",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "marketer": {
                 "memberuserid": "Organization Code",
@@ -1055,7 +1063,15 @@
                 "accountid": "Fund Account",
                 "accountstatus": "Organization Status",
                 "operation": "Operator",
-                "rolemodifytime": "Role Creation Time"
+                "rolemodifytime": "Role Creation Time",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "marketing": {
                 "memberuserid": "Organization Code",
@@ -1063,7 +1079,15 @@
                 "accountid": "Fund Account",
                 "accountstatus": "Organization Status",
                 "operation": "Operator",
-                "rolemodifytime": "Role Creation Time"
+                "rolemodifytime": "Role Creation Time",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "open": {
                 "username": "Username",
@@ -1152,7 +1176,15 @@
                 "accountid": "Fund Account",
                 "accountstatus": "Organization Status",
                 "operation": "Operator",
-                "rolemodifytime": "Role Creation Time"
+                "rolemodifytime": "Role Creation Time",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "riskcfg": {
                 "memberuserid": "Member",
@@ -1186,6 +1218,27 @@
                     "cutsaferatio": "斩仓安全度:",
                     "isdefault": "是否默认:",
                     "markets": "斩仓市场顺序:"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "userid": "会员",
+                    "riskcontrolmode": "风控模式:",
+                    "riskcontrolmode1": "交易商",
+                    "riskcontrolmode2": "做市会员",
+                    "customertype1": "客户类别:",
+                    "riskratiocalcmode": "风险率计算方式:",
+                    "riskratiocalcmode1": "占用/净值",
+                    "riskratiocalcmode2": "值/占用",
+                    "notemarginriskratio": "提示保证金风险率:",
+                    "addmarginriskratio": "追加保证金风险率:",
+                    "cutriskratio": "斩仓风险率:",
+                    "cutbackriskratio": "斩仓恢复风险率:",
+                    "notesaferatio": "提示安全度:",
+                    "addsaferatio": "追加安全度:",
+                    "recoversaferatio": "恢复正常安全度:",
+                    "cutsaferatio": "斩仓安全度:",
+                    "isdefault": "是否默认:",
+                    "markets": "斩仓市场顺序:"
                 }
             },
             "role": {
@@ -1243,6 +1296,21 @@
                     "feealgorithm": "费用算法",
                     "fee": "服务费",
                     "tips1": "保证金类别,交易规则,交易服务费均未设置"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "tradetype1" : "自营会员",
+                    "tradetype2": "做市会员",
+                    "accountid": "资金账户",
+                    "goodsid": "商品",
+                    "rulename": "扩展项",
+                    "paramvalue": "平台",
+                    "cvalue": "个性化",
+                    "tradefeename": "费用项",
+                    "exchangevalue": "平台",
+                    "feealgorithm": "费用算法",
+                    "fee": "服务费",
+                    "tips1": "保证金类别,交易规则,交易服务费均未设置"
                 }
             },
             "user": {
@@ -1257,7 +1325,89 @@
                 "createtime": "Creation Time",
                 "modifytime": "Last Update Time",
                 "roleIds": "Organization Role",
-                "userName": "Operator"
+                "userName": "Operator",
+                "account": {
+                    "accountname": "的资金账户",
+                    "accountId": "资金账户",
+                    "isMain": "账户类型",
+                    "taAccountType": "内/外部",
+                    "relatedName": "关联账户",
+                    "parentAccountId": "所属母账户",
+                    "tradeStatus": "交易状态",
+                    "currency": "币种",
+                    "curRiskRate": "风险率(%)",
+                    "signstatement": {
+                        "title": "签解约流水记录",
+                        "accountid": "资金账户:",
+                        "accountcode": "资金账户",
+                        "cusbankid": "托管银行编号",
+                        "signtype": "签(解)约类型",
+                        "dealstatus": "处理状态",
+                        "createtime": "时间",
+                        "bankaccountno": "银行卡号",
+                        "currency": "币种",
+                        "querytype": "查询类型"
+                    }
+                },
+                "details": {
+                    "title": "详情",
+                    "subtitle1": "基本信息",
+                    "subtitle2": "管理员及账户信息",
+                    "subtitle3": "银行卡信息",
+                    "subtitle4": "附件",
+                    "userid": "机构代码",
+                    "userinfotype": "所有者类型",
+                    "refereeusername": "推荐人",
+                    "accountname": "机构名称",
+                    "usertype": "机构类型",
+                    "accountstatus": "机构状态",
+                    "reckonaccountid": "资金账户",
+                    "createtime": "创建时间",
+                    "customername": "名称",
+                    "company": "公司",
+                    "biznature": "企业性质",
+                    "cardtypeid": "证件类型",
+                    "cardnum": "证件号码",
+                    "cardfrontphotourl": "证件照正面",
+                    "cardbackphotourl": "证件照反面",
+                    "legalpersonname": "法人姓名",
+                    "legalcardfrontphotourl": "法人身份证正面",
+                    "legalcardbackphotourl": "法人身份证反面",
+                    "contactname": "联系人",
+                    "sex": "性别",
+                    "mobile": "手机号",
+                    "telphone": "联系电话",
+                    "address": "地址",
+                    "postalcode": "邮政编码",
+                    "email": "邮箱",
+                    "qq": "QQ",
+                    "wechat": "微信",
+                    "remark": "备注",
+                    "logincode": "管理员登录帐号",
+                    "username": "管理员名称",
+                    "managerstatus": "帐号状态",
+                    "bankname": "银行名称",
+                    "bankaccount": "银行账户",
+                    "bankcardfrontphotourl": "银行卡正面",
+                    "attachment1": "附件1",
+                    "attachment2": "附件2"
+                },
+                "login": {
+                    "accountname": "及子机构 管理员账户",
+                    "allstart": "全部启用",
+                    "allstop": "全部停用",
+                    "areauserid": "所属机构代码",
+                    "logincode": "登录账户",
+                    "managerstatus": "账户状态",
+                    "modifytime": "更新时间"
+                },
+                "terminal": {
+                    "accountname": "自营会员登录账号",
+                    "userid": "所属机构代码",
+                    "loginid": "登录账户",
+                    "loginstatus": "账户状态",
+                    "modifytime": "更新时间"
+                }
             },
             "warehouse": {
                 "memberuserid": "Organization Code",
@@ -1265,7 +1415,15 @@
                 "accountid": "Fund Account",
                 "accountstatus": "Organization Status",
                 "operation": "Operator",
-                "rolemodifytime": "Role Creation Time"
+                "rolemodifytime": "Role Creation Time",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "仓库",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             }
         },
         "subinstitution": {
@@ -1422,16 +1580,17 @@
                 }
             },
             "user": {
-                "username": "Organization Code",
-                "openmode": "Organization Name",
-                "userstate": "Parent Organization",
-                "createtime": "Member",
-                "operate1": "Organization Status",
-                "operate2": "Organization Type",
-                "operate3": "Owner Type",
-                "operate4": "Operator",
-                "operate5": "Last Update Time",
-                "username1": "Organization",
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "parentname": "所属机构",
+                "memberusername": "所属会员",
+                "accountstatus": "机构状态",
+                "usertype": "机构类型",
+                "userinfotype": "所有者类型",
+                "userName": "操作员",
+                "modifytime": "最后更新时间",
+                "username1": "机构",
+                "markets": "市场权限",
                 "edit": {
                     "title": "Edit",
                     "subtitle": "Administrator & Account Information",
@@ -1469,7 +1628,18 @@
         }
     },
     "notice": {
-        "manage": {}
+        "manage": {
+            "title": "标题",
+            "msgtype": "消息类型",
+            "sendtype": "发布类型",
+            "sentstatus": "推送状态",
+            "scheduletime": "生效时间",
+            "endtime": "结束时间",
+            "recipient": "接收人",
+            "content": "消息内容",
+            "userid": "接收交易商",
+            "isforcedisplay": "是否强制弹出"
+        }
     },
     "performance": {
         "buy": {},
@@ -1569,7 +1739,39 @@
                 "deliverygoodsname": "现货商品",
                 "deliveryqty": "现货数量",
                 "deliveryorderstatus": "状态",
-                "ordertime": "申报时间"
+                "ordertime": "申报时间",
+                "details": {
+                    "title": "交收委托(点选式)详细信息",
+                    "subtitle1": "申报信息",
+                    "subtitle2": "仓单信息",
+                    "subtitle3": "交易合约",
+                    "subtitle4": "辅助合约一",
+                    "subtitle5": "辅助合约二",
+                    "deliveryticket": "申报流水号:",
+                    "deliveryorderid": "委托单号:",
+                    "tradedate": "交易日:",
+                    "accountid": "申报人(账号):",
+                    "matchaccountid": "对手(账号):",
+                    "deliveryorderstatus": "交收状态:",
+                    "ordertime": "申报时间:",
+                    "auditname": "审核人:",
+                    "audittime": "审核时间:",
+                    "auditremark": "备注:",
+                    "retcode": "错误信息:",
+                    "wrstandardcode": "现货商品:",
+                    "deliveryqty": "现货数量:",
+                    "xgoodsname": "交易合约:",
+                    "xdeliveryprice": "交收价格:",
+                    "xdeliveryqty": "合约手数:",
+                    "ppricemode": "价格方式:",
+                    "pgoodsname": "辅助合约一:",
+                    "pdeliveryprice": "交收价格:",
+                    "pdeliveryqty": "合约手数:",
+                    "p2pricemode": "价格方式:",
+                    "p2goodsname": "辅助合约二:",
+                    "p2deliveryprice": "交收价格:",
+                    "p2deliveryqty": "合约手数:"
+                }
             },
             "deliverytrade": {
                 "startDate":"开始时间",
@@ -1692,7 +1894,58 @@
                 "deliverygoodsname": "交收商品",
                 "accountname": "账户",
                 "startdate": "申请日期",
-                "buyorsell": "方向"
+                "buyorsell": "方向",
+                "cancel": {
+                    "title": "详细",
+                    "submit": "交收失败",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:",
+                    "auditremark": "备注:",
+                    "tips": "请输入备注"
+                },
+                "confirm": {
+                    "title": "详细",
+                    "submit": "确认交收",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:"
+                },
+                "details": {
+                    "title": "详细",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "申请交收数量:",
+                    "sucdeliveryqty": "实际交收数量:",
+                    "cancledeliveryqty": "撤销交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:",
+                    "remark": "备注:",
+                    "deliverycharge": "交收手续费:",
+                    "closetime": "完成时间:"
+                }
             },
             "order": {
                 "marketid": "Market",

+ 272 - 19
public/locales/th-TH.json

@@ -1047,7 +1047,15 @@
                 "accountid": "บัญชีเงินทุน",
                 "accountstatus": "สถานะองค์กร",
                 "operation": "ผู้ดำเนินการ",
-                "rolemodifytime": "เวลาสร้างบทบาท"
+                "rolemodifytime": "เวลาสร้างบทบาท",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "marketer": {
                 "memberuserid": "รหัสองค์กร",
@@ -1055,7 +1063,15 @@
                 "accountid": "บัญชีเงินทุน",
                 "accountstatus": "สถานะองค์กร",
                 "operation": "ผู้ดำเนินการ",
-                "rolemodifytime": "เวลาสร้างบทบาท"
+                "rolemodifytime": "เวลาสร้างบทบาท",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "marketing": {
                 "memberuserid": "รหัสองค์กร",
@@ -1063,7 +1079,15 @@
                 "accountid": "บัญชีเงินทุน",
                 "accountstatus": "สถานะองค์กร",
                 "operation": "ผู้ดำเนินการ",
-                "rolemodifytime": "เวลาสร้างบทบาท"
+                "rolemodifytime": "เวลาสร้างบทบาท",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "open": {
                 "username": "ชื่อผู้ใช้",
@@ -1152,7 +1176,15 @@
                 "accountid": "บัญชีเงินทุน",
                 "accountstatus": "สถานะองค์กร",
                 "operation": "ผู้ดำเนินการ",
-                "rolemodifytime": "เวลาสร้างบทบาท"
+                "rolemodifytime": "เวลาสร้างบทบาท",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "riskcfg": {
                 "memberuserid": "สมาชิก",
@@ -1186,6 +1218,27 @@
                     "cutsaferatio": "斩仓安全度:",
                     "isdefault": "是否默认:",
                     "markets": "斩仓市场顺序:"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "userid": "会员",
+                    "riskcontrolmode": "风控模式:",
+                    "riskcontrolmode1": "交易商",
+                    "riskcontrolmode2": "做市会员",
+                    "customertype1": "客户类别:",
+                    "riskratiocalcmode": "风险率计算方式:",
+                    "riskratiocalcmode1": "占用/净值",
+                    "riskratiocalcmode2": "值/占用",
+                    "notemarginriskratio": "提示保证金风险率:",
+                    "addmarginriskratio": "追加保证金风险率:",
+                    "cutriskratio": "斩仓风险率:",
+                    "cutbackriskratio": "斩仓恢复风险率:",
+                    "notesaferatio": "提示安全度:",
+                    "addsaferatio": "追加安全度:",
+                    "recoversaferatio": "恢复正常安全度:",
+                    "cutsaferatio": "斩仓安全度:",
+                    "isdefault": "是否默认:",
+                    "markets": "斩仓市场顺序:"
                 }
             },
             "role": {
@@ -1243,6 +1296,21 @@
                     "feealgorithm": "费用算法",
                     "fee": "服务费",
                     "tips1": "保证金类别,交易规则,交易服务费均未设置"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "tradetype1" : "自营会员",
+                    "tradetype2": "做市会员",
+                    "accountid": "资金账户",
+                    "goodsid": "商品",
+                    "rulename": "扩展项",
+                    "paramvalue": "平台",
+                    "cvalue": "个性化",
+                    "tradefeename": "费用项",
+                    "exchangevalue": "平台",
+                    "feealgorithm": "费用算法",
+                    "fee": "服务费",
+                    "tips1": "保证金类别,交易规则,交易服务费均未设置"
                 }
             },
             "user": {
@@ -1257,7 +1325,89 @@
                 "createtime": "เวลาสร้าง",
                 "modifytime": "เวลาปรับปรุงล่าสุด",
                 "roleIds": "บทบาทองค์กร",
-                "userName": "ผู้ดำเนินการ"
+                "userName": "ผู้ดำเนินการ",
+                "account": {
+                    "accountname": "的资金账户",
+                    "accountId": "资金账户",
+                    "isMain": "账户类型",
+                    "taAccountType": "内/外部",
+                    "relatedName": "关联账户",
+                    "parentAccountId": "所属母账户",
+                    "tradeStatus": "交易状态",
+                    "currency": "币种",
+                    "curRiskRate": "风险率(%)",
+                    "signstatement": {
+                        "title": "签解约流水记录",
+                        "accountid": "资金账户:",
+                        "accountcode": "资金账户",
+                        "cusbankid": "托管银行编号",
+                        "signtype": "签(解)约类型",
+                        "dealstatus": "处理状态",
+                        "createtime": "时间",
+                        "bankaccountno": "银行卡号",
+                        "currency": "币种",
+                        "querytype": "查询类型"
+                    }
+                },
+                "details": {
+                    "title": "详情",
+                    "subtitle1": "基本信息",
+                    "subtitle2": "管理员及账户信息",
+                    "subtitle3": "银行卡信息",
+                    "subtitle4": "附件",
+                    "userid": "机构代码",
+                    "userinfotype": "所有者类型",
+                    "refereeusername": "推荐人",
+                    "accountname": "机构名称",
+                    "usertype": "机构类型",
+                    "accountstatus": "机构状态",
+                    "reckonaccountid": "资金账户",
+                    "createtime": "创建时间",
+                    "customername": "名称",
+                    "company": "公司",
+                    "biznature": "企业性质",
+                    "cardtypeid": "证件类型",
+                    "cardnum": "证件号码",
+                    "cardfrontphotourl": "证件照正面",
+                    "cardbackphotourl": "证件照反面",
+                    "legalpersonname": "法人姓名",
+                    "legalcardfrontphotourl": "法人身份证正面",
+                    "legalcardbackphotourl": "法人身份证反面",
+                    "contactname": "联系人",
+                    "sex": "性别",
+                    "mobile": "手机号",
+                    "telphone": "联系电话",
+                    "address": "地址",
+                    "postalcode": "邮政编码",
+                    "email": "邮箱",
+                    "qq": "QQ",
+                    "wechat": "微信",
+                    "remark": "备注",
+                    "logincode": "管理员登录帐号",
+                    "username": "管理员名称",
+                    "managerstatus": "帐号状态",
+                    "bankname": "银行名称",
+                    "bankaccount": "银行账户",
+                    "bankcardfrontphotourl": "银行卡正面",
+                    "attachment1": "附件1",
+                    "attachment2": "附件2"
+                },
+                "login": {
+                    "accountname": "及子机构 管理员账户",
+                    "allstart": "全部启用",
+                    "allstop": "全部停用",
+                    "areauserid": "所属机构代码",
+                    "logincode": "登录账户",
+                    "managerstatus": "账户状态",
+                    "modifytime": "更新时间"
+                },
+                "terminal": {
+                    "accountname": "自营会员登录账号",
+                    "userid": "所属机构代码",
+                    "loginid": "登录账户",
+                    "loginstatus": "账户状态",
+                    "modifytime": "更新时间"
+                }
             },
             "warehouse": {
                 "memberuserid": "รหัสองค์กร",
@@ -1265,7 +1415,15 @@
                 "accountid": "บัญชีเงินทุน",
                 "accountstatus": "สถานะองค์กร",
                 "operation": "ผู้ดำเนินการ",
-                "rolemodifytime": "เวลาสร้างบทบาท"
+                "rolemodifytime": "เวลาสร้างบทบาท",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "仓库",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             }
         },
         "subinstitution": {
@@ -1422,16 +1580,17 @@
                 }
             },
             "user": {
-                "username": "รหัสองค์กร",
-                "openmode": "ชื่อองค์กร",
-                "userstate": "องค์กรที่สังกัด",
-                "createtime": "สมาชิกที่สังกัด",
-                "operate1": "สถานะองค์กร",
-                "operate2": "ประเภทองค์กร",
-                "operate3": "ประเภทเจ้าของ",
-                "operate4": "ผู้ดำเนินการ",
-                "operate5": "เวลาปรับปรุงล่าสุด",
-                "username1": "องค์กร",
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "parentname": "所属机构",
+                "memberusername": "所属会员",
+                "accountstatus": "机构状态",
+                "usertype": "机构类型",
+                "userinfotype": "所有者类型",
+                "userName": "操作员",
+                "modifytime": "最后更新时间",
+                "username1": "机构",
+                "markets": "市场权限",
                 "edit": {
                     "title": "แก้ไข",
                     "subtitle": "ข้อมูลผู้ดูแลระบบและบัญชี",
@@ -1469,7 +1628,18 @@
         }
     },
     "notice": {
-        "manage": {}
+        "manage": {
+            "title": "标题",
+            "msgtype": "消息类型",
+            "sendtype": "发布类型",
+            "sentstatus": "推送状态",
+            "scheduletime": "生效时间",
+            "endtime": "结束时间",
+            "recipient": "接收人",
+            "content": "消息内容",
+            "userid": "接收交易商",
+            "isforcedisplay": "是否强制弹出"
+        }
     },
     "performance": {
         "buy": {},
@@ -1569,7 +1739,39 @@
                 "deliverygoodsname": "现货商品",
                 "deliveryqty": "现货数量",
                 "deliveryorderstatus": "状态",
-                "ordertime": "申报时间"
+                "ordertime": "申报时间",
+                "details": {
+                    "title": "交收委托(点选式)详细信息",
+                    "subtitle1": "申报信息",
+                    "subtitle2": "仓单信息",
+                    "subtitle3": "交易合约",
+                    "subtitle4": "辅助合约一",
+                    "subtitle5": "辅助合约二",
+                    "deliveryticket": "申报流水号:",
+                    "deliveryorderid": "委托单号:",
+                    "tradedate": "交易日:",
+                    "accountid": "申报人(账号):",
+                    "matchaccountid": "对手(账号):",
+                    "deliveryorderstatus": "交收状态:",
+                    "ordertime": "申报时间:",
+                    "auditname": "审核人:",
+                    "audittime": "审核时间:",
+                    "auditremark": "备注:",
+                    "retcode": "错误信息:",
+                    "wrstandardcode": "现货商品:",
+                    "deliveryqty": "现货数量:",
+                    "xgoodsname": "交易合约:",
+                    "xdeliveryprice": "交收价格:",
+                    "xdeliveryqty": "合约手数:",
+                    "ppricemode": "价格方式:",
+                    "pgoodsname": "辅助合约一:",
+                    "pdeliveryprice": "交收价格:",
+                    "pdeliveryqty": "合约手数:",
+                    "p2pricemode": "价格方式:",
+                    "p2goodsname": "辅助合约二:",
+                    "p2deliveryprice": "交收价格:",
+                    "p2deliveryqty": "合约手数:"
+                }
             },
             "deliverytrade": {
                 "startDate":"开始时间",
@@ -1692,7 +1894,58 @@
                 "deliverygoodsname": "交收商品",
                 "accountname": "账户",
                 "startdate": "申请日期",
-                "buyorsell": "方向"
+                "buyorsell": "方向",
+                "cancel": {
+                    "title": "详细",
+                    "submit": "交收失败",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:",
+                    "auditremark": "备注:",
+                    "tips": "请输入备注"
+                },
+                "confirm": {
+                    "title": "详细",
+                    "submit": "确认交收",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:"
+                },
+                "details": {
+                    "title": "详细",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "申请交收数量:",
+                    "sucdeliveryqty": "实际交收数量:",
+                    "cancledeliveryqty": "撤销交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:",
+                    "remark": "备注:",
+                    "deliverycharge": "交收手续费:",
+                    "closetime": "完成时间:"
+                }
             },
             "order": {
                 "marketid": "ตลาด",

+ 271 - 18
public/locales/vi-VN.json

@@ -1047,7 +1047,15 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "marketer": {
                 "memberuserid": "机构代码",
@@ -1055,7 +1063,15 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "marketing": {
                 "memberuserid": "机构代码",
@@ -1063,7 +1079,15 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "open": {
                 "username": "用户名称",
@@ -1152,7 +1176,15 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "riskcfg": {
                 "memberuserid": "会员",
@@ -1186,6 +1218,27 @@
                     "cutsaferatio": "斩仓安全度:",
                     "isdefault": "是否默认:",
                     "markets": "斩仓市场顺序:"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "userid": "会员",
+                    "riskcontrolmode": "风控模式:",
+                    "riskcontrolmode1": "交易商",
+                    "riskcontrolmode2": "做市会员",
+                    "customertype1": "客户类别:",
+                    "riskratiocalcmode": "风险率计算方式:",
+                    "riskratiocalcmode1": "占用/净值",
+                    "riskratiocalcmode2": "值/占用",
+                    "notemarginriskratio": "提示保证金风险率:",
+                    "addmarginriskratio": "追加保证金风险率:",
+                    "cutriskratio": "斩仓风险率:",
+                    "cutbackriskratio": "斩仓恢复风险率:",
+                    "notesaferatio": "提示安全度:",
+                    "addsaferatio": "追加安全度:",
+                    "recoversaferatio": "恢复正常安全度:",
+                    "cutsaferatio": "斩仓安全度:",
+                    "isdefault": "是否默认:",
+                    "markets": "斩仓市场顺序:"
                 }
             },
             "role": {
@@ -1243,6 +1296,21 @@
                     "feealgorithm": "费用算法",
                     "fee": "服务费",
                     "tips1": "保证金类别,交易规则,交易服务费均未设置"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "tradetype1" : "自营会员",
+                    "tradetype2": "做市会员",
+                    "accountid": "资金账户",
+                    "goodsid": "商品",
+                    "rulename": "扩展项",
+                    "paramvalue": "平台",
+                    "cvalue": "个性化",
+                    "tradefeename": "费用项",
+                    "exchangevalue": "平台",
+                    "feealgorithm": "费用算法",
+                    "fee": "服务费",
+                    "tips1": "保证金类别,交易规则,交易服务费均未设置"
                 }
             },
             "user": {
@@ -1257,7 +1325,89 @@
                 "createtime": "创建时间",
                 "modifytime": "最后更新时间",
                 "roleIds": "机构角色",
-                "userName": "操作员"
+                "userName": "操作员",
+                "account": {
+                    "accountname": "的资金账户",
+                    "accountId": "资金账户",
+                    "isMain": "账户类型",
+                    "taAccountType": "内/外部",
+                    "relatedName": "关联账户",
+                    "parentAccountId": "所属母账户",
+                    "tradeStatus": "交易状态",
+                    "currency": "币种",
+                    "curRiskRate": "风险率(%)",
+                    "signstatement": {
+                        "title": "签解约流水记录",
+                        "accountid": "资金账户:",
+                        "accountcode": "资金账户",
+                        "cusbankid": "托管银行编号",
+                        "signtype": "签(解)约类型",
+                        "dealstatus": "处理状态",
+                        "createtime": "时间",
+                        "bankaccountno": "银行卡号",
+                        "currency": "币种",
+                        "querytype": "查询类型"
+                    }
+                },
+                "details": {
+                    "title": "详情",
+                    "subtitle1": "基本信息",
+                    "subtitle2": "管理员及账户信息",
+                    "subtitle3": "银行卡信息",
+                    "subtitle4": "附件",
+                    "userid": "机构代码",
+                    "userinfotype": "所有者类型",
+                    "refereeusername": "推荐人",
+                    "accountname": "机构名称",
+                    "usertype": "机构类型",
+                    "accountstatus": "机构状态",
+                    "reckonaccountid": "资金账户",
+                    "createtime": "创建时间",
+                    "customername": "名称",
+                    "company": "公司",
+                    "biznature": "企业性质",
+                    "cardtypeid": "证件类型",
+                    "cardnum": "证件号码",
+                    "cardfrontphotourl": "证件照正面",
+                    "cardbackphotourl": "证件照反面",
+                    "legalpersonname": "法人姓名",
+                    "legalcardfrontphotourl": "法人身份证正面",
+                    "legalcardbackphotourl": "法人身份证反面",
+                    "contactname": "联系人",
+                    "sex": "性别",
+                    "mobile": "手机号",
+                    "telphone": "联系电话",
+                    "address": "地址",
+                    "postalcode": "邮政编码",
+                    "email": "邮箱",
+                    "qq": "QQ",
+                    "wechat": "微信",
+                    "remark": "备注",
+                    "logincode": "管理员登录帐号",
+                    "username": "管理员名称",
+                    "managerstatus": "帐号状态",
+                    "bankname": "银行名称",
+                    "bankaccount": "银行账户",
+                    "bankcardfrontphotourl": "银行卡正面",
+                    "attachment1": "附件1",
+                    "attachment2": "附件2"
+                },
+                "login": {
+                    "accountname": "及子机构 管理员账户",
+                    "allstart": "全部启用",
+                    "allstop": "全部停用",
+                    "areauserid": "所属机构代码",
+                    "logincode": "登录账户",
+                    "managerstatus": "账户状态",
+                    "modifytime": "更新时间"
+                },
+                "terminal": {
+                    "accountname": "自营会员登录账号",
+                    "userid": "所属机构代码",
+                    "loginid": "登录账户",
+                    "loginstatus": "账户状态",
+                    "modifytime": "更新时间"
+                }
             },
             "warehouse": {
                 "memberuserid": "机构代码",
@@ -1265,7 +1415,15 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "仓库",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             }
         },
         "subinstitution": {
@@ -1422,16 +1580,17 @@
                 }
             },
             "user": {
-                "username": "机构代码",
-                "openmode": "机构名称",
-                "userstate": "所属机构",
-                "createtime": "所属会员",
-                "operate1": "机构状态",
-                "operate2": "机构类型",
-                "operate3": "所有者类型",
-                "operate4": "操作员",
-                "operate5": "最后更新时间",
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "parentname": "所属机构",
+                "memberusername": "所属会员",
+                "accountstatus": "机构状态",
+                "usertype": "机构类型",
+                "userinfotype": "所有者类型",
+                "userName": "操作员",
+                "modifytime": "最后更新时间",
                 "username1": "机构",
+                "markets": "市场权限",
                 "edit": {
                     "title": "编辑",
                     "subtitle": "管理员及账户信息",
@@ -1469,7 +1628,18 @@
         }
     },
     "notice": {
-        "manage": {}
+        "manage": {
+            "title": "标题",
+            "msgtype": "消息类型",
+            "sendtype": "发布类型",
+            "sentstatus": "推送状态",
+            "scheduletime": "生效时间",
+            "endtime": "结束时间",
+            "recipient": "接收人",
+            "content": "消息内容",
+            "userid": "接收交易商",
+            "isforcedisplay": "是否强制弹出"
+        }
     },
     "performance": {
         "buy": {},
@@ -1569,7 +1739,39 @@
                 "deliverygoodsname": "现货商品",
                 "deliveryqty": "现货数量",
                 "deliveryorderstatus": "状态",
-                "ordertime": "申报时间"
+                "ordertime": "申报时间",
+                "details": {
+                    "title": "交收委托(点选式)详细信息",
+                    "subtitle1": "申报信息",
+                    "subtitle2": "仓单信息",
+                    "subtitle3": "交易合约",
+                    "subtitle4": "辅助合约一",
+                    "subtitle5": "辅助合约二",
+                    "deliveryticket": "申报流水号:",
+                    "deliveryorderid": "委托单号:",
+                    "tradedate": "交易日:",
+                    "accountid": "申报人(账号):",
+                    "matchaccountid": "对手(账号):",
+                    "deliveryorderstatus": "交收状态:",
+                    "ordertime": "申报时间:",
+                    "auditname": "审核人:",
+                    "audittime": "审核时间:",
+                    "auditremark": "备注:",
+                    "retcode": "错误信息:",
+                    "wrstandardcode": "现货商品:",
+                    "deliveryqty": "现货数量:",
+                    "xgoodsname": "交易合约:",
+                    "xdeliveryprice": "交收价格:",
+                    "xdeliveryqty": "合约手数:",
+                    "ppricemode": "价格方式:",
+                    "pgoodsname": "辅助合约一:",
+                    "pdeliveryprice": "交收价格:",
+                    "pdeliveryqty": "合约手数:",
+                    "p2pricemode": "价格方式:",
+                    "p2goodsname": "辅助合约二:",
+                    "p2deliveryprice": "交收价格:",
+                    "p2deliveryqty": "合约手数:"
+                }
             },
             "deliverytrade": {
                 "startDate":"开始时间",
@@ -1692,7 +1894,58 @@
                 "deliverygoodsname": "交收商品",
                 "accountname": "账户",
                 "startdate": "申请日期",
-                "buyorsell": "方向"
+                "buyorsell": "方向",
+                "cancel": {
+                    "title": "详细",
+                    "submit": "交收失败",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:",
+                    "auditremark": "备注:",
+                    "tips": "请输入备注"
+                },
+                "confirm": {
+                    "title": "详细",
+                    "submit": "确认交收",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:"
+                },
+                "details": {
+                    "title": "详细",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "申请交收数量:",
+                    "sucdeliveryqty": "实际交收数量:",
+                    "cancledeliveryqty": "撤销交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:",
+                    "remark": "备注:",
+                    "deliverycharge": "交收手续费:",
+                    "closetime": "完成时间:"
+                }
             },
             "order": {
                 "marketid": "市场",

+ 271 - 18
public/locales/zh-CN.json

@@ -1047,7 +1047,15 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "marketer": {
                 "memberuserid": "机构代码",
@@ -1055,7 +1063,15 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "marketing": {
                 "memberuserid": "机构代码",
@@ -1063,7 +1079,15 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "open": {
                 "username": "用户名称",
@@ -1152,7 +1176,15 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "riskcfg": {
                 "memberuserid": "会员",
@@ -1186,6 +1218,27 @@
                     "cutsaferatio": "斩仓安全度:",
                     "isdefault": "是否默认:",
                     "markets": "斩仓市场顺序:"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "userid": "会员",
+                    "riskcontrolmode": "风控模式:",
+                    "riskcontrolmode1": "交易商",
+                    "riskcontrolmode2": "做市会员",
+                    "customertype1": "客户类别:",
+                    "riskratiocalcmode": "风险率计算方式:",
+                    "riskratiocalcmode1": "占用/净值",
+                    "riskratiocalcmode2": "值/占用",
+                    "notemarginriskratio": "提示保证金风险率:",
+                    "addmarginriskratio": "追加保证金风险率:",
+                    "cutriskratio": "斩仓风险率:",
+                    "cutbackriskratio": "斩仓恢复风险率:",
+                    "notesaferatio": "提示安全度:",
+                    "addsaferatio": "追加安全度:",
+                    "recoversaferatio": "恢复正常安全度:",
+                    "cutsaferatio": "斩仓安全度:",
+                    "isdefault": "是否默认:",
+                    "markets": "斩仓市场顺序:"
                 }
             },
             "role": {
@@ -1243,6 +1296,21 @@
                     "feealgorithm": "费用算法",
                     "fee": "服务费",
                     "tips1": "保证金类别,交易规则,交易服务费均未设置"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "tradetype1" : "自营会员",
+                    "tradetype2": "做市会员",
+                    "accountid": "资金账户",
+                    "goodsid": "商品",
+                    "rulename": "扩展项",
+                    "paramvalue": "平台",
+                    "cvalue": "个性化",
+                    "tradefeename": "费用项",
+                    "exchangevalue": "平台",
+                    "feealgorithm": "费用算法",
+                    "fee": "服务费",
+                    "tips1": "保证金类别,交易规则,交易服务费均未设置"
                 }
             },
             "user": {
@@ -1257,7 +1325,89 @@
                 "createtime": "创建时间",
                 "modifytime": "最后更新时间",
                 "roleIds": "机构角色",
-                "userName": "操作员"
+                "userName": "操作员",
+                "account": {
+                    "accountname": "的资金账户",
+                    "accountId": "资金账户",
+                    "isMain": "账户类型",
+                    "taAccountType": "内/外部",
+                    "relatedName": "关联账户",
+                    "parentAccountId": "所属母账户",
+                    "tradeStatus": "交易状态",
+                    "currency": "币种",
+                    "curRiskRate": "风险率(%)",
+                    "signstatement": {
+                        "title": "签解约流水记录",
+                        "accountid": "资金账户:",
+                        "accountcode": "资金账户",
+                        "cusbankid": "托管银行编号",
+                        "signtype": "签(解)约类型",
+                        "dealstatus": "处理状态",
+                        "createtime": "时间",
+                        "bankaccountno": "银行卡号",
+                        "currency": "币种",
+                        "querytype": "查询类型"
+                    }
+                },
+                "details": {
+                    "title": "详情",
+                    "subtitle1": "基本信息",
+                    "subtitle2": "管理员及账户信息",
+                    "subtitle3": "银行卡信息",
+                    "subtitle4": "附件",
+                    "userid": "机构代码",
+                    "userinfotype": "所有者类型",
+                    "refereeusername": "推荐人",
+                    "accountname": "机构名称",
+                    "usertype": "机构类型",
+                    "accountstatus": "机构状态",
+                    "reckonaccountid": "资金账户",
+                    "createtime": "创建时间",
+                    "customername": "名称",
+                    "company": "公司",
+                    "biznature": "企业性质",
+                    "cardtypeid": "证件类型",
+                    "cardnum": "证件号码",
+                    "cardfrontphotourl": "证件照正面",
+                    "cardbackphotourl": "证件照反面",
+                    "legalpersonname": "法人姓名",
+                    "legalcardfrontphotourl": "法人身份证正面",
+                    "legalcardbackphotourl": "法人身份证反面",
+                    "contactname": "联系人",
+                    "sex": "性别",
+                    "mobile": "手机号",
+                    "telphone": "联系电话",
+                    "address": "地址",
+                    "postalcode": "邮政编码",
+                    "email": "邮箱",
+                    "qq": "QQ",
+                    "wechat": "微信",
+                    "remark": "备注",
+                    "logincode": "管理员登录帐号",
+                    "username": "管理员名称",
+                    "managerstatus": "帐号状态",
+                    "bankname": "银行名称",
+                    "bankaccount": "银行账户",
+                    "bankcardfrontphotourl": "银行卡正面",
+                    "attachment1": "附件1",
+                    "attachment2": "附件2"
+                },
+                "login": {
+                    "accountname": "及子机构 管理员账户",
+                    "allstart": "全部启用",
+                    "allstop": "全部停用",
+                    "areauserid": "所属机构代码",
+                    "logincode": "登录账户",
+                    "managerstatus": "账户状态",
+                    "modifytime": "更新时间"
+                },
+                "terminal": {
+                    "accountname": "自营会员登录账号",
+                    "userid": "所属机构代码",
+                    "loginid": "登录账户",
+                    "loginstatus": "账户状态",
+                    "modifytime": "更新时间"
+                }
             },
             "warehouse": {
                 "memberuserid": "机构代码",
@@ -1265,7 +1415,15 @@
                 "accountid": "资金账户",
                 "accountstatus": "机构状态",
                 "operation": "操作员",
-                "rolemodifytime": "角色创建时间"
+                "rolemodifytime": "角色创建时间",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "仓库",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             }
         },
         "subinstitution": {
@@ -1422,16 +1580,17 @@
                 }
             },
             "user": {
-                "username": "机构代码",
-                "openmode": "机构名称",
-                "userstate": "所属机构",
-                "createtime": "所属会员",
-                "operate1": "机构状态",
-                "operate2": "机构类型",
-                "operate3": "所有者类型",
-                "operate4": "操作员",
-                "operate5": "最后更新时间",
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "parentname": "所属机构",
+                "memberusername": "所属会员",
+                "accountstatus": "机构状态",
+                "usertype": "机构类型",
+                "userinfotype": "所有者类型",
+                "userName": "操作员",
+                "modifytime": "最后更新时间",
                 "username1": "机构",
+                "markets": "市场权限",
                 "edit": {
                     "title": "编辑",
                     "subtitle": "管理员及账户信息",
@@ -1469,7 +1628,18 @@
         }
     },
     "notice": {
-        "manage": {}
+        "manage": {
+            "title": "标题",
+            "msgtype": "消息类型",
+            "sendtype": "发布类型",
+            "sentstatus": "推送状态",
+            "scheduletime": "生效时间",
+            "endtime": "结束时间",
+            "recipient": "接收人",
+            "content": "消息内容",
+            "userid": "接收交易商",
+            "isforcedisplay": "是否强制弹出"
+        }
     },
     "performance": {
         "buy": {},
@@ -1569,7 +1739,39 @@
                 "deliverygoodsname": "现货商品",
                 "deliveryqty": "现货数量",
                 "deliveryorderstatus": "状态",
-                "ordertime": "申报时间"
+                "ordertime": "申报时间",
+                "details": {
+                    "title": "交收委托(点选式)详细信息",
+                    "subtitle1": "申报信息",
+                    "subtitle2": "仓单信息",
+                    "subtitle3": "交易合约",
+                    "subtitle4": "辅助合约一",
+                    "subtitle5": "辅助合约二",
+                    "deliveryticket": "申报流水号:",
+                    "deliveryorderid": "委托单号:",
+                    "tradedate": "交易日:",
+                    "accountid": "申报人(账号):",
+                    "matchaccountid": "对手(账号):",
+                    "deliveryorderstatus": "交收状态:",
+                    "ordertime": "申报时间:",
+                    "auditname": "审核人:",
+                    "audittime": "审核时间:",
+                    "auditremark": "备注:",
+                    "retcode": "错误信息:",
+                    "wrstandardcode": "现货商品:",
+                    "deliveryqty": "现货数量:",
+                    "xgoodsname": "交易合约:",
+                    "xdeliveryprice": "交收价格:",
+                    "xdeliveryqty": "合约手数:",
+                    "ppricemode": "价格方式:",
+                    "pgoodsname": "辅助合约一:",
+                    "pdeliveryprice": "交收价格:",
+                    "pdeliveryqty": "合约手数:",
+                    "p2pricemode": "价格方式:",
+                    "p2goodsname": "辅助合约二:",
+                    "p2deliveryprice": "交收价格:",
+                    "p2deliveryqty": "合约手数:"
+                }
             },
             "deliverytrade": {
                 "startDate":"开始时间",
@@ -1692,7 +1894,58 @@
                 "deliverygoodsname": "交收商品",
                 "accountname": "账户",
                 "startdate": "申请日期",
-                "buyorsell": "方向"
+                "buyorsell": "方向",
+                "cancel": {
+                    "title": "详细",
+                    "submit": "交收失败",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:",
+                    "auditremark": "备注:",
+                    "tips": "请输入备注"
+                },
+                "confirm": {
+                    "title": "详细",
+                    "submit": "确认交收",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:"
+                },
+                "details": {
+                    "title": "详细",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "申请交收数量:",
+                    "sucdeliveryqty": "实际交收数量:",
+                    "cancledeliveryqty": "撤销交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:",
+                    "remark": "备注:",
+                    "deliverycharge": "交收手续费:",
+                    "closetime": "完成时间:"
+                }
             },
             "order": {
                 "marketid": "市场",

+ 272 - 19
public/locales/zh-TW.json

@@ -1047,7 +1047,15 @@
                 "accountid": "資金賬戶",
                 "accountstatus": "機構狀態",
                 "operation": "操作員",
-                "rolemodifytime": "角色創建時間"
+                "rolemodifytime": "角色創建時間",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "marketer": {
                 "memberuserid": "機構代碼",
@@ -1055,7 +1063,15 @@
                 "accountid": "資金賬戶",
                 "accountstatus": "機構狀態",
                 "operation": "操作員",
-                "rolemodifytime": "角色創建時間"
+                "rolemodifytime": "角色創建時間",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "marketing": {
                 "memberuserid": "機構代碼",
@@ -1063,7 +1079,15 @@
                 "accountid": "資金賬戶",
                 "accountstatus": "機構狀態",
                 "operation": "操作員",
-                "rolemodifytime": "角色創建時間"
+                "rolemodifytime": "角色創建時間",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "open": {
                 "username": "用戶名稱",
@@ -1152,7 +1176,15 @@
                 "accountid": "資金賬戶",
                 "accountstatus": "機構狀態",
                 "operation": "操作員",
-                "rolemodifytime": "角色創建時間"
+                "rolemodifytime": "角色創建時間",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "商品查询权限",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             },
             "riskcfg": {
                 "memberuserid": "會員",
@@ -1186,6 +1218,27 @@
                     "cutsaferatio": "斩仓安全度:",
                     "isdefault": "是否默认:",
                     "markets": "斩仓市场顺序:"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "userid": "会员",
+                    "riskcontrolmode": "风控模式:",
+                    "riskcontrolmode1": "交易商",
+                    "riskcontrolmode2": "做市会员",
+                    "customertype1": "客户类别:",
+                    "riskratiocalcmode": "风险率计算方式:",
+                    "riskratiocalcmode1": "占用/净值",
+                    "riskratiocalcmode2": "值/占用",
+                    "notemarginriskratio": "提示保证金风险率:",
+                    "addmarginriskratio": "追加保证金风险率:",
+                    "cutriskratio": "斩仓风险率:",
+                    "cutbackriskratio": "斩仓恢复风险率:",
+                    "notesaferatio": "提示安全度:",
+                    "addsaferatio": "追加安全度:",
+                    "recoversaferatio": "恢复正常安全度:",
+                    "cutsaferatio": "斩仓安全度:",
+                    "isdefault": "是否默认:",
+                    "markets": "斩仓市场顺序:"
                 }
             },
             "role": {
@@ -1243,6 +1296,21 @@
                     "feealgorithm": "费用算法",
                     "fee": "服务费",
                     "tips1": "保证金类别,交易规则,交易服务费均未设置"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "tradetype1" : "自营会员",
+                    "tradetype2": "做市会员",
+                    "accountid": "资金账户",
+                    "goodsid": "商品",
+                    "rulename": "扩展项",
+                    "paramvalue": "平台",
+                    "cvalue": "个性化",
+                    "tradefeename": "费用项",
+                    "exchangevalue": "平台",
+                    "feealgorithm": "费用算法",
+                    "fee": "服务费",
+                    "tips1": "保证金类别,交易规则,交易服务费均未设置"
                 }
             },
             "user": {
@@ -1257,7 +1325,89 @@
                 "createtime": "創建時間",
                 "modifytime": "最後更新時間",
                 "roleIds": "機構角色",
-                "userName": "操作員"
+                "userName": "操作員",
+                "account": {
+                    "accountname": "的资金账户",
+                    "accountId": "资金账户",
+                    "isMain": "账户类型",
+                    "taAccountType": "内/外部",
+                    "relatedName": "关联账户",
+                    "parentAccountId": "所属母账户",
+                    "tradeStatus": "交易状态",
+                    "currency": "币种",
+                    "curRiskRate": "风险率(%)",
+                    "signstatement": {
+                        "title": "签解约流水记录",
+                        "accountid": "资金账户:",
+                        "accountcode": "资金账户",
+                        "cusbankid": "托管银行编号",
+                        "signtype": "签(解)约类型",
+                        "dealstatus": "处理状态",
+                        "createtime": "时间",
+                        "bankaccountno": "银行卡号",
+                        "currency": "币种",
+                        "querytype": "查询类型"
+                    }
+                },
+                "details": {
+                    "title": "详情",
+                    "subtitle1": "基本信息",
+                    "subtitle2": "管理员及账户信息",
+                    "subtitle3": "银行卡信息",
+                    "subtitle4": "附件",
+                    "userid": "机构代码",
+                    "userinfotype": "所有者类型",
+                    "refereeusername": "推荐人",
+                    "accountname": "机构名称",
+                    "usertype": "机构类型",
+                    "accountstatus": "机构状态",
+                    "reckonaccountid": "资金账户",
+                    "createtime": "创建时间",
+                    "customername": "名称",
+                    "company": "公司",
+                    "biznature": "企业性质",
+                    "cardtypeid": "证件类型",
+                    "cardnum": "证件号码",
+                    "cardfrontphotourl": "证件照正面",
+                    "cardbackphotourl": "证件照反面",
+                    "legalpersonname": "法人姓名",
+                    "legalcardfrontphotourl": "法人身份证正面",
+                    "legalcardbackphotourl": "法人身份证反面",
+                    "contactname": "联系人",
+                    "sex": "性别",
+                    "mobile": "手机号",
+                    "telphone": "联系电话",
+                    "address": "地址",
+                    "postalcode": "邮政编码",
+                    "email": "邮箱",
+                    "qq": "QQ",
+                    "wechat": "微信",
+                    "remark": "备注",
+                    "logincode": "管理员登录帐号",
+                    "username": "管理员名称",
+                    "managerstatus": "帐号状态",
+                    "bankname": "银行名称",
+                    "bankaccount": "银行账户",
+                    "bankcardfrontphotourl": "银行卡正面",
+                    "attachment1": "附件1",
+                    "attachment2": "附件2"
+                },
+                "login": {
+                    "accountname": "及子机构 管理员账户",
+                    "allstart": "全部启用",
+                    "allstop": "全部停用",
+                    "areauserid": "所属机构代码",
+                    "logincode": "登录账户",
+                    "managerstatus": "账户状态",
+                    "modifytime": "更新时间"
+                },
+                "terminal": {
+                    "accountname": "自营会员登录账号",
+                    "userid": "所属机构代码",
+                    "loginid": "登录账户",
+                    "loginstatus": "账户状态",
+                    "modifytime": "更新时间"
+                }
             },
             "warehouse": {
                 "memberuserid": "機構代碼",
@@ -1265,7 +1415,15 @@
                 "accountid": "資金賬戶",
                 "accountstatus": "機構狀態",
                 "operation": "操作員",
-                "rolemodifytime": "角色創建時間"
+                "rolemodifytime": "角色創建時間",
+                "details": {
+                    "title": "详情",
+                    "subtitle": "基本信息",
+                    "subtitle2": "仓库",
+                    "accountname": "名称",
+                    "userName": "管理员",
+                    "reckonaccountid": "资金账户"
+                }
             }
         },
         "subinstitution": {
@@ -1422,16 +1580,17 @@
                 }
             },
             "user": {
-                "username": "機構代碼",
-                "openmode": "機構名稱",
-                "userstate": "所屬機構",
-                "createtime": "所屬會員",
-                "operate1": "機構狀態",
-                "operate2": "機構類型",
-                "operate3": "所有者類型",
-                "operate4": "操作員",
-                "operate5": "最後更新時間",
-                "username1": "機構",
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "parentname": "所属机构",
+                "memberusername": "所属会员",
+                "accountstatus": "机构状态",
+                "usertype": "机构类型",
+                "userinfotype": "所有者类型",
+                "userName": "操作员",
+                "modifytime": "最后更新时间",
+                "username1": "机构",
+                "markets": "市场权限",
                 "edit": {
                     "title": "編輯",
                     "subtitle": "管理員及賬戶信息",
@@ -1469,7 +1628,18 @@
         }
     },
     "notice": {
-        "manage": {}
+        "manage": {
+            "title": "标题",
+            "msgtype": "消息类型",
+            "sendtype": "发布类型",
+            "sentstatus": "推送状态",
+            "scheduletime": "生效时间",
+            "endtime": "结束时间",
+            "recipient": "接收人",
+            "content": "消息内容",
+            "userid": "接收交易商",
+            "isforcedisplay": "是否强制弹出"
+        }
     },
     "performance": {
         "buy": {},
@@ -1569,7 +1739,39 @@
                 "deliverygoodsname": "现货商品",
                 "deliveryqty": "现货数量",
                 "deliveryorderstatus": "状态",
-                "ordertime": "申报时间"
+                "ordertime": "申报时间",
+                "details": {
+                    "title": "交收委托(点选式)详细信息",
+                    "subtitle1": "申报信息",
+                    "subtitle2": "仓单信息",
+                    "subtitle3": "交易合约",
+                    "subtitle4": "辅助合约一",
+                    "subtitle5": "辅助合约二",
+                    "deliveryticket": "申报流水号:",
+                    "deliveryorderid": "委托单号:",
+                    "tradedate": "交易日:",
+                    "accountid": "申报人(账号):",
+                    "matchaccountid": "对手(账号):",
+                    "deliveryorderstatus": "交收状态:",
+                    "ordertime": "申报时间:",
+                    "auditname": "审核人:",
+                    "audittime": "审核时间:",
+                    "auditremark": "备注:",
+                    "retcode": "错误信息:",
+                    "wrstandardcode": "现货商品:",
+                    "deliveryqty": "现货数量:",
+                    "xgoodsname": "交易合约:",
+                    "xdeliveryprice": "交收价格:",
+                    "xdeliveryqty": "合约手数:",
+                    "ppricemode": "价格方式:",
+                    "pgoodsname": "辅助合约一:",
+                    "pdeliveryprice": "交收价格:",
+                    "pdeliveryqty": "合约手数:",
+                    "p2pricemode": "价格方式:",
+                    "p2goodsname": "辅助合约二:",
+                    "p2deliveryprice": "交收价格:",
+                    "p2deliveryqty": "合约手数:"
+                }
             },
             "deliverytrade": {
                 "startDate":"开始时间",
@@ -1692,7 +1894,58 @@
                 "deliverygoodsname": "交收商品",
                 "accountname": "账户",
                 "startdate": "申请日期",
-                "buyorsell": "方向"
+                "buyorsell": "方向",
+                "cancel": {
+                    "title": "详细",
+                    "submit": "交收失败",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:",
+                    "auditremark": "备注:",
+                    "tips": "请输入备注"
+                },
+                "confirm": {
+                    "title": "详细",
+                    "submit": "确认交收",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:"
+                },
+                "details": {
+                    "title": "详细",
+                    "deliveryorderid": "交收单号:",
+                    "username": "申请人:",
+                    "goodsdisplay": "交收商品:",
+                    "buyorsell": "方向:",
+                    "deliveryqty": "申请交收数量:",
+                    "sucdeliveryqty": "实际交收数量:",
+                    "cancledeliveryqty": "撤销交收数量:",
+                    "deliveryprice": "交收价格:",
+                    "deliveryamount": "交收货款:",
+                    "matchname": "对手方:",
+                    "deliveryinfo": "交收信息:",
+                    "reqtime": "申请时间:",
+                    "orderstatusdisplay": "交收状态:",
+                    "remark": "备注:",
+                    "deliverycharge": "交收手续费:",
+                    "closetime": "完成时间:"
+                }
             },
             "order": {
                 "marketid": "市場",

+ 6 - 6
src/packages/pc/views/member/institution/industry/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.industry.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
+        <app-table-details :title="t('member.institution.industry.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.industry.details.subtitle2') }}</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.industry.details.accountname' },
+    { prop: 'userName', label: 'member.institution.industry.details.userName', formatValue: () => {
         return data.value?.users.username
     }, },
-    { prop: 'reckonaccountid', label: '资金账户' }
+    { prop: 'reckonaccountid', label: 'member.institution.industry.details.reckonaccountid' }
 ]
 
 const goodslimit = computed(() => {

+ 6 - 6
src/packages/pc/views/member/institution/marketer/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.marketer.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
+        <app-table-details :title="t('member.institution.marketer.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.marketer.details.subtitle2') }}</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.marketer.details.accountname' },
+    { prop: 'userName', label: 'member.institution.marketer.details.userName', formatValue: () => {
         return data.value?.users.username
     }, },
-    { prop: 'reckonaccountid', label: '资金账户' }
+    { prop: 'reckonaccountid', label: 'member.institution.marketer.details.reckonaccountid' }
 ]
 
 const goodslimit = computed(() => {

+ 6 - 6
src/packages/pc/views/member/institution/marketing/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.marketing.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
+        <app-table-details :title="t('member.institution.marketing.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.marketing.details.subtitle2') }}</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.marketing.details.accountname' },
+    { prop: 'userName', label: 'member.institution.marketing.details.userName', formatValue: () => {
         return data.value?.users.username
     }, },
-    { prop: 'reckonaccountid', label: '资金账户' }
+    { prop: 'reckonaccountid', label: 'member.institution.marketing.details.reckonaccountid' }
 ]
 
 const goodslimit = computed(() => {

+ 6 - 6
src/packages/pc/views/member/institution/operation/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.operation.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
+        <app-table-details :title="t('member.institution.operation.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.operation.details.subtitle2') }}</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.operation.details.accountname' },
+    { prop: 'userName', label: 'member.institution.operation.details.userName', formatValue: () => {
         return data.value?.users.username
     }, },
-    { prop: 'reckonaccountid', label: '资金账户' }
+    { prop: 'reckonaccountid', label: 'member.institution.operation.details.reckonaccountid' }
 ]
 
 const goodslimit = computed(() => {

+ 15 - 15
src/packages/pc/views/member/institution/riskcfg/components/edit/index.vue

@@ -1,10 +1,10 @@
 <!-- 会员机构管理-机构管理-风控个性化设置-新增/修改 -->
 <template>
-    <app-drawer title="编辑" width="900" v-model:show="show" :refresh="refresh" :loading="loading">
+    <app-drawer :title="t('member.institution.riskcfg.edit.title')" width="900" v-model:show="show" :refresh="refresh" :loading="loading">
         <el-form ref="formRef" label-width="140px" :model="formData" :rules="formRules" :show-message="false">
             <fieldset class="g-fieldset el-form--horizontal">
                 <legend class="g-fieldset__legend">{{ t('investor.custom.riskcfg.edit.subtitle1') }}</legend>
-                <el-form-item label="会员" prop="userid">
+                <el-form-item :label="t('member.institution.riskcfg.edit.userid')" prop="userid">
                     <app-select-member ref="useridRef" v-model="formData.userid"
                         :params="{ usertype: '2', roles: '6,8' }" :placeholder="t('investor.custom.riskcfg.edit.tips1')"
                         :disabled="!!record" @change="onMemberChange" />
@@ -107,19 +107,19 @@ const formRules: FormRules = {
 const detailProps = computed<CellProp[]>(() => {
     const { notesaferatio } = selectedItem.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.edit.riskcontrolmode', formatValue: (val) => val === 1 ? 'member.institution.riskcfg.edit.riskcontrolmode1' : 'member.institution.riskcfg.edit.riskcontrolmode2' },
+        { prop: 'customertype', label: 'member.institution.riskcfg.edit.customertype', formatValue: (val) => marketerTypeEnum.getEnumTypeName(val) },
+        { prop: 'riskratiocalcmode', label: 'member.institution.riskcfg.edit.riskratiocalcmode', formatValue: (val) => val === 1 ? 'member.institution.riskcfg.edit.riskratiocalcmode1' : 'member.institution.riskcfg.edit.riskratiocalcmode2' },
+        { prop: 'notemarginriskratio', label: 'member.institution.riskcfg.edit.notemarginriskratio', formatValue: (val) => val + '%', show: !notesaferatio },
+        { prop: 'addmarginriskratio', label: 'member.institution.riskcfg.edit.addmarginriskratio', formatValue: (val) => val + '%', show: !notesaferatio },
+        { prop: 'cutriskratio', label: 'member.institution.riskcfg.edit.cutriskratio', formatValue: (val) => val + '%', show: !notesaferatio },
+        { prop: 'cutbackriskratio', label: 'member.institution.riskcfg.edit.cutbackriskratio', formatValue: (val) => val + '%', show: !notesaferatio },
+        { prop: 'notesaferatio', label: 'member.institution.riskcfg.edit.notesaferatio', formatValue: (val) => val + '%', show: !!notesaferatio },
+        { prop: 'addsaferatio', label: 'member.institution.riskcfg.edit.addsaferatio', formatValue: (val) => val + '%', show: !!notesaferatio },
+        { prop: 'recoversaferatio', label: 'member.institution.riskcfg.edit.recoversaferatio', formatValue: (val) => val + '%', show: !!notesaferatio },
+        { prop: 'cutsaferatio', label: 'member.institution.riskcfg.edit.cutsaferatio', formatValue: (val) => val + '%', show: !!notesaferatio },
+        { prop: 'isdefault', label: 'member.institution.riskcfg.edit.isdefault', formatValue: (val) => getConfirmationName(val) },
+        { prop: 'markets', label: 'member.institution.riskcfg.edit.markets' },
     ]
 })
 

+ 12 - 12
src/packages/pc/views/member/institution/tradecfg/components/edit/index.vue

@@ -1,17 +1,17 @@
 <!-- 会员机构管理-机构管理-账户个性化设置-编辑 -->
 <template>
-    <app-drawer :title="t('investor.custom.tradecfg.edit.title')" width="1100" v-model:show="show" :refresh="refresh"
+    <app-drawer :title="t('member.institution.tradecfg.edit.title')" width="1100" v-model:show="show" :refresh="refresh"
         :loading="loading">
         <el-form ref="formRef" label-width="140px" :model="formData" :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="memberItem?.tradetype === 1 ? '自营会员' : '做市会员'">
+                <el-form-item :label="memberItem?.tradetype === 1 ? t('member.institution.tradecfg.edit.tradetype1') : t('member.institution.tradecfg.edit.tradetype2')">
                     {{ handleNoneValue(memberItem?.name) }}
                 </el-form-item>
-                <el-form-item label="资金账户">
+                <el-form-item :label="t('member.institution.tradecfg.edit.accountid')">
                     {{ handleNoneValue(accountItem?.name) }}
                 </el-form-item>
-                <el-form-item label="商品">
+                <el-form-item :label="t('member.institution.tradecfg.edit.goodsid')">
                     {{ handleNoneValue(goodsItem?.name) }}
                 </el-form-item>
                 <el-form-item :label="t('investor.custom.tradecfg.edit.paramid')" prop="paramid">
@@ -134,16 +134,16 @@ const { data: resultData } = useRequest(loadSelectOption, {
 })
 
 const ruleColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'rulename', label: '扩展项' },
-    { field: 'paramvalue', label: '平台' },
-    { field: 'cvalue', label: '个性化' },
+    { field: 'rulename', label: 'member.institution.tradecfg.edit.rulename' },
+    { field: 'paramvalue', label: 'member.institution.tradecfg.edit.paramvalue' },
+    { field: 'cvalue', label: 'member.institution.tradecfg.edit.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.edit.tradefeename' },
+    { field: 'exchangevalue', label: 'member.institution.tradecfg.edit.exchangevalue' },
+    { field: 'feealgorithm', label: 'member.institution.tradecfg.edit.feealgorithm', formatValue: (val) => scfRiskMode.getEnumTypeName(val) },
+    { field: 'fee', label: 'member.institution.tradecfg.edit.fee', width: 200 },
 ])
 
 // 选择保证金类别
@@ -168,7 +168,7 @@ const onSubmit = () => {
                     loading.value = false
                 })
             } else {
-                ElMessage.warning('保证金类别,交易规则,交易服务费均未设置')
+                ElMessage.warning(t('member.institution.tradecfg.edit.tips1'))
             }
         }
     })

+ 10 - 10
src/packages/pc/views/member/institution/user/components/account/index.vue

@@ -7,7 +7,7 @@
             </template>
             <app-table :data="dataList" :columns="tableColumns" :loading="loading">
                 <template #headerLeft>
-                    <span>[{{ record.accountname }}]的资金账户</span>
+                    <span>[{{ record.accountname }}]{{ t('member.institution.user.account.accountname') }}</span>
                 </template>
                 <template #headerRight>
                     <div>
@@ -86,14 +86,14 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(organT
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'accountId', label: '资金账户' },
-    { field: 'isMain', label: '账户类型', formatValue: (val) => mainaccounttypeEnum.getEnumTypeName(val) },
-    { field: 'taAccountType', label: '内/外部', formatValue: (val) => accounttypeEnum.getEnumTypeName(val) },
-    { field: 'relatedName', label: '关联账户' },
-    { field: 'parentAccountId', label: '所属母账户' },
-    { field: 'tradeStatus', label: '交易状态', formatValue: (val) => traderstatusEnum.getEnumTypeName(val) },
-    { field: 'currency', label: '币种' },
-    { field: 'curRiskRate', label: '风险率(%)' },
+    { field: 'accountId', label: 'member.institution.user.account.accountId' },
+    { field: 'isMain', label: 'member.institution.user.account.isMain', formatValue: (val) => mainaccounttypeEnum.getEnumTypeName(val) },
+    { field: 'taAccountType', label: 'member.institution.user.account.taAccountType', formatValue: (val) => accounttypeEnum.getEnumTypeName(val) },
+    { field: 'relatedName', label: 'member.institution.user.account.relatedName' },
+    { field: 'parentAccountId', label: 'member.institution.user.account.parentAccountId' },
+    { field: 'tradeStatus', label: 'member.institution.user.account.tradeStatus', formatValue: (val) => traderstatusEnum.getEnumTypeName(val) },
+    { field: 'currency', label: 'member.institution.user.account.currency' },
+    { field: 'curRiskRate', label: 'member.institution.user.account.curRiskRate' },
     { field: 'operate', label: 'common.operate', width: 180, fixed: 'right' }
 ])
 
@@ -101,7 +101,7 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.Orga
     filters: [
         {
             field: 'accountId',
-            label: '资金账户'
+            label: t('member.institution.user.account.accountId')
         },
     ],
     buttons: [

+ 12 - 12
src/packages/pc/views/member/institution/user/components/account/signstatement/index.vue

@@ -1,9 +1,9 @@
 <!-- 会员机构管理-机构管理-机构资料管理-资金账户-签解约流水 -->
 <template>
-    <app-drawer title="签解约流水记录" width="1200" v-model:show="show">
+    <app-drawer :title="t('member.institution.user.account.signstatement.title')" width="1200" v-model:show="show">
         <app-table :data="dataList" :columns="tableColumns">
             <template #headerLeft>
-                <span>资金账户:{{ record.accountId }}</span>
+                <span>{{ t('member.institution.user.account.signstatement.accountid') }}{{ record.accountId }}</span>
             </template>
             <template #headerRight>
                 <app-filter :option="filterOption" />
@@ -55,24 +55,24 @@ const { dataList, total, pageSize, pageIndex, run } = useRequest(querySignlog, {
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'accountcode', label: '资金账户' },
-    { field: 'cusbankid', label: '托管银行编号' },
-    { field: 'signtype', label: '签(解)约类型' },
-    { field: 'dealstatus', label: '处理状态' },
-    { field: 'createtime', label: '时间' },
-    { field: 'bankaccountno', label: '银行卡号' },
-    { field: 'currency', label: '币种' }
+    { field: 'accountcode', label: 'member.institution.user.account.signstatement.accountcode' },
+    { field: 'cusbankid', label: 'member.institution.user.account.signstatement.cusbankid' },
+    { field: 'signtype', label: 'member.institution.user.account.signstatement.signtype' },
+    { field: 'dealstatus', label: 'member.institution.user.account.signstatement.dealstatus' },
+    { field: 'createtime', label: 'member.institution.user.account.signstatement.createtime' },
+    { field: 'bankaccountno', label: 'member.institution.user.account.signstatement.bankaccountno' },
+    { field: 'currency', label: 'member.institution.user.account.signstatement.currency' }
 ])
 
 const { filterOption, getQueryParams } = useDataFilter<Member.SignlogReq>({
     filters: [
         {
             field: 'querytype',
-            label: '查询类型',
+            label: t('member.institution.user.account.signstatement.querytype'),
             value: 0,
             options: () => [
-                { label: '当前', value: 0 },
-                { label: '历史', value: 1 },
+                { label: t('common.current'), value: 0 },
+                { label: t('common.history'), value: 1 },
             ],
         }
     ],

+ 41 - 41
src/packages/pc/views/member/institution/user/components/details/index.vue

@@ -1,7 +1,7 @@
 <!-- 会员机构管理-机构管理-机构资料管理-详情 -->
 <template>
-    <app-drawer title="详情" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
-        <app-table-details title="基本信息" :data="data?.rspResult" :label-width="160" :cell-props="detailProps1"
+    <app-drawer :title="t('member.institution.user.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
+        <app-table-details :title="t('member.institution.user.details.subtitle1')" :data="data?.rspResult" :label-width="160" :cell-props="detailProps1"
             :column="2" />
         <app-table-details :title="t('member.institution.open.details.subtitle1')" :data="data?.userinfo"
             :label-width="160" :cell-props="detailProps2" :column="2">
@@ -22,16 +22,16 @@
                 <el-image :src="value" fit="cover" lazy style="width: 128px; height: 72px" />
             </template>
         </app-table-details>
-        <app-table-details title="管理员及账户信息" :data="data?.users" :label-width="160" :cell-props="detailProps3"
+        <app-table-details :title="t('member.institution.user.details.subtitle2')" :data="data?.users" :label-width="160" :cell-props="detailProps3"
             :column="2" />
-        <app-table-details title="银行卡信息" :data="data?.userinfo" :label-width="160" :cell-props="detailProps4"
+        <app-table-details :title="t('member.institution.user.details.subtitle3')" :data="data?.userinfo" :label-width="160" :cell-props="detailProps4"
             :column="2" v-if="data?.userinfo.bankid">
             <!-- 银行卡正面 -->
             <template #bankcardfrontphotourl="{ value }">
                 <el-image :src="value" fit="cover" lazy style="width: 128px; height: 72px" />
             </template>
         </app-table-details>
-        <app-table-details title="附件" :data="data?.userinfo" :label-width="160" :cell-props="detailProps5" :column="2"
+        <app-table-details :title="t('member.institution.user.details.subtitle4')" :data="data?.userinfo" :label-width="160" :cell-props="detailProps5" :column="2"
             v-if="data?.userinfo.attachment1 || data?.userinfo.attachment2" />
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
@@ -103,57 +103,57 @@ const { data } = useRequest(queryOrganDetail, {
 })
 
 const detailProps1: CellProp[] = [
-    { prop: 'userid', label: '机构代码' },
-    { prop: 'userinfotype', label: '所有者类型', formatValue: () => getUserInfoTypeName(data.value?.userinfo.userinfotype) },
-    { prop: 'refereeusername', label: '推荐人', formatValue: () => data.value?.refereeusername },
-    { prop: 'accountname', label: '机构名称' },
-    { prop: 'usertype', label: '机构类型', formatValue: (val) => usertype2Enum.getEnumTypeName(val) },
-    { prop: 'accountstatus', label: '机构状态', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
-    { prop: 'reckonaccountid', label: '资金账户' },
-    { prop: 'createtime', label: '创建时间', formatValue: (val) => formatDate(val) },
+    { prop: 'userid', label: 'member.institution.user.details.userid' },
+    { prop: 'userinfotype', label: 'member.institution.user.details.userinfotype', formatValue: () => getUserInfoTypeName(data.value?.userinfo.userinfotype) },
+    { prop: 'refereeusername', label: 'member.institution.user.details.refereeusername', formatValue: () => data.value?.refereeusername },
+    { prop: 'accountname', label: 'member.institution.user.details.accountname' },
+    { prop: 'usertype', label: 'member.institution.user.details.usertype', formatValue: (val) => usertype2Enum.getEnumTypeName(val) },
+    { prop: 'accountstatus', label: 'member.institution.user.details.accountstatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
+    { prop: 'reckonaccountid', label: 'member.institution.user.details.reckonaccountid' },
+    { prop: 'createtime', label: 'member.institution.user.details.createtime', formatValue: (val) => formatDate(val) },
 ]
 
 const detailProps2 = computed<CellProp[]>(() => {
     const isPerson = data.value?.userinfo.userinfotype === UserInfoType.Personal
     return [
-        { prop: 'customername', label: '名称' },
-        { prop: 'company', label: '公司', show: isPerson },
-        { prop: 'biznature', label: '企业性质', formatValue: (val) => biznatureEnum.getEnumTypeName(val), show: !isPerson },
-        { prop: 'cardtypeid', label: '证件类型', formatValue: (val) => certificatetypeEnum.getEnumTypeName(val) },
-        { prop: 'cardnum', label: '证件号码', formatValue: (val) => decryptAES(val) },
-        { prop: 'cardfrontphotourl', label: '证件照正面' },
-        { prop: 'cardbackphotourl', label: '证件照反面', show: isPerson },
-        { prop: 'legalpersonname', label: '法人姓名', show: !isPerson },
-        { prop: 'legalcardfrontphotourl', label: '法人身份证正面', show: !isPerson },
-        { prop: 'legalcardbackphotourl', label: '法人身份证反面', show: !isPerson },
-        { prop: 'contactname', label: '联系人', show: !isPerson },
-        { prop: 'sex', label: '性别', formatValue: (val) => getGenderName(val) },
-        { prop: 'mobile', label: '手机号', formatValue: (val) => decryptAES(val) },
-        { prop: 'telphone', label: '联系电话', formatValue: (val) => decryptAES(val) },
-        { prop: 'address', label: '地址', formatValue: (val) => (data.value?.division ?? '') + (val ?? '') },
-        { prop: 'postalcode', label: '邮政编码' },
-        { prop: 'email', label: '邮箱', formatValue: (val) => decryptAES(val) },
-        { prop: 'qq', label: 'QQ' },
-        { prop: 'wechat', label: '微信' },
-        { prop: 'remark', label: '备注' },
+        { prop: 'customername', label: 'member.institution.user.details.customername' },
+        { prop: 'company', label: 'member.institution.user.details.company', show: isPerson },
+        { prop: 'biznature', label: 'member.institution.user.details.biznature', formatValue: (val) => biznatureEnum.getEnumTypeName(val), show: !isPerson },
+        { prop: 'cardtypeid', label: 'member.institution.user.details.cardtypeid', formatValue: (val) => certificatetypeEnum.getEnumTypeName(val) },
+        { prop: 'cardnum', label: 'member.institution.user.details.cardnum', formatValue: (val) => decryptAES(val) },
+        { prop: 'cardfrontphotourl', label: 'member.institution.user.details.cardfrontphotourl' },
+        { prop: 'cardbackphotourl', label: 'member.institution.user.details.cardbackphotourl', show: isPerson },
+        { prop: 'legalpersonname', label: 'member.institution.user.details.legalpersonname', show: !isPerson },
+        { prop: 'legalcardfrontphotourl', label: 'member.institution.user.details.legalcardfrontphotourl', show: !isPerson },
+        { prop: 'legalcardbackphotourl', label: 'member.institution.user.details.legalcardbackphotourl', show: !isPerson },
+        { prop: 'contactname', label: 'member.institution.user.details.contactname', show: !isPerson },
+        { prop: 'sex', label: 'member.institution.user.details.sex', formatValue: (val) => getGenderName(val) },
+        { prop: 'mobile', label: 'member.institution.user.details.mobile', formatValue: (val) => decryptAES(val) },
+        { prop: 'telphone', label: 'member.institution.user.details.telphone', formatValue: (val) => decryptAES(val) },
+        { prop: 'address', label: 'member.institution.user.details.address', formatValue: (val) => (data.value?.division ?? '') + (val ?? '') },
+        { prop: 'postalcode', label: 'member.institution.user.details.postalcode' },
+        { prop: 'email', label: 'member.institution.user.details.email', formatValue: (val) => decryptAES(val) },
+        { prop: 'qq', label: 'member.institution.user.details.qq' },
+        { prop: 'wechat', label: 'member.institution.user.details.wechat' },
+        { prop: 'remark', label: 'member.institution.user.details.remark' },
     ]
 })
 
 const detailProps3: CellProp[] = [
-    { prop: 'logincode', label: '管理员登录帐号' },
-    { prop: 'username', label: '管理员名称' },
-    { prop: 'managerstatus', label: '帐号状态', formatValue: (val) => userstatusEnum.getEnumTypeName(val) }
+    { prop: 'logincode', label: 'member.institution.user.details.logincode' },
+    { prop: 'username', label: 'member.institution.user.details.username' },
+    { prop: 'managerstatus', label: 'member.institution.user.details.managerstatus', formatValue: (val) => userstatusEnum.getEnumTypeName(val) }
 ]
 
 const detailProps4: CellProp[] = [
-    { prop: 'bankname', label: '银行名称' },
-    { prop: 'bankaccount', label: '银行账户' },
-    { prop: 'bankcardfrontphotourl', label: '银行卡正面' },
+    { prop: 'bankname', label: 'member.institution.user.details.bankname' },
+    { prop: 'bankaccount', label: 'member.institution.user.details.bankaccount' },
+    { prop: 'bankcardfrontphotourl', label: 'member.institution.user.details.bankcardfrontphotourl' },
 ]
 
 const detailProps5: CellProp[] = [
-    { prop: 'attachment1', label: '附件1' },
-    { prop: 'attachment2', label: '附件2' },
+    { prop: 'attachment1', label: 'member.institution.user.details.attachment1' },
+    { prop: 'attachment2', label: 'member.institution.user.details.attachment2' },
 ]
 
 const onCancel = (isRefresh = false) => {

+ 7 - 7
src/packages/pc/views/member/institution/user/components/login/index.vue

@@ -4,12 +4,12 @@
         <app-view>
             <app-table :data="dataList" :columns="tableColumns" :loading="loading">
                 <template #headerLeft>
-                    <span>[{{ record.accountname }}]及子机构 管理员账户</span>
+                    <span>[{{ record.accountname }}]{{ t('member.institution.user.login.accountname') }}</span>
                 </template>
                 <template #headerRight>
                     <div>
-                        <el-button type="primary" @click="updateStatuses(1)">全部启用</el-button>
-                        <el-button type="primary" @click="updateStatuses(2)">全部停用</el-button>
+                        <el-button type="primary" @click="updateStatuses(1)">{{ t('member.institution.user.login.allstart') }}</el-button>
+                        <el-button type="primary" @click="updateStatuses(2)">{{ t('member.institution.user.login.allstop') }}</el-button>
                         <el-button @click="emit('closed')">{{ t('operation.close') }}</el-button>
                     </div>
                 </template>
@@ -78,10 +78,10 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryo
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'areauserid', label: '所属机构代码' },
-    { field: 'logincode', label: '登录账户' },
-    { field: 'managerstatus', label: '账户状态', formatValue: (val) => userstatusEnum.getEnumTypeName(val) },
-    { field: 'modifytime', label: '更新时间', formatValue: (val) => formatDate(val) },
+    { field: 'areauserid', label: 'member.institution.user.login.areauserid' },
+    { field: 'logincode', label: 'member.institution.user.login.logincode' },
+    { field: 'managerstatus', label: 'member.institution.user.login.managerstatus', formatValue: (val) => userstatusEnum.getEnumTypeName(val) },
+    { field: 'modifytime', label: 'member.institution.user.login.modifytime', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 

+ 6 - 6
src/packages/pc/views/member/institution/user/components/terminal/index.vue

@@ -7,7 +7,7 @@
             </template>
             <app-table :data="dataList" :columns="tableColumns" :loading="loading">
                 <template #headerLeft>
-                    <span>[{{ record.accountname }}]自营会员登录账号</span>
+                    <span>[{{ record.accountname }}]{{ t('member.institution.user.terminal.accountname') }}</span>
                 </template>
                 <template #headerRight>
                     <div>
@@ -80,10 +80,10 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(querys
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'userid', label: '所属机构代码' },
-    { field: 'loginid', label: '登录账户' },
-    { field: 'loginstatus', label: '账户状态', formatValue: (val) => userstatusEnum.getEnumTypeName(val) },
-    { field: 'modifytime', label: '更新时间', formatValue: (val) => formatDate(val) },
+    { field: 'userid', label: 'member.institution.user.terminal.userid' },
+    { field: 'loginid', label: 'member.institution.user.terminal.loginid' },
+    { field: 'loginstatus', label: 'member.institution.user.terminal.loginstatus', formatValue: (val) => userstatusEnum.getEnumTypeName(val) },
+    { field: 'modifytime', label: 'member.institution.user.terminal.modifytime', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
@@ -91,7 +91,7 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.Self
     filters: [
         {
             field: 'loginid',
-            label: '登录账户'
+            label: t('member.institution.user.terminal.loginid')
         },
     ],
     buttons: [

+ 7 - 7
src/packages/pc/views/member/institution/warehouse/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.warehouse.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
+        <app-table-details :title="t('member.institution.warehouse.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.warehouse.details.subtitle2') }}</span>
             <span v-for="item in warehouse" v-bind:key="item.id">
                 <span>{{ item.label }}: </span>
                 <span>{{ item.title }}</span>
@@ -53,11 +53,11 @@ const { data } = useRequest(queryRoleDetail, {
 })
 
 const detailProps1: CellProp[] = [
-    { prop: 'accountname', label: '名称' },
-    { prop: 'userName', label: '管理员', formatValue: () => {
+    { prop: 'accountname', label: 'member.institution.warehouse.details.accountname' },
+    { prop: 'userName', label: 'member.institution.warehouse.details.userName', formatValue: () => {
         return data.value?.users.username
     }, },
-    { prop: 'reckonaccountid', label: '资金账户' }
+    { prop: 'reckonaccountid', label: 'member.institution.warehouse.details.reckonaccountid' }
 ]
 
 const warehouse = computed(() => {
@@ -65,7 +65,7 @@ const warehouse = computed(() => {
         return {
             id: e.warehousecode,
             title: e.warehousename,
-            label: '仓库'
+            label: t('member.institution.warehouse.details.subtitle2')
         }
     }) ?? []
 })

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

@@ -65,15 +65,15 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryO
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'userid', label: '机构代码' },
-    { field: 'accountname', label: '机构名称' },
-    { field: 'parentname', label: '所属机构' },
-    { field: 'memberusername', label: '所属会员' },
-    { field: 'accountstatus', label: '机构状态', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
-    { field: 'usertype', label: '机构类型', formatValue: (val) => usertype2Enum.getEnumTypeName(val) },
-    { field: 'userinfotype', label: '所有者类型', formatValue: (val) => getUserInfoTypeName(val) },
-    { field: 'userName', label: '操作员' },
-    { field: 'modifytime', label: '最后更新时间', formatValue: (val) => formatDate(val) },
+    { field: 'userid', label: 'member.subinstitution.user.userid' },
+    { field: 'accountname', label: 'member.subinstitution.user.accountname' },
+    { field: 'parentname', label: 'member.subinstitution.user.parentname' },
+    { field: 'memberusername', label: 'member.subinstitution.user.memberusername' },
+    { field: 'accountstatus', label: 'member.subinstitution.user.accountstatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
+    { field: 'usertype', label: 'member.subinstitution.user.usertype', formatValue: (val) => usertype2Enum.getEnumTypeName(val) },
+    { field: 'userinfotype', label: 'member.subinstitution.user.userinfotype', formatValue: (val) => getUserInfoTypeName(val) },
+    { field: 'userName', label: 'member.subinstitution.user.userName' },
+    { field: 'modifytime', label: 'member.subinstitution.user.modifytime', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', width: 200, fixed: 'right' }
 ])
 
@@ -81,16 +81,16 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.Orga
     filters: [
         {
             field: 'accountname',
-            label: '机构'
+            label: t('member.subinstitution.user.username1')
         },
         {
             field: 'markets',
-            label: '市场权限',
+            label: t('member.subinstitution.user.markets'),
             options: () => getMarketOptions()
         },
         {
             field: 'accountstatus',
-            label: '机构状态',
+            label: t('member.subinstitution.user.accountstatus'),
             options: () => areastatusEnum.getEnumOptions()
         },
     ],

+ 13 - 13
src/packages/pc/views/notice/manage/index.vue

@@ -55,13 +55,13 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(query,
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'title', label: '标题' },
-    { field: 'msgtype', label: '消息类型' },
-    { field: 'sendtype', label: '发布类型' },
-    { field: 'sentstatus', label: '推送状态' },
-    { field: 'scheduletime', label: '生效时间' },
-    { field: 'endtime', label: '结束时间' },
-    { field: 'recipient', label: '接收人' },
+    { field: 'title', label: 'notice.manage.title' },
+    { field: 'msgtype', label: 'notice.manage.msgtype' },
+    { field: 'sendtype', label: 'notice.manage.sendtype' },
+    { field: 'sentstatus', label: 'notice.manage.sentstatus' },
+    { field: 'scheduletime', label: 'notice.manage.scheduletime' },
+    { field: 'endtime', label: 'notice.manage.endtime' },
+    { field: 'recipient', label: 'notice.manage.recipient' },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
@@ -69,27 +69,27 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     filters: [
         {
             field: 'title',
-            label: '标题'
+            label: t('notice.manage.title')
         },
         {
             field: 'msgtype',
-            label: '消息类型'
+            label: t('notice.manage.msgtype')
         },
         {
             field: 'content',
-            label: '消息内容'
+            label: t('notice.manage.content')
         },
         {
             field: 'userid',
-            label: '接收交易商'
+            label: t('notice.manage.userid')
         },
         {
             field: 'sendtype',
-            label: '发布类型'
+            label: t('notice.manage.sendtype')
         },
         {
             field: 'isforcedisplay',
-            label: '是否强制弹出'
+            label: t('notice.manage.isforcedisplay')
         },
     ],
     buttons: [

+ 30 - 30
src/packages/pc/views/query/internal/deliveryorder/components/details/index.vue

@@ -1,12 +1,12 @@
 <!-- 查询管理-内部订单查询-交收委托查询-详情 -->
 <template>
-    <app-drawer title="交收委托(点选式)详细信息" width="960" v-model:show="show">
-        <app-table-details title="申报信息" :data="data" :label-width="200" :cell-props="detailProps1" :column="2" />
-        <app-table-details title="仓单信息" :data="data" :label-width="200" :cell-props="detailProps2" :column="2" />
-        <app-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-drawer :title="t('query.internal.deliveryorder.details.title')" width="960" v-model:show="show">
+        <app-table-details :title="t('query.internal.deliveryorder.details.subtitle1')" :data="data" :label-width="200" :cell-props="detailProps1" :column="2" />
+        <app-table-details :title="t('query.internal.deliveryorder.details.subtitle2')" :data="data" :label-width="200" :cell-props="detailProps2" :column="2" />
+        <app-table-details :title="t('query.internal.deliveryorder.details.subtitle3')" :data="data" :label-width="200" :cell-props="detailProps3" :column="2" />
+        <app-table-details :title="t('query.internal.deliveryorder.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.deliveryorder.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>
@@ -53,17 +53,17 @@ const detailProps1 = computed(() => {
     const { deliveryorderstatus = 0, histradedate, tradedate, accountname, accountid, matchaccountname, matchaccountid } = data.value ?? {}
 
     const result: CellProp[] = [
-        { prop: 'deliveryticket', label: '申报流水号:' },
-        { prop: 'deliveryorderid', label: '委托单号:' },
-        { prop: 'tradedate', label: '交易日:', formatValue: () => formatDate(histradedate || tradedate, 'YYYY-MM-DD') },
-        { prop: 'accountid', label: '申报人(账号):', formatValue: (val) => val && `${accountname}(${accountid})` },
-        { prop: 'matchaccountid', label: '对手(账号):', formatValue: (val) => val && `${matchaccountname}(${matchaccountid})` },
-        { prop: 'deliveryorderstatus', label: '交收状态:', formatValue: (val) => deliveryorderstatus1Enum.getEnumTypeName(val) },
-        { prop: 'ordertime', label: '申报时间:', formatValue: (val) => formatDate(val) },
-        { prop: 'auditname', label: '审核人:', show: [2, 3].includes(deliveryorderstatus) },
-        { prop: 'audittime', label: '审核时间:', formatValue: (val) => formatDate(val), show: [2, 3].includes(deliveryorderstatus) },
-        { prop: 'auditremark', label: '备注:', show: deliveryorderstatus === 3 },
-        { prop: 'retcode', label: '错误信息:', show: deliveryorderstatus === 5 }
+        { prop: 'deliveryticket', label: 'query.internal.deliveryorder.details.deliveryticket' },
+        { prop: 'deliveryorderid', label: 'query.internal.deliveryorder.details.deliveryorderid' },
+        { prop: 'tradedate', label: 'query.internal.deliveryorder.details.tradedate', formatValue: () => formatDate(histradedate || tradedate, 'YYYY-MM-DD') },
+        { prop: 'accountid', label: 'query.internal.deliveryorder.details.accountid', formatValue: (val) => val && `${accountname}(${accountid})` },
+        { prop: 'matchaccountid', label: 'query.internal.deliveryorder.details.matchaccountid', formatValue: (val) => val && `${matchaccountname}(${matchaccountid})` },
+        { prop: 'deliveryorderstatus', label: 'query.internal.deliveryorder.details.deliveryorderstatus', formatValue: (val) => deliveryorderstatus1Enum.getEnumTypeName(val) },
+        { prop: 'ordertime', label: 'query.internal.deliveryorder.details.ordertime', formatValue: (val) => formatDate(val) },
+        { prop: 'auditname', label: 'query.internal.deliveryorder.details.auditname', show: [2, 3].includes(deliveryorderstatus) },
+        { prop: 'audittime', label: 'query.internal.deliveryorder.details.audittime', formatValue: (val) => formatDate(val), show: [2, 3].includes(deliveryorderstatus) },
+        { prop: 'auditremark', label: 'query.internal.deliveryorder.details.auditremark', show: deliveryorderstatus === 3 },
+        { prop: 'retcode', label: 'query.internal.deliveryorder.details.retcode', show: deliveryorderstatus === 5 }
     ]
 
     return result
@@ -73,8 +73,8 @@ const detailProps2 = computed(() => {
     const { deliveryqty = 0, deliverygoodsunitname = '', wrstandardcode, wrstandardname } = data.value ?? {}
 
     const result: CellProp[] = [
-        { prop: 'wrstandardcode', label: '现货商品:', formatValue: (val) => val && `${wrstandardcode}/${wrstandardname}` },
-        { prop: 'deliveryqty', label: '现货数量:', formatValue: () => deliveryqty + deliverygoodsunitname },
+        { prop: 'wrstandardcode', label: 'query.internal.deliveryorder.details.wrstandardcode', formatValue: (val) => val && `${wrstandardcode}/${wrstandardname}` },
+        { prop: 'deliveryqty', label: 'query.internal.deliveryorder.details.deliveryqty', formatValue: () => deliveryqty + deliverygoodsunitname },
     ]
 
     data.value?.wrFactorTypeItemList.forEach((item) => {
@@ -88,9 +88,9 @@ const detailProps2 = computed(() => {
 
 const detailProps3 = computed(() => {
     const result: CellProp[] = [
-        { prop: 'xgoodsname', label: '交易合约:' },
-        { prop: 'xdeliveryprice', label: '交收价格:', decimal: 2 },
-        { prop: 'xdeliveryqty', label: '合约手数:' },
+        { prop: 'xgoodsname', label: 'query.internal.deliveryorder.details.xgoodsname' },
+        { prop: 'xdeliveryprice', label: 'query.internal.deliveryorder.details.xdeliveryprice', decimal: 2 },
+        { prop: 'xdeliveryqty', label: 'query.internal.deliveryorder.details.xdeliveryqty' },
     ]
 
     return result
@@ -100,10 +100,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, show: ppricemode === 2 },
-        { prop: 'pdeliveryqty', label: '合约手数:' },
+        { prop: 'ppricemode', label: 'query.internal.deliveryorder.details.ppricemode' },
+        { prop: 'pgoodsname', label: 'query.internal.deliveryorder.details.pgoodsname', show: ppricemode === 1 },
+        { prop: 'pdeliveryprice', label: 'query.internal.deliveryorder.details.pdeliveryprice', decimal: 2, show: ppricemode === 2 },
+        { prop: 'pdeliveryqty', label: 'query.internal.deliveryorder.details.pdeliveryqty' },
     ]
 
     return result
@@ -113,10 +113,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, show: p2pricemode === 2 },
-        { prop: 'p2deliveryqty', label: '合约手数:' },
+        { prop: 'p2pricemode', label: 'query.internal.deliveryorder.details.p2pricemode' },
+        { prop: 'p2goodsname', label: 'query.internal.deliveryorder.details.p2goodsname', show: p2pricemode === 1 },
+        { prop: 'p2deliveryprice', label: 'query.internal.deliveryorder.details.p2deliveryprice', decimal: 2, show: p2pricemode === 2 },
+        { prop: 'p2deliveryqty', label: 'query.internal.deliveryorder.details.p2deliveryqty' },
     ]
 
     return result

+ 18 - 18
src/packages/pc/views/query/internal/offlinedelivery/components/cancel/index.vue

@@ -1,14 +1,14 @@
 <!-- 查询管理-内部订单查询-线下交收单查询-失败 -->
 <template>
-    <app-drawer title="详细" width="960" v-model:show="show">
+    <app-drawer :title="t('query.internal.offlinedelivery.cancel.title')" width="960" v-model:show="show">
         <app-table-details :data="data" :label-width="160" :cell-props="detailProps1" :column="2">
             <template #auditremark>
-                <el-input ref="inputRef" type="textarea" :rows="3" placeholder="必填" v-model="formData.auditremark" />
+                <el-input ref="inputRef" type="textarea" :rows="3" :placeholder="t('common.require')" v-model="formData.auditremark" />
             </template>
         </app-table-details>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
-            <el-button type="primary" @click="onSubmit">交收失败</el-button>
+            <el-button type="primary" @click="onSubmit">{{ t('query.internal.offlinedelivery.cancel.submit') }}</el-button>
         </template>
     </app-drawer>
 </template>
@@ -54,18 +54,18 @@ const { data } = useRequest(queryOfflineDetail, {
 })
 
 const detailProps1: CellProp[] = [
-    { prop: 'deliveryorderid', label: '交收单号:' },
-    { prop: 'username', label: '申请人:' },
-    { prop: 'goodsdisplay', label: '交收商品:' },
-    { prop: 'buyorsell', label: '方向:', formatValue: (val) => getBuyOrSellName(val) },
-    { prop: 'deliveryqty', label: '交收数量:' },
-    { prop: 'deliveryprice', label: '交收价格:' },
-    { prop: 'deliveryamount', label: '交收货款:' },
-    { prop: 'matchname', label: '对手方:' },
-    { prop: 'deliveryinfo', label: '交收信息:' },
-    { prop: 'reqtime', label: '申请时间:', formatValue: (val) => formatDate(val) },
-    { prop: 'orderstatusdisplay', label: '交收状态:' },
-    { prop: 'auditremark', label: '备注:', required: true }
+    { prop: 'deliveryorderid', label: 'query.internal.offlinedelivery.cancel.deliveryorderid' },
+    { prop: 'username', label: 'query.internal.offlinedelivery.cancel.username' },
+    { prop: 'goodsdisplay', label: 'query.internal.offlinedelivery.cancel.goodsdisplay' },
+    { prop: 'buyorsell', label: 'query.internal.offlinedelivery.cancel.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { prop: 'deliveryqty', label: 'query.internal.offlinedelivery.cancel.deliveryqty' },
+    { prop: 'deliveryprice', label: 'query.internal.offlinedelivery.cancel.deliveryprice' },
+    { prop: 'deliveryamount', label: 'query.internal.offlinedelivery.cancel.deliveryamount' },
+    { prop: 'matchname', label: 'query.internal.offlinedelivery.cancel.matchname' },
+    { prop: 'deliveryinfo', label: 'query.internal.offlinedelivery.cancel.deliveryinfo' },
+    { prop: 'reqtime', label: 'query.internal.offlinedelivery.cancel.reqtime', formatValue: (val) => formatDate(val) },
+    { prop: 'orderstatusdisplay', label: 'query.internal.offlinedelivery.cancel.orderstatusdisplay' },
+    { prop: 'auditremark', label: 'query.internal.offlinedelivery.cancel.auditremark', required: true }
 ]
 
 const onCancel = (isRefresh = false) => {
@@ -79,17 +79,17 @@ const onSubmit = () => {
         offlineFail({
             data: formData
         }).then(() => {
-            ElMessage.success('提交成功')
+            ElMessage.success(t('common.tips1'))
             onCancel(true)
         }).catch((err) => {
-            ElMessage.error('提交失败:' + err)
+            ElMessage.error(t('common.tips2') + err)
             onCancel()
         }).finally(() => {
             loading.value = false
         })
     } else {
         inputRef.value?.focus()
-        ElMessage.warning('请输入备注')
+        ElMessage.warning(t('query.internal.offlinedelivery.cancel.tips'))
     }
 }
 </script>

+ 13 - 13
src/packages/pc/views/query/internal/offlinedelivery/components/confirm/index.vue

@@ -1,10 +1,10 @@
 <!-- 查询管理-内部订单查询-线下交收单查询-确认 -->
 <template>
-    <app-drawer title="详细" width="960" v-model:show="show">
+    <app-drawer :title="t('query.internal.offlinedelivery.confirm.title')" width="960" v-model:show="show">
         <app-table-details :data="data" :label-width="160" :cell-props="detailProps1" :column="2" />
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
-            <el-button type="primary" @click="onSubmit">确认交收</el-button>
+            <el-button type="primary" @click="onSubmit">{{ t('query.internal.offlinedelivery.confirm.submit') }}</el-button>
         </template>
     </app-drawer>
 </template>
@@ -43,17 +43,17 @@ const { data } = useRequest(queryOfflineDetail, {
 })
 
 const detailProps1: CellProp[] = [
-    { prop: 'deliveryorderid', label: '交收单号:' },
-    { prop: 'username', label: '申请人:' },
-    { prop: 'goodsdisplay', label: '交收商品:' },
-    { prop: 'buyorsell', label: '方向:', formatValue: (val) => getBuyOrSellName(val) },
-    { prop: 'deliveryqty', label: '交收数量:' },
-    { prop: 'deliveryprice', label: '交收价格:' },
-    { prop: 'deliveryamount', label: '交收货款:' },
-    { prop: 'matchname', label: '对手方:' },
-    { prop: 'deliveryinfo', label: '交收信息:' },
-    { prop: 'reqtime', label: '申请时间:', formatValue: (val) => formatDate(val) },
-    { prop: 'orderstatusdisplay', label: '交收状态:' }
+    { prop: 'deliveryorderid', label: 'query.internal.offlinedelivery.confirm.deliveryorderid' },
+    { prop: 'username', label: 'query.internal.offlinedelivery.confirm.username' },
+    { prop: 'goodsdisplay', label: 'query.internal.offlinedelivery.confirm.goodsdisplay' },
+    { prop: 'buyorsell', label: 'query.internal.offlinedelivery.confirm.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { prop: 'deliveryqty', label: 'query.internal.offlinedelivery.confirm.deliveryqty' },
+    { prop: 'deliveryprice', label: 'query.internal.offlinedelivery.confirm.deliveryprice' },
+    { prop: 'deliveryamount', label: 'query.internal.offlinedelivery.confirm.deliveryamount' },
+    { prop: 'matchname', label: 'query.internal.offlinedelivery.confirm.matchname' },
+    { prop: 'deliveryinfo', label: 'query.internal.offlinedelivery.confirm.deliveryinfo' },
+    { prop: 'reqtime', label: 'query.internal.offlinedelivery.confirm.reqtime', formatValue: (val) => formatDate(val) },
+    { prop: 'orderstatusdisplay', label: 'query.internal.offlinedelivery.confirm.orderstatusdisplay' }
 ]
 
 const onCancel = (isRefresh = false) => {

+ 17 - 17
src/packages/pc/views/query/internal/offlinedelivery/components/details/index.vue

@@ -1,6 +1,6 @@
 <!-- 查询管理-内部订单查询-线下交收单查询-详情 -->
 <template>
-    <app-drawer title="详细" width="960" v-model:show="show">
+    <app-drawer :title="t('query.internal.offlinedelivery.details.title')" width="960" v-model:show="show">
         <app-table-details :data="data" :label-width="160" :cell-props="detailProps1" :column="2" />
         <template #footer>
             <el-button @click="onCancel">{{ t('operation.close') }}</el-button>
@@ -40,22 +40,22 @@ const { data } = useRequest(queryOfflineDetail, {
 })
 
 const detailProps1: CellProp[] = [
-    { prop: 'deliveryorderid', label: '交收单号:' },
-    { prop: 'username', label: '申请人:' },
-    { prop: 'goodsdisplay', label: '交收商品:' },
-    { prop: 'buyorsell', label: '方向:', formatValue: (val) => getBuyOrSellName(val) },
-    { prop: 'deliveryqty', label: '申请交收数量:' },
-    { prop: 'sucdeliveryqty', label: '实际交收数量:' },
-    { prop: 'cancledeliveryqty', label: '撤销交收数量:' },
-    { prop: 'deliveryprice', label: '交收价格:' },
-    { prop: 'deliveryamount', label: '交收货款:' },
-    { prop: 'matchname', label: '对手方:' },
-    { prop: 'deliveryinfo', label: '交收信息:' },
-    { prop: 'reqtime', label: '申请时间:', formatValue: (val) => formatDate(val) },
-    { prop: 'orderstatusdisplay', label: '交收状态:' },
-    { prop: 'remark', label: '备注:' },
-    { prop: 'deliverycharge', label: '交收手续费:' },
-    { prop: 'closetime', label: '完成时间:', formatValue: (val) => formatDate(val) },
+    { prop: 'deliveryorderid', label: 'query.internal.offlinedelivery.details.deliveryorderid' },
+    { prop: 'username', label: 'query.internal.offlinedelivery.details.username' },
+    { prop: 'goodsdisplay', label: 'query.internal.offlinedelivery.details.goodsdisplay' },
+    { prop: 'buyorsell', label: 'query.internal.offlinedelivery.details.buyorsell', formatValue: (val) => getBuyOrSellName(val) },
+    { prop: 'deliveryqty', label: 'query.internal.offlinedelivery.details.deliveryqty' },
+    { prop: 'sucdeliveryqty', label: 'query.internal.offlinedelivery.details.sucdeliveryqty' },
+    { prop: 'cancledeliveryqty', label: 'query.internal.offlinedelivery.details.cancledeliveryqty' },
+    { prop: 'deliveryprice', label: 'query.internal.offlinedelivery.details.deliveryprice' },
+    { prop: 'deliveryamount', label: 'query.internal.offlinedelivery.details.deliveryamount' },
+    { prop: 'matchname', label: 'query.internal.offlinedelivery.details.matchname' },
+    { prop: 'deliveryinfo', label: 'query.internal.offlinedelivery.details.deliveryinfo' },
+    { prop: 'reqtime', label: 'query.internal.offlinedelivery.details.reqtime', formatValue: (val) => formatDate(val) },
+    { prop: 'orderstatusdisplay', label: 'query.internal.offlinedelivery.details.orderstatusdisplay' },
+    { prop: 'remark', label: 'query.internal.offlinedelivery.details.remark' },
+    { prop: 'deliverycharge', label: 'query.internal.offlinedelivery.details.deliverycharge' },
+    { prop: 'closetime', label: 'query.internal.offlinedelivery.details.closetime', formatValue: (val) => formatDate(val) },
 ]
 
 const onCancel = () => {