xxxxx

public/locales/en-US.json

@@ -5,7 +5,7 @@
         "left2": "MTP Background Management System"
     },
     "account": {
-        "tradeacct": {
+        "fundacct": {
             "accountId": "TaAccountID",
             "isMain": "Account Type",
             "taAccountType": "Internal/External",
@@ -123,6 +123,55 @@
                     "mobilephone": "Mobile Number"
                 }
             }
+        },
+        "tradingacct": {
+            "loginid": "登录账号",
+            "loginstatus": "账号状态",
+            "modifytime": "修改时间",
+            "modifiername": "修改人",
+            "close": {
+                "message": "确认将账户停用？"
+            },
+            "details": {
+                "title": "详情",
+                "loginid": "登录账户",
+                "loginstatus": "登录账号状态",
+                "accountIdS": "授权资金账户",
+                "modifytime": "修改时间"
+            },
+            "edit": {
+                "title": "修改",
+                "title1": "新增",
+                "accountids": "授权资金账户",
+                "confirmPassword": "确认密码",
+                "password": "登录密码",
+                "loginid": "登录账户",
+                "tips1": "请选择授权资金账户",
+                "tips2": "不符合密码规则",
+                "tips3": "新密码和确认密码不一致",
+                "tips4": "修改成功",
+                "tips5": "修改失败：",
+                "tips6": "新增成功",
+                "tips7": "新增失败："
+            },
+            "lock": {
+                "message1": "确认解锁该账户？",
+                "message2": "确认锁定该账户？",
+                "tips1": "解锁成功",
+                "tips2": "锁定成功",
+                "tips3": "解锁失败：",
+                "tips4": "锁定失败："
+            },
+            "password": {
+                "message": "确认将密码重置？",
+                "tips1": "重置成功",
+                "tips2": "重置失败："
+            },
+            "recover": {
+                "message": "确认恢复该登录账户？",
+                "tips1": "恢复成功",
+                "tips2": "恢复失败："
+            }
         }
     },
     "admin": {
@@ -1008,7 +1057,18 @@
             }
         },
         "subinstitution": {
-            "addition": {},
+            "addition": {
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "parentname": "所属机构",
+                "memberusername": "所属会员",
+                "accountstatus": "机构状态",
+                "usertype": "机构类型",
+                "userinfotype": "所有者类型",
+                "userName": "操作员",
+                "modifytime": "最后更新时间",
+                "subarealevel": "类型"
+            },
             "manage": {
                 "userid": "Organization Code:",
                 "accountname": "Organization Name:",
@@ -1110,7 +1170,37 @@
                 }
             },
             "modification": {},
-            "transfer": {},
+            "transfer": {
+                "outparentusername": "转出机构",
+                "outlevel": "转出机构类型",
+                "inuseridname": "转入机构",
+                "inlevel": "转入机构类型",
+                "transfermode": "转移方式",
+                "transferstatus": "转移状态",
+                "createtime": "申请时间",
+                "cancel": {
+                    "message": "确认撤销转移申请？"
+                },
+                "edit": {
+                    "legend": "转出",
+                    "diversionoutlevel": "转出类型",
+                    "outparentuserid": "转出一级子机构",
+                    "outparentuserid1": "转出二级子机构",
+                    "cardtypeid": "证件类型",
+                    "cardnum": "证件号码",
+                    "legend1": "转入",
+                    "transfermode": "转入方式",
+                    "diversioninlevel": "转入类型",
+                    "inuserid": "转入经纪会员",
+                    "inuserid1": "转入一级子机构",
+                    "tips1": "*将转移子机构及下属交易商，会在系统结算时处理"
+                },
+                "run": {
+                    "message": "确认执行转移？",
+                    "tips1": "转移成功",
+                    "tips2": "转移失败："
+                }
+            },
             "user": {
                 "username": "Organization Code",
                 "openmode": "Organization Name",

public/locales/th-TH.json

@@ -5,7 +5,7 @@
         "left2": "MTP管理系統"
     },
     "account": {
-        "tradeacct": {
+        "fundacct": {
             "accountId": "บัญชีเงินทุน",
             "isMain": "ประเภทบัญชี",
             "taAccountType": "ภายใน/ภายนอก",
@@ -123,6 +123,55 @@
                     "mobilephone": "หมายเลขโทรศัพท์มือถือ"
                 }
             }
+        },
+        "tradingacct": {
+            "loginid": "登录账号",
+            "loginstatus": "账号状态",
+            "modifytime": "修改时间",
+            "modifiername": "修改人",
+            "close": {
+                "message": "确认将账户停用？"
+            },
+            "details": {
+                "title": "详情",
+                "loginid": "登录账户",
+                "loginstatus": "登录账号状态",
+                "accountIdS": "授权资金账户",
+                "modifytime": "修改时间"
+            },
+            "edit": {
+                "title": "修改",
+                "title1": "新增",
+                "accountids": "授权资金账户",
+                "confirmPassword": "确认密码",
+                "password": "登录密码",
+                "loginid": "登录账户",
+                "tips1": "请选择授权资金账户",
+                "tips2": "不符合密码规则",
+                "tips3": "新密码和确认密码不一致",
+                "tips4": "修改成功",
+                "tips5": "修改失败：",
+                "tips6": "新增成功",
+                "tips7": "新增失败："
+            },
+            "lock": {
+                "message1": "确认解锁该账户？",
+                "message2": "确认锁定该账户？",
+                "tips1": "解锁成功",
+                "tips2": "锁定成功",
+                "tips3": "解锁失败：",
+                "tips4": "锁定失败："
+            },
+            "password": {
+                "message": "确认将密码重置？",
+                "tips1": "重置成功",
+                "tips2": "重置失败："
+            },
+            "recover": {
+                "message": "确认恢复该登录账户？",
+                "tips1": "恢复成功",
+                "tips2": "恢复失败："
+            }
         }
     },
     "admin": {
@@ -1008,7 +1057,18 @@
             }
         },
         "subinstitution": {
-            "addition": {},
+            "addition": {
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "parentname": "所属机构",
+                "memberusername": "所属会员",
+                "accountstatus": "机构状态",
+                "usertype": "机构类型",
+                "userinfotype": "所有者类型",
+                "userName": "操作员",
+                "modifytime": "最后更新时间",
+                "subarealevel": "类型"
+            },
             "manage": {
                 "userid": "รหัสองค์กร:",
                 "accountname": "ชื่อองค์กร:",
@@ -1110,7 +1170,37 @@
                 }
             },
             "modification": {},
