xxxxx

public/locales/en-US.json

@@ -1430,9 +1430,8 @@
                 "tradefee": "Transaction service fee",
                 "name1": "Self-operated member account personalized settings",
                 "name2": "Market maker member account personalized settings",
-                "userName": "Self-operated",
-                "userName1": "Market maker",
-                "userName2": "Member",
+                "userName": "Self-operated Member",
+                "userName1": "Market maker Member",
                 "accountName": "Capital account",
                 "goodsName": "Commodity",
                 "customerType": "Margin category",

public/locales/th-TH.json

@@ -1430,9 +1430,8 @@
                 "tradefee": "ค่าธรรมเนียมการซื้อขาย",
                 "name1": "การตั้งค่าพิเศษของบัญชีสมาชิกการค้าเอง",
                 "name2": "การตั้งค่าพิเศษของบัญชีสมาชิกทำตลาด",
-                "userName": "การค้าเอง",
-                "userName1": "ทำตลาด",
-                "userName2": "สมาชิก",
+                "userName": "การค้าเองสมาชิก",
+                "userName1": "ทำตลาดสมาชิก",
                 "accountName": "บัญชีเงิน",
                 "goodsName": "สินค้า",
                 "customerType": "ประเภทประกันธนาคาร",

public/locales/vi-VN.json

@@ -1430,9 +1430,8 @@
                 "tradefee": "Phí dịch vụ giao dịch",
                 "name1": "Cài đặt cá nhân hóa tài khoản thành viên tự giao dịch",
                 "name2": "Cài đặt cá nhân hóa tài khoản thành viên tạo thị trường",
-                "userName": "Tự giao dịch",
-                "userName1": "Tạo thị trường",
-                "userName2": "Thành viên",
+                "userName": "Tự giao dịch Thành viên",
+                "userName1": "Tạo thị trường Thành viên",
                 "accountName": "Tài khoản tiền",
                 "goodsName": "Sản phẩm",
                 "customerType": "Loại bảo lãnh",

public/locales/zh-CN.json

@@ -1430,9 +1430,8 @@
                 "tradefee": "交易服务费",
                 "name1": "自营会员账户个性化设置",
                 "name2": "做市会员账户个性化设置",
-                "userName": "自营",
-                "userName1": "做市",
-                "userName2": "会员",
+                "userName": "自营会员",
+                "userName1": "做市会员",
                 "accountName": "资金账户",
                 "goodsName": "商品",
                 "customerType": "保证金类别",

public/locales/zh-TW.json

@@ -1430,9 +1430,8 @@
                 "tradefee": "交易服務費",
                 "name1": "自營會員帳戶個性化設定",
                 "name2": "做市會員帳戶個性化設定",
-                "userName": "自營",
-                "userName1": "做市",
-                "userName2": "會員",
+                "userName": "自營會員",
+                "userName1": "做市會員",
                 "accountName": "資金帳戶",
                 "goodsName": "商品",
                 "customerType": "保證金類別",

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

@@ -107,7 +107,7 @@ const detailProps = computed<CellProp[]>(() => {
     const { notesaferatio } = selectedItem.value ?? {}
     return [
         { prop: 'riskcontrolmode', label: 'member.institution.riskcfg.edit.riskcontrolmode', formatValue: (val) => val === 1 ? t('member.institution.riskcfg.edit.riskcontrolmode1') : t('member.institution.riskcfg.edit.riskcontrolmode2') },
-        { prop: 'customertype', label: 'member.institution.riskcfg.edit.customertype', formatValue: (val) => marketerTypeEnum.getEnumTypeName(val) },
+        { prop: 'customertype', label: 'member.institution.riskcfg.edit.customertype1', formatValue: (val) => marketerTypeEnum.getEnumTypeName(val) },
         { prop: 'riskratiocalcmode', label: 'member.institution.riskcfg.edit.riskratiocalcmode', formatValue: (val) => val === 1 ? t('member.institution.riskcfg.edit.riskratiocalcmode1') : t('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 },

src/packages/pc/views/member/institution/tradecfg/index.vue

@@ -86,6 +86,8 @@ const { global: { t } } = i18n
 const customerTypeEnum = useEnum('customerType')
 const feetypeEnum = useEnum('feetype')
 const scfRiskMode = useEnum('SCFRiskMode')
+const traderule = useEnum('traderule')
+const tradefee = useEnum('tradefee')
 
 const treeRef = ref()
 const nodeList = ref<(Member.CreateTreeRsp & { children: Member.CreateTreeRsp[]; })[]>([])
@@ -171,20 +173,20 @@ const { data, run: getDetails } = useRequest(OrganDetailTradeConfigView, {
 })
 
 const detailProps = computed<CellProp[]>(() => [
-    { prop: 'userName', formatLabel: () => (data.value?.tradetype === 1 ? 'member.institution.tradecfg.userName' : 'member.institution.tradecfg.userName1') + 'member.institution.tradecfg.userName2' },
+    { prop: 'userName', formatLabel: () => (data.value?.tradetype === 1 ? 'member.institution.tradecfg.userName' : 'member.institution.tradecfg.userName1') },
     { prop: 'accountName', label: 'member.institution.tradecfg.accountName' },
     { prop: 'goodsName', label: 'member.institution.tradecfg.goodsName' },
     { prop: 'customerType', label: 'member.institution.tradecfg.customerType', formatValue: () => customerTypeEnum.getEnumTypeName(data.value?.paramid) },
 ])
 
 const ruleColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'rulename', label: 'member.institution.tradecfg.rulename' },
+    { field: 'ruleid', label: 'member.institution.tradecfg.rulename', formatValue: (val) => traderule.getEnumTypeName(val) },
     { field: 'paramvalue', label: 'member.institution.tradecfg.paramvalue' },
     { field: 'cvalue', label: 'member.institution.tradecfg.cvalue' },
 ])
 
 const feeColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'tradefeename', label: 'member.institution.tradecfg.tradefeename' },
+    { field: 'tradefeeid', label: 'member.institution.tradecfg.tradefeename', formatValue: (val) => tradefee.getEnumTypeName(val) },
     { field: 'exchangevalue', label: 'member.institution.tradecfg.exchangevalue' },
     { field: 'cvalue', label: 'member.institution.tradecfg.cvalue' },
 ])