commit

src/services/go/ermcp/qhj/index.ts

@@ -6,7 +6,7 @@ import { commonSearch_go } from "@/services/go";
 import {
     QhjAccountOutInApply,
     QhjContract,
-    QhjCustomer, QhjMgrSubArea,
+    QhjCustomer, QhjMgrPosition, QhjMgrSubArea,
     QhjParentAreaList,
 
     QhjPayOrder, QhjPickGoods,
@@ -18,7 +18,7 @@ import {
     QueryAccountInOutApplyReq,
 
     QueryCustomerInfoReq, QueryPayOrderReq,
-    QueryReckonPriceLogReq, QuerySubAreaReq
+    QueryReckonPriceLogReq, QuerySubAreaReq, QueryTradePositionReq
 } from "@/services/go/ermcp/qhj/interface";
 
 /**
@@ -159,4 +159,14 @@ export function querySubArea(req: QuerySubAreaReq): Promise<QhjMgrSubArea[]> {
     });
 }
 
+/**
+ * -- 铂金宝 -- 单据查询 -- 持仓
+ * /QhjMgr/QueryTradePosition
+ */
+export function queryTradePosition(req: QueryTradePositionReq): Promise<QhjMgrPosition[]> {
+    return commonSearch_go('/QhjMgr/QueryTradePosition', req).catch((err) => {
+        throw new Error(`查询持仓汇总: ${err}`);
+    });
+}
+
 

src/services/go/ermcp/qhj/interface.ts

@@ -414,4 +414,41 @@ export interface QhjMgrSubArea{
     usertype	:number;//账户类型 - 1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户 7:企业成员(云平台)
 }
 
+/**
+ * 查询交易持仓
+ */
+export interface QueryTradePositionReq {
+    userid: number              // 用户ID
+    userinfotype? : number      // 用户类型 1-个人 2-企业
+    goodsid?: number            // 商品id
+    filtername?: string          // 名称(模糊搜索账户)
+    includesub?: number         // 是否包含子级 1-包含
+}
+
+/**
+ * 查询交易持仓返回
+ */
+export interface QhjMgrPosition{
+    accountid	:number;//账号Id
+    accountname	:string;//用户名称
+    agreeunit	:number;//合约乘数
+    averageprice	:number;//均价
+    avialqty	:number;//可用数量
+    decimalplace	:number;//报价小数位
+    enumdicname	:string;//单位名称(商品)
+    frozenqty	:number;//冻结数量
+    goodscode	:string;//商品代码(内部)
+    goodsid	:number;//商品Id
+    goodsname	:string;//商品名称
+    goodunitid	:number;//报价单位ID
+    holderamount	:number;//金额
+    holderqty	:number;//持有数量
+    holdertype	:number;//持仓类别 - 1:单边持仓 2:双边持仓
+    logincode	:string;//登录代码(账户)
+    qtydecimalplace	:number;//成交量小数位
+    userid	:number;//用户id
+    userinfotype	:number;//账户类型 1-个人 2-企业
+}
+
+
 

src/services/proto/manager/index.ts

@@ -30,5 +30,5 @@ export const goodsPickupOperate = (param: GoodsPickupOperateReq): Promise<GoodsP
  * @param param
  */
 export const goodsPickupConfirm = (param: GoodsPickupConfirmReq): Promise<GoodsPickupConfirmRsp> => {
-    return protoMiddleware<GoodsPickupConfirmReq>(param, 'GoodsPickupConfirmReq', 'GoodsPickupConfirmRsp', 2)
+    return protoMiddleware<GoodsPickupConfirmReq>(param, 'GoodsPickupConfirmReq', 'GoodsPickupConfirmRsp', 4)
 }

src/services/socket/protobuf/protoHeader.ts

@@ -8,6 +8,7 @@ export enum HeadEnum {
     AccountID,  // funcode uuid userID AccountID
     MarketID18_GoodsID0, // funcode uuid userID, MarketID:18, GoodsID: 0
     MarketID15101,
+    MarketID69201,
 }
 
 /**
@@ -38,6 +39,9 @@ export function getProtoHeadParam(funCodeName: string, type: HeadEnum = 0): IMes
         case HeadEnum.MarketID15101:
             result = Object.assign(result, {  MarketID: 15101,})
             break;
+        case HeadEnum.MarketID69201:
+            result = Object.assign(result, {  MarketID: 69201,})
+            break;
     }
     return result
 }

src/views/platinum/platinum_recharge_withdrawal_review/list/recharge/compoments/detail/index.vue

@@ -8,10 +8,14 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="cancel">关闭</a-button>
+        <a-button key="submit"
+                  type="primary"
+                  :loading="loading"
+                  @click="submit">拒绝</a-button>
+        <a-button key="cancel"
+                  type="primary"
+                  :loading="loading"
+                  @click="cancel">关闭</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />
   </a-modal>
@@ -19,15 +23,15 @@
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import CommomDetail from '../common-detail/index.vue';
+import {QhjAccountOutInApply} from "@/services/go/ermcp/qhj/interface";
 
 export default defineComponent({
     name: 'platinum_withdrawal_review_detail-desc',
     components: { CommomDetail },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjAccountOutInApply>,
             default: {},
         },
     },

src/views/platinum/platinum_recharge_withdrawal_review/list/recharge/compoments/refuse/index.vue

@@ -5,13 +5,17 @@
            centered
            v-model:visible="visible"
            :maskClosable="false"
-           @cancel="submit"
+           @cancel="cancel"
            width="890px">
     <template #footer>
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
                 @click="cancel">拒绝</a-button>
+        <a-button key="cancel"
+                  type="primary"
+                  :loading="loading"
+                  @click="cancel">关闭</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />
   </a-modal>