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

public/locales/en-US.json

@@ -1097,7 +1097,19 @@
                 "marketid": "Market",
                 "goodsid": "Product",
                 "tips1": "Please select economic member",
-                "tips2": "Enter code or name"
+                "tips2": "Enter code or name",
+                "delete": {
+                    "tips": "确认删除该配置？"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "userid": "经纪会员",
+                    "marketid": "市场",
+                    "goodsid": "商品",
+                    "isnodisplay": "是否不显示",
+                    "iscannotbuy": "是否不能建买",
+                    "iscannotsell": "是否不能建卖"
+                }
             },
             "industry": {
                 "memberuserid": "Organization Code",
@@ -1418,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

@@ -1097,7 +1097,19 @@
                 "marketid": "ตลาด",
                 "goodsid": "สินค้า",
                 "tips1": "กรุณาเลือกสมาชิกเศรษฐกิจ",
-                "tips2": "ป้อนรหัสหรือชื่อ"
+                "tips2": "ป้อนรหัสหรือชื่อ",
+                "delete": {
+                    "tips": "确认删除该配置？"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "userid": "经纪会员",
+                    "marketid": "市场",
+                    "goodsid": "商品",
+                    "isnodisplay": "是否不显示",
+                    "iscannotbuy": "是否不能建买",
+                    "iscannotsell": "是否不能建卖"
+                }
             },
             "industry": {
                 "memberuserid": "รหัสองค์กร",
@@ -1418,9 +1430,8 @@
                 "tradefee": "ค่าธรรมเนียมการซื้อขาย",
                 "name1": "การตั้งค่าพิเศษของบัญชีสมาชิกการค้าเอง",
                 "name2": "การตั้งค่าพิเศษของบัญชีสมาชิกทำตลาด",
-                "userName": "การค้าเอง",
-                "userName1": "ทำตลาด",
-                "userName2": "สมาชิก",
+                "userName": "การค้าเองสมาชิก",
+                "userName1": "ทำตลาดสมาชิก",
                 "accountName": "บัญชีเงิน",
                 "goodsName": "สินค้า",
                 "customerType": "ประเภทประกันธนาคาร",

public/locales/vi-VN.json

@@ -1097,7 +1097,19 @@
                 "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"
+                "tips2": "Nhập mã hoặc tên",
+                "delete": {
+                    "tips": "确认删除该配置？"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "userid": "经纪会员",
+                    "marketid": "市场",
+                    "goodsid": "商品",
+                    "isnodisplay": "是否不显示",
+                    "iscannotbuy": "是否不能建买",
+                    "iscannotsell": "是否不能建卖"
+                }
             },
             "industry": {
                 "memberuserid": "Mã tổ chức",
@@ -1418,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

@@ -1097,7 +1097,19 @@
                 "marketid": "市场",
                 "goodsid": "商品",
                 "tips1": "请选择经纪会员",
-                "tips2": "输入代码或名称"
+                "tips2": "输入代码或名称",
+                "delete": {
+                    "tips": "确认删除该配置？"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "userid": "经纪会员",
+                    "marketid": "市场",
+                    "goodsid": "商品",
+                    "isnodisplay": "是否不显示",
+                    "iscannotbuy": "是否不能建买",
+                    "iscannotsell": "是否不能建卖"
+                }
             },
             "industry": {
                 "memberuserid": "机构代码",
@@ -1418,9 +1430,8 @@
                 "tradefee": "交易服务费",
                 "name1": "自营会员账户个性化设置",
                 "name2": "做市会员账户个性化设置",
-                "userName": "自营",
-                "userName1": "做市",
-                "userName2": "会员",
+                "userName": "自营会员",
+                "userName1": "做市会员",
                 "accountName": "资金账户",
                 "goodsName": "商品",
                 "customerType": "保证金类别",

public/locales/zh-TW.json

@@ -1097,7 +1097,19 @@
                 "marketid": "市場",
                 "goodsid": "商品",
                 "tips1": "請選擇經濟會員",
-                "tips2": "輸入代碼或名稱"
+                "tips2": "輸入代碼或名稱",
+                "delete": {
+                    "tips": "确认删除该配置？"
+                },
+                "edit": {
+                    "title": "编辑",
+                    "userid": "经纪会员",
+                    "marketid": "市场",
+                    "goodsid": "商品",
+                    "isnodisplay": "是否不显示",
+                    "iscannotbuy": "是否不能建买",
+                    "iscannotsell": "是否不能建卖"
+                }
             },
             "industry": {
                 "memberuserid": "機構代碼",
@@ -1418,9 +1430,8 @@
                 "tradefee": "交易服務費",
                 "name1": "自營會員帳戶個性化設定",
                 "name2": "做市會員帳戶個性化設定",
-                "userName": "自營",
-                "userName1": "做市",
-                "userName2": "會員",
+                "userName": "自營會員",
+                "userName1": "做市會員",
                 "accountName": "資金帳戶",
                 "goodsName": "商品",
                 "customerType": "保證金類別",

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

@@ -1,17 +1,81 @@
 <!-- 会员机构管理-机构管理-经纪会员管理-子机构 -->
 <template>
     <app-drawer title="子机构" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
+        <template #header>
+            <app-filter :option="filterOption" />
+        </template>
+        <app-table :data="dataList" :columns="tableColumns" :loading="loading" />
+        <component :is="componentMap.get(componentId)" v-bind="{ record }" @closed="closeComponent"
+            v-if="componentId" />
     </app-drawer>
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, PropType, defineAsyncComponent } from 'vue'
+import { ref, shallowRef, PropType } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useDataFilter } from '@/hooks/datatable-v2'
+import { useRequest } from '@/hooks/request'
+import { useOperation } from '@/hooks/operation'
+import { queryRole } from '@/services/api/member'
 import { i18n } from '@/stores'
