Merge remote-tracking branch 'origin/master'

public/config/app.config.json

@@ -1,3 +1,3 @@
 {
-    "apiUrl": "http://192.168.31.176:8080/cfg?key=test_176"
+    "apiUrl": "http://218.17.158.45:21001/cfg?key=test_176"
 }

src/assets/styles/mixin.less

@@ -769,6 +769,9 @@
 .mb40 {
     margin-bottom: 40px !important;
 }
+.mr10 {
+    margin-right: 10px;
+}
 .grey {
     color: @m-grey2;
 }

src/common/constants/buttonType.ts

@@ -104,6 +104,9 @@ export interface ButtonType {
     inventory_review_checkout_cancel: string; // 出库 撤销
 
     inventory_current_add: string; // 库存查询 新增
-
+    /******** =========================== 千海金 =========================== *********/
     platinum_custom_info_normal_add: string; // 千海金 客户资料 新增
+
+    platinum_recharge_review_confirm_payment: string; // 千海金 充值审核 确认收款
+    platinum_recharge_review_refuse: string; // 千海金 充值审核 审核拒绝
 }

src/common/methods/table/interface.ts

@@ -15,7 +15,7 @@ export interface ColumnType {
     render?: Function;
 }
 export interface TableKey {
-    table_pcweb_aggregate_profit_and_loss: "string; // 报表-库存报表"
+    table_pcweb_aggregate_profit_and_loss: "string; // 报表-汇总损益报表"
     table_pcweb_application_record: "string; // 库存查询-申请记录"
     table_pcweb_business_aduit_dj: "string; // 业务审核-点价"
     table_pcweb_business_aduit_js: "string; // 业务审核-交收"
@@ -37,6 +37,8 @@ export interface TableKey {
     table_pcweb_purchase_all: "string; // 采购_全部"
     table_pcweb_purchase_pointprice: "string; // 采购_待点价"
     table_pcweb_purchase_settle: "string; // 采购_履约交收"
+    table_pcweb_qhj_recharge_review: "string; // 铂金宝-充值提现审核-充值审核"
+    table_pcweb_qhj_withdrawal_review: "string; // 铂金宝-充值提现审核-提现审核"
     table_pcweb_report_fincial_invoice_day: "string; // 报表-财务报表-发票-日报表"
     table_pcweb_report_fincial_month: "string; // 报表-财务报表-月报表"
     table_pcweb_report_fincial_payment_day: "string; // 报表-财务报表-款项-日报表"

src/common/setup/table/button.ts

@@ -12,8 +12,8 @@ import { BtnClassName, BtnList, ButtonListKey } from './interface';
  */
 function getClassName(val: string): BtnClassName {
     let result: BtnClassName = 'btnDeafault'
-    const btnDanger = ['disable', 'cancle', 'cancel', 'delete', 'logout', 'locked']
-    const operBtn = ['add', 'modify', 'reset', 'credit']
+    const btnDanger = ['disable', 'cancle', 'cancel', 'delete', 'logout', 'locked', 'refuse']
+    const operBtn = ['add', 'modify', 'reset', 'credit', 'payment', 'confirm_withdrawal']
     const map = new Map<BtnClassName, string[]>([
         ['btnDanger', btnDanger],
         ['operBtn', operBtn],

src/common/setup/table/interface.ts

@@ -75,7 +75,12 @@ export interface ButtonListKey {
     spot_report_spot: string; // 现货报表
     inventory_report_inventory: string; // 库存报表
 
+    /********* =================== 千海金=================== **********/
     platinum_custom_info_normal: string; // 千海金 客户资料 正常
     platinum_customer_info_unsubmit: string; // 千海金 客户资料 待审核
     platinum_customer_info_stop: string; // 千海金 客户资料 停用
+
+    platinum_withdrawal_review_tab: string; // 千海金 提现审核
+    platinum_recharge_review_tab: string; // 千海金 充值审核
+
 }

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

@@ -9,117 +9,117 @@ export interface QueryTradeGoodsPickupReq {
  * 提货查询返回
  */
 export interface QhjTradeGoodsPickup {
-    accountid	:number;//账户ID
-    address	:string;//提货人详细地址
-    amount	:number;//提货金额
-    artradedate	:string;//自动收货交易日(yyyyMMdd)
-    auditer	:number;//审核人
-    auditsrc	:number;//更新来源 - 1:管理端 2:终端
-    audittime	:string;//审核时间(发货时间)
-    audittradedate	:string;//审核交易日(yyyyMMdd)
-    cardnum	:string;//提货人证件号码
-    cardtypeid	:number;//提货人证件类型
-    checkremark	:string;//审核备注
-    cityid	:number;//市
-    cityname	:string;//城市名称
-    countryid	:number;//国家
-    countryname	:string;//国家名称
-    districtid	:number;//地区
-    districtname	:string;//地区名称
-    enumdicname	:string;//单位名称(提货商品)
-    expresscompany	:string;//物流公司
-    expressnum	:string;//物流单号
-    goodsagreeunit	:number;//交易商品乘数
-    goodscode	:string;//商品代码
-    goodsid	:number;//商品ID
-    goodsname	:string;//商品名称
-    goodsqty	:number;//交易商品手数(69模式按成交量小数位放大取整)
-    handlestatus	:number;//处理状态
-    marketid	:number;//市场ID
-    phonenum	:string;//提货人联系方式
-    pickupgoodsagreeunit	:number;//提货商品合约乘数
-    pickupgoodsid	:string;//提货商品ID
-    pickupgoodsname	:string;//提货商品名称
-    pickupgoodsqty	:number;//提货商品手数(数量)
-    pickupgoodsunitid	:number;//单位ID(提货商品)
-    pickupratio	:number;//提货系数
-    preparedays	:number;//备货期(天)-提货单明细表
-    provinceid	:number;//省
-    provincename	:string;//省名称
-    qty	:number;//交易商品总手数(交易商品 - 69模式按成交量放大) - 明细表的交易商品手数汇总
-    recivername	:string;//提货人姓名
-    reqtime	:string;//提货申请时间
-    storeuserid	:number;//门店用户ID (千海金)
-    storeusername	:string;//门店用户名称
-    takemode	:number;//提货方式 - 2:自提 3:配送(邮寄)
-    takeorderid	:number;//提货单号(9number;
-//5+Unix秒时间戳(1number;
-//位)+xxxxxx)
-    takeorderstatus	:number;//提货状态 - 1:备货中 2:待取货(自提) 3:已取货(自提) 4:待收货(邮寄) 5:已收货(邮寄) 6:自动收货(邮寄) 7:已拒绝 8:已撤销
-    takeremark	:string;//提货备注
-    tradedate	:string;//交易日(yyyyMMdd)
-    updatetime	:string;//更新时间
-    userid	:number;//用户ID
-    username	:string;//用户名称
+    accountid: number;//账户ID
+    address: string;//提货人详细地址
+    amount: number;//提货金额
+    artradedate: string;//自动收货交易日(yyyyMMdd)
+    auditer: number;//审核人
+    auditsrc: number;//更新来源 - 1:管理端 2:终端
+    audittime: string;//审核时间(发货时间)
+    audittradedate: string;//审核交易日(yyyyMMdd)
+    cardnum: string;//提货人证件号码
+    cardtypeid: number;//提货人证件类型
+    checkremark: string;//审核备注
+    cityid: number;//市
+    cityname: string;//城市名称
+    countryid: number;//国家
+    countryname: string;//国家名称
+    districtid: number;//地区
+    districtname: string;//地区名称
+    enumdicname: string;//单位名称(提货商品)
+    expresscompany: string;//物流公司
+    expressnum: string;//物流单号
+    goodsagreeunit: number;//交易商品乘数
+    goodscode: string;//商品代码
+    goodsid: number;//商品ID
+    goodsname: string;//商品名称
+    goodsqty: number;//交易商品手数(69模式按成交量小数位放大取整)
+    handlestatus: number;//处理状态
+    marketid: number;//市场ID
+    phonenum: string;//提货人联系方式
+    pickupgoodsagreeunit: number;//提货商品合约乘数
+    pickupgoodsid: string;//提货商品ID
+    pickupgoodsname: string;//提货商品名称
+    pickupgoodsqty: number;//提货商品手数(数量)
+    pickupgoodsunitid: number;//单位ID(提货商品)
+    pickupratio: number;//提货系数
+    preparedays: number;//备货期(天)-提货单明细表
+    provinceid: number;//省
+    provincename: string;//省名称
+    qty: number;//交易商品总手数(交易商品 - 69模式按成交量放大) - 明细表的交易商品手数汇总
+    recivername: string;//提货人姓名
+    reqtime: string;//提货申请时间
+    storeuserid: number;//门店用户ID (千海金)
+    storeusername: string;//门店用户名称
+    takemode: number;//提货方式 - 2:自提 3:配送(邮寄)
+    takeorderid: number;//提货单号(9number;
+    //5+Unix秒时间戳(1number;
+    //位)+xxxxxx)
+    takeorderstatus: number;//提货状态 - 1:备货中 2:待取货(自提) 3:已取货(自提) 4:待收货(邮寄) 5:已收货(邮寄) 6:自动收货(邮寄) 7:已拒绝 8:已撤销
+    takeremark: string;//提货备注
+    tradedate: string;//交易日(yyyyMMdd)
+    updatetime: string;//更新时间
+    userid: number;//用户ID
+    username: string;//用户名称
 }
 
 /**
  * 查询充值提现请求
  */
 export interface QueryAccountInOutApplyReq {
-    begindate: string  //   申请起始日期(格式yyyymmdd)
-    enddate: string    //   申请截止日期(格式yyyymmdd)
-    likename: string   //   模糊搜索名称
+    begindate?: string  //   申请起始日期(格式yyyymmdd)
+    enddate?: string    //   申请截止日期(格式yyyymmdd)
+    likename?: string   //   模糊搜索名称
 }
 
 /**
  * 查询充值提现返回
  */
-export interface QhjAccountOutInApply{
-    accountcode	:string;//资金账号
-    accountname	:string;//用户名称(名称)
-    accountpwd	:string;//资金密码
-    accountticket	:string;//最新账户服务流水号
-    amount	:number;//金额
-    applyremark	:string;//申请备注
-    applystatus	:number;//申请状态 - 1:待审核 2:待复审 3:初审拒绝 4:交易冻结中 5:交易解冻中 6:交易解冻扣款中 7:交易入金中 8:交易冻结/解冻/扣款中(银行发起出金时用) 9:银行出金中 1number;
-//:银行入金中 11:成功 12:失败 13:银行审核中 14:账户服务入金失败； 15:账户服务解冻失败； 16:账户服务解冻扣款失败； 17:账户服务出金失败 18:复审通过 19:复审拒绝 2number;
-//:提交审核，账户冻结中 21:审核拒绝，账户解冻中；22: 待审核，账户服务解冻回滚中； 23：待复审，账户服务解冻回滚中； 24： 审核通过，账户冻结金额检查中；25： 复审通过，账户冻结金额检查中；
-    auditid	:number;//审核人
-    audittime	:string;//审核时间
-    bank_apply_ticket	:string;//银行申请流水
-    bankaccountname	:string;//银行账户名
-    bankaccountno	:string;//银行卡号
-    bankid	:string;//银行编号
-    bankticket	:string;//银行流水
-    branchbankid	:string;//银行支行号
-    branchbankname	:string;//银行支行名称
-    capamountout	:number;//出金(劣后本金) - 外部子账户
-    certificatephotourl	:string;//凭证地址
-    charge	:number;//手续费
-    checkerrorflag	:number;//对账差错标志 - 1:为单边账;其它为正常出入金
-    currency	:string;//币种
-    cusbankid	:string;//托管银行编号
-    exchticket	:string;//银行服务流水号
-    executetype	:number;//申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金
-    extendinfo	:string;//扩展信息
-    extoperateid	:number;//交易服务流水号
-    infamount	:number;//劣后金额(自有)
-    logincode	:string;//登录账号(账号)
-    netaddr	:string;//调转网址
-    priamount	:number;//优先金额(授信)
-    reauditid	:number;//复审人
-    reauditremark	:string;//复审备注
-    reaudittime	:string;//复审时间
-    relatedorderid	:string;//三方关联ID
-    remark	:string;//备注
-    remark2	:string;//备注(失败原因)
-    soucreamount	:number;//原始出入金金额
-    soucrecurrencyid	:number;//原始出入金币种
-    tradedate	:string;//交易日(yyyyMMdd)
-    updatetime	:string;//更新时间(申请时间)
-    userid	:number;//用户id
-    userinfotype	:number;//账户类型 1-个人 2-企业
+export interface QhjAccountOutInApply {
+    accountcode: string;//资金账号
+    accountname: string;//用户名称(名称)
+    accountpwd: string;//资金密码
+    accountticket: string;//最新账户服务流水号
+    amount: number;//金额
+    applyremark: string;//申请备注
+    applystatus: number;//申请状态 - 1:待审核 2:待复审 3:初审拒绝 4:交易冻结中 5:交易解冻中 6:交易解冻扣款中 7:交易入金中 8:交易冻结/解冻/扣款中(银行发起出金时用) 9:银行出金中 1number;
+    //:银行入金中 11:成功 12:失败 13:银行审核中 14:账户服务入金失败； 15:账户服务解冻失败； 16:账户服务解冻扣款失败； 17:账户服务出金失败 18:复审通过 19:复审拒绝 2number;
+    //:提交审核，账户冻结中 21:审核拒绝，账户解冻中；22: 待审核，账户服务解冻回滚中； 23：待复审，账户服务解冻回滚中； 24： 审核通过，账户冻结金额检查中；25： 复审通过，账户冻结金额检查中；
+    auditid: number;//审核人
+    audittime: string;//审核时间
+    bank_apply_ticket: string;//银行申请流水
+    bankaccountname: string;//银行账户名
+    bankaccountno: string;//银行卡号
+    bankid: string;//银行编号
+    bankticket: string;//银行流水
+    branchbankid: string;//银行支行号
+    branchbankname: string;//银行支行名称
+    capamountout: number;//出金(劣后本金) - 外部子账户
+    certificatephotourl: string;//凭证地址
+    charge: number;//手续费
+    checkerrorflag: number;//对账差错标志 - 1:为单边账;其它为正常出入金
+    currency: string;//币种
+    cusbankid: string;//托管银行编号
+    exchticket: string;//银行服务流水号
+    executetype: number;//申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金
+    extendinfo: string;//扩展信息
+    extoperateid: number;//交易服务流水号
+    infamount: number;//劣后金额(自有)
+    logincode: string;//登录账号(账号)
+    netaddr: string;//调转网址
+    priamount: number;//优先金额(授信)
+    reauditid: number;//复审人
+    reauditremark: string;//复审备注
+    reaudittime: string;//复审时间
+    relatedorderid: string;//三方关联ID
+    remark: string;//备注
+    remark2: string;//备注(失败原因)
+    soucreamount: number;//原始出入金金额
+    soucrecurrencyid: number;//原始出入金币种
+    tradedate: string;//交易日(yyyyMMdd)
+    updatetime: string;//更新时间(申请时间)
+    userid: number;//用户id
+    userinfotype: number;//账户类型 1-个人 2-企业
 }
 
 /**

src/services/request/serviceURL.ts

@@ -83,4 +83,6 @@ export const setServiceURL = (config: URL): void => {
         serviceURL.tradeUrl = 'ws://218.17.158.45:21005';
     }
     serviceURL = config;
+    console.log(serviceURL);
+
 };

src/views/platinum/platinum_customer_info/compoments/detail/index.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType, ref } from 'vue';
+import { defineComponent, PropType, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import Detail from '../common-detail/index.vue';

src/views/platinum/platinum_recharge_withdrawal_review/compoments/filter/index.vue

@@ -1,7 +1,11 @@
 <template>
   <!-- 过滤 -->
   <div class="filterTable">
-
+    <a-range-picker v-model:value="date"
+                    class="commonPicker"
+                    style="width: 200px"
+                    :show-time="{hideDisabledOptions: true}"
+                    format="YYYY-MM-DD" />
     <FilterOption :selectList="selectList"
                   :inputList="inputList"
                   :fixedBtnList="fixedBtnList" />
@@ -11,27 +15,20 @@
 
 <script lang="ts">
 import FilterOption from '@/common/components/filter/index.vue';
-import { defineComponent } from 'vue';
+import { defineComponent, ref } from 'vue';
 import { handleFilter, InputList, SelectList } from '@/common/setup/filter';
+import { Moment } from 'moment';
 
 export default defineComponent({
     name: 'filter-withdrawal_review',
     components: { FilterOption },
     setup(props, context) {
-        const select: SelectList[] = [
-            {
-                value: undefined,
-                key: 'userinfotype',
-                placeholder: '全部客户类型',
-                list: [
-                    { value: 1, lable: '个人' },
-                    { value: 2, lable: '企业' },
-                ],
-            },
-        ];
+        const date = ref<Moment[]>([]);
+        const select: SelectList[] = [];
         const input: InputList[] = [{ value: '', placeholder: '模糊搜索账号', key: 'account' }];
         const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context);
         return {
+            date,
             selectList,
             inputList,
             fixedBtnList,
@@ -41,4 +38,16 @@ export default defineComponent({
 </script>
 
 <style lang="less">
+.filterTable {
+  .commonPicker.ant-calendar-picker {
+    display: inline-flex;
+    padding-top: 9px;
+    padding-bottom: 6px;
+    margin-right: 10px;
+    .ant-input {
+      border: 0;
+      background: @m-grey9;
+    }
+  }
+}
 </style>;

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

@@ -0,0 +1,91 @@
+<template>
+  <div>
+    <Des :list="desList" />
+  </div>
+
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType, watchEffect } from 'vue';
+import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+import { getStatusName } from '@/common/constants/enumsName';
+import { formatValue } from '@/common/methods';
+import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
+import { Des, handleDesList } from '@/common/components/commonDes';
+import { handlePreviewImg } from '@/common/setup/upload';
+
+export default defineComponent({
+    name: 'custom-detail-desc',
+    components: { Des },
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryCustomInfoType>,
+            default: {},
+        },
+    },
+    setup(props) {
+        function isPersonal() {
+            return props.selectedRow.userinfotype === '1';
+        }
+        const { desList, getDesList } = handleDesList();
+        // 预览附件
+        const { previewVisible, previewImage, cancelImg, previewImg, getImgName } = handlePreviewImg();
+
+        watchEffect(() => {
+            if (props.selectedRow.customername) {
+                const data = props.selectedRow;
+                // 个人
+                const person = [
+                    { label: '客户类型', value: '个人' },
+                    { label: '姓名', value: data.customername },
+                    { label: '身份证号码', value: formatValue(data.cardnum) },
+                    { label: '手机号码', value: formatValue(data.mobile) },
+                    { label: '身份证正面照', value: formatValue(getImgName(data.cardfrontphotourl)), className: 'blue' },
+                    { label: '身份证反面照', value: formatValue(getImgName(data.cardbackphotourl)), className: 'blue' },
+                    { label: '邮箱', value: formatValue(data.email) },
+                    { label: '联系电话', value: formatValue(data.telphone) },
+                    { label: '通讯地址', value: formatValue(data.address) },
+                    { label: '备注', value: formatValue(data.remark) },
+                ];
+                // 企业
+                const company = [
+                    { label: '客户类型', value: '企业' },
+                    { label: '企业名称', value: data.customername },
+                    { label: '企业简称', value: formatValue(data.nickname) },
+                    { label: '证件类型', value: getCardTypeEnumItemName(data.cardtype) },
+                    { label: '法定代表人', value: formatValue(data.legalpersonname) },
+                    { label: '证件号码', value: formatValue(data.cardnum) },
+                    { label: '纳税人识别号', value: formatValue(data.taxpayernum) },
+                    { label: '营业执照', value: formatValue(getImgName(data.attachment1)), className: 'blue' },
+                    { label: '联系人', value: formatValue(data.contactname) },
+                    { label: '联系人手机号', value: formatValue(data.mobile) },
+                    { label: '联系电话', value: formatValue(data.telphone) },
+                    { label: '状态', value: getStatusName(data.status), className: 'green' },
+                    { label: '通讯地址', value: formatValue(data.address) },
+                    { label: '备注', value: formatValue(data.remark) },
+                ];
+                getDesList(isPersonal() ? person : company);
+            }
+        });
+        return {
+            desList,
+            previewVisible,
+            previewImage,
+            cancelImg,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.custom-detail {
+    .ant-form.inlineForm {
+        margin-top: 20px;
+    }
+    .upload {
+        .look {
+            margin-left: 0;
+        }
+    }
+}
+</style>;

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

@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <!-- 详情 -->
+    <Detail :selectedRow="selectedRow" />
+    <!-- 确认收款 -->
+    <Payment :selectedRow="selectedRow" />
+    <!-- 审核拒绝 -->
+    <Refuse :selectedRow="selectedRow" />
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType } from 'vue';
+import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
+import Detail from '../../../../compoments/detail/index.vue';
+import Payment from '../payment/index.vue';
+import Refuse from '../refuse/index.vue';
+
+export default defineComponent({
+    name: 'custom-control-modal',
+    components: { Detail, Payment, Refuse },
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryCustomInfoType>,
+            default: {},
+        },
+    },
+    setup(props, context) {
+        function refresh() {
+            context.emit('context');
+        }
+        return {
+            refresh,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.custom-detail {
+    .ant-form.inlineForm {
+        margin-top: 20px;
+    }
+    .upload {
+        .look {
+            margin-left: 0;
+        }
+    }
+}
+</style>;
+

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

@@ -0,0 +1,44 @@
+<template>
+  <!-- 充值审核详情-->
+  <a-modal class="add-custom custom-detail"
+           title="充值审核详情"
+           centered
+           v-model:visible="visible"
+           :maskClosable="false"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading.loading"
+                @click="cancel">关闭</a-button>
+    </template>
+    <CommomDetail :selectedRow="selectedRow" />
+  </a-modal>
+</template>
+<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';
+
+export default defineComponent({
+    name: 'platinum_withdrawal_review_detail-desc',
+    components: { CommomDetail },
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryCustomInfoType>,
+            default: {},
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = closeModal('detail');
+        const loading = ref<boolean>(false);
+        return {
+            cancel,
+            visible,
+            loading,
+        };
+    },
+});
+</script>

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

@@ -0,0 +1,44 @@
+<template>
+  <!-- 充值审核 确认收款-->
+  <a-modal class="add-custom custom-detail"
+           title="确认收款"
+           centered
+           v-model:visible="visible"
+           :maskClosable="false"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading.loading"
+                @click="cancel">关闭</a-button>
+    </template>
+    <CommomDetail :selectedRow="selectedRow" />
+  </a-modal>
+</template>
+<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';
+
+export default defineComponent({
+    name: 'platinum_recharge_review_confirm_payment',
+    components: { CommomDetail },
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryCustomInfoType>,
+            default: {},
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = closeModal('platinum_recharge_review_confirm_payment');
+        const loading = ref<boolean>(false);
+        return {
+            cancel,
+            visible,
+            loading,
+        };
+    },
+});
+</script>

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

@@ -0,0 +1,45 @@
+<template>
+  <!-- 充值审核 审核拒绝-->
+  <a-modal class="add-custom custom-detail"
+           title="审核拒绝"
+           centered
+           v-model:visible="visible"
+           :maskClosable="false"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading.loading"
+                @click="cancel">关闭</a-button>
+    </template>
+    <CommomDetail :selectedRow="selectedRow" />
+  </a-modal>
+</template>
+
+<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';
+
+export default defineComponent({
+    name: 'custom-detail-desc',
+    components: { CommomDetail },
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryCustomInfoType>,
+            default: {},
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = closeModal('platinum_recharge_review_refuse');
+        const loading = ref<boolean>(false);
+        return {
+            cancel,
+            visible,
+            loading,
+        };
+    },
+});
+</script>

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

@@ -1,8 +1,87 @@
+
+
 <template>
   <!-- 充值审核 -->
-  <div>platinum_recharge_review_tab</div>
+  <div class="platinum_recharge_review_tab">
+    <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>
 </template>
 
 <script lang="ts">
-export default {};
-</script>
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
+import { ErmcpWareHouseInfo } from '@/views/information/warehouse-info/list';
+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, filteredInfo } = getTableColumns();
+        // 表格事件
+        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<ErmcpWareHouseInfo>({});
+        // 表格操作按钮列表
+        const [firstBtn] = _getBtnList('platinum_recharge_review_tab', true).value;
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList('in');
+        initData(() => {
+            // 获取列表数据
+            queryTable();
+            // 注册表头信息 过滤
+            registerColumn('table_pcweb_qhj_withdrawal_review', ['warehousetype', 'warehousename', 'address']);
+        });
+
+        // 查询
+        function search(value: any) {
+            filteredInfo.value = value;
+            // 更新表信息
+            updateColumn();
+        }
+
+        return {
+            columns,
+            filteredInfo,
+            expandedRowKeys,
+            selectedRow,
+            Rowclick,
+            firstBtn,
+            loading,
+            tableList,
+            search,
+            queryTable,
+            btnClick,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.platinum_recharge_review_tab {
+    .topTable {
+        .operBtn.ant-btn {
+            margin-top: 0;
+            margin-bottom: 0;
+            height: 26px;
+            line-height: 26px;
+        }
+    }
+}
+</style>;

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

@@ -0,0 +1,20 @@
+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' ? [1, 3, 5, 7] : [2, 4, 6, 8]
+                tableList.value = res.filter((e: QhjAccountOutInApply) => arr.includes(e.executetype))
+            })
+    }
+    return { loading, tableList, queryTable }
+}

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

@@ -1,8 +1,70 @@
 <template>
   <!-- 提现审核 -->
-  <div>platinum_withdrawal_review_tab</div>
+  <div class="platinum_withdrawal_review_tab">
+    <Filter></Filter>
+    <contextMenu :contextMenuList="forDataBtn">
+      <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>
+  </div>
 </template>
 
 <script lang="ts">
-export default {};
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
+import { ErmcpWareHouseInfo } from '@/views/information/warehouse-info/list';
+import Filter from '../../compoments/filter/index.vue';
+import { queryTableList } from '../setup';
+
+export default defineComponent({
+    name: 'platinum_withdrawal_review_tab',
+    components: { Filter, contextMenu, BtnList },
+    setup() {
+        // 表头数据
+        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
+        // 表格事件
+        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<ErmcpWareHouseInfo>({});
+        // 表格操作按钮列表
+        const [firstBtn] = _getBtnList('platinum_withdrawal_review_tab', true).value;
+        // 表格列表数据
+        const { loading, tableList, queryTable } = queryTableList('out');
+        initData(() => {
+            // 获取列表数据
+            queryTable();
+            // 注册表头信息 过滤
+            registerColumn('table_pcweb_qhj_recharge_review', ['warehousetype', 'warehousename', 'address']);
+        });
+
+        // 查询
+        function search(value: any) {
+            filteredInfo.value = value;
+            // 更新表信息
+            updateColumn();
+        }
+
+        return {
+            columns,
+            filteredInfo,
+            expandedRowKeys,
+            selectedRow,
+            Rowclick,
+            firstBtn,
+            loading,
+            tableList,
+            search,
+            queryTable,
+            btnClick,
+        };
+    },
+});
 </script>