-            "transfer": {},
+            "transfer": {
+                "outparentusername": "转出机构",
+                "outlevel": "转出机构类型",
+                "inuseridname": "转入机构",
+                "inlevel": "转入机构类型",
+                "transfermode": "转移方式",
+                "transferstatus": "转移状态",
+                "createtime": "申请时间",
+                "cancel": {
+                    "message": "确认撤销转移申请？"
+                },
+                "edit": {
+                    "legend": "转出",
+                    "diversionoutlevel": "转出类型",
+                    "outparentuserid": "转出一级子机构",
+                    "outparentuserid1": "转出二级子机构",
+                    "cardtypeid": "证件类型",
+                    "cardnum": "证件号码",
+                    "legend1": "转入",
+                    "transfermode": "转入方式",
+                    "diversioninlevel": "转入类型",
+                    "inuserid": "转入经纪会员",
+                    "inuserid1": "转入一级子机构",
+                    "tips1": "*将转移子机构及下属交易商，会在系统结算时处理"
+                },
+                "run": {
+                    "message": "确认执行转移？",
+                    "tips1": "转移成功",
+                    "tips2": "转移失败："
+                }
+            },
             "user": {
                 "username": "รหัสองค์กร",
                 "openmode": "ชื่อองค์กร",

public/locales/vi-VN.json

@@ -5,7 +5,7 @@
         "left2": "MTP管理系统"
     },
     "account": {
-        "tradeacct": {
+        "fundacct": {
             "accountId": "资金账号",
             "isMain": "账户类型",
             "taAccountType": "内/外部",
@@ -123,6 +123,55 @@
                     "mobilephone": "手机号"
                 }
             }
+        },
+        "tradingacct": {
+            "loginid": "登录账号",
+            "loginstatus": "账号状态",
+            "modifytime": "修改时间",
+            "modifiername": "修改人",
+            "close": {
+                "message": "确认将账户停用？"
+            },
+            "details": {
+                "title": "详情",
+                "loginid": "登录账户",
+                "loginstatus": "登录账号状态",
+                "accountIdS": "授权资金账户",
+                "modifytime": "修改时间"
+            },
+            "edit": {
+                "title": "修改",
+                "title1": "新增",
+                "accountids": "授权资金账户",
+                "confirmPassword": "确认密码",
+                "password": "登录密码",
+                "loginid": "登录账户",
+                "tips1": "请选择授权资金账户",
+                "tips2": "不符合密码规则",
+                "tips3": "新密码和确认密码不一致",
+                "tips4": "修改成功",
+                "tips5": "修改失败：",
+                "tips6": "新增成功",
+                "tips7": "新增失败："
+            },
+            "lock": {
+                "message1": "确认解锁该账户？",
+                "message2": "确认锁定该账户？",
+                "tips1": "解锁成功",
+                "tips2": "锁定成功",
+                "tips3": "解锁失败：",
+                "tips4": "锁定失败："
+            },
+            "password": {
+                "message": "确认将密码重置？",
+                "tips1": "重置成功",
+                "tips2": "重置失败："
+            },
+            "recover": {
+                "message": "确认恢复该登录账户？",
+                "tips1": "恢复成功",
+                "tips2": "恢复失败："
+            }
         }
     },
     "admin": {
@@ -1008,7 +1057,18 @@
             }
         },
         "subinstitution": {
-            "addition": {},
+            "addition": {
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "parentname": "所属机构",
+                "memberusername": "所属会员",
+                "accountstatus": "机构状态",
+                "usertype": "机构类型",
+                "userinfotype": "所有者类型",
+                "userName": "操作员",
+                "modifytime": "最后更新时间",
+                "subarealevel": "类型"
+            },
             "manage": {
                 "userid": "机构代码：",
                 "accountname": "机构名称：",
@@ -1110,7 +1170,37 @@
                 }
             },
             "modification": {},
-            "transfer": {},
+            "transfer": {
+                "outparentusername": "转出机构",
+                "outlevel": "转出机构类型",
+                "inuseridname": "转入机构",
+                "inlevel": "转入机构类型",
+                "transfermode": "转移方式",
+                "transferstatus": "转移状态",
+                "createtime": "申请时间",
+                "cancel": {
+                    "message": "确认撤销转移申请？"
+                },
+                "edit": {
+                    "legend": "转出",
+                    "diversionoutlevel": "转出类型",
+                    "outparentuserid": "转出一级子机构",
+                    "outparentuserid1": "转出二级子机构",
+                    "cardtypeid": "证件类型",
+                    "cardnum": "证件号码",
+                    "legend1": "转入",
+                    "transfermode": "转入方式",
+                    "diversioninlevel": "转入类型",
+                    "inuserid": "转入经纪会员",
+                    "inuserid1": "转入一级子机构",
+                    "tips1": "*将转移子机构及下属交易商，会在系统结算时处理"
+                },
+                "run": {
+                    "message": "确认执行转移？",
+                    "tips1": "转移成功",
+                    "tips2": "转移失败："
+                }
+            },
             "user": {
                 "username": "机构代码",
                 "openmode": "机构名称",

public/locales/zh-CN.json

@@ -5,7 +5,7 @@
         "left2": "MTP管理系统"
     },
     "account": {
-        "tradeacct": {
+        "fundacct": {
             "accountId": "资金账号",
             "isMain": "账户类型",
             "taAccountType": "内/外部",
@@ -123,6 +123,55 @@
                     "mobilephone": "手机号"
                 }
             }
+        },
+        "tradingacct": {
+            "loginid": "登录账号",
+            "loginstatus": "账号状态",
+            "modifytime": "修改时间",
+            "modifiername": "修改人",
+            "close": {
+                "message": "确认将账户停用？"
+            },
+            "details": {
+                "title": "详情",
+                "loginid": "登录账户",
+                "loginstatus": "登录账号状态",
+                "accountIdS": "授权资金账户",
+                "modifytime": "修改时间"
+            },
+            "edit": {
+                "title": "修改",
+                "title1": "新增",
+                "accountids": "授权资金账户",
+                "confirmPassword": "确认密码",
+                "password": "登录密码",
+                "loginid": "登录账户",
+                "tips1": "请选择授权资金账户",
+                "tips2": "不符合密码规则",
+                "tips3": "新密码和确认密码不一致",
+                "tips4": "修改成功",
+                "tips5": "修改失败：",
+                "tips6": "新增成功",
+                "tips7": "新增失败："
+            },
+            "lock": {
+                "message1": "确认解锁该账户？",
+                "message2": "确认锁定该账户？",
+                "tips1": "解锁成功",
+                "tips2": "锁定成功",
+                "tips3": "解锁失败：",
+                "tips4": "锁定失败："
+            },
+            "password": {
+                "message": "确认将密码重置？",
+                "tips1": "重置成功",
+                "tips2": "重置失败："
+            },
+            "recover": {
+                "message": "确认恢复该登录账户？",
+                "tips1": "恢复成功",
+                "tips2": "恢复失败："
+            }
         }
     },
     "admin": {
@@ -1008,7 +1057,18 @@
             }
         },
         "subinstitution": {
-            "addition": {},
+            "addition": {
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "parentname": "所属机构",
+                "memberusername": "所属会员",
+                "accountstatus": "机构状态",
+                "usertype": "机构类型",
+                "userinfotype": "所有者类型",
+                "userName": "操作员",
+                "modifytime": "最后更新时间",
+                "subarealevel": "类型"
+            },
             "manage": {
                 "userid": "机构代码：",
                 "accountname": "机构名称：",
@@ -1109,8 +1169,46 @@
                     "tips": "确认恢复该机构机构？同时恢复默认管理员账户。"
                 }
             },
-            "modification": {},
-            "transfer": {},
+            "modification": {
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "memberusername": "所属会员",
+                "parentname": "所属机构",
+                "modifystatus": "变更状态",
+                "modifytime": "最后更新时间",
+                "subarealevel": "类型"
+            },
+            "transfer": {
+                "outparentusername": "转出机构",
+                "outlevel": "转出机构类型",
+                "inuseridname": "转入机构",
+                "inlevel": "转入机构类型",
+                "transfermode": "转移方式",
+                "transferstatus": "转移状态",
+                "createtime": "申请时间",
+                "cancel": {
+                    "message": "确认撤销转移申请？"
+                },
+                "edit": {
+                    "legend": "转出",
+                    "diversionoutlevel": "转出类型",
+                    "outparentuserid": "转出一级子机构",
+                    "outparentuserid1": "转出二级子机构",
+                    "cardtypeid": "证件类型",
+                    "cardnum": "证件号码",
+                    "legend1": "转入",
+                    "transfermode": "转入方式",
+                    "diversioninlevel": "转入类型",
+                    "inuserid": "转入经纪会员",
+                    "inuserid1": "转入一级子机构",
+                    "tips1": "*将转移子机构及下属交易商，会在系统结算时处理"
+                },
+                "run": {
+                    "message": "确认执行转移？",
+                    "tips1": "转移成功",
+                    "tips2": "转移失败："
+                }
+            },
             "user": {
                 "username": "机构代码",
                 "openmode": "机构名称",

public/locales/zh-TW.json

@@ -5,7 +5,7 @@
         "left2": "MTP管理系統"
     },
     "account": {
-        "tradeacct": {
+        "fundacct": {
             "accountId": "資金賬號",
             "isMain": "賬戶類型",
             "taAccountType": "內/外部",
@@ -123,6 +123,55 @@
                     "mobilephone": "手機號"
                 }
             }
+        },
+        "tradingacct": {
+            "loginid": "登录账号",
+            "loginstatus": "账号状态",
+            "modifytime": "修改时间",
+            "modifiername": "修改人",
+            "close": {
+                "message": "确认将账户停用？"
+            },
+            "details": {
+                "title": "详情",
+                "loginid": "登录账户",
+                "loginstatus": "登录账号状态",
+                "accountIdS": "授权资金账户",
+                "modifytime": "修改时间"
+            },
+            "edit": {
+                "title": "修改",
+                "title1": "新增",
+                "accountids": "授权资金账户",
+                "confirmPassword": "确认密码",
+                "password": "登录密码",
+                "loginid": "登录账户",
+                "tips1": "请选择授权资金账户",
+                "tips2": "不符合密码规则",
+                "tips3": "新密码和确认密码不一致",
+                "tips4": "修改成功",
+                "tips5": "修改失败：",
+                "tips6": "新增成功",
+                "tips7": "新增失败："
+            },
+            "lock": {
+                "message1": "确认解锁该账户？",
+                "message2": "确认锁定该账户？",
+                "tips1": "解锁成功",
+                "tips2": "锁定成功",
+                "tips3": "解锁失败：",
+                "tips4": "锁定失败："
+            },
+            "password": {
+                "message": "确认将密码重置？",
+                "tips1": "重置成功",
+                "tips2": "重置失败："
+            },
+            "recover": {
+                "message": "确认恢复该登录账户？",
+                "tips1": "恢复成功",
+                "tips2": "恢复失败："
+            }
         }
     },
     "admin": {
@@ -1008,7 +1057,18 @@
             }
         },
         "subinstitution": {
-            "addition": {},
+            "addition": {
+                "userid": "机构代码",
+                "accountname": "机构名称",
+                "parentname": "所属机构",
+                "memberusername": "所属会员",
+                "accountstatus": "机构状态",
+                "usertype": "机构类型",
+                "userinfotype": "所有者类型",
+                "userName": "操作员",
+                "modifytime": "最后更新时间",
+                "subarealevel": "类型"
+            },
             "manage": {
                 "userid": "機構代碼：",
                 "accountname": "機構名稱：",
@@ -1110,7 +1170,37 @@
                 }
             },
             "modification": {},
