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

public/locales/en-US.json

@@ -594,22 +594,22 @@
                 "outmemberuserid": "Transferor",
                 "inuserid": "Transferee",
                 "edit": {
-                    "title": "编辑",
-                    "legend": "转出",
-                    "legend1": "转入",
-                    "diversiontype": "转移类型",
-                    "outinvestor": "转出交易商",
-                    "memberUserName": "所属会员",
-                    "parentUserName": "所属机构",
-                    "cardtypeid": "证件类型",
-                    "cardnum": "证件号码",
-                    "outmemberuserid": "转出所属会员",
-                    "outparentuserid": "转出所属机构",
-                    "inmemberuserid": "转入所属会员",
-                    "inuserid": "转入所属机构",
-                    "cardtypeid1": "机构证件类型",
-                    "cardnum1": "机构证件号码",
-                    "tips": "*交易商转移将会在系统结算时处理"
+                    "title": "Edit",
+                    "legend": "Transfer out",
+                    "legend1": "Transfer in",
+                    "diversiontype": "Transfer type",
+                    "outinvestor": "Transfer-out dealer",
+                    "memberUserName": "Affiliated member",
+                    "parentUserName": "Affiliated institution",
+                    "cardtypeid": "Certificate type",
+                    "cardnum": "Certificate number",
+                    "outmemberuserid": "Transfer-out affiliated member",
+                    "outparentuserid": "Transfer-out affiliated institution",
+                    "inmemberuserid": "Transfer-in affiliated member",
+                    "inuserid": "Transfer-in affiliated institution",
+                    "cardtypeid1": "Institutional certificate type",
+                    "cardnum1": "Institutional certificate number",
+                    "tips": "*The dealer transfer will be processed during the system settlement."
                 }
             },
             "user": {
@@ -1097,19 +1097,7 @@
                 "marketid": "Market",
                 "goodsid": "Product",
                 "tips1": "Please select economic member",
-                "tips2": "Enter code or name",
-                "delete": {
-                    "tips": "确认删除该配置？"
-                },
-                "edit": {
-                    "title": "编辑",
-                    "userid": "经纪会员",
-                    "marketid": "市场",
-                    "goodsid": "商品",
-                    "isnodisplay": "是否不显示",
-                    "iscannotbuy": "是否不能建买",
-                    "iscannotsell": "是否不能建卖"
-                }
+                "tips2": "Enter code or name"
             },
             "industry": {
                 "memberuserid": "Organization Code",

public/locales/th-TH.json

@@ -594,22 +594,22 @@
                 "outmemberuserid": "ผู้โอนออก",
                 "inuserid": "ผู้รับโอน",
                 "edit": {
-                    "title": "编辑",
-                    "legend": "转出",
-                    "legend1": "转入",
-                    "diversiontype": "转移类型",
-                    "outinvestor": "转出交易商",
-                    "memberUserName": "所属会员",
-                    "parentUserName": "所属机构",
-                    "cardtypeid": "证件类型",
-                    "cardnum": "证件号码",
-                    "outmemberuserid": "转出所属会员",
-                    "outparentuserid": "转出所属机构",
-                    "inmemberuserid": "转入所属会员",
-                    "inuserid": "转入所属机构",
-                    "cardtypeid1": "机构证件类型",
-                    "cardnum1": "机构证件号码",
-                    "tips": "*交易商转移将会在系统结算时处理"
+                    "title": "แก้ไข",
+                    "legend": "โอนออก",
+                    "legend1": "โอนเข้า",
+                    "diversiontype": "ประเภทการโอน",
+                    "outinvestor": "ผู้ค้าโอนออก",
+                    "memberUserName": "สมาชิกที่เกี่ยวข้อง",
+                    "parentUserName": "สถานประกอบการที่เกี่ยวข้อง",
+                    "cardtypeid": "ประเภทเอกสารตัวตน",
+                    "cardnum": "หมายเลขเอกสารตัวตน",
+                    "outmemberuserid": "สมาชิกที่เกี่ยวข้องกับการโอนออก",
+                    "outparentuserid": "สถานประกอบการที่เกี่ยวข้องกับการโอนออก",
+                    "inmemberuserid": "สมาชิกที่เกี่ยวข้องกับการโอนเข้า",
+                    "inuserid": "สถานประกอบการที่เกี่ยวข้องกับการโอนเข้า",
+                    "cardtypeid1": "ประเภทเอกสารของสถานประกอบการ",
+                    "cardnum1": "หมายเลขเอกสารของสถานประกอบการ",
+                    "tips": "*การย้ายผู้ค้า จะถูกประมวลผลขณะระบบทำการปิดยอดและชำระเงิน"
                 }
             },
             "user": {
@@ -1097,19 +1097,7 @@
                 "marketid": "ตลาด",
                 "goodsid": "สินค้า",
                 "tips1": "กรุณาเลือกสมาชิกเศรษฐกิจ",
-                "tips2": "ป้อนรหัสหรือชื่อ",
-                "delete": {
-                    "tips": "确认删除该配置？"
-                },
-                "edit": {
-                    "title": "编辑",
-                    "userid": "经纪会员",
-                    "marketid": "市场",
-                    "goodsid": "商品",
-                    "isnodisplay": "是否不显示",
-                    "iscannotbuy": "是否不能建买",
-                    "iscannotsell": "是否不能建卖"
-                }
+                "tips2": "ป้อนรหัสหรือชื่อ"
             },
             "industry": {
                 "memberuserid": "รหัสองค์กร",

public/locales/vi-VN.json

@@ -594,22 +594,22 @@
                 "outmemberuserid": "Đối tượng xuất",
                 "inuserid": "Đối tượng nhập",
                 "edit": {
-                    "title": "编辑",
-                    "legend": "转出",
-                    "legend1": "转入",
-                    "diversiontype": "转移类型",
-                    "outinvestor": "转出交易商",
-                    "memberUserName": "所属会员",
-                    "parentUserName": "所属机构",
-                    "cardtypeid": "证件类型",
-                    "cardnum": "证件号码",
-                    "outmemberuserid": "转出所属会员",
-                    "outparentuserid": "转出所属机构",
-                    "inmemberuserid": "转入所属会员",
-                    "inuserid": "转入所属机构",
-                    "cardtypeid1": "机构证件类型",
-                    "cardnum1": "机构证件号码",
-                    "tips": "*交易商转移将会在系统结算时处理"
+                    "title": "Sửa",
+                    "legend": "Chuyển ra",
+                    "legend1": "Chuyển vào",
+                    "diversiontype": "Loại chuyển chuyển",
+                    "outinvestor": "Người thương mại chuyển ra",
+                    "memberUserName": "Thành viên thuộc về",
+                    "parentUserName": "Cơ quan thuộc về",
+                    "cardtypeid": "Loại giấy tờ",
+                    "cardnum": "Số giấy tờ",
+                    "outmemberuserid": "Thành viên thuộc về chuyển ra",
+                    "outparentuserid": "Cơ quan thuộc về chuyển ra",
+                    "inmemberuserid": "Thành viên thuộc về chuyển vào",
+                    "inuserid": "Cơ quan thuộc về chuyển vào",
+                    "cardtypeid1": "Loại giấy tờ của cơ quan",
+                    "cardnum1": "Số giấy tờ của cơ quan",
+                    "tips": "*Việc chuyển đổi người thương mại sẽ được xử lý trong thời gian kết toán hệ thống"
                 }
             },
             "user": {
@@ -1097,19 +1097,7 @@
                 "marketid": "Thị trường",
                 "goodsid": "Hàng hóa",
                 "tips1": "Vui lòng chọn thành viên kinh tế",
-                "tips2": "Nhập mã hoặc tên",
-                "delete": {
-                    "tips": "确认删除该配置？"
-                },
-                "edit": {
-                    "title": "编辑",
-                    "userid": "经纪会员",
-                    "marketid": "市场",
-                    "goodsid": "商品",
-                    "isnodisplay": "是否不显示",
-                    "iscannotbuy": "是否不能建买",
-                    "iscannotsell": "是否不能建卖"
-                }
+                "tips2": "Nhập mã hoặc tên"
             },
             "industry": {
                 "memberuserid": "Mã tổ chức",

public/locales/zh-CN.json

@@ -1097,19 +1097,7 @@
                 "marketid": "市场",
                 "goodsid": "商品",
                 "tips1": "请选择经纪会员",
-                "tips2": "输入代码或名称",
-                "delete": {
-                    "tips": "确认删除该配置？"
-                },
-                "edit": {
-                    "title": "编辑",
-                    "userid": "经纪会员",
-                    "marketid": "市场",
-                    "goodsid": "商品",
-                    "isnodisplay": "是否不显示",
-                    "iscannotbuy": "是否不能建买",
-                    "iscannotsell": "是否不能建卖"
-                }
+                "tips2": "输入代码或名称"
             },
             "industry": {
                 "memberuserid": "机构代码",

public/locales/zh-TW.json

@@ -594,22 +594,22 @@
                 "outmemberuserid": "轉出方",
                 "inuserid": "轉入方",
                 "edit": {
-                    "title": "编辑",
-                    "legend": "转出",
-                    "legend1": "转入",
-                    "diversiontype": "转移类型",
-                    "outinvestor": "转出交易商",
-                    "memberUserName": "所属会员",
-                    "parentUserName": "所属机构",
-                    "cardtypeid": "证件类型",
-                    "cardnum": "证件号码",
-                    "outmemberuserid": "转出所属会员",
-                    "outparentuserid": "转出所属机构",
-                    "inmemberuserid": "转入所属会员",
-                    "inuserid": "转入所属机构",
-                    "cardtypeid1": "机构证件类型",
-                    "cardnum1": "机构证件号码",
-                    "tips": "*交易商转移将会在系统结算时处理"
+                    "title": "編輯",
+                    "legend": "轉出",
+                    "legend1": "轉入",
+                    "diversiontype": "轉移類型",
+                    "outinvestor": "轉出交易商",
+                    "memberUserName": "所屬會員",
+                    "parentUserName": "所屬機構",
+                    "cardtypeid": "證件類型",
+                    "cardnum": "證件號碼",
+                    "outmemberuserid": "轉出所屬會員",
+                    "outparentuserid": "轉出所屬機構",
+                    "inmemberuserid": "轉入所屬會員",
+                    "inuserid": "轉入所屬機構",
+                    "cardtypeid1": "機構證件類型",
+                    "cardnum1": "機構證件號碼",
+                    "tips": "*交易商轉移將會在系統結算時處理"
                 }
             },
             "user": {
@@ -1097,19 +1097,7 @@
                 "marketid": "市場",
                 "goodsid": "商品",
                 "tips1": "請選擇經濟會員",
-                "tips2": "輸入代碼或名稱",
-                "delete": {
-                    "tips": "确认删除该配置？"
-                },
-                "edit": {
-                    "title": "编辑",
-                    "userid": "经纪会员",
-                    "marketid": "市场",
-                    "goodsid": "商品",
-                    "isnodisplay": "是否不显示",
-                    "iscannotbuy": "是否不能建买",
-                    "iscannotsell": "是否不能建卖"
-                }
+                "tips2": "輸入代碼或名稱"
             },
             "industry": {
                 "memberuserid": "機構代碼",

src/packages/pc/views/investor/custom/accountcfg/components/add/index.vue

@@ -139,6 +139,8 @@ import SelectInvestor from './select-investor/index.vue'
 
 const feetypeEnum = useEnum('feetype')
 const scfRiskMode = useEnum('SCFRiskMode')
+const traderule = useEnum('traderule')
+const tradefee = useEnum('tradefee')
 
 const { global: { t } } = i18n
 const formRef = ref<FormInstance>()
@@ -203,7 +205,7 @@ const { data: resultData, run: getResultList } = useRequest(loadSelectOption, {
 })
 
 const ruleColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'rulename', label: 'investor.custom.accountcfg.add.rulename' },
