xxxxx

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/investor/custom/tradecfg/components/add/index.vue

@@ -116,6 +116,8 @@ import AppTable from '@pc/components/base/table/index.vue'
 import { i18n } from '@/stores'
 
 const feetypeEnum = useEnum('feetype')
+const traderule = useEnum('traderule')
+const tradefee = useEnum('tradefee')
 
 const { global: { t } } = i18n
 const formRef = ref<FormInstance>()
@@ -168,14 +170,14 @@ const { data: resultData, run: getResultList } = useRequest(initInvestorPerson,
 })
 
 const ruleColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'rulename', label: 'investor.custom.tradecfg.edit.rulename' },
+    { field: 'ruleid', label: 'investor.custom.tradecfg.edit.rulename', formatValue: (val) => traderule.getEnumTypeName(val) },
     { field: 'paramvalue', label: 'investor.custom.tradecfg.edit.paramvalue' },
     { field: 'dvalue', label: 'investor.custom.tradecfg.edit.dvalue', show: formData.usergroupid !== 0 },
     { field: 'cvalue', label: 'investor.custom.tradecfg.edit.cvalue' },
 ])
 
 const feeColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'tradefeename', label: 'investor.custom.tradecfg.edit.tradefeename' },
+    { field: 'tradefeeid', label: 'investor.custom.tradecfg.edit.tradefeename', formatValue: (val) => tradefee.getEnumTypeName(val) },
     { field: 'feealgorithm', label: 'investor.custom.tradecfg.edit.feealgorithm', formatValue: (val) => getFeeAlgorithmName(val) },
     { field: 'exchangevalue', label: 'investor.custom.tradecfg.edit.exchangevalue' },
     { field: 'dvalue', label: 'investor.custom.tradecfg.edit.dvalue', show: formData.usergroupid !== 0 },

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

@@ -111,6 +111,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>()
@@ -150,14 +152,14 @@ const { data: resultData } = useRequest(initInvestorPerson, {
 })
 
 const ruleColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'rulename', label: 'investor.custom.tradecfg.edit.rulename' },
+    { field: 'ruleid', label: 'investor.custom.tradecfg.edit.rulename', formatValue: (val) => traderule.getEnumTypeName(val) },
     { field: 'paramvalue', label: 'investor.custom.tradecfg.edit.paramvalue' },
     { field: 'dvalue', label: 'investor.custom.tradecfg.edit.dvalue', show: formData.usergroupid !== 0 },
     { field: 'cvalue', label: 'investor.custom.tradecfg.edit.cvalue' },
 ])
 
 const feeColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'tradefeename', label: 'investor.custom.tradecfg.edit.tradefeename' },
+    { field: 'tradefeeid', label: 'investor.custom.tradecfg.edit.tradefeename', formatValue: (val) => tradefee.getEnumTypeName(val) },
     { field: 'feealgorithm', label: 'investor.custom.tradecfg.edit.feealgorithm', formatValue: (val) => scfRiskMode.getEnumTypeName(val) },
     { field: 'exchangevalue', label: 'investor.custom.tradecfg.edit.exchangevalue' },
     { field: 'dvalue', label: 'investor.custom.tradecfg.edit.dvalue', show: formData.usergroupid !== 0 },

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

@@ -101,6 +101,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<(Investor.InvestorTreeRsp & { children: Investor.InvestorTreeRsp[]; })[]>([])
@@ -179,14 +181,14 @@ const detailProps = computed<CellProp[]>(() => [
 ])
 
 const ruleColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'rulename', label: 'investor.custom.tradecfg.rulename' },
+    { field: 'ruleid', label: 'investor.custom.tradecfg.rulename', formatValue: (val) => traderule.getEnumTypeName(val) },
     { field: 'paramvalue', label: 'investor.custom.tradecfg.paramvalue' },
     { field: 'dvalue', label: 'investor.custom.tradecfg.dvalue', show: qs.value.usergroupid !== 0 },
     { field: 'cvalue', label: 'investor.custom.tradecfg.cvalue' },
 ])
 
 const feeColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'tradefeename', label: 'investor.custom.tradecfg.tradefeename' },
+    { field: 'tradefeeid', label: 'investor.custom.tradecfg.tradefeename', formatValue: (val) => tradefee.getEnumTypeName(val) },
     { field: 'exchangevalue', label: 'investor.custom.tradecfg.exchangevalue' },
     { field: 'dvalue', label: 'investor.custom.tradecfg.dvalue', show: qs.value.usergroupid !== 0 },
     { field: 'cvalue', label: 'investor.custom.tradecfg.cvalue' },

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 },