Merge branch 'master' of http://192.168.31.240:3000/MTP2.0_New/MTP2.0_NEWMANAGE_WEB

public/locales/en-US.json

@@ -64,12 +64,28 @@
                 "freezeCharge": "Frozen Trading Fee:",
                 "outAmountFreeze": "Withdrawal Freeze:",
                 "outThreshold": "Withdrawal Threshold:",
+                "dtype": "市场权限",
+                "loginIds": "授权交易账户",
                 "cusBankName": "Bank Business Number",
                 "bankName": "Bank Name",
                 "bankAccountName": "Bank Account Name",
                 "bankAccountNo": "Bank Account Number",
                 "signStatus": "Contract Status"
             },
+            "edit": {
+                "title": "编辑",
+                "accountId": "资金账户",
+                "accounttype": "账户类型",
+                "parentAccountId": "所属母账户",
+                "markets": "市场权限",
+                "marketName": "市场",
+                "tradeMode": "买大厅权限",
+                "tradeMode79": "买大厅权限：可挂",
+                "tradeMode1": "卖大厅权限",
+                "tradeMode78": "卖大厅权限：可挂",
+                "tips1": "授权登录账户(交易员)",
+                "tips2": "默认授权登录账户"
+            },
             "password": {
                 "title": "Modify Fund Password",
                 "accountId": "Fund Account ID",
@@ -1067,7 +1083,10 @@
                     "subtitle1": "Commodity query permission",
                     "accountname": "Name",
                     "userName": "Administrator",
-                    "reckonaccountid": "Capital account"
+                    "reckonaccountid": "Capital account",
+                    "market": "市场",
+                    "markets": "市场权限:",
+                    "transurl": "移动端开户地址: "
                 },
                 "edit": {
                     "title": "Edit",

public/locales/th-TH.json

@@ -64,12 +64,28 @@
                 "freezeCharge": "ค่าธรรมเนียมการซื้อขายที่ถูกระงับ:",
                 "outAmountFreeze": "การระงับการถอนเงิน:",
                 "outThreshold": "เกณฑ์การถอนเงิน:",
+                "dtype": "市场权限",
+                "loginIds": "授权交易账户",
                 "cusBankName": "หมายเลขธุรกรรมธนาคาร",
                 "bankName": "ธนาคารที่เปิดบัญชี",
                 "bankAccountName": "ชื่อบัญชีธนาคาร",
                 "bankAccountNo": "หมายเลขบัญชีธนาคาร",
                 "signStatus": "สถานะสัญญา"
             },
+            "edit": {
+                "title": "编辑",
+                "accountId": "资金账户",
+                "accounttype": "账户类型",
+                "parentAccountId": "所属母账户",
+                "markets": "市场权限",
+                "marketName": "市场",
+                "tradeMode": "买大厅权限",
+                "tradeMode79": "买大厅权限：可挂",
+                "tradeMode1": "卖大厅权限",
+                "tradeMode78": "卖大厅权限：可挂",
+                "tips1": "授权登录账户(交易员)",
+                "tips2": "默认授权登录账户"
+            },
             "password": {
                 "title": "แก้ไขรหัสผ่านเงินทุน",
                 "accountId": "รหัสบัญชีเงินทุน",
@@ -1067,7 +1083,10 @@
                     "subtitle1": "สิทธิการค้นหาสินค้า",
                     "accountname": "ชื่อ",
                     "userName": "ผู้ดูแลระบบ",
-                    "reckonaccountid": "บัญชีเงิน"
+                    "reckonaccountid": "บัญชีเงิน",
+                    "market": "市场",
+                    "markets": "市场权限:",
+                    "transurl": "移动端开户地址: "
                 },
                 "edit": {
                     "title": "แก้ไข",

public/locales/vi-VN.json

@@ -64,12 +64,28 @@
                 "freezeCharge": "Phí dịch vụ giao dịch đóng băng:",
                 "outAmountFreeze": "Rút tiền đóng băng:",
                 "outThreshold": "Ngưỡng rút tiền:",
+                "dtype": "市场权限",
+                "loginIds": "授权交易账户",
                 "cusBankName": "Số nghiệp vụ ngân hàng",
                 "bankName": "Ngân hàng mở tài khoản",
                 "bankAccountName": "Tên chủ thẻ ngân hàng",
                 "bankAccountNo": "Số thẻ ngân hàng",
                 "signStatus": "Trạng thái ký kết"
             },
