Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/views/business/plan/components/audit/index.vue

@@ -72,7 +72,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="结算币种">
-              <span class="white">{{ formatValue(selectedRow.currencyname) }}</span>
+                <span class="white">{{ formatValue(getPayCurrencyTypeEnumList().find(item => item.enumdicid === selectedRow.currencyid).enumdicname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -99,6 +99,7 @@ import { getPlanContractType } from '@/views/business/plan/setup';
 import { formatValue } from '@/common/methods';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { hedgePlanReq } from '@/services/proto/hedgeplan';
+import {getPayCurrencyTypeEnumList} from "@/common/constants/enumsList";
 export default defineComponent({
     name: 'plan_audit_audit',
     components: {},
@@ -160,6 +161,7 @@ export default defineComponent({
             pass,
             getPlanContractType,
             formatValue,
+            getPayCurrencyTypeEnumList,
         };
     },
 });

src/views/business/plan/components/cancel/index.vue

@@ -70,7 +70,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="结算币种">
-              <span class="white">{{ formatValue(selectedRow.currencyname) }}</span>
+                <span class="white">{{ formatValue(getPayCurrencyTypeEnumList().find(item => item.enumdicid === selectedRow.currencyid).enumdicname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -97,6 +97,7 @@ import { HedgePlanOperateReq } from '@/services/proto/hedgeplan/interface';
 import * as Long from 'long';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { oldHedgePlanReq } from '@/services/proto/hedgeplan';
+import {getPayCurrencyTypeEnumList} from "@/common/constants/enumsList";
 
 export default defineComponent({
     name: 'plan_audit_cancel',
@@ -138,6 +139,7 @@ export default defineComponent({
             maskClosableFlag,
             formatValue,
             getPlanContractType,
+            getPayCurrencyTypeEnumList,
         };
     },
 });

src/views/business/plan/components/delete/index.vue

@@ -64,7 +64,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="结算币种">
-              <span class="white">{{ formatValue(selectedRow.currencyname) }}</span>
+                <span class="white">{{ formatValue(getPayCurrencyTypeEnumList().find(item => item.enumdicid === selectedRow.currencyid).enumdicname) }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -91,6 +91,7 @@ import { ErmcpHedgePlanReq } from '@/services/proto/hedgeplan/interface';
 import * as Long from 'long';
 import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
 import { hedgePlanReq } from '@/services/proto/hedgeplan';
+import {getPayCurrencyTypeEnumList} from "@/common/constants/enumsList";
 
 export default defineComponent({
     name: 'plan_uncommitted_delete',
@@ -128,6 +129,7 @@ export default defineComponent({
             submit,
             formatValue,
             getPlanContractType,
+            getPayCurrencyTypeEnumList,
         };
     },
 });

src/views/business/plan/components/detail/index.vue

@@ -65,7 +65,7 @@
                 </a-col>
                 <a-col :span="12">
                     <a-form-item label="结算币种">
-                        <span class="white">{{ formatValue(selectedRow.currencyname) }}</span>
+                        <span class="white">{{ formatValue(getPayCurrencyTypeEnumList().find(item => item.enumdicid === selectedRow.currencyid).enumdicname) }}</span>
                     </a-form-item>
                 </a-col>
             </a-row>
@@ -87,6 +87,7 @@ import {closeModal} from '@/common/setup/modal/index';
 import {Ermcp3HedgePlan} from '@/services/go/ermcp/plan/interface';
 import {formatValue} from '@/common/methods';
 import {getPlanContractType} from '@/views/business/plan/setup';
+import {getPayCurrencyTypeEnumList} from "@/common/constants/enumsList";
 
 export default defineComponent({
     name: 'plan-detail',
@@ -111,6 +112,7 @@ export default defineComponent({
             submit,
             formatValue,
             getPlanContractType,
+            getPayCurrencyTypeEnumList,
         };
     },
 });

src/views/information/account_info/compoments/add-business/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 业务账户 - 新增登陆账户 -->
   <a-modal class="commonModal add-business-info"
-           title="新增登录账户"
+           title="新增账户"
            v-model:visible="visible"
            @cancel="cancel"
            centered

src/views/information/account_info/compoments/add-managers-permission/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- 新增角色 -->
+  <!-- 新增权限模板 -->
   <a-modal class="commonModal add-roles"
-           title="新增角色"
+           title="新增权限模板"
            v-model:visible="visible"
            @cancel="cancel"
            centered

src/views/information/account_info/compoments/cancel-business/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- 注销交易账户 -->
+  <!-- 注销账户 -->
   <a-modal class="add-custom"
-           title="注销交易账户"
+           title="注销账户"
            v-model:visible="visible"
            @cancel="cancel"
            centered

src/views/information/account_info/compoments/cancel-futures/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- 注销业务账户 -->
+  <!-- 注销账户 -->
   <a-modal class="add-custom"
-           title="注销业务账户"
+           title="注销账户"
            v-model:visible="visible"
            @cancel="cancel"
            centered

src/views/information/account_info/compoments/credit-futures/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- 管理员账号注销-->
+  <!-- 授信-->
   <a-modal class="add-custom custom-detail"
-           title="管理员账号注销"
+           title="授信"
            v-model:visible="visible"
            centered
            :maskClosable="maskClosableFlag"

src/views/information/account_info/compoments/detail-business/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 账号详情-->
   <a-modal class="add-custom custom-detail"
-           title="账号详情"
+           title="账户明细"
            v-model:visible="visible"
            centered
            :maskClosable="maskClosableFlag"

src/views/information/account_info/compoments/detail-futures/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 交易账号详情-->
   <a-modal class="add-custom custom-detail"
-           title="交易账号详情"
+           title="账号详情"
            v-model:visible="visible"
            centered
            :maskClosable="maskClosableFlag"

src/views/information/account_info/compoments/locked-business/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- 锁定业务账户 -->
+  <!-- 锁定账户 -->
   <a-modal class="add-custom"
-           title="锁定业务账户"
+           title="锁定账户"
            v-model:visible="visible"
            @cancel="cancel"
            centered

src/views/information/account_info/compoments/modify-business/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 修改登录账户 -->
   <a-modal class="commonModal add-business-info"
-           title="修改登录账户"
+           title="修改账户"
            v-model:visible="visible"
            @cancel="cancel"
            centered

src/views/information/account_info/compoments/modify-traders/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 修改交易用户 -->
   <a-modal class="commonModal add-traders"
-           title="修改交易用户"
+           title="修改交易员"
            v-model:visible="visible"
            @cancel="cancel"
            centered

src/views/information/account_info/compoments/reset-business/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <!-- 重置登录账户密码 -->
+  <!-- 重置账户密码 -->
   <a-modal class="add-custom"
-           title="重置登录账户密码"
+           title="重置登录密码"
            v-model:visible="visible"
            @cancel="cancel"
            centered

src/views/information/account_info/compoments/reset-managers/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 重置管理员账户密码 -->
   <a-modal class="add-custom"
-           title="重置管理员账户密码"
+           title="重置登录密码"
            v-model:visible="visible"
            @cancel="cancel"
            centered