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

public/proto/mtp.proto

@@ -1767,3 +1767,16 @@ message WRTradeFinanceBuyCancelRsp {
 	optional uint64 FinanceApplyID = 4; // uint64 融资申请单ID
 	optional string ClientSerialNo = 5; // string 客户端流水号
 }
+// 履约激活请求 0 20 21
+message PerformanceActivateReq {
+ optional MessageHead Header = 1; // MessageHead
+ optional uint64 PerformancePlanID = 2; // uint64 履约计划ID
+ optional uint64 ApplyAccountID = 3; // uint64 发起方账号ID
+}
+// 履约激活应答 0 20 22
+message PerformanceActivateRsp {
+ optional MessageHead Header = 1; // MessageHead 消息头
+ optional int32 RetCode = 2; // int32 返回码
+ optional string RetDesc = 3; // string 描述信息
+ optional uint64 PerformancePlanID = 4; // uint64 履约计划ID
+}

src/services/funcode/index.ts

@@ -182,7 +182,8 @@ export const funCode: Code = {
     PerformancePlanStepProcessedNtf: 131111, // 履约计划步骤处理完成通知
     PerformanceModifyContactReq: 1310735, // 履约修改联络信息请求
     PerformanceModifyContactRsp: 1310736, // 履约修改联络信息回应
-
+    PerformanceActivateReq: 1310741,  //履约激活请求
+    PerformanceActivateRsp: 1310742,  //履约激活应答
 
     /***************** 融资信息 ******************/
 

src/services/proto/performance/index.ts

@@ -3,6 +3,7 @@
 
 import {protoMiddleware} from "@/services/socket/protobuf/buildReq";
 import {
+    PerformanceActivateReq,
     PerformanceContractedApplyReq,
     PerformanceDelayApplyReq,
     PerformanceManualConfirmReq, PerformanceModifyContactReq
@@ -39,4 +40,12 @@ export const performanceContractedApply = (param: PerformanceContractedApplyReq)
  */
 export const performanceModifyContact = (param: PerformanceModifyContactReq): Promise<any> => {
     return protoMiddleware<PerformanceModifyContactReq>(param, 'PerformanceModifyContactReq', 'PerformanceModifyContactRsp', HeadEnum.tradeMode17)
-}
+}
+
+/**
+ * 履约激活请求
+ * @param param
+ */
+export const performanceActivate = (param: PerformanceActivateReq):Promise<any> => {
+    return protoMiddleware<PerformanceActivateReq>(param, 'PerformanceActivateReq', 'PerformanceActivateRsp', HeadEnum.tradeMode17)
+}

src/services/proto/performance/interface.ts

@@ -56,3 +56,15 @@ export interface PerformanceModifyContactRsp {
     AccountID: number // uint64 账号
 }
 
+// 履约激活请求 0 20 21
+export interface  PerformanceActivateReq {
+    PerformancePlanID: number // uint64 履约计划ID
+    ApplyAccountID: number // uint64 发起方账号ID
+}
+// 履约激活应答 0 20 22
+export interface  PerformanceActivateRsp {
+    RetCode: number // int32 返回码
+    RetDesc: string // string 描述信息
+    PerformancePlanID: number  // uint64 履约计划ID
+}
+

src/views/business/exposure/list/futures/index.vue

@@ -78,7 +78,7 @@ export default defineComponent({
             if (code === 'exposure_futures_details') {
                 // 现货明细
                 // 注册表头
-                registerColumnDetail('table_pcweb_exposure_futuresposition', []);
+                registerColumnDetail('table_pcweb_exposure_futuresposition_detail', []);
             } else {
                 console.error(`${lable}没有配置对应的code: ${code},`);
                 return;

src/views/information/spot-contract/components/detail/index.vue

@@ -58,9 +58,29 @@
 
         <!-- 金额-->
         <template #payamount="{ text, record }">
-          <a>{{ record.kxtype === 2 ? record.deductamount : text }}</a>
+          <span>{{ formatValue(record.kxtype === 2 ? record.deductamount : text) }}</span>
         </template>
 
+          <!-- 调整付保证金-->
+          <template #addmargin="{ text, record }">
+              <span>{{ formatValue(record.addmargin === undefined || "" ? record.decmargin : record.addmargin) }}</span>
+          </template>
+
+          <!-- 交收量 -->
+          <template #reckonrealqty="{record }">
+              <span>{{ formatValue(record.reckonrealqty) }}</span>
+          </template>
+
+          <!-- 其他费用 -->
+          <template #reckonotheramount="{record }">
+              <span>{{ formatValue(record.reckonotheramount) }}</span>
+          </template>
+
+          <!-- 申请人 -->
+          <template #applyname="{record }">
+              <span>{{ formatValue(record.applyname) }}</span>
+          </template>
+
         <!-- 款项记录 款项类型为退款  则金额使用deductamount-->
       </a-table>
     </div>
@@ -84,6 +104,7 @@ import { getPlanContractType } from '@/views/business/plan/setup';
 import { InOutTypeName } from '@/views/manage/inventory-review/setup';
 import { kxtypeName } from '@/views/manage/finance-review/setup';
 import { _closeModal } from '@/common/setup/modal/modal';
+import {formatValue} from "@/common/methods";
 
 export default defineComponent({
     name: 'spot-contract-detail',
@@ -200,6 +221,7 @@ export default defineComponent({
             getPlanContractType,
             InOutTypeName,
             kxtypeName,
+            formatValue
         };
     },
 });

src/views/market/spot_trade/components/buy-sell-market/components/buy/index.vue

@@ -44,7 +44,7 @@ import { expandIcon } from '@/common/setup/table/clolumn';
 import { ColumnType } from '@/common/methods/table/interface';
 import { Moment } from 'moment';
 import moment from 'moment';
-import { getHasBottom } from '@/common/setup/order/orderData';
+import { getShowBottomValue } from '@/common/config/constrolBottom';
 
 export default defineComponent({
     emits: ['cancel', 'openComponent'],
@@ -72,7 +72,7 @@ export default defineComponent({
         [ModalEnum.spot_trade_warehouse_delisting]: defineAsyncComponent(() => import('../delisting/index.vue')),
     },
     setup(props, context) {
-        const isBottom = getHasBottom();
+        const isBottom = getShowBottomValue();
         console.log(isBottom.value, 'isBottom');
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuoteDetail>();

src/views/market/spot_trade/components/buy-sell-market/components/sell/index.vue

@@ -43,7 +43,7 @@ import { expandIcon } from '@/common/setup/table/clolumn';
 import { ColumnType } from '@/common/methods/table/interface';
 import { Moment } from 'moment';
 import moment from 'moment';
-import { getHasBottom } from '@/common/setup/order/orderData';
+import { getShowBottomValue } from '@/common/config/constrolBottom';
 
 export default defineComponent({
     emits: ['cancel', 'openComponent'],
@@ -72,7 +72,7 @@ export default defineComponent({
         [ModalEnum.spot_trade_warehouse_financing_delisting]: defineAsyncComponent(() => import('../financing_delisting/index.vue')),
     },
     setup(props, context) {
-        const isBottom = getHasBottom();
+        const isBottom = getShowBottomValue();
         console.log(isBottom.value, 'isBottom');
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<WrOrderQuoteDetail>();