xxxxx

public/locales/en-US.json

@@ -1131,7 +1131,8 @@
                 "details": {
                     "title": "Details",
                     "subtitle": "Basic information",
-                    "subtitle2": "Commodity query permission",
+                    "subtitle2": "市场权限",
+                    "market": "市场",
                     "accountname": "Name",
                     "userName": "Administrator",
                     "reckonaccountid": "Capital account"
@@ -1419,6 +1420,7 @@
                     "title": "Details",
                     "subtitle": "Basic information",
                     "market": "Market",
+                    "markets": "市场权限:",
                     "accountname": "Name",
                     "userName": "Administrator",
                     "reckonaccountid": "Capital account"

public/locales/th-TH.json

@@ -1131,7 +1131,8 @@
                 "details": {
                     "title": "รายละเอียด",
                     "subtitle": "ข้อมูลพื้นฐาน",
-                    "subtitle2": "สิทธิการค้นหาสินค้า",
+                    "subtitle2": "市场权限",
+                    "market": "市场",
                     "accountname": "ชื่อ",
                     "userName": "ผู้ดูแลระบบ",
                     "reckonaccountid": "บัญชีเงิน"
@@ -1419,6 +1420,7 @@
                     "title": "รายละเอียด",
                     "subtitle": "ข้อมูลพื้นฐาน",
                     "market": "ตลาด",
+                    "markets": "市场权限:",
                     "accountname": "ชื่อ",
                     "userName": "ผู้ดูแลระบบ",
                     "reckonaccountid": "บัญชีเงิน"

public/locales/vi-VN.json

@@ -1131,7 +1131,8 @@
                 "details": {
                     "title": "Chi tiết",
                     "subtitle": "Thông tin cơ bản",
-                    "subtitle2": "Quyền truy vấn sản phẩm",
+                    "subtitle2": "市场权限",
+                    "market": "市场",
                     "accountname": "Tên",
                     "userName": "Quản trị viên",
                     "reckonaccountid": "Tài khoản tiền"
@@ -1419,6 +1420,7 @@
                     "title": "Chi tiết",
                     "subtitle": "Thông tin cơ bản",
                     "market": "Thị trường",
+                    "markets": "市场权限:",
                     "accountname": "Tên",
                     "userName": "Quản trị viên",
                     "reckonaccountid": "Tài khoản tiền"

public/locales/zh-CN.json

@@ -1131,7 +1131,8 @@
                 "details": {
                     "title": "详情",
                     "subtitle": "基本信息",
-                    "subtitle2": "商品查询权限",
+                    "subtitle2": "市场权限",
+                    "market": "市场",
                     "accountname": "名称",
                     "userName": "管理员",
                     "reckonaccountid": "资金账户"
@@ -1419,6 +1420,7 @@
                     "title": "详情",
                     "subtitle": "基本信息",
                     "market": "市场",
+                    "markets": "市场权限:",
                     "accountname": "名称",
                     "userName": "管理员",
                     "reckonaccountid": "资金账户"

public/locales/zh-TW.json

@@ -1131,7 +1131,8 @@
                 "details": {
                     "title": "詳情",
                     "subtitle": "基本資訊",
-                    "subtitle2": "商品查詢權限",
+                    "subtitle2": "市场权限",
+                    "market": "市场",
                     "accountname": "名稱",
                     "userName": "管理員",
                     "reckonaccountid": "資金帳戶"
@@ -1419,6 +1420,7 @@
                     "title": "詳情",
                     "subtitle": "基本資訊",
                     "market": "市場",
+                    "markets": "市场权限:",
                     "accountname": "名稱",
                     "userName": "管理員",
                     "reckonaccountid": "資金帳戶"

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

@@ -51,7 +51,7 @@ const { data } = useRequest(queryRoleDetail, {
     }
 })
 
-const goodslimit = computed(() => data.value?.markets.map(e => `${e.marketname+': '+goodsinfo(e.marketid)}`) ?? [])
+const goodslimit = computed(() => data.value?.markets.map(e => `${e.marketname+goodsinfo(e.marketid)}`) ?? [])
 
 const goodsinfo = (marketid: number) => { 
     return ((data.value?.operategoodsinfo ?? []).filter(e => e.marketid === marketid).map(e => e.goodsname) ?? []).join(',') ?? ''

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

@@ -13,7 +13,7 @@
                     <span style="margin-left: 10px;">{{ manger }}</span>
                 </el-form-item>
                 <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="{ exists: '3' }"/>
+                    <app-select-member v-model="formData.parentuserid"  :placeholder="t('investor.custom.riskcfg.edit.tips1')" :params="{ roles: '3' }"/>
                 </el-form-item>
             </fieldset>
             <fieldset class="g-fieldset el-form--horizontal">
@@ -73,7 +73,6 @@ import { handleNoneValue } from '@/filters'
 import { roleadd, initAdd, getOragnDefaultManager, queryRoleDetail } from '@/services/api/member'
 import { useRequest } from '@/hooks/request'
 import AppSelectMember from '@pc/components/modules/select-member/index.vue'
-import AppSelectMember2 from '@pc/components/modules/select-member2/index.vue'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
 const props = defineProps({

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

@@ -57,7 +57,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'accountname', label: 'member.institution.broker.accountname' },
     { field: 'accountid', label: 'member.institution.broker.accountid' },
     { field: 'accountstatus', label: 'member.institution.broker.accountstatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
-    { field: 'operation', label: 'member.institution.broker.operation' },
+    { field: 'userName', label: 'member.institution.broker.operation' },
     { field: 'rolemodifytime', label: 'member.institution.broker.rolemodifytime', formatValue:(val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])

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

@@ -64,7 +64,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'accountname', label: 'member.institution.broker.accountname' },
     { field: 'accountid', label: 'member.institution.broker.accountid' },
     { field: 'accountstatus', label: 'member.institution.broker.accountstatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
-    { field: 'operation', label: 'member.institution.broker.operation' },
+    { field: 'userName', label: 'member.institution.broker.operation' },
     { field: 'rolemodifytime', label: 'member.institution.broker.rolemodifytime', formatValue:(val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])

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

@@ -4,7 +4,7 @@
         :loading="loading">
         <app-table-details :title="t('member.institution.industry.details.subtitle')" :data="data?.organ"
             :label-width="160" :cell-props="detailProps1" :column="2" />
-        <app-table-details title="市场" :data="data?.organ" :label-width="160" :cell-props="detailProps2">
+        <app-table-details :title="t('member.institution.industry.details.market')" :data="data?.organ" :label-width="160" :cell-props="detailProps2">
             <template #market>
                 {{ goodslimit.join(',') }}
             </template>

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

@@ -64,7 +64,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'accountname', label: 'member.institution.industry.accountname' },
     { field: 'accountid', label: 'member.institution.industry.accountid' },
     { field: 'accountstatus', label: 'member.institution.industry.accountstatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
-    { field: 'operation', label: 'member.institution.industry.operation' },
+    { field: 'userName', label: 'member.institution.industry.operation' },
     { field: 'rolemodifytime', label: 'member.institution.industry.rolemodifytime', formatValue:(val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])

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

@@ -64,7 +64,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'accountname', label: 'member.institution.marketer.accountname' },
     { field: 'accountid', label: 'member.institution.marketer.accountid' },
     { field: 'accountstatus', label: 'member.institution.marketer.accountstatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
-    { field: 'operation', label: 'member.institution.marketer.operation' },
+    { field: 'userName', label: 'member.institution.marketer.operation' },
     { field: 'rolemodifytime', label: 'member.institution.marketer.rolemodifytime', formatValue:(val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])

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

@@ -64,7 +64,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'accountname', label: 'member.institution.marketing.accountname' },
     { field: 'accountid', label: 'member.institution.marketing.accountid' },
     { field: 'accountstatus', label: 'member.institution.marketing.accountstatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
-    { field: 'operation', label: 'member.institution.marketing.operation' },
+    { field: 'userName', label: 'member.institution.marketing.operation' },
     { field: 'rolemodifytime', label: 'member.institution.marketing.rolemodifytime', formatValue:(val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])

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

@@ -64,7 +64,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'accountname', label: 'member.institution.operation.accountname' },
     { field: 'accountid', label: 'member.institution.operation.accountid' },
     { field: 'accountstatus', label: 'member.institution.operation.accountstatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
-    { field: 'operation', label: 'member.institution.operation.operation' },
+    { field: 'userName', label: 'member.institution.operation.operation' },
     { field: 'rolemodifytime', label: 'member.institution.operation.rolemodifytime', formatValue:(val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])

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

@@ -2,7 +2,7 @@
 <template>
     <app-drawer :title="t('member.institution.self.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
         <app-table-details :title="t('member.institution.self.details.subtitle')" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
-        <app-table-details :title="t('member.institution.self.details.market')" :data="data?.organ" :label-width="80" :cell-props="detailProps2">
+        <app-table-details :title="t('member.institution.self.details.market')" :data="data?.organ" :label-width="160" :cell-props="detailProps2">
             <template #market>
                 {{ goodslimit.join(', ') }}
             </template>
@@ -56,7 +56,7 @@ const detailProps1: CellProp[] = [
 ]
 
 const detailProps2: CellProp[] = [
-    { prop: 'market', label: 'member.institution.self.details.market' }
+    { prop: 'market', label: 'member.institution.self.details.markets' }
 ]
 
 const goodslimit = computed(() => data.value?.markets.map((e) => e.marketname) ?? [])

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

@@ -66,7 +66,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'accountname', label: 'member.institution.self.accountname' },
     { field: 'accountid', label: 'member.institution.self.accountid' },
     { field: 'accountstatus', label: 'member.institution.self.accountstatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
-    { field: 'operation', label: 'member.institution.self.operation' },
+    { field: 'userName', label: 'member.institution.self.operation' },
     { field: 'rolemodifytime', label: 'member.institution.self.rolemodifytime', formatValue:(val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])

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

@@ -64,7 +64,7 @@ const tableColumns = ref<Model.TableColumn[]>([
     { field: 'accountname', label: 'member.institution.warehouse.accountname' },
     { field: 'accountid', label: 'member.institution.warehouse.accountid' },
     { field: 'accountstatus', label: 'member.institution.warehouse.accountstatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
-    { field: 'operation', label: 'member.institution.warehouse.operation' },
+    { field: 'userName', label: 'member.institution.warehouse.operation' },
     { field: 'rolemodifytime', label: 'member.institution.warehouse.rolemodifytime', formatValue:(val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])