+            "edit": {
+                "title": "编辑",
+                "accountId": "资金账户",
+                "accounttype": "账户类型",
+                "parentAccountId": "所属母账户",
+                "markets": "市场权限",
+                "marketName": "市场",
+                "tradeMode": "买大厅权限",
+                "tradeMode79": "买大厅权限：可挂",
+                "tradeMode1": "卖大厅权限",
+                "tradeMode78": "卖大厅权限：可挂",
+                "tips1": "授权登录账户(交易员)",
+                "tips2": "默认授权登录账户"
+            },
             "password": {
                 "title": "Đổi mật khẩu ngân quỹ",
                 "accountId": "Số tài khoản ngân quỹ",
@@ -1067,7 +1083,10 @@
                     "subtitle1": "Quyền truy vấn sản phẩm",
                     "accountname": "Tên",
                     "userName": "Quản trị viên",
-                    "reckonaccountid": "Tài khoản tiền"
+                    "reckonaccountid": "Tài khoản tiền",
+                    "market": "市场",
+                    "markets": "市场权限:",
+                    "transurl": "移动端开户地址: "
                 },
                 "edit": {
                     "title": "Chỉnh sửa",

public/locales/zh-CN.json

@@ -64,12 +64,28 @@
                 "freezeCharge": "交易服务费冻结：",
                 "outAmountFreeze": "出金冻结：",
                 "outThreshold": "出金阈值：",
+                "dtype": "市场权限",
+                "loginIds": "授权交易账户",
                 "cusBankName": "银行业务编号",
                 "bankName": "开户银行",
                 "bankAccountName": "银行卡户名",
                 "bankAccountNo": "银行卡号",
                 "signStatus": "签约状态"
             },
+            "edit": {
+                "title": "编辑",
+                "accountId": "资金账户",
+                "accounttype": "账户类型",
+                "parentAccountId": "所属母账户",
+                "markets": "市场权限",
+                "marketName": "市场",
+                "tradeMode": "买大厅权限",
+                "tradeMode79": "买大厅权限：可挂",
+                "tradeMode1": "卖大厅权限",
+                "tradeMode78": "卖大厅权限：可挂",
+                "tips1": "授权登录账户(交易员)",
+                "tips2": "默认授权登录账户"
+            },
             "password": {
                 "title": "修改资金密码",
                 "accountId": "资金账号",
@@ -1067,7 +1083,10 @@
                     "subtitle1": "商品查询权限",
                     "accountname": "名称",
                     "userName": "管理员",
-                    "reckonaccountid": "资金账户"
+                    "reckonaccountid": "资金账户",
+                    "market": "市场",
+                    "markets": "市场权限:",
+                    "transurl": "移动端开户地址: "
                 },
                 "edit": {
                     "title": "编辑",

public/locales/zh-TW.json

@@ -64,12 +64,28 @@
                 "freezeCharge": "交易服務費凍結：",
                 "outAmountFreeze": "出金凍結：",
                 "outThreshold": "出金閾值：",
+                "dtype": "市场权限",
+                "loginIds": "授权交易账户",
                 "cusBankName": "銀行業務編號",
                 "bankName": "開戶銀行",
                 "bankAccountName": "銀行卡戶名",
                 "bankAccountNo": "銀行卡號",
                 "signStatus": "簽約狀態"
             },