+import { formatDate } from '@/filters'
+import { useEnum } from '@/hooks/enum'
+import AppTable from '@pc/components/base/table/index.vue'
+import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 
-const { global: { t } } = i18n
+const props = defineProps({
+    record: {
+        type: Object as PropType<Member.OrganRoleRsp>
+    }
+})
 
+const { global: { t } } = i18n
 const show = shallowRef(true)
 const refresh = shallowRef(false)
-const loading = shallowRef(false)
+// 状态
+const areastatusEnum = useEnum('areastatus')
+
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Member.OrganRoleRsp>({
+    onClose: () => onSearch()
+})
+
+const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryRole, {
+    params: {
+        roleid: 7,
+        pageNum: 1,
+        pageSize: 20,
+        parentuserid: props.record?.userid
+    },
+    onError: (err) => {
+        ElMessage.error(err)
+    }
+})
+
+const tableColumns = ref<Model.TableColumn[]>([
+    { field: 'memberuserid', label: 'member.institution.broker.memberuserid' },
+    { 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: 'rolemodifytime', label: 'member.institution.broker.rolemodifytime', formatValue:(val) => formatDate(val) },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
+])
+
+const { filterOption, getQueryParams } = useDataFilter<Member.OrganRoleReq>({
+    filters: [],
+    buttons: [
+        { label: t('operation.close'), className: 'el-button--primary', onClick: () => onCancel() }
+    ]
+})
+
+const onCancel = (isRefresh = false) => {
+    show.value = false
+    refresh.value = isRefresh
+}
+
+const onSearch = () => {
+    const qs = getQueryParams()
+    run(qs)
+}
 </script>

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

@@ -1,37 +1,37 @@
 <!-- 会员机构管理-机构管理-商品限制设置-编辑 -->
 <template>
-    <app-drawer title="编辑" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
+    <app-drawer :title="t('member.institution.goodscfg.edit.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
         <el-form ref="formRef" class="el-form--horizontal" label-width="140px" :model="formData" :rules="formRules"
             :show-message="false">
-            <el-form-item label="经纪会员" prop="userid">
+            <el-form-item :label="t('member.institution.goodscfg.edit.userid')" prop="userid">
                 <app-select-member ref="useridRef" v-model="formData.userid" :params="{ usertype: '2', roles: '7' }" />
             </el-form-item>
-            <el-form-item label="市场" prop="marketid">
+            <el-form-item :label="t('member.institution.goodscfg.edit.marketid')" prop="marketid">
                 <el-select v-model="formData.marketid" @change="goodsRef.onReset()">
                     <template v-for="item in getMarketOptions([15, 97, 99], true)" :key="item.value">
                         <el-option :label="item.label" :value="item.value" />
                     </template>
                 </el-select>
             </el-form-item>
