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

src/common/constants/enumsName.ts

@@ -206,3 +206,55 @@ export function getApplyStatusName(type: number): string {
     }
     return result
 }
+
+/**
+ * 千海金-提货申请-状态
+ * @param type 1:备货中 2:待取货(自提) 3:已取货(自提) 4:待收货(邮寄) 5:已收货(邮寄) 6:自动收货(邮寄) 7:已拒绝 8:已撤销
+ */
+export function getPickUpStateName(type: number): string {
+    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
+        case 8:
+            result = "已撤销";
+            break
+    }
+    return result
+}
+
+/**
+ * 千海金-收货方式
+ * @param type  2:自提 3:配送(邮寄)
+ */
+export function getTakeStateName(type: number): string {
+    let result = "--";
+    switch (type) {
+        case 2:
+            result = "自提";
+            break
+        case 3:
+            result = "配送(邮寄)";
+            break
+    }
+    return result
+}

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";
 
 /**
@@ -125,7 +125,7 @@ export function queryParentAreaList(): Promise<QhjParentAreaList[]> {
 
 /**
  * -- 铂金宝 - 查询所属机构列表
- * 查询客户资料 /Qhj/QueryParentAreaList
+ * 查询客户资料 /Qhj/QueryPickGoods
  * @param req
  */
 export function queryPickGoods(status?: 1 | 2 | 3): Promise<QhjPickGoods[]> {
@@ -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_customer_info/list/checkpending/index.vue

@@ -41,6 +41,7 @@ import { queryTableList, QueryCustomInfoType } from '../index';
 import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
+import {getUserId} from "@/services/bus/account";
 
 export default defineComponent({
     name: 'custom_info_checkpending',
@@ -61,7 +62,7 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
             // 获取列表数据
-            queryTable(2);
+            queryTable(2, getUserId());
             // 注册表头信息 过滤
             registerColumn('table_pcweb_qhj_customer_info', ['userinfotype', 'nickname', 'contactname', 'mobile']);
         });

src/views/platinum/platinum_customer_info/list/normal-use/index.vue

@@ -51,6 +51,7 @@ import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
 import { QhjCustomer } from '@/services/go/ermcp/qhj/interface';
+    import {getUserId} from "@/services/bus/account";
 export default defineComponent({
     name: 'custom-normal',
     components: {
@@ -72,7 +73,7 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
             // 获取列表数据
-            queryTable(3);
+            queryTable(3, getUserId())
             // 注册表头信息 过滤
             registerColumn('table_pcweb_qhj_customer_info', ['userinfotype', 'nickname', 'contactname', 'mobile']);
         });

src/views/platinum/platinum_customer_info/list/setup.ts

@@ -14,8 +14,8 @@ export function queryTableList() {
     const loading = ref<boolean>(false);
     // 表格数据
     const tableList = ref<QhjCustomer[]>([]);
-    function queryTable(querytype: 1 | 2 | 3 | 4) {
-        const param = { querytype }
+    function queryTable(querytype: 1 | 2 | 3 | 4, userid: number) {
+        const param = { querytype, userid }
         queryResultLoadingAndInfo(queryCustomerInfo, loading, param).then(res => {
             tableList.value = res
         })

src/views/platinum/platinum_customer_info/list/stop-use/index.vue

@@ -52,6 +52,7 @@ import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
 import { QhjCustomer } from '@/services/go/ermcp/qhj/interface';
+    import {getUserId} from "@/services/bus/account";
 
 export default defineComponent({
     name: 'custom-normal',
@@ -74,7 +75,7 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
             // 获取列表数据
-            queryTable(4);
+            queryTable(4, getUserId())
             // 注册表头信息 过滤
             registerColumn('table_pcweb_qhj_customer_info', ['userinfotype', 'nickname', 'contactname', 'mobile']);
         });

src/views/platinum/platinum_customer_info/list/unsubmit/index.vue

@@ -45,6 +45,7 @@ import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 import Middle from '@/views/platinum/platinum_customer_info/compoments/controlModal/index.vue';
 import { QhjCustomer } from '@/services/go/ermcp/qhj/interface';
+import {getUserId} from "@/services/bus/account";
 
 export default defineComponent({
     name: 'custom_info_unsubmit',
@@ -65,7 +66,7 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
             // 获取列表数据
-            queryTable(2);
+            queryTable(2, getUserId())
             // 注册表头信息 过滤
             registerColumn('table_pcweb_qhj_customer_info', ['userinfotype', 'nickname', 'contactname', 'mobile']);
         });

src/views/platinum/platinum_pick_query/list/tab/compoments/complete_stocking/index.vue

@@ -38,6 +38,7 @@ import {goodsPickupConfirm, goodsPickupOperate, t2bExchConfirmBusiness} from "@/
 import {QhjTradeGoodsPickup} from "@/services/go/ermcp/qhj/interface";
 import {getLongTypeLoginID} from "@/services/bus/login";
 import {getUUID} from "ant-design-vue/es/vc-select/utils/commonUtil";
+import Long from "long";
 
 export default defineComponent({
     name: 'platinum_pick_query_complete_stocking',
@@ -53,12 +54,11 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         function submit() {
             let reqParams: GoodsPickupConfirmReq = {
-                TakeOrderID: props.selectedRow.takeorderid, // uint64 提货单号
+                TakeOrderID: Long.fromString(props.selectedRow.takeorderid.toString()), // uint64 提货单号
                 Auditer: getUserId(), // uint64 审核人
                 CheckRemark: "", // string 审核备注
                 ClientTicket: getUserId().toString(), // string 客户端流水号
             }
-
             requestResultLoadingAndInfo(goodsPickupConfirm, reqParams, loading, ['完成备货成功', '完成备货失败:']).then(() => {
                 cancel();
                 context.emit('refresh');

src/views/platinum/platinum_pick_query/list/tab/compoments/confirm_pickup/index.vue

@@ -21,13 +21,14 @@ 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 {QhjTradeGoodsPickup} from "@/services/go/ermcp/qhj/interface";
 
 export default defineComponent({
     name: 'platinum_pick_query_confirm_pickup',
     components: { CommomDetail },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjTradeGoodsPickup>,
             default: {},
         },
     },

src/views/platinum/platinum_pick_query/list/tab/compoments/controlModal/index.vue

@@ -21,13 +21,14 @@ import CompleteStocking from '../complete_stocking/index.vue';
 import ConfirmPickup from '../confirm_pickup/index.vue';
 import Receipt from '../query_receipt/index.vue';
 import UploadLogistics from '../upload_logistics/index.vue';
+import {QhjTradeGoodsPickup} from "@/services/go/ermcp/qhj/interface";
 
 export default defineComponent({
     name: 'custom-control-modal',
     components: { Detail, CompleteStocking, ConfirmPickup, Receipt, UploadLogistics },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjTradeGoodsPickup>,
             default: {},
         },
     },

src/views/platinum/platinum_pick_query/list/tab/compoments/detail/index.vue

@@ -21,13 +21,14 @@ 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 {QhjTradeGoodsPickup} 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<QhjTradeGoodsPickup>,
             default: {},
         },
     },

src/views/platinum/platinum_pick_query/list/tab/index.vue

@@ -15,6 +15,14 @@
           <BtnList :btnList="firstBtn"
                    @onClick="btnClick(record)" />
         </template>
+        <!-- 提货状态 -->
+          <template #takeorderstatus="{ record }">
+              <a>{{ getPickUpStateName(record.takeorderstatus) }}</a>
+          </template>
+          <!-- 提货/ 收货人-->
+          <template #takemode="{ record }">
+              <a>{{ getTakeStateName(record.takemode)}}</a>
+          </template>
       </a-table>
     </contextMenu>
     <ControlModal :selectedRow="selectedRow" />
@@ -27,6 +35,7 @@ import Filter from '../../compoments/filter/index.vue';
 import { queryTableList } from './setup';
 import ControlModal from './compoments/controlModal/index.vue';
 import { QhjTradeGoodsPickup } from '@/services/go/ermcp/qhj/interface';
+import {getPickUpStateName, getTakeStateName} from "@/common/constants/enumsName";
 
 export default defineComponent({
     name: 'platinum_pick_query_tab',
@@ -58,6 +67,8 @@ export default defineComponent({
             tableList,
             queryTable,
             btnClick,
+            getPickUpStateName,
+            getTakeStateName,
         };
     },
 });

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/payment/index.vue

@@ -12,6 +12,10 @@
                 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>
@@ -53,7 +57,6 @@ export default defineComponent({
                 businesstype: props.selectedRow.executetype === 1 ? 2 : 1,  // 交易类型 1: 入金  2：出金 3： 签约 4： 解约
                 auditid: Number(getUserId())  // 审核人
             }
-            debugger
 
             requestResultLoadingAndInfo(t2bExchConfirmBusiness, reqParams, loading, ['确认收款成功', '确认收款失败:']).then(() => {
                 cancel();

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

@@ -11,7 +11,11 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="cancel">拒绝</a-button>
+                @click="submit">拒绝</a-button>
+        <a-button key="cancel"
+                  type="primary"
+                  :loading="loading"
+                  @click="cancel">关闭</a-button>
     </template>
     <CommomDetail :selectedRow="selectedRow" />
   </a-modal>

src/views/platinum/platinum_recharge_withdrawal_review/list/withdrawal/compoments/controlModal/index.vue

@@ -15,13 +15,14 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import Detail from '../detail/index.vue';
 import Withdrawal from '../withdrawal/index.vue';
 import Refuse from '../refuse/index.vue';
+import {QhjAccountOutInApply} from "@/services/go/ermcp/qhj/interface";
 
 export default defineComponent({
     name: 'custom-control-modal',
     components: { Detail, Withdrawal, Refuse },
     props: {
         selectedRow: {
-            type: Object as PropType<QueryCustomInfoType>,
+            type: Object as PropType<QhjAccountOutInApply>,
             default: {},
         },
     },

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

@@ -21,13 +21,14 @@ 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/withdrawal/compoments/refuse/index.vue

@@ -8,10 +8,14 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">拒绝</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>
@@ -53,7 +57,6 @@ export default defineComponent({
                 businesstype: props.selectedRow.executetype === 1 ? 2 : 1,  // 交易类型 1: 入金  2：出金 3： 签约 4： 解约
                 auditid: Number(getUserId())  // 审核人
             }
-
             requestResultLoadingAndInfo(t2bExchConfirmBusiness, reqParams, loading, ['审核拒绝成功', '审核拒绝失败:']).then(() => {
                 cancel();
                 context.emit('refresh');

src/views/platinum/platinum_recharge_withdrawal_review/list/withdrawal/compoments/withdrawal/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>