+            "edit": {
+                "title": "编辑",
+                "accountId": "资金账户",
+                "accounttype": "账户类型",
+                "parentAccountId": "所属母账户",
+                "markets": "市场权限",
+                "marketName": "市场",
+                "tradeMode": "买大厅权限",
+                "tradeMode79": "买大厅权限：可挂",
+                "tradeMode1": "卖大厅权限",
+                "tradeMode78": "卖大厅权限：可挂",
+                "tips1": "授权登录账户(交易员)",
+                "tips2": "默认授权登录账户"
+            },
             "password": {
                 "title": "修改資金密碼",
                 "accountId": "資金賬號",
@@ -1067,7 +1083,10 @@
                     "subtitle1": "商品查詢權限",
                     "accountname": "名稱",
                     "userName": "管理員",
-                    "reckonaccountid": "資金帳戶"
+                    "reckonaccountid": "資金帳戶",
+                    "market": "市场",
+                    "markets": "市场权限:",
+                    "transurl": "移动端开户地址: "
                 },
                 "edit": {
                     "title": "編輯",

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

@@ -108,8 +108,8 @@ const detailProps: CellProp[] = [
     { 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 }
+    { prop: 'dtype', label: 'account.fundacct.details.dtype', show: !!data.value?.isSelf },
+    { prop: 'loginIds', label: 'account.fundacct.details.loginIds', show: !!data.value?.isSelf }
 ]
 
 const tableColumns = shallowRef<Model.TableColumn[]>([

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

@@ -1,29 +1,29 @@
 <!-- 账号管理-资金账户管理-编辑 -->
 <template>
-    <app-drawer title="编辑" width="900" v-model:show="show" :refresh="refresh" :loading="loading">
+    <app-drawer :title="t('account.fundacct.edit.title')" width="900" v-model:show="show" :refresh="refresh" :loading="loading">
         <el-form ref="formRef" class="el-form--horizontal" label-width="180px" :model="formData" :show-message="false">
-            <el-form-item label="资金账户">
+            <el-form-item :label="t('account.fundacct.edit.accountId')">
                 <span>{{ record.accountId }}</span>
             </el-form-item>
-            <el-form-item label="账户类型" v-if="record.isMain === 1">
+            <el-form-item :label="t('account.fundacct.edit.accounttype')" v-if="record.isMain === 1">
                 <span>{{ mainaccounttypeEnum.getEnumTypeName(record.isMain) }}</span>
             </el-form-item>
             <template v-else>
-                <el-form-item label="所属母账户">
+                <el-form-item :label="t('account.fundacct.edit.parentAccountId')">
                     <span>{{ record.parentAccountId }}</span>
                 </el-form-item>
             </template>
             <template v-if="data && data.selfFlag === 1">
                 <template v-if="!data.cannotEdit">
-                    <el-form-item class="el-form-item--row" label="市场权限">
+                    <el-form-item class="el-form-item--row" :label="t('account.fundacct.edit.markets')">
                         <el-table ref="tableRef" :data="formData.dtype" @selection-change="handleSelectionChange"
                             border>
                             <el-table-column type="selection" width="55" />
-                            <el-table-column prop="marketName" label="市场" />
-                            <el-table-column prop="tradeMode" label="买大厅权限"
+                            <el-table-column prop="marketName" :label="t('account.fundacct.edit.marketName')" />
+                            <el-table-column prop="tradeMode" :label="t('account.fundacct.edit.tradeMode')"
                                 v-if="multipleSelection.some((e) => e.tradeProperty === 4 || e.tradeMode === 79)">
                                 <template #default="{ row }">
-                                    <span v-if="row.tradeMode === 79">买大厅权限：可挂</span>
+                                    <span v-if="row.tradeMode === 79">{{ t('account.fundacct.edit.tradeMode79') }}</span>
                                     <template v-else-if="row.tradeMode === 17 && row.tradeProperty === 4">
                                         <el-select v-model="row.dtype">
                                             <template v-for="item in getMarketbstypeOptions(row.fdType)"
@@ -37,10 +37,10 @@
                                     </template>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="tradeMode" label="卖大厅权限"
+                            <el-table-column prop="tradeMode" :label="t('account.fundacct.edit.tradeMode1')"
                                 v-if="multipleSelection.some((e) => e.tradeProperty === 4 || [77, 78].includes(e.tradeMode))">
                                 <template #default="{ row }">
-                                    <span v-if="[77, 78].includes(row.tradeMode)">卖大厅权限：可挂</span>
+                                    <span v-if="[77, 78].includes(row.tradeMode)">{{ t('account.fundacct.edit.tradeMode78') }}</span>
                                     <template v-else-if="row.tradeProperty === 4">
                                         <el-select v-model="row.spotRightType">
                                             <template v-for="item in getMarketbstypeOptions(row.fspotRightType)"
@@ -57,7 +57,7 @@
                         </el-table>
                     </el-form-item>
                 </template>
-                <el-form-item class="el-form-item--row" label="授权登录账户(交易员)">
+                <el-form-item class="el-form-item--row" :label="t('account.fundacct.edit.tips1')">
                     <!-- <el-checkbox-group v-model="formData.loginIds">
                         <template v-for="value in data.loginaccount" :key="value">
                             <el-checkbox :label="value" :value="value" />
@@ -65,7 +65,7 @@
                     </el-checkbox-group> -->
                     {{ handleNoneValue(data.loginaccount.join(',')) }}
                 </el-form-item>
-                <el-form-item class="el-form-item--row" label="默认授权登录账户">
+                <el-form-item class="el-form-item--row" :label="t('account.fundacct.edit.tips2')">
                     {{ handleNoneValue(data.defaultloginaccount.join(',')) }}
                 </el-form-item>
             </template>

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

@@ -3,15 +3,15 @@
     <app-drawer :title="t('member.institution.broker.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
         <app-table-details :title="t('member.institution.broker.details.subtitle')" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
         <span>
-            <span>市场</span>
-            <span>市场权限:</span>
+            <span>{{ t('member.institution.broker.details.market') }}</span>
+            <span>{{ t('member.institution.broker.details.markets') }}</span>
             <span v-for="item in goodslimit" v-bind:key="item.id">
                 <span>{{ item.title }}: </span>
             </span> 
         </span>
         <span>
-            <span>市场</span>
-            <span>移动端开户地址: {{ data?.transurl }}</span>
+            <span>{{ t('member.institution.broker.details.market') }}</span>
+            <span>{{ t('member.institution.broker.details.transurl') }} {{ data?.transurl }}</span>
         </span>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>