-            "transfer": {},
+            "transfer": {
+                "outparentusername": "转出机构",
+                "outlevel": "转出机构类型",
+                "inuseridname": "转入机构",
+                "inlevel": "转入机构类型",
+                "transfermode": "转移方式",
+                "transferstatus": "转移状态",
+                "createtime": "申请时间",
+                "cancel": {
+                    "message": "确认撤销转移申请？"
+                },
+                "edit": {
+                    "legend": "转出",
+                    "diversionoutlevel": "转出类型",
+                    "outparentuserid": "转出一级子机构",
+                    "outparentuserid1": "转出二级子机构",
+                    "cardtypeid": "证件类型",
+                    "cardnum": "证件号码",
+                    "legend1": "转入",
+                    "transfermode": "转入方式",
+                    "diversioninlevel": "转入类型",
+                    "inuserid": "转入经纪会员",
+                    "inuserid1": "转入一级子机构",
+                    "tips1": "*将转移子机构及下属交易商，会在系统结算时处理"
+                },
+                "run": {
+                    "message": "确认执行转移？",
+                    "tips1": "转移成功",
+                    "tips2": "转移失败："
+                }
+            },
             "user": {
                 "username": "機構代碼",
                 "openmode": "機構名稱",

src/packages/pc/views/account/fundacct/components/bankinout/index.vue

@@ -1,58 +1,58 @@
 <!-- 账号管理-资金账户管理-出入金 -->
 <template>
-    <app-drawer :title="t('account.tradeacct.bankinout.title')" width="900" v-model:show="show" :refresh="refresh" :loading="loading">
+    <app-drawer :title="t('account.fundacct.bankinout.title')" width="900" v-model:show="show" :refresh="refresh" :loading="loading">
         <el-form ref="formRef" class="el-form--horizontal" label-width="140px" :model="formData" :rules="formRules"
             :show-message="false">
             <fieldset class="g-fieldset el-form--horizontal">
                 <legend class="g-fieldset__legend">{{ t('common.baseinfo') }}</legend>
-                <el-form-item :label="t('account.tradeacct.bankinout.accountId')">
+                <el-form-item :label="t('account.fundacct.bankinout.accountId')">
                     {{ record.accountId }}
                 </el-form-item>
-                <el-form-item :label="t('account.tradeacct.bankinout.enableAmount')">
+                <el-form-item :label="t('account.fundacct.bankinout.enableAmount')">
                     {{ data?.money ?? 0 }}
                 </el-form-item>
-                <el-form-item :label="t('account.tradeacct.bankinout.inOutAmount')" prop="type">
+                <el-form-item :label="t('account.fundacct.bankinout.inOutAmount')" prop="type">
                     <el-radio-group v-model="formData.type">
-                        <el-radio :label="t('account.tradeacct.bankinout.outAmount')" :value="1" />
-                        <el-radio :label="t('account.tradeacct.bankinout.inAmount')" :value="2" />
+                        <el-radio :label="t('account.fundacct.bankinout.outAmount')" :value="1" />
+                        <el-radio :label="t('account.fundacct.bankinout.inAmount')" :value="2" />
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item :label="t('account.tradeacct.bankinout.amount')" prop="money">
+                <el-form-item :label="t('account.fundacct.bankinout.amount')" prop="money">
                     <el-input-number v-model="formData.money" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item :label="t('account.tradeacct.bankinout.cusbankid')" prop="cusbankid">
+                <el-form-item :label="t('account.fundacct.bankinout.cusbankid')" prop="cusbankid">
                     <el-select v-model="selectedBank" :placeholder="t('common.pleasechoice')" value-key="cusbankid" @change="onBankChange">
                         <el-option v-for="item in bankList" :key="item.cusbankid" :label="item.cusbankname"
                             :value="item" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('account.tradeacct.bankinout.accpwd')" prop="accpwd">
+                <el-form-item :label="t('account.fundacct.bankinout.accpwd')" prop="accpwd">
                     <el-input type="password" v-model="formData.accpwd" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
                 <template v-if="selectedBank">
-                    <el-form-item :label="t('account.tradeacct.bankinout.accounttype')">
+                    <el-form-item :label="t('account.fundacct.bankinout.accounttype')">
                         {{ selectedBank.accounttype }}
                     </el-form-item>
-                    <el-form-item :label="t('account.tradeacct.bankinout.cardtype')">
+                    <el-form-item :label="t('account.fundacct.bankinout.cardtype')">
                         {{ selectedBank.cardtype }}
                     </el-form-item>
-                    <el-form-item :label="t('account.tradeacct.bankinout.cardno')">
+                    <el-form-item :label="t('account.fundacct.bankinout.cardno')">
                         {{ selectedBank.cardno }}
                     </el-form-item>
-                    <el-form-item :label="t('account.tradeacct.bankinout.bankname')">
+                    <el-form-item :label="t('account.fundacct.bankinout.bankname')">
                         {{ selectedBank.bankname }}
                     </el-form-item>
-                    <el-form-item :label="t('account.tradeacct.bankinout.bankaccountno')">
+                    <el-form-item :label="t('account.fundacct.bankinout.bankaccountno')">
                         {{ selectedBank.bankaccountno }}
                     </el-form-item>
-                    <el-form-item :label="t('account.tradeacct.bankinout.bankaccountname')">
+                    <el-form-item :label="t('account.fundacct.bankinout.bankaccountname')">
                         {{ selectedBank.bankaccountname }}
                     </el-form-item>
-                    <el-form-item :label="t('account.tradeacct.bankinout.mobilephone')">
+                    <el-form-item :label="t('account.fundacct.bankinout.mobilephone')">
                         {{ selectedBank.mobilephone }}
                     </el-form-item>
                 </template>
-                <el-form-item class="el-form-item--row" :label="t('account.tradeacct.bankinout.remark')" prop="remark">
+                <el-form-item class="el-form-item--row" :label="t('account.fundacct.bankinout.remark')" prop="remark">
                     <el-input type="textarea" v-model="formData.remark" maxlength="200" :rows="3" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
             </fieldset>

src/packages/pc/views/account/fundacct/components/bankstatement/index.vue

@@ -7,7 +7,7 @@
             </template>
             <app-table :data="dataList" :columns="tableColumns" :loading="loading">
                 <template #headerLeft>
-                    <span>{{ t('account.tradeacct.bankstatement.accountId') }}：{{ record.accountId }}</span>
+                    <span>{{ t('account.fundacct.bankstatement.accountId') }}：{{ record.accountId }}</span>
                 </template>
                 <template #headerRight>
                     <div>
@@ -59,22 +59,22 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryA
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'operateType', label: 'account.tradeacct.bankstatement.operateType' },
-    { field: 'relationOrderId', label: 'account.tradeacct.bankstatement.relationOrderId' },
-    { field: 'marketName', label: 'account.tradeacct.bankstatement.marketName' },
-    { field: 'goodsName', label: 'account.tradeacct.bankstatement.goodsName' },
-    { field: 'amount', label: 'account.tradeacct.bankstatement.amount' },
-    { field: 'balance', label: 'account.tradeacct.bankstatement.balance' },
-    { field: 'currentBalance', label: 'account.tradeacct.bankstatement.currentBalance' },
-    { field: 'createTime', label: 'account.tradeacct.bankstatement.createTime' },
-    { field: 'amountAdjustTypeName', label: 'account.tradeacct.bankstatement.amountAdjustTypeName' },
+    { field: 'operateType', label: 'account.fundacct.bankstatement.operateType' },
+    { field: 'relationOrderId', label: 'account.fundacct.bankstatement.relationOrderId' },
+    { field: 'marketName', label: 'account.fundacct.bankstatement.marketName' },
+    { field: 'goodsName', label: 'account.fundacct.bankstatement.goodsName' },
+    { field: 'amount', label: 'account.fundacct.bankstatement.amount' },
+    { field: 'balance', label: 'account.fundacct.bankstatement.balance' },
+    { field: 'currentBalance', label: 'account.fundacct.bankstatement.currentBalance' },
+    { field: 'createTime', label: 'account.fundacct.bankstatement.createTime' },
+    { field: 'amountAdjustTypeName', label: 'account.fundacct.bankstatement.amountAdjustTypeName' },
 ])
 
 const { filterOption, getQueryParams } = useDataFilter<Model.AmountStreamReq>({
     filters: [
         {
             field: 'logType',
-            label: t('account.tradeacct.bankstatement.logType'),
+            label: t('account.fundacct.bankstatement.logType'),
             value: 1,
             options: () => [
                 { label: t('common.current'), value: 1 },

src/packages/pc/views/account/fundacct/components/details/index.vue

@@ -1,6 +1,6 @@
 <!-- 账号管理-资金账户管理-详情 -->
 <template>
-    <app-drawer :title="t('account.tradeacct.details.title')" width="900" v-model:show="show">
+    <app-drawer :title="t('account.fundacct.details.title')" width="900" v-model:show="show">
         <app-table-details :data="data" :label-width="160" :cell-props="detailProps" :column="2">
             <!-- 市场权限 -->
             <template #dtype="{ value }">
@@ -90,32 +90,32 @@ const { data } = useRequest(queryTaAccountDetail, {
 })
 
 const detailProps: CellProp[] = [
-    { prop: 'accountId', label: 'account.tradeacct.details.accountId' },
-    { prop: 'accountName', label: 'account.tradeacct.details.accountName' },
-    { prop: 'isMain', label: 'account.tradeacct.details.isMain', formatValue: (val) => mainaccounttypeEnum.getEnumTypeName(val) },
-    { prop: 'currency', label: 'account.tradeacct.details.currency' },
-    { prop: 'taAccountType', label: 'account.tradeacct.details.taAccountType', formatValue: (val) => accounttypeEnum.getEnumTypeName(val) },
-    { prop: 'changeFlag', label: 'account.tradeacct.details.changeFlag', formatValue: (val) => flagEnum.getEnumTypeName(val) },
-    { prop: 'tradeStatus', label: 'account.tradeacct.details.tradeStatus', formatValue: (val) => traderstatusEnum.getEnumTypeName(val) },
-    { prop: 'currentBalance', label: 'account.tradeacct.details.currentBalance', decimal: 2 },
-    { prop: 'payCharge', label: 'account.tradeacct.details.payCharge', decimal: 2 },
-    { prop: 'otherPay', label: 'account.tradeacct.details.otherPay', decimal: 2 },
-    { prop: 'otherFreezeMargin', label: 'account.tradeacct.details.otherFreezeMargin', decimal: 2 },
-    { prop: 'freezeMargin', label: 'account.tradeacct.details.freezeMargin', decimal: 2 },
-    { prop: 'usedMargin', label: 'account.tradeacct.details.usedMargin', decimal: 2 },
-    { prop: 'freezeCharge', label: 'account.tradeacct.details.freezeCharge', decimal: 2 },
-    { prop: 'outAmountFreeze', label: 'account.tradeacct.details.outAmountFreeze', decimal: 2 },
-    { prop: 'outThreshold', label: 'account.tradeacct.details.outThreshold', decimal: 2 },
+    { prop: 'accountId', label: 'account.fundacct.details.accountId' },
+    { prop: 'accountName', label: 'account.fundacct.details.accountName' },
+    { prop: 'isMain', label: 'account.fundacct.details.isMain', formatValue: (val) => mainaccounttypeEnum.getEnumTypeName(val) },
+    { prop: 'currency', label: 'account.fundacct.details.currency' },
+    { prop: 'taAccountType', label: 'account.fundacct.details.taAccountType', formatValue: (val) => accounttypeEnum.getEnumTypeName(val) },
+    { prop: 'changeFlag', label: 'account.fundacct.details.changeFlag', formatValue: (val) => flagEnum.getEnumTypeName(val) },
+    { prop: 'tradeStatus', label: 'account.fundacct.details.tradeStatus', formatValue: (val) => traderstatusEnum.getEnumTypeName(val) },
+    { prop: 'currentBalance', label: 'account.fundacct.details.currentBalance', decimal: 2 },
+    { prop: 'payCharge', label: 'account.fundacct.details.payCharge', decimal: 2 },
+    { prop: 'otherPay', label: 'account.fundacct.details.otherPay', decimal: 2 },
+    { prop: 'otherFreezeMargin', label: 'account.fundacct.details.otherFreezeMargin', decimal: 2 },
+    { prop: 'freezeMargin', label: 'account.fundacct.details.freezeMargin', decimal: 2 },
+    { prop: 'usedMargin', label: 'account.fundacct.details.usedMargin', decimal: 2 },
+    { prop: 'freezeCharge', label: 'account.fundacct.details.freezeCharge', decimal: 2 },
+    { prop: 'outAmountFreeze', label: 'account.fundacct.details.outAmountFreeze', decimal: 2 },
+    { prop: 'outThreshold', label: 'account.fundacct.details.outThreshold', decimal: 2 },
     { prop: 'dtype', label: '市场权限', show: !!data.value?.isSelf },
     { prop: 'loginIds', label: '授权交易账户', show: !!data.value?.isSelf }
 ]
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'cusBankName', label: 'account.tradeacct.details.cusBankName' },
-    { field: 'bankName', label: 'account.tradeacct.details.bankName' },
-    { field: 'bankAccountName', label: 'account.tradeacct.details.bankAccountName', formatValue: (val) => decryptAES(val) },
-    { field: 'bankAccountNo', label: 'account.tradeacct.details.bankAccountNo', formatValue: (val) => decryptAES(val) },
-    { field: 'signStatus', label: 'account.tradeacct.details.signStatus', formatValue: (val) => signstatusEnum.getEnumTypeName(val) }
+    { field: 'cusBankName', label: 'account.fundacct.details.cusBankName' },
+    { field: 'bankName', label: 'account.fundacct.details.bankName' },
+    { field: 'bankAccountName', label: 'account.fundacct.details.bankAccountName', formatValue: (val) => decryptAES(val) },
+    { field: 'bankAccountNo', label: 'account.fundacct.details.bankAccountNo', formatValue: (val) => decryptAES(val) },
+    { field: 'signStatus', label: 'account.fundacct.details.signStatus', formatValue: (val) => signstatusEnum.getEnumTypeName(val) }
 ])
 
 const onCancel = () => {

src/packages/pc/views/account/fundacct/components/password/index.vue

@@ -1,15 +1,15 @@
 <!-- 账号管理-资金账户管理-修改密码 -->
 <template>
-    <app-drawer :title="t('account.tradeacct.password.title')" width="480" v-model:show="show" :refresh="refresh"
+    <app-drawer :title="t('account.fundacct.password.title')" width="480" v-model:show="show" :refresh="refresh"
         :loading="loading">
         <el-form ref="formRef" class="el-form--vertical" label-width="100px" :model="formData" :rules="formRules">
-            <el-form-item :label="t('account.tradeacct.password.accountId')">
+            <el-form-item :label="t('account.fundacct.password.accountId')">
                 {{ record.accountId }}
             </el-form-item>
-            <el-form-item :label="t('account.tradeacct.password.oldPwd')" prop="oldPwd">
+            <el-form-item :label="t('account.fundacct.password.oldPwd')" prop="oldPwd">
                 <el-input type="password" v-model="formData.oldPwd" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <el-form-item :label="t('account.tradeacct.password.newPwd')" prop="newPwd">
+            <el-form-item :label="t('account.fundacct.password.newPwd')" prop="newPwd">
                 <el-popover placement="top" trigger="click" :width="244" :hide-after="0"
                     :content="validateRules.password.message">
                     <template #reference>
@@ -18,7 +18,7 @@
                     </template>
                 </el-popover>
             </el-form-item>
-            <el-form-item :label="t('account.tradeacct.password.confirmPassword')" prop="confirmPassword">
+            <el-form-item :label="t('account.fundacct.password.confirmPassword')" prop="confirmPassword">
                 <el-input type="password" v-model="formData.confirmPassword" maxlength="50"
                     :placeholder="t('common.pleaseenter')" />
             </el-form-item>
@@ -70,7 +70,7 @@ const formRules: FormRules = {
             if (validateRules.password.validate(value)) {
                 callback()
             } else {
-                callback(new Error(t('account.tradeacct.password.tips1')))
+                callback(new Error(t('account.fundacct.password.tips1')))
             }
         },
     }],
@@ -81,7 +81,7 @@ const formRules: FormRules = {
             if (value === formData.value.newPwd) {
                 callback()
             } else {
-                callback(new Error(t('account.tradeacct.password.tips2')))
+                callback(new Error(t('account.fundacct.password.tips2')))
             }
         },
     }]

