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

public/proto/mtp.proto

@@ -1458,8 +1458,8 @@ message ErmcpSpotGoodsPriceRsp {
 // 协议操作请求 0 29 189
 message QHJAgreementConfigOperateReq {
 	optional MessageHead Header = 1; // MessageHead
-	optional uint32 operatetype = 2; // uint32 操作类型-1:新增 2:修改
-		optional uint64 agreementid = 3; // uint64 协议ID（操作类型为2时必填）
+	optional uint32 operatetype = 2; // uint32 操作类型-1:新增 2:修改 3:停用 4:恢复 5:注销
+		optional uint64 agreementid = 3; // uint64 协议ID（操作类型为2,3,4,5时必填）
 		optional string agreementno = 4; // string 协议编号
 		optional string agreementname = 5; // string 协议名称
 		optional uint32 agreementtype = 6; // uint32 协议类型 - 1:注册 2:登录 3:交易
@@ -1472,5 +1472,5 @@ message QHJAgreementConfigOperateRsp {
 	optional MessageHead Header = 1; // MessageHead 消息头
 	optional int32 RetCode = 2; // int32 返回码
 	optional string RetDesc = 3; // string 描述信息
-	optional uint64 agreementid = 4; // uint64 协议ID
-}
+		optional uint64 agreementid = 4; // uint64 协议ID
+}

src/services/proto/manager/interface.ts

@@ -66,14 +66,14 @@ export interface  GoodsPickupConfirmRsp {
 
 // 协议操作请求 0 29 189
 export interface QHJAgreementConfigOperateReq {
-    operatetype: number // uint32 操作类型-1:新增 2:修改
-    agreementid?: number // uint64 协议ID（操作类型为2时必填）
+    operatetype: number // uint32  操作类型-1:新增 2:修改 3:停用 4:恢复 5:注销
+    agreementid?: number // uint64 协议ID（操作类型为2,3,4,5时必填）
     agreementno?: string // string 协议编号
     agreementname?: string // string 协议名称
     agreementtype?: number // uint32 协议类型 - 1:注册 2:登录 3:交易
     agreementcontent?: string // string 协议内容
-    operatesrc: number // uint32 操作来源 - 1:管理端 2:终端
-    operateid: number // uint64 操作人
+    operatesrc?: number // uint32 操作来源 - 1:管理端 2:终端
+    operateid?: number // uint64 操作人
 }
 // 协议操作响应 0 29 190
 export interface QHJAgreementConfigOperateRsp {

src/views/information/account_info/list/account_info_futures/index.vue

@@ -48,7 +48,7 @@
             <template #header>
               <a-row class="contRow">
                 <a-col :span="12">{{sub.accountname}}</a-col>
-                <a-col :span="12">{{getAccountStatus(sub.tradestatus)}}</a-col>
+                <a-col :span="12">{{getTaAccountStatus(sub.tradestatus)}}</a-col>
               </a-row>
             </template>
             <BtnList :btnList="getBtnList(sub.tradestatus)"
@@ -92,7 +92,7 @@
 <script lang="ts">
 import { defineComponent, initData, _getBtnList, contextMenu, BtnList } from '@/common/export/table';
 import filterCustomTable from '@/views/information/goods/components/filterTable/index.vue';
-import { getAccountStatus, handleModalData } from '../setup';
+import {getAccountStatus, getTaAccountStatus, handleModalData} from '../setup';
 import { handleTradeTemplate, queryTableList } from './setup';
 import { getUserName } from '@/services/bus/user';
 import Add from '../../compoments/add-futures/index.vue';
@@ -161,7 +161,7 @@ export default defineComponent({
             loading,
             search,
             tableList,
-            getAccountStatus,
+            getTaAccountStatus,
             getUserName,
             queryTable,
             getBtnList,

src/views/information/account_info/list/setup.ts

@@ -36,6 +36,39 @@ export function getAccountStatus(type: number) {
 }
 
 /**
+ * 获取期货账户状态
+ * @param type
+ * @returns
+ */
+export function getTaAccountStatus(type: number) {
+    let result = '--'
+    switch (type) {
+        case 1:
+            result = '正常'
+            break;
+        case 2:
+            result = '受限'
+            break;
+        case 3:
+            result = '冻结（停用）'
+            break;
+        case 4:
+            result = '禁止建仓（人工受限）'
+            break;
+        case 5:
+            result = '禁止交易人（人工冻结）'
+            break;
+        case 6:
+            result = '待激活'
+            break;
+        case 7:
+            result = '已删除（注销）'
+            break;
+    }
+    return result
+}
+
+/**
  * 获取角色状态
  * @param type 
  * @returns