+    { field: 'ruleid', label: 'investor.custom.accountcfg.add.rulename', formatValue: (val) => traderule.getEnumTypeName(val) },
     { field: 'paramvalue', label: 'investor.custom.accountcfg.add.paramvalue' },
     { field: 'dvalue', label: 'investor.custom.accountcfg.add.dvalue' },
     { field: 'gvalue', label: 'investor.custom.accountcfg.add.gvalue' },
@@ -211,7 +213,7 @@ const ruleColumns = computed<Model.TableColumn[]>(() => [
 ])
 
 const feeColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'tradefeename', label: 'investor.custom.accountcfg.add.tradefeename' },
+    { field: 'tradefeeid', label: 'investor.custom.accountcfg.add.tradefeename', formatValue: (val) => tradefee.getEnumTypeName(val) },
     { field: 'exchangevalue', label: 'investor.custom.accountcfg.add.exchangevalue' },
     { field: 'dvalue', label: 'investor.custom.accountcfg.add.dvalue' },
     { field: 'gvalue', label: 'investor.custom.accountcfg.add.gvalue' },

src/packages/pc/views/investor/custom/accountcfg/components/edit/index.vue

@@ -132,6 +132,8 @@ const props = defineProps({
 
 const feetypeEnum = useEnum('feetype')
 const scfRiskMode = useEnum('SCFRiskMode')
+const traderule = useEnum('traderule')
+const tradefee = useEnum('tradefee')
 
 const { global: { t } } = i18n
 const formRef = shallowRef<FormInstance>()
@@ -176,7 +178,7 @@ const { data: resultData } = useRequest(loadSelectOption, {
 })
 
 const ruleColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'rulename', label: 'investor.custom.accountcfg.edit.rulename' },
+    { field: 'ruleid', label: 'investor.custom.accountcfg.edit.rulename', formatValue: (val) => traderule.getEnumTypeName(val) },
     { field: 'paramvalue', label: 'investor.custom.accountcfg.edit.paramvalue' },
     { field: 'dvalue', label: 'investor.custom.accountcfg.edit.dvalue' },
     { field: 'gvalue', label: 'investor.custom.accountcfg.edit.gvalue' },
@@ -184,7 +186,7 @@ const ruleColumns = computed<Model.TableColumn[]>(() => [
 ])
 
 const feeColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'tradefeename', label: 'investor.custom.accountcfg.edit.tradefeename' },
