修好充值提现

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

@@ -6,7 +6,7 @@ import { commonSearch_go } from "@/services/go";
 import {
     QhjAccountOutInApply,
     QhjContract,
-    QhjCustomer,
+    QhjCustomer, QhjMgrSubArea,
     QhjParentAreaList,
 
     QhjPayOrder, QhjPickGoods,
@@ -18,7 +18,7 @@ import {
     QueryAccountInOutApplyReq,
 
     QueryCustomerInfoReq, QueryPayOrderReq,
-    QueryReckonPriceLogReq
+    QueryReckonPriceLogReq, QuerySubAreaReq
 } from "@/services/go/ermcp/qhj/interface";
 
 /**
@@ -34,12 +34,13 @@ export function queryTradeGoodsPickup(): Promise<QhjTradeGoodsPickup[]> {
 }
 
 /**
+ *
  * -- 铂金宝 - 充值提现审核 - 充值审核/提现审核
- * 查询充值提现 /Qhj/QueryAccountInOutApply
+ * 查询充值提现 /QhjMgr/QueryAccountInOutApply
  * @param req
  */
 export function queryAccountInOutApply(req: QueryAccountInOutApplyReq): Promise<QhjAccountOutInApply[]> {
-    return commonSearch_go('/Qhj/QueryAccountInOutApply', req).catch((err) => {
+    return commonSearch_go('/QhjMgr/QueryAccountInOutApply', req).catch((err) => {
         throw new Error(`查询充值提现: ${err}`);
     });
 }
@@ -100,14 +101,11 @@ export function queryContract(scfcontractid?: number): Promise<QhjContract[]> {
 
 /**
  * -- 铂金宝 - 客户资料
- * 查询客户资料 /Qhj/QueryCustomerInfo
+ * 查询客户资料 /QhjMgr/QueryCustomerInfo
  * @param req
  */
 export function queryCustomerInfo(req: QueryCustomerInfoReq): Promise<QhjCustomer[]> {
-    const userid = getUsrId();
-    req.userid = userid;
-
-    return commonSearch_go('/Qhj/QueryCustomerInfo', req).catch((err) => {
+    return commonSearch_go('/QhjMgr/QueryCustomerInfo', req).catch((err) => {
         throw new Error(`查询客户资料: ${err}`);
     });
 }
@@ -150,4 +148,15 @@ export function queryPayOrder(req: QueryPayOrderReq): Promise<QhjPayOrder[]> {
     });
 }
 
+/**
+ * -- 铂金宝 - 查询子机构列表
+ * 查询子机构列表 /QhjMgr/QuerySubArea
+ * @param req
+ */
+export function querySubArea(req: QuerySubAreaReq): Promise<QhjMgrSubArea[]> {
+    return commonSearch_go('/QhjMgr/QuerySubArea', req).catch((err) => {
+        throw new Error(`查询子机构列表: ${err}`);
+    });
+}
+
 

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

@@ -67,6 +67,8 @@ export interface QhjTradeGoodsPickup {
  * 查询充值提现请求
  */
 export interface QueryAccountInOutApplyReq {
+    querytype: number  // 查询类型 1-提现(出金) 2-充值(出金)
+    applystatus: number // 状态 1-待审核 2-审核通过 3-审核拒绝
     begindate?: string  //   申请起始日期(格式yyyymmdd)
     enddate?: string    //   申请截止日期(格式yyyymmdd)
     likename?: string   //   模糊搜索名称
@@ -278,7 +280,7 @@ export interface QhjContract {
  * 查询客户资料
  */
 export interface QueryCustomerInfoReq {
-    userid?: number  //          用户ID
+    userid: number  //          用户ID
     querytype: number //        查询类型 1:未提交(网上开户表) 2:待审核(网上开户表) 3:正常 4:停用
     userinfotype?: number//      客户类型 1-个人 2-企业
     customername?: string//      客户名称(模糊匹配)
@@ -387,3 +389,29 @@ export interface QhjPayOrder {
     tradeqty: number;//成交数量
 }
 
+/**
+ * 查询子机构列表
+ */
+export interface QuerySubAreaReq {
+    userid: number
+}
+
+/**
+ * 查询子机构列表返回
+ */
+export interface QhjMgrSubArea{
+    accountname	:string;//账户名称(机构名称)
+    memberuserid	:number;//所属会员ID
+    parenttopuser	:string;//上级顶级机构 [number;
+//92=number;
+//,1时，默认为1， number;
+//92=2时若自已为顶级，则填入自己，自己不为顶级，填入ParentUserID的ParentTopUser]
+    parentuserid	:number;//所属机构ID
+    rootuserid	:string;//根用户ID
+    subaccountlevel	:number;//子账户层数
+    subarealevelpath	:string;//子机构层级路径(逗号分隔,首尾加逗号)
+    userid	:number;//用户ID
+    usertype	:number;//账户类型 - 1:交易所 2:机构 3:会员子机构 4:经纪人 5:投资者 6:客户 7:企业成员(云平台)
+}
+
+

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

@@ -1,70 +1,82 @@
 <template>
-  <!-- 充值审核 -->
-  <div class="platinum_recharge_review_tab">
-    <Filter @search="updateColumn" />
-    <contextMenu :contextMenuList="firstBtn">
-      <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="firstBtn"
-                   @onClick="btnClick" />
-        </template>
-      </a-table>
-    </contextMenu>
-    <ControlModal :selectedRow="selectedRow" />
-  </div>
+    <!-- 充值审核 -->
+    <div class="platinum_recharge_review_tab">
+        <Filter @search="updateColumn"/>
+        <contextMenu :contextMenuList="firstBtn">
+            <a-table :columns="columns"
+                     class="topTable hiddenFirstCol"
+                     :pagination="false"
+                     :expandedRowKeys="expandedRowKeys"
+                     :customRow="Rowclick"
+                     rowKey="key"
+                     :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{  }">
+                    <BtnList :btnList="firstBtn"
+                             @onClick="btnClick"/>
+                </template>
+                <!-- 账户类型 -->
+                <template #userinfotype="{ record }">
+                    <a>{{ record.userinfotype === 1 ? "个人" : "企业" }}</a>
+                </template>
+            </a-table>
+        </contextMenu>
+        <ControlModal :selectedRow="selectedRow"/>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
-import { QhjAccountOutInApply } from '@/services/go/ermcp/qhj/interface';
-import Filter from '../../compoments/filter/index.vue';
-import { queryTableList } from '../setup';
-import ControlModal from './compoments/controlModal/index.vue';
+    import {
+        defineComponent,
+        initData,
+        getTableColumns,
+        getTableEvent,
+        contextMenu,
+        BtnList,
+        _getBtnList
+    } from '@/common/export/table';
+    import {QhjAccountOutInApply} from '@/services/go/ermcp/qhj/interface';
+    import Filter from '../../compoments/filter/index.vue';
+    import {queryTableList} from '../setup';
+    import ControlModal from './compoments/controlModal/index.vue';
 
-export default defineComponent({
-    name: 'platinum_recharge_review_tab',
-    components: { Filter, contextMenu, BtnList, ControlModal },
-    setup() {
-        // 表头数据
-        const { columns, registerColumn, updateColumn } = getTableColumns();
-        // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<QhjAccountOutInApply>({});
-        // 表格操作按钮列表
-        const [firstBtn] = _getBtnList('platinum_recharge_review_tab', true).value;
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList('in');
-        initData(() => {
-            // 获取列表数据
-            queryTable();
-            // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_recharge_review', ['accountcode', 'updatetime']);
-        });
+    export default defineComponent({
+        name: 'platinum_recharge_review_tab',
+        components: {Filter, contextMenu, BtnList, ControlModal},
+        setup() {
+            // 表头数据
+            const {columns, registerColumn, updateColumn} = getTableColumns();
+            // 表格事件
+            const {expandedRowKeys, selectedRow, Rowclick, btnClick} = getTableEvent<QhjAccountOutInApply>({});
+            // 表格操作按钮列表
+            const [firstBtn] = _getBtnList('platinum_recharge_review_tab', true).value;
+            // 表格列表数据
+            const {loading, tableList, queryTable} = queryTableList('in');
+            initData(() => {
+                // 获取列表数据
+                queryTable();
+                // 注册表头信息 过滤
+                registerColumn('table_pcweb_qhj_recharge_review', ['accountcode', 'updatetime']);
+            });
 
-        return {
-            columns,
+            return {
+                columns,
 
-            expandedRowKeys,
-            selectedRow,
-            Rowclick,
-            firstBtn,
-            loading,
-            tableList,
-            updateColumn,
-            queryTable,
-            btnClick,
-        };
-    },
-});
+                expandedRowKeys,
+                selectedRow,
+                Rowclick,
+                firstBtn,
+                loading,
+                tableList,
+                updateColumn,
+                queryTable,
+                btnClick,
+            };
+        },
+    });
 </script>
 
 <style lang="less">
-.platinum_recharge_review_tab {
-}
+    .platinum_recharge_review_tab {
+    }
 </style>;

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

@@ -1,22 +0,0 @@
-import { queryResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { queryAccountInOutApply } from '@/services/go/ermcp/qhj';
-import { QhjAccountOutInApply } from '@/services/go/ermcp/qhj/interface';
-import { ref } from 'vue';
-
-export function queryTableList(type: 'in' | 'out') {
-    // 加载状态
-    const loading = ref<boolean>(false);
-    // 表格数据
-    const tableList = ref<QhjAccountOutInApply[]>([]);
-    function queryTable() {
-        queryResultLoadingAndInfo(queryAccountInOutApply, loading)
-            .then(res => {
-                //申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金
-                const arr = type === 'in' ? [2, 4, 6, 8] : [1, 3, 5, 7]
-                tableList.value = res.filter((e: QhjAccountOutInApply) => arr.includes(e.executetype)).map((e: QhjAccountOutInApply, i: number) => {
-                    return { ...e, key: String(i) }
-                })
-            })
-    }
-    return { loading, tableList, queryTable }
-}

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

@@ -1,64 +1,77 @@
 <template>
-  <!-- 提现审核 -->
-  <div class="platinum_withdrawal_review_tab">
-    <Filter @search="updateColumn"></Filter>
-    <contextMenu :contextMenuList="firstBtn">
-      <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="firstBtn"
-                   @onClick="btnClick" />
-        </template>
-      </a-table>
-    </contextMenu>
-    <ControlModal :selectedRow="selectedRow" />
-  </div>
+    <!-- 提现审核 -->
+    <div class="platinum_withdrawal_review_tab">
+        <Filter @search="updateColumn"></Filter>
+        <contextMenu :contextMenuList="firstBtn">
+            <a-table :columns="columns"
+                     class="topTable hiddenFirstCol"
+                     :pagination="false"
+                     :expandedRowKeys="expandedRowKeys"
+                     :customRow="Rowclick"
+                     rowKey="key"
+                     :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{  }">
+                    <BtnList :btnList="firstBtn"
+                             @onClick="btnClick"/>
+                </template>
+                <!-- 账户类型 -->
+                <template #userinfotype="{ record }">
+                    <a>{{ record.userinfotype === 1 ? "个人" : "企业" }}</a>
+                </template>
+
+            </a-table>
+        </contextMenu>
+        <ControlModal :selectedRow="selectedRow"/>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
-import { QhjAccountOutInApply } from '@/services/go/ermcp/qhj/interface';
-import Filter from '../../compoments/filter/index.vue';
-import { queryTableList } from '../setup';
-import ControlModal from './compoments/controlModal/index.vue';
+    import {
+        defineComponent,
+        initData,
+        getTableColumns,
+        getTableEvent,
+        contextMenu,
+        BtnList,
+        _getBtnList
+    } from '@/common/export/table';
+    import {QhjAccountOutInApply} from '@/services/go/ermcp/qhj/interface';
+    import Filter from '../../compoments/filter/index.vue';
+    import {queryTableList} from '../setup';
+    import ControlModal from './compoments/controlModal/index.vue';
 
-export default defineComponent({
-    name: 'platinum_withdrawal_review_tab',
-    components: { Filter, contextMenu, BtnList, ControlModal },
-    setup() {
-        // 表头数据
-        const { columns, registerColumn, updateColumn } = getTableColumns();
-        // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<QhjAccountOutInApply>({});
-        // 表格操作按钮列表
-        const [firstBtn] = _getBtnList('platinum_withdrawal_review_tab', true).value;
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList('out');
-        initData(() => {
-            // 获取列表数据
-            queryTable();
-            // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_withdrawal_review', ['accountcode', 'updatetime']);
-        });
+    export default defineComponent({
+        name: 'platinum_withdrawal_review_tab',
+        components: {Filter, contextMenu, BtnList, ControlModal},
+        setup() {
+            // 表头数据
+            const {columns, registerColumn, updateColumn} = getTableColumns();
+            // 表格事件
+            const {expandedRowKeys, selectedRow, Rowclick, btnClick} = getTableEvent<QhjAccountOutInApply>({});
+            // 表格操作按钮列表
+            const [firstBtn] = _getBtnList('platinum_withdrawal_review_tab', true).value;
+            // 表格列表数据
+            const {loading, tableList, queryTable} = queryTableList('out');
+            initData(() => {
+                // 获取列表数据
+                queryTable();
+                // 注册表头信息 过滤
+                registerColumn('table_pcweb_qhj_withdrawal_review', ['accountcode', 'updatetime']);
+            });
 
-        return {
-            columns,
-            updateColumn,
-            expandedRowKeys,
-            selectedRow,
-            Rowclick,
-            firstBtn,
-            loading,
-            tableList,
-            queryTable,
-            btnClick,
-        };
-    },
-});
+            return {
+                columns,
+                updateColumn,
+                expandedRowKeys,
+                selectedRow,
+                Rowclick,
+                firstBtn,
+                loading,
+                tableList,
+                queryTable,
+                btnClick,
+            };
+        },
+    });
 </script>