Merge remote-tracking branch 'origin/master'

src/common/constants/buttonType.ts

@@ -109,4 +109,6 @@ export interface ButtonType {
 
     platinum_recharge_review_confirm_payment: string; // 千海金 充值审核 确认收款
     platinum_recharge_review_refuse: string; // 千海金 充值审核 审核拒绝
+    platinum_withdrawal_review_confirm_withdrawal: string; // 千海金 提现审核 确认提现
+    platinum_withdrawal_review_refuse: string; // 千海金 提现审核 审核拒绝
 }

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

@@ -12,7 +12,7 @@
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import Detail from '../../../../compoments/detail/index.vue';
+import Detail from '../detail/index.vue';
 import Payment from '../payment/index.vue';
 import Refuse from '../refuse/index.vue';
 

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

@@ -46,7 +46,8 @@ export default defineComponent({
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_withdrawal_review', ['warehousetype', 'warehousename', 'address']);
+            registerColumn('table_pcweb_warehouse', ['warehousetype', 'warehousename', 'address']);
+            // registerColumn('table_pcweb_qhj_withdrawal_review', ['warehousetype', 'warehousename', 'address']);
         });
 
         // 查询

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

@@ -13,7 +13,9 @@ export function queryTableList(type: 'in' | 'out') {
             .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))
+                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/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/withdrawal/compoments/controlModal/index.vue

@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <!-- 详情 -->
+    <Detail :selectedRow="selectedRow" />
+    <!-- 确认收款 -->
+    <Withdrawal :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 '../detail/index.vue';
+import Withdrawal from '../withdrawal/index.vue';
+import Refuse from '../refuse/index.vue';
+
+export default defineComponent({
+    name: 'custom-control-modal',
+    components: { Detail, Withdrawal, 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/withdrawal/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/withdrawal/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_withdrawal_review_refuse');
+        const loading = ref<boolean>(false);
+        return {
+            cancel,
+            visible,
+            loading,
+        };
+    },
+});
+</script>

src/views/platinum/platinum_recharge_withdrawal_review/list/withdrawal/compoments/withdrawal/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_confirm_withdrawal',
+    components: { CommomDetail },
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryCustomInfoType>,
+            default: {},
+        },
+    },
+    setup(props, context) {
+        const { visible, cancel } = closeModal('platinum_withdrawal_review_confirm_withdrawal');
+        const loading = ref<boolean>(false);
+        return {
+            cancel,
+            visible,
+            loading,
+        };
+    },
+});
+</script>

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

@@ -17,6 +17,7 @@
         </template>
       </a-table>
     </contextMenu>
+    <ControlModal :selectedRow="selectedRow" />
   </div>
 </template>
 
@@ -25,10 +26,11 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 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_withdrawal_review_tab',
-    components: { Filter, contextMenu, BtnList },
+    components: { Filter, contextMenu, BtnList, ControlModal },
     setup() {
         // 表头数据
         const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();