+    { field: 'tradefeeid', label: 'investor.custom.accountcfg.edit.tradefeename', formatValue: (val) => tradefee.getEnumTypeName(val) },
     { field: 'exchangevalue', label: 'investor.custom.accountcfg.edit.exchangevalue' },
     { field: 'dvalue', label: 'investor.custom.accountcfg.edit.dvalue' },
     { field: 'gvalue', label: 'investor.custom.accountcfg.edit.gvalue' },

src/packages/pc/views/investor/custom/accountcfg/index.vue

@@ -118,6 +118,8 @@ import { i18n } from '@/stores'
 const customerTypeEnum = useEnum('customerType')
 const feetypeEnum = useEnum('feetype')
 const scfRiskMode = useEnum('SCFRiskMode')
+const traderule = useEnum('traderule')
+const tradefee = useEnum('tradefee')
 
 const { global: { t } } = i18n
 
@@ -200,15 +202,15 @@ const detailProps = computed<CellProp[]>(() => [
 ])
 
 const ruleColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'rulename', label: 'investor.custom.accountcfg.rulename' },
-    { field: 'paramvalue', label: 'investor.custom.accountcfg.paramvalue' },
+    { field: 'ruleid', label: 'investor.custom.accountcfg.rulename' },
+    { field: 'paramvalue', label: 'investor.custom.accountcfg.paramvalue', formatValue: (val) => traderule.getEnumTypeName(val) },
     { field: 'dvalue', label: 'investor.custom.accountcfg.dvalue' },
     { field: 'gvalue', label: 'investor.custom.accountcfg.gvalue' },
     { field: 'cvalue', label: 'investor.custom.accountcfg.cvalue' },
 ])
 
 const feeColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'tradefeename', label: 'investor.custom.accountcfg.tradefeename' },