src/packages/pc/views/account/fundacct/components/sign/cancel/index.vue

@@ -1,13 +1,13 @@
 <!-- 账号管理-资金账户管理-银行签约信息-解约 -->
 <template>
-    <app-drawer :title="t('account.tradeacct.sign.cancel.title')" width="900" v-model:show="show" :refresh="refresh" :loading="loading">
+    <app-drawer :title="t('account.fundacct.sign.cancel.title')" width="900" v-model:show="show" :refresh="refresh" :loading="loading">
         <app-table-details :title="t('common.baseinfo')" :data="formData" :label-width="200" :cell-props="detailProps1" :column="2" />
         <app-table-details :title="t('common.extendinfo')" :data="formData.extend" :label-width="200" :cell-props="detailProps2"
             :column="2" v-if="expandableList.length" />
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
-            <el-button type="primary" @click="onSubmit(1)" v-if="selectedItem.canBindCard === 1">{{ t('account.tradeacct.sign.cancel.broker') }}</el-button>
-            <el-button type="primary" @click="onSubmit(2)">{{ t('account.tradeacct.sign.cancel.unbind') }}</el-button>
+            <el-button type="primary" @click="onSubmit(1)" v-if="selectedItem.canBindCard === 1">{{ t('account.fundacct.sign.cancel.broker') }}</el-button>
+            <el-button type="primary" @click="onSubmit(2)">{{ t('account.fundacct.sign.cancel.unbind') }}</el-button>
         </template>
     </app-drawer>
 </template>
