xxxxx

public/locales/en-US.json

@@ -1051,6 +1051,7 @@
                 "edit": {
                     "title": "Edit",
                     "userid": "Institution",
+                    "parentuserid": "营销中心",
                     "title1": "Role Permission Information:",
                     "look": "View",
                     "userid2": "Permission Information",

public/locales/th-TH.json

@@ -1051,6 +1051,7 @@
                 "edit": {
                     "title": "แก้ไข",
                     "userid": "องค์กร",
+                    "parentuserid": "营销中心",
                     "title1": "ข้อมูลสิทธิ์ของบทบาท:",
                     "look": "ดู",
                     "userid2": "ข้อมูลสิทธิ์",

public/locales/vi-VN.json

@@ -1051,6 +1051,7 @@
                 "edit": {
                     "title": "Chỉnh sửa",
                     "userid": "Cơ quan",
+                    "parentuserid": "营销中心",
                     "title1": "Thông tin quyền hạn của vai trò:",
                     "look": "Xem",
                     "userid2": "Thông tin quyền hạn",

public/locales/zh-CN.json

@@ -1051,6 +1051,7 @@
                 "edit": {
                     "title": "编辑",
                     "userid": "机构",
+                    "parentuserid": "营销中心",
                     "title1": "角色权限信息:",
                     "look": "查看",
                     "userid2": "权限信息",

public/locales/zh-TW.json

@@ -1051,6 +1051,7 @@
                 "edit": {
                     "title": "編輯",
                     "userid": "機構",
+                    "parentuserid": "营销中心",
                     "title1": "角色權限資訊:",
                     "look": "查看",
                     "userid2": "權限資訊",

src/packages/pc/components/base/remote-select/index.vue

@@ -3,7 +3,7 @@
     <el-select class="app-remote-select" :empty-values="emptyValues" :placeholder="placeholder" remote filterable
         clearable>
         <template #header>
-            <el-button text bg size="small" @click="$emit('reset')">重置</el-button>
+            <el-button text bg size="small" @click="$emit('reset')">{{ t('operation.reset') }}</el-button>
         </template>
         <el-option v-for="(item, index) in options" :key="index" :label="item[defaultProps.label]"
             :value="item[defaultProps.value]">
@@ -16,6 +16,8 @@
 import { i18n } from '@/stores';
 import { computed, PropType } from 'vue'
 
+const { global: { t } } = i18n
+
 const props = defineProps({
     options: {
         type: Array as any, // eslint-disable-next-line

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

@@ -12,7 +12,7 @@
                     <el-button @click="openComponent('Roles')">{{ t('member.institution.broker.edit.look') }}</el-button>
                     <span>{{ manger }}</span>
                 </el-form-item>
-                <el-form-item label="营销中心" prop="parentuserid">
+                <el-form-item :label="t('member.institution.broker.edit.parentuserid')" prop="parentuserid">
                     <app-select-member2 v-model="formData.parentuserid"  :placeholder="t('investor.custom.riskcfg.edit.tips1')" :params="{ roles: '3' }"/>
                 </el-form-item>
             </fieldset>

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

@@ -12,11 +12,8 @@
                     <el-button @click="openComponent('Roles')">{{ t('member.institution.marketer.edit.look') }}</el-button>
                     <span>{{ manger }}</span>
                 </el-form-item>
-                <el-form-item :label="t('member.institution.marketer.edit.customertype')" prop="customertype">
-                    <el-select v-model="formData.customertype" :placeholder="t('common.pleasechoice')" @change="run">
-                        <el-option v-for="item in getCustomerTypeList()" :key="item.value" :label="item.label"
-                        :value="item.value" />
-                    </el-select>
+                <el-form-item :label="t('member.institution.marketer.edit.customertype')" prop="marketerType">
+                    <app-enum code="marketerType" v-model="formData.customertype" />
                 </el-form-item>
             </fieldset>
             <fieldset class="g-fieldset el-form--horizontal">
@@ -49,7 +46,6 @@ import { useComponent } from '@/hooks/component'
 import { i18n } from '@/stores'
 import { roleadd, initAdd, getOragnDefaultManager, queryRoleDetail } from '@/services/api/member'
 import { useEnum } from '@/hooks/enum'
-import { getCustomerTypeList } from '@/constants/member'
 import { useRequest } from '@/hooks/request'
 import { getRiskRatioTypeForMarketer } from '@/services/api/investor'
 import { CellProp } from '@pc/components/base/table-details/types'
@@ -57,6 +53,7 @@ import { queryTAAccountList } from '@/services/api/common'
 import AppSelectMember from '@pc/components/modules/select-member/index.vue'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTableDetails from '@pc/components/base/table-details/index.vue'
+import AppEnum from '@pc/components/modules/enum/index.vue'
 
 const flagEnum = useEnum('flag') // 确认状态
 const marketerTypeEnum = useEnum('marketerType') // 风险率类型

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

@@ -123,12 +123,12 @@ import { decryptAES } from '@/services/crypto'
 import { useRequest } from '@/hooks/request'
 import { wskhUserinfoAdd, queryWskhUserinfoDetail } from '@/services/api/member'
 import { UserInfoType, Gender } from '@/constants/member'
+import { i18n } from '@/stores'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppUpload from '@pc/components/base/upload/index.vue'
 import AppEnum from '@pc/components/modules/enum/index.vue'
 import AppRegion from '@pc/components/modules/region/index.vue'
 import AppSelectMember from '@pc/components/modules/select-member/index.vue'
-import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {

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

@@ -43,7 +43,7 @@
                 <el-form-item :label="t('member.institution.tradecfg.add.paramid')" prop="paramid">
                     <el-select v-model="formData.paramid" @change="onResultChange" clearable>
                         <template v-for="(item, index) in resultData?.results" :key="index">
-                            <el-option :label="item.enumdicname" :value="item.enumitemname" />
+                            <el-option :label="customerType.getEnumTypeName(item.enumitemname)" :value="item.enumitemname" />
                         </template>
                     </el-select>
                 </el-form-item>
@@ -106,8 +106,11 @@ import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppSelectMember from '@pc/components/modules/select-member/index.vue'
 
-const feetypeEnum = useEnum('feetype')
+const customerType = useEnum('customerType')
 const scfRiskMode = useEnum('SCFRiskMode')
+const feetypeEnum = useEnum('feetype')
+const traderule = useEnum('traderule')
+const tradefee = useEnum('tradefee')
 
 const { global: { t } } = i18n
 const formRef = ref<FormInstance>()
@@ -172,13 +175,13 @@ const { data: resultData, run: getResultList } = useRequest(loadSelectOption, {
 })
 
 const ruleColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'rulename', label: 'member.institution.tradecfg.add.rulename' },
+    { field: 'ruleid', label: 'member.institution.tradecfg.add.rulename', formatValue: (val) => traderule.getEnumTypeName(val) },
     { field: 'paramvalue', label: 'member.institution.tradecfg.add.paramvalue' },
     { field: 'cvalue', label: 'member.institution.tradecfg.add.cvalue' },
 ])
 
 const feeColumns = computed<Model.TableColumn[]>(() => [
-    { field: 'tradefeename', label: 'member.institution.tradecfg.add.tradefeename' },
+    { field: 'tradefeeid', label: 'member.institution.tradecfg.add.tradefeename', formatValue: (val) => tradefee.getEnumTypeName(val) },
     { field: 'exchangevalue', label: 'member.institution.tradecfg.add.exchangevalue' },
     { field: 'feealgorithm', label: 'member.institution.tradecfg.add.feealgorithm', formatValue: (val) => scfRiskMode.getEnumTypeName(val) },
     { field: 'fee', label: 'member.institution.tradecfg.add.fee', width: 200 },