+    { field: 'tradefeeid', label: 'investor.custom.accountcfg.tradefeename', formatValue: (val) => tradefee.getEnumTypeName(val) },
     { field: 'exchangevalue', label: 'investor.custom.accountcfg.exchangevalue' },
     { field: 'dvalue', label: 'investor.custom.accountcfg.dvalue' },
     { field: 'gvalue', label: 'investor.custom.accountcfg.gvalue' },

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/components/edit/index.vue

@@ -90,6 +90,8 @@ const props = defineProps({
 
 const feetypeEnum = useEnum('feetype')
 const scfRiskMode = useEnum('SCFRiskMode')
+const traderule = useEnum('traderule')
+const tradefee = useEnum('tradefee')
 
 const { global: { t } } = i18n
 const formRef = shallowRef<FormInstance>()
@@ -134,13 +136,13 @@ const { data: resultData } = useRequest(loadSelectOption, {
 })
 
 const ruleColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'rulename', label: 'member.institution.tradecfg.edit.rulename' },
+    { field: 'ruleid', label: 'member.institution.tradecfg.edit.rulename', formatValue: (val) => traderule.getEnumTypeName(val) },
     { field: 'paramvalue', label: 'member.institution.tradecfg.edit.paramvalue' },
     { field: 'cvalue', label: 'member.institution.tradecfg.edit.cvalue' },
 ])
 
 const feeColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'tradefeename', label: 'member.institution.tradecfg.edit.tradefeename' },
+    { field: 'tradefeeid', label: 'member.institution.tradecfg.edit.tradefeename', formatValue: (val) => tradefee.getEnumTypeName(val) },
     { field: 'exchangevalue', label: 'member.institution.tradecfg.edit.exchangevalue' },
     { field: 'feealgorithm', label: 'member.institution.tradecfg.edit.feealgorithm', formatValue: (val) => scfRiskMode.getEnumTypeName(val) },
     { field: 'fee', label: 'member.institution.tradecfg.edit.fee', width: 200 },

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' },
 ])