@@ -80,14 +80,14 @@ const { dataList: expandableList, run: getExpandableList } = useRequest(queryBoo
 })
 
 const detailProps1: CellProp[] = [
-    { prop: 'accounttype', label: 'account.tradeacct.sign.cancel.accounttype', formatValue: (val) => val === 1 ? 'account.tradeacct.sign.cancel.person' : 'account.tradeacct.sign.cancel.companny' },
-    { prop: 'certtype', label: 'account.tradeacct.sign.cancel.certtype' },
-    { prop: 'cusbankid', label: 'account.tradeacct.sign.cancel.cusbankid', formatValue: () => props.selectedItem.cusBankName },
-    { prop: 'certid', label: 'account.tradeacct.sign.cancel.certid' },
-    { prop: 'exbankname', label: 'account.tradeacct.sign.cancel.exbankname' },
-    { prop: 'bankaccountno', formatLabel: () => formData.accounttype === 1 ? 'account.tradeacct.sign.cancel.bankaccountno' : 'account.tradeacct.sign.cancel.bankaccountno1' },
-    { prop: 'bankaccountname', label: 'account.tradeacct.sign.cancel.bankaccountname' },
-    { prop: 'mobilephone', label: 'account.tradeacct.sign.cancel.mobilephone' },
+    { prop: 'accounttype', label: 'account.fundacct.sign.cancel.accounttype', formatValue: (val) => val === 1 ? 'account.fundacct.sign.cancel.person' : 'account.fundacct.sign.cancel.companny' },
+    { prop: 'certtype', label: 'account.fundacct.sign.cancel.certtype' },
+    { prop: 'cusbankid', label: 'account.fundacct.sign.cancel.cusbankid', formatValue: () => props.selectedItem.cusBankName },
+    { prop: 'certid', label: 'account.fundacct.sign.cancel.certid' },
+    { prop: 'exbankname', label: 'account.fundacct.sign.cancel.exbankname' },
+    { prop: 'bankaccountno', formatLabel: () => formData.accounttype === 1 ? 'account.fundacct.sign.cancel.bankaccountno' : 'account.fundacct.sign.cancel.bankaccountno1' },
+    { prop: 'bankaccountname', label: 'account.fundacct.sign.cancel.bankaccountname' },
+    { prop: 'mobilephone', label: 'account.fundacct.sign.cancel.mobilephone' },
 ]
 
 const detailProps2 = computed<CellProp[]>(() => expandableList.value.map((e) => ({
@@ -102,7 +102,7 @@ const onCancel = (isRefresh = false) => {
 
 const onSubmit = (flag: number) => {
     ElMessageBox.confirm(
-        flag === 1 ? t('account.tradeacct.sign.cancel.tips1') : t('account.tradeacct.sign.cancel.tips2'),
+        flag === 1 ? t('account.fundacct.sign.cancel.tips1') : t('account.fundacct.sign.cancel.tips2'),
         t('common.alert')
     ).then(() => {
         const rawData = toRaw(formData)

src/packages/pc/views/account/fundacct/components/sign/edit/index.vue

@@ -1,40 +1,40 @@
 <!-- 账号管理-资金账户管理-银行签约信息-编辑 -->
 <template>
-    <app-drawer :title="t('account.tradeacct.sign.edit.title')" width="900" v-model:show="show" :refresh="refresh"
+    <app-drawer :title="t('account.fundacct.sign.edit.title')" width="900" v-model:show="show" :refresh="refresh"
         :loading="loading">
         <el-form ref="formRef" class="el-form--horizontal" label-width="140px" :model="formData" :rules="formRules"
             :show-message="false">
             <fieldset class="g-fieldset el-form--horizontal">
                 <legend class="g-fieldset__legend">{{ t('common.baseinfo') }}</legend>
-                <el-form-item :label="t('account.tradeacct.sign.edit.userinfotype')" v-if="userInfo">
+                <el-form-item :label="t('account.fundacct.sign.edit.userinfotype')" v-if="userInfo">
                     {{ getUserInfoTypeName(userInfo.userinfotype) }}
                 </el-form-item>
-                <el-form-item :label="t('account.tradeacct.sign.edit.cardtypeid')" v-if="userInfo">
+                <el-form-item :label="t('account.fundacct.sign.edit.cardtypeid')" v-if="userInfo">
                     {{ userInfo.cardtypeid }}
                 </el-form-item>
-                <el-form-item :label="t('account.tradeacct.sign.edit.cusbankid')" prop="cusbankid">
+                <el-form-item :label="t('account.fundacct.sign.edit.cusbankid')" prop="cusbankid">
                     <el-select v-model="formData.cusbankid" placeholder="请选择" @change="onCusBankChange">
                         <el-option v-for="item in cusbankList" :key="item.cusbankid" :label="item.cusbankname"
                             :value="item.cusbankid" />
                     </el-select>
                 </el-form-item>
-                <el-form-item :label="t('account.tradeacct.sign.edit.certid')" v-if="userInfo">
+                <el-form-item :label="t('account.fundacct.sign.edit.certid')" v-if="userInfo">
                     {{ handleNoneValue(formData.certid) }}
                 </el-form-item>
-                <el-form-item :label="t('account.tradeacct.sign.edit.exbankname')" prop="exbankname">
+                <el-form-item :label="t('account.fundacct.sign.edit.exbankname')" prop="exbankname">
                     <app-select-bank v-model:selected="selectedBank" :cusbankid="formData.cusbankid"
                         @change="onBankChange" />
                 </el-form-item>
                 <el-form-item
-                    :label="userInfo.userinfotype === UserInfoType.Personal ? t('account.tradeacct.sign.edit.bankaccountno') : t('account.tradeacct.sign.edit.bankaccountno1')"
+                    :label="userInfo.userinfotype === UserInfoType.Personal ? t('account.fundacct.sign.edit.bankaccountno') : t('account.fundacct.sign.edit.bankaccountno1')"
                     prop="bankaccountno" v-if="userInfo">
                     <el-input v-model="formData.bankaccountno" maxlength="50" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item :label="t('account.tradeacct.sign.edit.bankaccountname')" prop="bankaccountname">
+                <el-form-item :label="t('account.fundacct.sign.edit.bankaccountname')" prop="bankaccountname">
                     <el-input v-model="formData.bankaccountname" maxlength="50"
                         :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
-                <el-form-item :label="t('account.tradeacct.sign.edit.mobilephone')" prop="mobilephone">
+                <el-form-item :label="t('account.fundacct.sign.edit.mobilephone')" prop="mobilephone">
                     <el-input type="number" v-model="formData.mobilephone" maxlength="50"
                         :placeholder="t('common.pleaseenter')" />
                 </el-form-item>

src/packages/pc/views/account/fundacct/index.vue

@@ -58,20 +58,20 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryT
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'accountId', label: 'account.tradeacct.accountId' },
-    { field: 'isMain', label: 'account.tradeacct.isMain', formatValue: (val) => mainaccounttypeEnum.getEnumTypeName(val) },
-    { field: 'taAccountType', label: 'account.tradeacct.taAccountType', formatValue: (val) => accounttypeEnum.getEnumTypeName(val) },
-    { field: 'relatedName', label: 'account.tradeacct.relatedName' },
-    { field: 'parentAccountId', label: 'account.tradeacct.parentAccountId' },
-    { field: 'tradeStatus', label: 'account.tradeacct.tradeStatus', formatValue: (val) => traderstatusEnum.getEnumTypeName(val) },
-    { field: 'currency', label: 'account.tradeacct.currency' },
-    { field: 'accountName', label: 'account.tradeacct.accountName' },
+    { field: 'accountId', label: 'account.fundacct.accountId' },
+    { field: 'isMain', label: 'account.fundacct.isMain', formatValue: (val) => mainaccounttypeEnum.getEnumTypeName(val) },
+    { field: 'taAccountType', label: 'account.fundacct.taAccountType', formatValue: (val) => accounttypeEnum.getEnumTypeName(val) },
+    { field: 'relatedName', label: 'account.fundacct.relatedName' },
+    { field: 'parentAccountId', label: 'account.fundacct.parentAccountId' },
+    { field: 'tradeStatus', label: 'account.fundacct.tradeStatus', formatValue: (val) => traderstatusEnum.getEnumTypeName(val) },
+    { field: 'currency', label: 'account.fundacct.currency' },
+    { field: 'accountName', label: 'account.fundacct.accountName' },
     { field: 'operate', label: 'common.operate', width: 220, fixed: 'right' }
 ])
 
 const { filterOption, getQueryParams } = useDataFilter<Model.TaAccountReq>({
     filters: [
-        { label: t('account.tradeacct.accountId'), field: 'accountId' }
+        { label: t('account.fundacct.accountId'), field: 'accountId' }
     ],
     buttons: [
         { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },

src/packages/pc/views/account/tradingacct/components/close/index.vue

@@ -1,7 +1,7 @@
 <!-- 账号管理-资金账户管理-注销 -->
 <template>
     <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">确认将账户停用？</div>
+        <div class="g-text-message">{{ t('account.tradingacct.close.message') }}</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>
@@ -40,10 +40,10 @@ const onSubmit = () => {
             loginid: props.record.loginid
         }
     }).then(() => {
-        ElMessage.success('注销成功')
+        ElMessage.success(t('common.tips11'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('注销失败：' + err)
+        ElMessage.error(t('common.tips12') + err)
         onCancel()
     }).finally(() => {
         loading.value = false

src/packages/pc/views/account/tradingacct/components/details/index.vue

@@ -1,6 +1,6 @@
 <!-- 账号管理-资金账户管理-详情 -->
 <template>
-    <app-drawer :title="t('account.tradeacct.details.title')" width="480" v-model:show="show">
+    <app-drawer :title="t('account.tradingacct.details.title')" width="480" v-model:show="show">
         <app-table-details :data="data" :label-width="120" :cell-props="detailProps" />
         <template #footer>
             <el-button @click="onCancel">{{ t('operation.close') }}</el-button>
@@ -43,10 +43,10 @@ const { data } = useRequest(tradingAccView, {
 })
 
 const detailProps: CellProp[] = [
-    { prop: 'loginid', label: '登录账户' },
-    { prop: 'loginstatus', label: '登录账号状态', formatValue: (val) => loginstatusEnum.getEnumTypeName(val) },
-    { prop: 'accountIdS', label: '授权资金账户', formatValue: (val) => val?.join(',') },
-    { prop: 'modifytime', label: '修改时间', formatValue: (val) => formatDate(val) }
+    { prop: 'loginid', label: 'account.tradingacct.details.loginid' },
+    { prop: 'loginstatus', label: 'account.tradingacct.details.loginstatus', formatValue: (val) => loginstatusEnum.getEnumTypeName(val) },
+    { prop: 'accountIdS', label: 'account.tradingacct.details.accountIdS', formatValue: (val) => val?.join(',') },
+    { prop: 'modifytime', label: 'account.tradingacct.details.modifytime', formatValue: (val) => formatDate(val) }
 ]
 
 const onCancel = () => {

src/packages/pc/views/account/tradingacct/components/edit/index.vue

@@ -1,11 +1,11 @@
 <!-- 账号管理-交易账号管理-新增/修改 -->
 <template>
-    <app-drawer :title="record ? '修改' : '新增'" width="480" v-model:show="show" :refresh="refresh" :loading="loading">
+    <app-drawer :title="record ? t('account.tradingacct.edit.title') : t('account.tradingacct.edit.title1')" width="480" v-model:show="show" :refresh="refresh" :loading="loading">
         <el-form ref="formRef" class="el-form--vertical" label-width="120px" :model="formData" :rules="formRules">
-            <el-form-item label="登录账户">
+            <el-form-item :label="t('account.tradingacct.edit.loginid')">
                 {{ formData.loginid }}
             </el-form-item>
-            <el-form-item label="登录密码" prop="password" v-if="!record">
+            <el-form-item :label="t('account.tradingacct.edit.password')" prop="password" v-if="!record">
                 <el-popover placement="top" trigger="click" :width="244" :hide-after="0"
                     :content="validateRules.password.message">
                     <template #reference>
@@ -14,11 +14,11 @@
                     </template>
                 </el-popover>
             </el-form-item>
-            <el-form-item label="确认密码" prop="confirmPassword" v-if="!record">
+            <el-form-item :label="t('account.tradingacct.edit.confirmPassword')" prop="confirmPassword" v-if="!record">
                 <el-input type="password" v-model="formData.confirmPassword" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <el-form-item label="授权资金账户" prop="accountids">
-                <el-select v-model="selectedAccountIds" placeholder="请选择" multiple>
+            <el-form-item :label="t('account.tradingacct.edit.accountids')" prop="accountids">
+                <el-select v-model="selectedAccountIds" :placeholder="t('common.pleasechoice')" multiple>
                     <el-option v-for="item in initData?.taaccounts" :key="item.accountid" :label="item.accountid"
                         :value="item.accountid" />
                 </el-select>
@@ -90,7 +90,7 @@ const formRules: FormRules = {
             if (validateRules.password.validate(value)) {
                 callback()
             } else {
-                callback(new Error(t('account.tradeacct.password.tips1')))
+                callback(new Error(t('account.tradingacct.password.tips2')))
             }
         },
     }],
@@ -101,7 +101,7 @@ const formRules: FormRules = {
             if (value === formData.value.password) {
                 callback()
             } else {
-                callback(new Error(t('account.tradeacct.password.tips2')))
+                callback(new Error(t('account.tradingacct.password.tips3')))
             }
         },
     }],
@@ -111,7 +111,7 @@ const formRules: FormRules = {
             if (selectedAccountIds.value.length) {
                 callback()
             } else {
-                callback(new Error(t('请选择授权资金账户')))
+                callback(new Error(t('account.tradingacct.edit.tips1')))
             }
         },
     }]
@@ -133,10 +133,10 @@ const onSubmit = () => {
                 tradingAccEdit({
                     data: rawData
                 }).then(() => {
-                    ElMessage.success('修改成功')
+                    ElMessage.success(t('account.tradingacct.edit.tips4'))
                     onCancel(true)
                 }).catch((err) => {
-                    ElMessage.error('修改失败：' + err)
+                    ElMessage.error(t('account.tradingacct.edit.tips5') + err)
                 }).finally(() => {
                     loading.value = false
                 })
@@ -144,10 +144,10 @@ const onSubmit = () => {
                 tradingAccAdd({
                     data: rawData
                 }).then(() => {
-                    ElMessage.success('新增成功')
+                    ElMessage.success(t('account.tradingacct.edit.tips6'))
                     onCancel(true)
                 }).catch((err) => {
-                    ElMessage.error('新增失败：' + err)
+                    ElMessage.error(t('account.tradingacct.edit.tips7') + err)
                 }).finally(() => {
                     loading.value = false
                 })

src/packages/pc/views/account/tradingacct/components/lock/index.vue

@@ -2,8 +2,8 @@
 <template>
     <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">
-            <span v-if="isLock">确认解锁该账户？</span>
-            <span v-else>确认锁定该账户？</span>
+            <span v-if="isLock">{{ t('account.tradingacct.lock.message1') }}</span>
+            <span v-else>{{ t('account.tradingacct.lock.message2') }}</span>
         </div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
@@ -46,10 +46,10 @@ const onSubmit = () => {
             status: isLock.value ? 1 : 2
         }
     }).then(() => {
-        ElMessage.success(isLock.value ? '解锁成功' : '锁定成功')
+        ElMessage.success(isLock.value ? t('account.tradingacct.lock.tips1') : t('account.tradingacct.lock.tips2'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error(isLock.value ? '解锁失败' : '锁定失败：' + err)
+        ElMessage.error(isLock.value ? t('account.tradingacct.lock.tips3') : t('account.tradingacct.lock.tips4') + err)
         onCancel()
     }).finally(() => {
         loading.value = false

src/packages/pc/views/account/tradingacct/components/password/index.vue

@@ -1,7 +1,7 @@
 <!-- 账号管理-资金账户管理-重置密码 -->
 <template>
     <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading">
-        <div class="g-text-message">确认将密码重置？</div>
+        <div class="g-text-message">{{ t('account.tradingacct.password.message') }}</div>
         <template #footer>
             <el-button @click="onCancel">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>
@@ -38,10 +38,10 @@ const onSubmit = () => {
             loginid: props.record.loginid
         }
     }).then(() => {
-        ElMessage.success('重置成功')
+        ElMessage.success(t('account.tradingacct.password.tips1'))
         onCancel()
     }).catch((err) => {
-        ElMessage.error('重置失败：' + err)
+        ElMessage.error(t('account.tradingacct.password.tips2') + err)
         onCancel()
     }).finally(() => {
         loading.value = false

src/packages/pc/views/account/tradingacct/components/recover/index.vue

@@ -1,7 +1,7 @@
 <!-- 账号管理-资金账户管理-恢复 -->
 <template>
     <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">确认恢复该登录账户？</div>
+        <div class="g-text-message">{{ t('account.tradingacct.recover.message') }}</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>
@@ -40,10 +40,10 @@ const onSubmit = () => {
             loginid: props.record.loginid
         }
     }).then(() => {
-        ElMessage.success('恢复成功')
+        ElMessage.success(t('account.tradingacct.recover.tips1'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('恢复失败：' + err)
+        ElMessage.error(t('account.tradingacct.recover.tips2') + err)
         onCancel()
     }).finally(() => {
         loading.value = false

src/packages/pc/views/account/tradingacct/index.vue

@@ -57,17 +57,17 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryT
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'loginid', label: '登录账号' },
-    { field: 'loginstatus', label: '账号状态', formatValue: (val) => loginstatusEnum.getEnumTypeName(val) },
-    { field: 'modifytime', label: '修改时间', formatValue: (val) => formatDate(val) },
-    { field: 'modifiername', label: '修改人' },
-    { field: 'operate', label: '操作', width: 220, fixed: 'right' }
+    { field: 'loginid', label: 'account.tradingacct.loginid' },
+    { field: 'loginstatus', label: 'account.tradingacct.loginstatus', formatValue: (val) => loginstatusEnum.getEnumTypeName(val) },
+    { field: 'modifytime', label: 'account.tradingacct.modifytime', formatValue: (val) => formatDate(val) },
+    { field: 'modifiername', label: 'account.tradingacct.modifiername' },
+    { field: 'operate', label: 'common.operate', width: 220, fixed: 'right' }
 ])
 
 const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.TradingAccReq>({
     filters: [
-        { label: '登录账户', field: 'loginid' },
-        { label: '账户状态', field: 'loginstatus', options: () => loginstatusEnum.getEnumOptions() }
+        { label: t('account.tradingacct.loginid'), field: 'loginid' },
+        { label: t('account.tradingacct.loginstatus'), field: 'loginstatus', options: () => loginstatusEnum.getEnumOptions() }
     ],
     buttons: [
         { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },

src/packages/pc/views/member/subinstitution/addition/index.vue

@@ -61,15 +61,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.addition.userid' },
+    { field: 'accountname', label: 'member.subinstitution.addition.accountname' },
+    { field: 'parentname', label: 'member.subinstitution.addition.parentname' },
+    { field: 'memberusername', label: 'member.subinstitution.addition.memberusername' },
+    { field: 'accountstatus', label: 'member.subinstitution.addition.accountstatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
+    { field: 'usertype', label: 'member.subinstitution.addition.usertype', formatValue: (val) => usertype2Enum.getEnumTypeName(val) },
+    { field: 'userinfotype', label: 'member.subinstitution.addition.userinfotype', formatValue: (val) => getUserInfoTypeName(val) },
+    { field: 'userName', label: 'member.subinstitution.addition.userName' },
+    { field: 'modifytime', label: 'member.subinstitution.addition.modifytime', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
@@ -77,11 +77,11 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.Orga
     filters: [
         {
             field: 'accountname',
-            label: '机构'
+            label: t('member.subinstitution.addition.accountname')
         },
         {
             field: 'subarealevel',
-            label: '类型',
+            label: t('member.subinstitution.addition.subarealevel'),
             options: () => subarealevelEnum.getEnumOptions()
         }
     ],

src/packages/pc/views/member/subinstitution/modification/index.vue

@@ -58,12 +58,12 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryO
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'userid', label: '机构代码' },
-    { field: 'accountname', label: '机构名称' },
-    { field: 'memberusername', label: '所属会员' },
-    { field: 'parentname', label: '所属机构' },
-    { field: 'modifystatus', label: '变更状态', formatValue: (val) => modifystatusEnum.getEnumTypeName(val) },
-    { field: 'modifytime', label: '最后更新时间', formatValue: (val) => formatDate(val) },
+    { field: 'userid', label: 'member.subinstitution.modification.userid' },
+    { field: 'accountname', label: 'member.subinstitution.modification.accountname' },
+    { field: 'memberusername', label: 'member.subinstitution.modification.memberusername' },
+    { field: 'parentname', label: 'member.subinstitution.modification.parentname' },
+    { field: 'modifystatus', label: 'member.subinstitution.modification.modifystatus', formatValue: (val) => modifystatusEnum.getEnumTypeName(val) },
+    { field: 'modifytime', label: 'member.subinstitution.modification.modifytime', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
@@ -71,11 +71,11 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.Orga
     filters: [
         {
             field: 'accountname',
-            label: '机构'
+            label: t('member.subinstitution.modification.accountname')
         },
         {
             field: 'subarealevel',
-            label: '类型',
+            label: t('member.subinstitution.modification.subarealevel'),
             options: () => subarealevelEnum.getEnumOptions()
         }
     ],

src/packages/pc/views/member/subinstitution/transfer/components/cancel/index.vue

@@ -1,7 +1,7 @@
 <!-- 会员机构管理-子机构管理-子机构转移-撤回 -->
 <template>
     <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">确认撤销转移申请？</div>
+        <div class="g-text-message">{{ t('member.subinstitution.transfer.cancel.message') }}</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>

src/packages/pc/views/member/subinstitution/transfer/components/edit/index.vue

@@ -5,66 +5,66 @@
         <el-form ref="formRef" class="el-form--horizontal" label-width="140px" :model="formData" :rules="formRules"
             :show-message="false">
             <fieldset class="g-fieldset el-form--horizontal">
-                <legend class="g-fieldset__legend">转出</legend>
-                <el-form-item label="转出类型" prop="diversionoutlevel">
+                <legend class="g-fieldset__legend">{{ t('member.subinstitution.transfer.edit.legend') }}</legend>
+                <el-form-item :label="t('member.subinstitution.transfer.edit.diversionoutlevel')" prop="diversionoutlevel">
                     <el-radio-group v-model="formData.diversionoutlevel" @change="switchOutType">
                         <template v-for="item in transferouttypeEnum.getEnumOptions()" :key="item.value">
                             <el-radio :label="item.label" :value="item.value" />
                         </template>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="转出一级子机构" prop="outparentuserid" v-if="formData.diversionoutlevel === 1">
+                <el-form-item :label="t('member.subinstitution.transfer.edit.outparentuserid')" prop="outparentuserid" v-if="formData.diversionoutlevel === 1">
                     <select-level v-model="formData.outparentuserid" :params="{ subarealevel: 1 }"
                         @change="selectOutUser" />
                 </el-form-item>
-                <el-form-item label="转出二级子机构" prop="outparentuserid" v-else>
+                <el-form-item :label="t('member.subinstitution.transfer.edit.outparentuserid1')" prop="outparentuserid" v-else>
                     <select-level v-model="formData.outparentuserid" :params="{ subarealevel: 2 }"
                         @change="selectOutUser" />
                 </el-form-item>
-                <el-form-item label="证件类型">
+                <el-form-item :label="t('member.subinstitution.transfer.edit.cardtypeid')">
                     {{ outUserInfo ? certificatetypeEnum.getEnumTypeName(outUserInfo.cardtypeid) : handleNoneValue() }}
                 </el-form-item>
-                <el-form-item label="证件号码">
+                <el-form-item :label="t('member.subinstitution.transfer.edit.cardnum')">
                     {{ outUserInfo ? decryptAES(outUserInfo.cardnum) : handleNoneValue() }}
                 </el-form-item>
             </fieldset>
             <fieldset class="g-fieldset el-form--horizontal">
-                <legend class="g-fieldset__legend">转入</legend>
-                <el-form-item label="转入方式" prop="transfermode">
+                <legend class="g-fieldset__legend">{{ t('member.subinstitution.transfer.edit.legend1') }}</legend>
+                <el-form-item :label="t('member.subinstitution.transfer.edit.transfermode')" prop="transfermode">
                     <el-select v-model="formData.transfermode">
                         <template v-for="item in transfermodeEnum.getEnumOptions()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="转入类型" prop="diversioninlevel">
+                <el-form-item :label="t('member.subinstitution.transfer.edit.diversioninlevel')" prop="diversioninlevel">
                     <el-select v-model="formData.diversioninlevel" @change="switchInType">
                         <template v-for="item in transferintypeEnum.getEnumOptions()" :key="item.value">
                             <el-option :label="item.label" :value="item.value" />
                         </template>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="转入经纪会员" prop="inuserid" v-if="formData.diversioninlevel === 1">
+                <el-form-item :label="t('member.subinstitution.transfer.edit.inuserid')" prop="inuserid" v-if="formData.diversioninlevel === 1">
                     <app-select-member v-model="formData.inuserid" :params="{ usertype: '2', roles: '7' }"
                         @change="selectInUser" />
                 </el-form-item>
-                <el-form-item label="转入一级子机构" prop="inuserid" v-else>
+                <el-form-item :label="t('member.subinstitution.transfer.edit.inuserid1')" prop="inuserid" v-else>
                     <select-level v-model="formData.inuserid" :params="{ subarealevel: 1 }" @change="selectInUser" />
                 </el-form-item>
-                <el-form-item label="证件类型">
+                <el-form-item :label="t('member.subinstitution.transfer.edit.cardtypeid')">
                     {{ inUserInfo ? certificatetypeEnum.getEnumTypeName(inUserInfo.cardtypeid) : handleNoneValue() }}
                 </el-form-item>
-                <el-form-item label="证件号码">
+                <el-form-item :label="t('member.subinstitution.transfer.edit.cardnum')">
                     {{ inUserInfo ? decryptAES(inUserInfo.cardnum) : handleNoneValue() }}
                 </el-form-item>
                 <el-form-item class="el-form-item--row">
-                    <span class="red">*将转移子机构及下属交易商，会在系统结算时处理</span>
+                    <span class="red">{{ t('member.subinstitution.transfer.edit.tips1') }}</span>
                 </el-form-item>
             </fieldset>
         </el-form>
         <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('operation.save') }}</el-button>
         </template>
     </app-drawer>
 </template>

src/packages/pc/views/member/subinstitution/transfer/components/run/index.vue

@@ -1,7 +1,7 @@
 <!-- 会员机构管理-子机构管理-子机构转移-执行转移 -->
 <template>
     <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">确认执行转移？</div>
+        <div class="g-text-message">{{ t('member.subinstitution.transfer.run.message') }}</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>
@@ -29,10 +29,10 @@ const onCancel = (isRefresh = false) => {
 const onSubmit = () => {
     loading.value = true
     organSonExecuteTransfer().then(() => {
-        ElMessage.success('转移成功')
+        ElMessage.success(t('member.subinstitution.transfer.run.tips1'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('转移失败：' + err)
+        ElMessage.error(t('member.subinstitution.transfer.run.tips2') + err)
         onCancel()
     }).finally(() => {
         loading.value = false

src/packages/pc/views/member/subinstitution/transfer/index.vue

@@ -68,13 +68,13 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryO
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'outparentusername', label: '转出机构' },
-    { field: 'outlevel', label: '转出机构类型', formatValue: (val) => transferouttypeEnum.getEnumTypeName(val) },
-    { field: 'inuseridname', label: '转入机构' },
-    { field: 'inlevel', label: '转入机构类型', formatValue: (val) => transferintypeEnum.getEnumTypeName(val) },
-    { field: 'transfermode', label: '转移方式', formatValue: (val) => transfermodeEnum.getEnumTypeName(val) },
-    { field: 'transferstatus', label: '转移状态', formatValue: (val) => transferstatusEnum.getEnumTypeName(val) },
-    { field: 'createtime', label: '申请时间', formatValue: (val) => formatDate(val) },
+    { field: 'outparentusername', label: 'member.subinstitution.transfer.outparentusername' },
+    { field: 'outlevel', label: 'member.subinstitution.transfer.outlevel', formatValue: (val) => transferouttypeEnum.getEnumTypeName(val) },
+    { field: 'inuseridname', label: 'member.subinstitution.transfer.inuseridname' },
+    { field: 'inlevel', label: 'member.subinstitution.transfer.inlevel', formatValue: (val) => transferintypeEnum.getEnumTypeName(val) },
+    { field: 'transfermode', label: 'member.subinstitution.transfer.transfermode', formatValue: (val) => transfermodeEnum.getEnumTypeName(val) },
+    { field: 'transferstatus', label: 'member.subinstitution.transfer.transferstatus', formatValue: (val) => transferstatusEnum.getEnumTypeName(val) },
+    { field: 'createtime', label: 'member.subinstitution.transfer.createtime', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', width: 200, fixed: 'right' }
 ])
 
@@ -82,15 +82,15 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Member.Orga
     filters: [
         {
             field: 'outmemberuserid',
-            label: '转出机构'
+            label: t('member.subinstitution.transfer.outparentusername')
         },
         {
             field: 'inuserid',
-            label: '转入机构'
+            label:  t('member.subinstitution.transfer.inuseridname')
         },
         {
             field: 'transferstatus',
-            label: '转移状态',
+            label: t('member.subinstitution.transfer.transferstatus'),
             options: () => transferstatusEnum.getEnumOptions()
         },
     ],