-            <el-form-item label="商品" prop="goodsid">
+            <el-form-item :label="t('member.institution.goodscfg.edit.goodsid')" prop="goodsid">
                 <app-select-goods ref="goodsRef" v-model="formData.goodsid"
                     :params="{ marketId: formData.marketid ?? -1, goodsStatusIds: '3,6,7' }" />
             </el-form-item>
-            <el-form-item label="是否不显示" prop="isnodisplay">
+            <el-form-item :label="t('member.institution.goodscfg.edit.isnodisplay')" prop="isnodisplay">
                 <el-radio-group v-model="formData.isnodisplay">
                     <template v-for="item in flagEnum.getEnumOptions()" :key="item.value">
                         <el-radio :label="item.label" :value="item.value" />
                     </template>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item label="是否不能建买" prop="iscannotbuy">
+            <el-form-item :label="t('member.institution.goodscfg.edit.iscannotbuy')" prop="iscannotbuy">
                 <el-radio-group v-model="formData.iscannotbuy">
                     <template v-for="item in flagEnum.getEnumOptions()" :key="item.value">
                         <el-radio :label="item.label" :value="item.value" />
                     </template>
                 </el-radio-group>
             </el-form-item>
-            <el-form-item label="是否不能建卖" prop="iscannotsell">
+            <el-form-item :label="t('member.institution.goodscfg.edit.iscannotsell')" prop="iscannotsell">
                 <el-radio-group v-model="formData.iscannotsell">
                     <template v-for="item in flagEnum.getEnumOptions()" :key="item.value">
                         <el-radio :label="item.label" :value="item.value" />

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

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

@@ -5,7 +5,7 @@
         <el-form ref="formRef" label-width="140px" :model="formData" :rules="formRules" :show-message="false">
             <fieldset class="g-fieldset el-form--horizontal">
                 <legend class="g-fieldset__legend">{{ t('member.institution.user.edit.subtitle') }}</legend>
-                <el-form-item label="机构代码">
+                <el-form-item :label="t('member.institution.user.edit.userid')">
                     {{ handleNoneValue(data?.rspResult.userid) }}
                 </el-form-item>
                 <el-form-item :label="t('member.institution.user.edit.userinfotype')" prop="userinfotype">
@@ -23,9 +23,9 @@
             </fieldset>
             <fieldset class="g-fieldset el-form--horizontal">
                 <legend class="g-fieldset__legend">{{ isPerson ? t('member.institution.user.edit.person') :
-                    t('member.institution.user.edit.enterprise') }}{{ t('member.institution.user.edit.legend') }}
+                    t('member.institution.user.edit.enterprise') }} {{ t('member.institution.user.edit.legend') }}
                 </legend>
-                <el-form-item label="名称" prop="customername">
+                <el-form-item :label="t('member.institution.user.edit.customername')" prop="customername">
                     <el-input v-model="formData.customername" maxlength="50" :placeholder="t('common.pleaseenter')" />
                 </el-form-item>
                 <el-form-item :label="t('member.institution.user.edit.company')" prop="company" v-if="isPerson">
@@ -156,7 +156,6 @@ const props = defineProps({
 
 
 const usertype2Enum = useEnum('usertype2') // 机构类型
-const sexEnum = useEnum('Sex') 
 const userinfotypeEnum = useEnum('userinfotype') // 所有者类型
 
 const { global: { t } } = i18n

src/services/api/member/index.ts

@@ -46,7 +46,7 @@ export function wskhUserinfoDelete(options: CommonFetchOptions<{ request: Member
 /**
  * 获取机构及所有子机构
  */
-export function getAreaAndAllChilds(options: CommonFetchOptions<{ response: Member.AreaAndAllChildsRsp[]; }>) {
+export function getAreaAndAllChilds(options: CommonFetchOptions<{ request: Member.AreaAndAllChildsReq; response: Member.AreaAndAllChildsRsp[]; }>) {
     return httpClient.commonRequest('/common/getAreaAndAllChilds', 'get', options)
 }
 

src/types/model/member.d.ts

@@ -116,6 +116,11 @@ declare namespace Member {
         userid: number;
     }
 
+    /** 子机构管理-->获取机构及所有子机构 请求 */
+    interface AreaAndAllChildsReq {
+        areauserid?: number;
+    }
+
     /** 获取机构及所有子机构 响应 */
     interface AreaAndAllChildsRsp {
         accountname: string; // 账户名称(机构名称)