Merge pull request 'khy-three' (#128) from khy-three into master
Reviewed-on: #128
This commit is contained in:
commit
291c962a98
@ -1,76 +0,0 @@
|
|||||||
<template>
|
|
||||||
<Dialog title="审核" v-model="dialogVisible">
|
|
||||||
<el-form
|
|
||||||
ref="formRef"
|
|
||||||
:model="formData"
|
|
||||||
:rules="formRules"
|
|
||||||
label-width="100px"
|
|
||||||
v-loading="formLoading"
|
|
||||||
>
|
|
||||||
<el-form-item label="通过凭证" prop="voucher">
|
|
||||||
<!-- <el-input v-model="formData.auditReason" type="textarea" placeholder="请输入驳回原因" />-->
|
|
||||||
<UploadImg v-model="formData.voucher" :max-count="1" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<template #footer>
|
|
||||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
|
||||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
|
||||||
</template>
|
|
||||||
</Dialog>
|
|
||||||
</template>
|
|
||||||
<script setup lang="ts">
|
|
||||||
import * as BrokerageWithdrawApi from '@/api/mall/trade/brokerage/withdraw'
|
|
||||||
import {Upload} from "@element-plus/icons-vue";
|
|
||||||
import {approveBrokerageWithdrawClosing} from "@/api/mall/trade/brokerage/withdraw";
|
|
||||||
|
|
||||||
const message = useMessage() // 消息弹窗
|
|
||||||
|
|
||||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
|
||||||
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
|
||||||
const formData = ref({
|
|
||||||
id: undefined,
|
|
||||||
voucher: undefined
|
|
||||||
})
|
|
||||||
const formRules = reactive({
|
|
||||||
voucher: [{ required: true, message: '凭证不能为空', trigger: 'blur' }]
|
|
||||||
})
|
|
||||||
const formRef = ref() // 表单 Ref
|
|
||||||
|
|
||||||
/** 打开弹窗 */
|
|
||||||
const open = async (id: number) => {
|
|
||||||
dialogVisible.value = true
|
|
||||||
resetForm()
|
|
||||||
formData.value.id = id
|
|
||||||
}
|
|
||||||
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
|
|
||||||
|
|
||||||
/** 提交表单 */
|
|
||||||
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
|
|
||||||
const submitForm = async () => {
|
|
||||||
// 校验表单
|
|
||||||
if (!formRef) return
|
|
||||||
const valid = await formRef.value.validate()
|
|
||||||
if (!valid) return
|
|
||||||
// 提交请求
|
|
||||||
formLoading.value = true
|
|
||||||
try {
|
|
||||||
const data = formData.value as unknown as BrokerageWithdrawApi.BrokerageWithdrawVO
|
|
||||||
await BrokerageWithdrawApi.approveBrokerageWithdrawClosing(data)
|
|
||||||
message.success('通过成功')
|
|
||||||
dialogVisible.value = false
|
|
||||||
// 发送操作成功的事件
|
|
||||||
emit('success')
|
|
||||||
} finally {
|
|
||||||
formLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 重置表单 */
|
|
||||||
const resetForm = () => {
|
|
||||||
formData.value = {
|
|
||||||
id: undefined,
|
|
||||||
voucher: undefined
|
|
||||||
}
|
|
||||||
formRef.value?.resetFields()
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@ -1,180 +0,0 @@
|
|||||||
<template>
|
|
||||||
<Dialog :title="dialogTitle" v-model="dialogVisible">
|
|
||||||
<el-form
|
|
||||||
ref="formRef"
|
|
||||||
:model="formData"
|
|
||||||
:rules="formRules"
|
|
||||||
label-width="100px"
|
|
||||||
v-loading="formLoading"
|
|
||||||
>
|
|
||||||
<el-form-item label="代理商余额:" prop="agentPrice">
|
|
||||||
<span>￥ {{fenToYuan(formData.agentPrice) || '-'}} </span>
|
|
||||||
<!-- <el-input v-model="formData.agentPrice" placeholder="请输入代理商id" :disabled="true"/>-->
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="可提现金额:" prop="brokeragePrice">
|
|
||||||
<span>￥ {{fenToYuan(formData.brokeragePrice) || '-'}} </span>
|
|
||||||
<!-- <el-input v-model="formData.brokeragePrice" placeholder="请输入可提现金额" :disabled= "true"/>-->
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="冻结金额:" prop="frozenPrice">
|
|
||||||
<span>￥ {{fenToYuan(formData.frozenPrice) || '-'}} </span>
|
|
||||||
<!-- <el-input v-model="formData.frozenPrice" placeholder="请输入冻结金额" :disabled= "true"/>-->
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="结算类型:" prop="closingType">
|
|
||||||
<el-radio-group v-model="formData.closingType">
|
|
||||||
<el-radio :value="1">钱包</el-radio>
|
|
||||||
<el-radio :value="2">银行</el-radio>
|
|
||||||
<el-radio :value="3">微信</el-radio>
|
|
||||||
<el-radio :value="4">支付宝</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="真实姓名:" prop="realName">
|
|
||||||
<span>{{(formData.realName) || '-'}} </span>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item v-if="formData.closingType === 3" label="微信账号:" prop="wechatAccount">
|
|
||||||
<span>{{(formData.wechatAccount) || '-'}} </span>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item v-if="formData.closingType === 3" label="微信收款码:" prop="wechatAccountQrCodeUrl">
|
|
||||||
<UploadImg v-model="formData.wechatAccountQrCodeUrl" :disabled="true"/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item v-if="formData.closingType === 4" label="支付宝账号:" prop="alipayAccount">
|
|
||||||
<span>{{(formData.alipayAccount || '-')}} </span>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item v-if="formData.closingType === 4" label="支付宝收款码:" prop="alipayAccountQrCodeUrl">
|
|
||||||
<UploadImg v-model="formData.alipayAccountQrCodeUrl" :disabled="true"/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item v-if="formData.closingType === 2" label="开户银行:" prop="bankName">
|
|
||||||
<span>{{(formData.bankName) || '-'}} </span>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item v-if="formData.closingType === 2" label="银行账号:" prop="bankCardNo">
|
|
||||||
<span>{{(formData.bankCardNo) || '-'}} </span>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="申请金额:" prop="supplyPrice">
|
|
||||||
<el-input-number v-model="formData.supplyPrice" :min="1" :precision="2" :step="0.01"/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="备注:" prop="remark">
|
|
||||||
<el-input type="textarea" v-model="formData.remark" placeholder="请输入平台备注" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<template #footer>
|
|
||||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
|
||||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
|
||||||
</template>
|
|
||||||
</Dialog>
|
|
||||||
</template>
|
|
||||||
<script setup lang="ts">
|
|
||||||
import * as BrokerageWithdrawApi from '@/api/mall/trade/brokerage/withdraw'
|
|
||||||
import { fenToYuan, jsonParse } from '@/utils'
|
|
||||||
|
|
||||||
/** 结算记录 表单 */
|
|
||||||
defineOptions({ name: 'ClosingRecordForm' })
|
|
||||||
|
|
||||||
const { t } = useI18n() // 国际化
|
|
||||||
const message = useMessage() // 消息弹窗
|
|
||||||
|
|
||||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
|
||||||
const dialogTitle = ref('') // 弹窗的标题
|
|
||||||
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
|
||||||
const formType = ref('') // 表单的类型：create - 新增；update - 修改
|
|
||||||
const formData = ref({
|
|
||||||
id: undefined,
|
|
||||||
userId: undefined,
|
|
||||||
agentPrice: undefined,
|
|
||||||
brokeragePrice: undefined,
|
|
||||||
frozenPrice: undefined,
|
|
||||||
closingType: undefined,
|
|
||||||
wechatAccountQrCodeUrl: undefined,
|
|
||||||
aliyAccountQrCodeUrl: undefined,
|
|
||||||
realName: undefined,
|
|
||||||
accountNo: undefined,
|
|
||||||
bankName: undefined,
|
|
||||||
bankCardNo: undefined,
|
|
||||||
supplyPrice: undefined,
|
|
||||||
remark: undefined,
|
|
||||||
wechatAccount: undefined,
|
|
||||||
aliyAccount: undefined,
|
|
||||||
agentId: undefined,
|
|
||||||
agentName: undefined,
|
|
||||||
})
|
|
||||||
const formRules = reactive({
|
|
||||||
closingType: [{ required: true, message: '结算类型不能为空', trigger: 'change' }],
|
|
||||||
supplyPrice: [{ required: true, message: '申请金额不能为空', trigger: 'change' }],
|
|
||||||
})
|
|
||||||
const formRef = ref() // 表单 Ref
|
|
||||||
|
|
||||||
/** 打开弹窗 */
|
|
||||||
const open = async (type: string, id?: number) => {
|
|
||||||
dialogVisible.value = true
|
|
||||||
dialogTitle.value = t('action.' + type)
|
|
||||||
formType.value = type
|
|
||||||
resetForm()
|
|
||||||
formData.value = await BrokerageWithdrawApi.getBrokerageSupplyInfo()
|
|
||||||
formData.value.closingType = 1
|
|
||||||
formData.value.supplyPrice = 1
|
|
||||||
console.log("form:",formData.value)
|
|
||||||
/*// 修改时，设置数据
|
|
||||||
if (id) {
|
|
||||||
formLoading.value = true
|
|
||||||
try {
|
|
||||||
|
|
||||||
|
|
||||||
} finally {
|
|
||||||
formLoading.value = false
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
|
|
||||||
|
|
||||||
/** 提交表单 */
|
|
||||||
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
|
|
||||||
const submitForm = async () => {
|
|
||||||
// 校验表单
|
|
||||||
await formRef.value.validate()
|
|
||||||
// 提交请求
|
|
||||||
formLoading.value = true
|
|
||||||
try {
|
|
||||||
const data = formData.value as unknown as BrokerageWithdrawApi.withDrawSupplyVO
|
|
||||||
if (formType.value === 'create') {
|
|
||||||
const submitData = JSON.parse(JSON.stringify(data))
|
|
||||||
submitData.supplyPrice = submitData.supplyPrice * 100
|
|
||||||
console.log("formData:",data)
|
|
||||||
|
|
||||||
await BrokerageWithdrawApi.createWithDraw(submitData)
|
|
||||||
message.success(t('common.createSuccess'))
|
|
||||||
}
|
|
||||||
/* else {
|
|
||||||
await ClosingRecordApi.updateClosingRecord(data)
|
|
||||||
message.success(t('common.updateSuccess'))
|
|
||||||
}*/
|
|
||||||
dialogVisible.value = false
|
|
||||||
// 发送操作成功的事件
|
|
||||||
emit('success')
|
|
||||||
} finally {
|
|
||||||
formLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 重置表单 */
|
|
||||||
const resetForm = () => {
|
|
||||||
formData.value = {
|
|
||||||
id: undefined,
|
|
||||||
userId: undefined,
|
|
||||||
agentPrice: undefined,
|
|
||||||
brokeragePrice: undefined,
|
|
||||||
frozenPrice: undefined,
|
|
||||||
closingType: undefined,
|
|
||||||
wechatAccountQrCodeUrl: undefined,
|
|
||||||
aliyAccountQrCodeUrl: undefined,
|
|
||||||
realName: undefined,
|
|
||||||
accountNo: undefined,
|
|
||||||
bankName: undefined,
|
|
||||||
bankCardNo: undefined,
|
|
||||||
supplyPrice: undefined,
|
|
||||||
remark: undefined,
|
|
||||||
wechatAccount: undefined,
|
|
||||||
aliyAccount: undefined,
|
|
||||||
agentId: undefined,
|
|
||||||
agentName: undefined,
|
|
||||||
}
|
|
||||||
formRef.value?.resetFields()
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@ -1,318 +0,0 @@
|
|||||||
<template>
|
|
||||||
<doc-alert title="【交易】分销返佣" url="https://doc.iocoder.cn/mall/trade-brokerage/" />
|
|
||||||
|
|
||||||
<ContentWrap>
|
|
||||||
<!-- 搜索工作栏 -->
|
|
||||||
<el-form
|
|
||||||
class="-mb-15px"
|
|
||||||
:model="queryParams"
|
|
||||||
ref="queryFormRef"
|
|
||||||
:inline="true"
|
|
||||||
label-width="68px"
|
|
||||||
>
|
|
||||||
<el-form-item label="用户编号" prop="userId">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.userId"
|
|
||||||
placeholder="请输入用户编号"
|
|
||||||
clearable
|
|
||||||
@keyup.enter="handleQuery"
|
|
||||||
class="!w-240px"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="提现类型" prop="type">
|
|
||||||
<el-select
|
|
||||||
v-model="queryParams.type"
|
|
||||||
placeholder="请选择提现类型"
|
|
||||||
clearable
|
|
||||||
class="!w-240px"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE)"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="dict.label"
|
|
||||||
:value="dict.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="账号" prop="accountNo">
|
|
||||||
<el-input
|
|
||||||
v-model="queryParams.accountNo"
|
|
||||||
placeholder="请输入账号"
|
|
||||||
clearable
|
|
||||||
@keyup.enter="handleQuery"
|
|
||||||
class="!w-240px"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="提现银行" prop="bankName">
|
|
||||||
<el-select
|
|
||||||
v-model="queryParams.bankName"
|
|
||||||
placeholder="请选择提现银行"
|
|
||||||
clearable
|
|
||||||
class="!w-240px"
|
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="dict in getStrDictOptions(DICT_TYPE.BROKERAGE_BANK_NAME)"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="dict.label"
|
|
||||||
:value="dict.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="状态" prop="status">
|
|
||||||
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
|
|
||||||
<el-option
|
|
||||||
v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_STATUS)"
|
|
||||||
:key="dict.value"
|
|
||||||
:label="dict.label"
|
|
||||||
:value="dict.value"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="申请时间" prop="createTime">
|
|
||||||
<el-date-picker
|
|
||||||
v-model="queryParams.createTime"
|
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
|
||||||
type="daterange"
|
|
||||||
start-placeholder="开始日期"
|
|
||||||
end-placeholder="结束日期"
|
|
||||||
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
|
|
||||||
class="!w-240px"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item>
|
|
||||||
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
|
||||||
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
|
||||||
<el-button
|
|
||||||
@click="openClosingForm('create')"
|
|
||||||
v-hasPermi="['trade:brokerage-withdraw:create']"
|
|
||||||
>
|
|
||||||
<Icon icon="ep:plus" class="mr-5px" /> 申请结算
|
|
||||||
</el-button>
|
|
||||||
<el-button
|
|
||||||
type="success"
|
|
||||||
plain
|
|
||||||
@click="handleExport"
|
|
||||||
:loading="exportLoading"
|
|
||||||
v-hasPermi="['trade:brokerage-withdraw:export']"
|
|
||||||
>
|
|
||||||
<Icon icon="ep:download" class="mr-5px" /> 导出
|
|
||||||
</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
</ContentWrap>
|
|
||||||
|
|
||||||
<!-- 列表 -->
|
|
||||||
<ContentWrap>
|
|
||||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
|
||||||
<el-table-column label="编号" align="left" prop="id" min-width="60px" />
|
|
||||||
<el-table-column label="用户信息" align="left" min-width="120px">
|
|
||||||
<template #default="scope">
|
|
||||||
<div>编号：{{ scope.row.userId }}</div>
|
|
||||||
<div>昵称：{{ scope.row.userNickname }}</div>
|
|
||||||
<div>代理商名称：{{ scope.row.agentName }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="提现金额" align="left" prop="price" min-width="80px">
|
|
||||||
<template #default="scope">
|
|
||||||
<div>金 额：￥{{ fenToYuan(scope.row.price) }}</div>
|
|
||||||
<div>手续费：￥{{ fenToYuan(scope.row.feePrice) }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="提现方式" align="left" prop="type" min-width="120px">
|
|
||||||
<template #default="scope">
|
|
||||||
<div v-if="scope.row.type === BrokerageWithdrawTypeEnum.WALLET.type"> 余额 </div>
|
|
||||||
<div v-else>
|
|
||||||
{{ getDictLabel(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE, scope.row.type) }}
|
|
||||||
<span v-if="scope.row.accountNo">账号：{{ scope.row.accountNo }}</span>
|
|
||||||
</div>
|
|
||||||
<template v-if="scope.row.type === BrokerageWithdrawTypeEnum.BANK.type">
|
|
||||||
<div>真实姓名：{{ scope.row.name }}</div>
|
|
||||||
<div>
|
|
||||||
银行名称：
|
|
||||||
<dict-tag :type="DICT_TYPE.BROKERAGE_BANK_NAME" :value="scope.row.bankName" />
|
|
||||||
</div>
|
|
||||||
<div>开户地址：{{ scope.row.bankAddress }}</div>
|
|
||||||
</template>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="收款码" align="left" prop="accountQrCodeUrl" min-width="70px">
|
|
||||||
<template #default="scope">
|
|
||||||
<el-image
|
|
||||||
v-if="scope.row.accountQrCodeUrl"
|
|
||||||
:src="scope.row.accountQrCodeUrl"
|
|
||||||
class="h-40px w-40px"
|
|
||||||
:preview-src-list="[scope.row.accountQrCodeUrl]"
|
|
||||||
preview-teleported
|
|
||||||
/>
|
|
||||||
<span v-else>无</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
label="申请时间"
|
|
||||||
align="left"
|
|
||||||
prop="createTime"
|
|
||||||
:formatter="dateFormatter"
|
|
||||||
width="180px"
|
|
||||||
/>
|
|
||||||
<el-table-column label="备注" align="left" prop="remark" />
|
|
||||||
<el-table-column label="状态" align="left" prop="status" min-width="120px">
|
|
||||||
<template #default="scope">
|
|
||||||
<dict-tag :type="DICT_TYPE.BROKERAGE_WITHDRAW_STATUS" :value="scope.row.status" />
|
|
||||||
<div v-if="scope.row.auditTime" class="text-xs">
|
|
||||||
时间：{{ formatDate(scope.row.auditTime) }}
|
|
||||||
</div>
|
|
||||||
<div v-if="scope.row.auditReason" class="text-xs">
|
|
||||||
原因：{{ scope.row.auditReason }}
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="操作" align="left" width="110px" fixed="right">
|
|
||||||
<template #default="scope">
|
|
||||||
<template v-if="scope.row.status === BrokerageWithdrawStatusEnum.AUDITING.status">
|
|
||||||
<el-button
|
|
||||||
link
|
|
||||||
type="primary"
|
|
||||||
@click="openApproveForm(scope.row.id)"
|
|
||||||
v-hasPermi="['trade:brokerage-withdraw:audit']"
|
|
||||||
>
|
|
||||||
通过
|
|
||||||
</el-button>
|
|
||||||
<el-button
|
|
||||||
link
|
|
||||||
type="danger"
|
|
||||||
@click="openForm(scope.row.id)"
|
|
||||||
v-hasPermi="['trade:brokerage-withdraw:audit']"
|
|
||||||
>
|
|
||||||
驳回
|
|
||||||
</el-button>
|
|
||||||
</template>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
<!-- 分页 -->
|
|
||||||
<Pagination
|
|
||||||
:total="total"
|
|
||||||
v-model:page="queryParams.pageNo"
|
|
||||||
v-model:limit="queryParams.pageSize"
|
|
||||||
@pagination="getList"
|
|
||||||
/>
|
|
||||||
</ContentWrap>
|
|
||||||
|
|
||||||
<!-- 表单弹窗：添加/修改 -->
|
|
||||||
<BrokerageWithdrawRejectForm ref="formRef" @success="getList" />
|
|
||||||
<ClosingRecordForm ref="closingFormRef" @success="getList" />
|
|
||||||
<ClosingRecordAgreeForm ref="approveFormRef" @success="getList" />
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { DICT_TYPE, getDictLabel, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
|
|
||||||
import { dateFormatter, formatDate } from '@/utils/formatTime'
|
|
||||||
import * as BrokerageWithdrawApi from '@/api/mall/trade/brokerage/withdraw'
|
|
||||||
import BrokerageWithdrawRejectForm from '@/views/mall/trade/brokerage/withdraw/BrokerageWithdrawRejectForm.vue'
|
|
||||||
import { BrokerageWithdrawStatusEnum, BrokerageWithdrawTypeEnum } from '@/utils/constants'
|
|
||||||
import ClosingRecordForm from "@/views/agent/closingrecord/ClosingRecordForm.vue";
|
|
||||||
import ClosingRecordAgreeForm from "@/views/agent/closingrecord/ClosingRecordAgreeForm.vue";
|
|
||||||
import { fenToYuanFormat } from '@/utils/formatter'
|
|
||||||
import { fenToYuan } from '@/utils'
|
|
||||||
import download from "@/utils/download";
|
|
||||||
|
|
||||||
defineOptions({ name: 'BrokerageWithdraw' })
|
|
||||||
|
|
||||||
const { t } = useI18n() // 国际化
|
|
||||||
const exportLoading = ref(false) // 导出的加载中
|
|
||||||
const message = useMessage() // 消息弹窗
|
|
||||||
const loading = ref(true) // 列表的加载中
|
|
||||||
const total = ref(0) // 列表的总页数
|
|
||||||
const list = ref([]) // 列表的数据
|
|
||||||
const queryParams = reactive({
|
|
||||||
pageNo: 1,
|
|
||||||
pageSize: 10,
|
|
||||||
userId: null,
|
|
||||||
type: null,
|
|
||||||
name: null,
|
|
||||||
accountNo: null,
|
|
||||||
bankName: null,
|
|
||||||
status: null,
|
|
||||||
auditReason: null,
|
|
||||||
auditTime: [],
|
|
||||||
remark: null,
|
|
||||||
createTime: []
|
|
||||||
})
|
|
||||||
const queryFormRef = ref() // 搜索的表单
|
|
||||||
|
|
||||||
/** 查询列表 */
|
|
||||||
const getList = async () => {
|
|
||||||
loading.value = true
|
|
||||||
try {
|
|
||||||
const data = await BrokerageWithdrawApi.getBrokerageWithdrawPage(queryParams)
|
|
||||||
list.value = data.list
|
|
||||||
total.value = data.total
|
|
||||||
console.log("list:",list)
|
|
||||||
} finally {
|
|
||||||
loading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 搜索按钮操作 */
|
|
||||||
const handleQuery = () => {
|
|
||||||
queryParams.pageNo = 1
|
|
||||||
getList()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 重置按钮操作 */
|
|
||||||
const resetQuery = () => {
|
|
||||||
queryFormRef.value.resetFields()
|
|
||||||
handleQuery()
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 添加/修改操作 */
|
|
||||||
const formRef = ref()
|
|
||||||
const openForm = (id: number) => {
|
|
||||||
formRef.value.open(id)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 添加/修改操作 */
|
|
||||||
const closingFormRef = ref()
|
|
||||||
const openClosingForm = (type: string,id?: number) => {
|
|
||||||
closingFormRef.value.open(type,id)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 添加/修改操作 */
|
|
||||||
const approveFormRef = ref()
|
|
||||||
const openApproveForm = (id: number) => {
|
|
||||||
approveFormRef.value.open(id)
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 导出按钮操作 */
|
|
||||||
const handleExport = async () => {
|
|
||||||
try {
|
|
||||||
// 导出的二次确认
|
|
||||||
await message.exportConfirm()
|
|
||||||
// 发起导出
|
|
||||||
exportLoading.value = true
|
|
||||||
const data = await BrokerageWithdrawApi.exportBrokerageWithDraw(queryParams)
|
|
||||||
download.excel(data, '结算管理.xls')
|
|
||||||
} catch {
|
|
||||||
} finally {
|
|
||||||
exportLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 审核通过 */
|
|
||||||
const handleApprove = async (id: number) => {
|
|
||||||
try {
|
|
||||||
loading.value = true
|
|
||||||
await message.confirm('确定要审核通过吗？')
|
|
||||||
await BrokerageWithdrawApi.approveBrokerageWithdraw(id)
|
|
||||||
await message.success(t('common.success'))
|
|
||||||
await getList()
|
|
||||||
} finally {
|
|
||||||
loading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 初始化 **/
|
|
||||||
onMounted(() => {
|
|
||||||
getList()
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
@ -1,118 +0,0 @@
|
|||||||
<template>
|
|
||||||
<Dialog :title="dialogTitle" v-model="dialogVisible">
|
|
||||||
<el-form
|
|
||||||
ref="formRef"
|
|
||||||
:model="formData"
|
|
||||||
:rules="formRules"
|
|
||||||
label-width="100px"
|
|
||||||
v-loading="formLoading"
|
|
||||||
>
|
|
||||||
<el-form-item label="订单id" prop="orderId">
|
|
||||||
<el-input v-model="formData.orderId" placeholder="请输入订单id" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="订单支付金额，单位：分" prop="price">
|
|
||||||
<el-input v-model="formData.price" placeholder="请输入订单支付金额，单位：分" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="分红金额，单位: 分" prop="bonus">
|
|
||||||
<el-input v-model="formData.bonus" placeholder="请输入分红金额，单位: 分" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="代理商id" prop="agentId">
|
|
||||||
<el-input v-model="formData.agentId" placeholder="请输入代理商id" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="支付状态" prop="status">
|
|
||||||
<el-radio-group v-model="formData.status">
|
|
||||||
<el-radio value="1">请选择字典生成</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
<template #footer>
|
|
||||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
|
||||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
|
||||||
</template>
|
|
||||||
</Dialog>
|
|
||||||
</template>
|
|
||||||
<script setup lang="ts">
|
|
||||||
import { BonusApi, BonusVO } from '@/api/agent/bonus'
|
|
||||||
|
|
||||||
/** 代理商分红明细 表单 */
|
|
||||||
defineOptions({ name: 'BonusForm' })
|
|
||||||
|
|
||||||
const { t } = useI18n() // 国际化
|
|
||||||
const message = useMessage() // 消息弹窗
|
|
||||||
|
|
||||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
|
||||||
const dialogTitle = ref('') // 弹窗的标题
|
|
||||||
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
|
|
||||||
const formType = ref('') // 表单的类型：create - 新增；update - 修改
|
|
||||||
const formData = ref({
|
|
||||||
id: undefined,
|
|
||||||
orderId: undefined,
|
|
||||||
price: undefined,
|
|
||||||
bonus: undefined,
|
|
||||||
agentId: undefined,
|
|
||||||
status: undefined,
|
|
||||||
})
|
|
||||||
const formRules = reactive({
|
|
||||||
orderId: [{ required: true, message: '订单id不能为空', trigger: 'blur' }],
|
|
||||||
price: [{ required: true, message: '订单支付金额，单位：分不能为空', trigger: 'blur' }],
|
|
||||||
bonus: [{ required: true, message: '分红金额，单位: 分不能为空', trigger: 'blur' }],
|
|
||||||
agentId: [{ required: true, message: '代理商id不能为空', trigger: 'blur' }],
|
|
||||||
status: [{ required: true, message: '支付状态不能为空', trigger: 'blur' }],
|
|
||||||
})
|
|
||||||
const formRef = ref() // 表单 Ref
|
|
||||||
|
|
||||||
/** 打开弹窗 */
|
|
||||||
const open = async (type: string, id?: number) => {
|
|
||||||
dialogVisible.value = true
|
|
||||||
dialogTitle.value = t('action.' + type)
|
|
||||||
formType.value = type
|
|
||||||
resetForm()
|
|
||||||
// 修改时，设置数据
|
|
||||||
if (id) {
|
|
||||||
formLoading.value = true
|
|
||||||
try {
|
|
||||||
formData.value = await BonusApi.getBonus(id)
|
|
||||||
} finally {
|
|
||||||
formLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
|
|
||||||
|
|
||||||
/** 提交表单 */
|
|
||||||
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
|
|
||||||
const submitForm = async () => {
|
|
||||||
// 校验表单
|
|
||||||
await formRef.value.validate()
|
|
||||||
// 提交请求
|
|
||||||
formLoading.value = true
|
|
||||||
try {
|
|
||||||
const data = formData.value as unknown as BonusVO
|
|
||||||
if (formType.value === 'create') {
|
|
||||||
await BonusApi.createBonus(data)
|
|
||||||
message.success(t('common.createSuccess'))
|
|
||||||
} else {
|
|
||||||
await BonusApi.updateBonus(data)
|
|
||||||
message.success(t('common.updateSuccess'))
|
|
||||||
}
|
|
||||||
dialogVisible.value = false
|
|
||||||
// 发送操作成功的事件
|
|
||||||
emit('success')
|
|
||||||
} finally {
|
|
||||||
formLoading.value = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 重置表单 */
|
|
||||||
const resetForm = () => {
|
|
||||||
formData.value = {
|
|
||||||
id: undefined,
|
|
||||||
orderId: undefined,
|
|
||||||
price: undefined,
|
|
||||||
bonus: undefined,
|
|
||||||
agentId: undefined,
|
|
||||||
status: undefined,
|
|
||||||
}
|
|
||||||
formRef.value?.resetFields()
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
@ -206,8 +206,7 @@
|
|||||||
/>
|
/>
|
||||||
</ContentWrap>
|
</ContentWrap>
|
||||||
|
|
||||||
<!-- 表单弹窗：添加/修改 -->
|
|
||||||
<BonusForm ref="formRef" @success="getList" />
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
@ -215,7 +214,6 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
|
|||||||
import { dateFormatter } from '@/utils/formatTime'
|
import { dateFormatter } from '@/utils/formatTime'
|
||||||
import download from '@/utils/download'
|
import download from '@/utils/download'
|
||||||
import { AgentOrderApi, AgentOrderVO } from '@/api/agent/order'
|
import { AgentOrderApi, AgentOrderVO } from '@/api/agent/order'
|
||||||
import BonusForm from './BonusForm.vue'
|
|
||||||
import {InfoApi} from "@/api/agent/info";
|
import {InfoApi} from "@/api/agent/info";
|
||||||
import { fenToYuanFormat } from '@/utils/formatter'
|
import { fenToYuanFormat } from '@/utils/formatter'
|
||||||
import {useRouter,useRoute} from "vue-router";
|
import {useRouter,useRoute} from "vue-router";
|
||||||
|
|||||||
@ -61,7 +61,7 @@ public class agentOrderController {
|
|||||||
@Operation(summary = "获得代理商交易订单分页")
|
@Operation(summary = "获得代理商交易订单分页")
|
||||||
@PreAuthorize("@ss.hasPermission('agent:order:query')")
|
@PreAuthorize("@ss.hasPermission('agent:order:query')")
|
||||||
public CommonResult<PageResult<BrokerageRecordRespDTO>> getOrderPage(BrokerageRecordPageReqDTO reqVO) {
|
public CommonResult<PageResult<BrokerageRecordRespDTO>> getOrderPage(BrokerageRecordPageReqDTO reqVO) {
|
||||||
List<AdminUserRespDTO> userList = adminUserApi.getAdminUserByCode("super_admin");
|
/* List<AdminUserRespDTO> userList = adminUserApi.getAdminUserByCode("super_admin");
|
||||||
List<AdminUserRespDTO> users = adminUserApi.getAdminUserByCode("dfhg");
|
List<AdminUserRespDTO> users = adminUserApi.getAdminUserByCode("dfhg");
|
||||||
Long userId = getLoginUserId();
|
Long userId = getLoginUserId();
|
||||||
if(!userList.get(0).getId().equals(userId) && !users.get(0).getId().equals(userId)){
|
if(!userList.get(0).getId().equals(userId) && !users.get(0).getId().equals(userId)){
|
||||||
@ -72,7 +72,7 @@ public class agentOrderController {
|
|||||||
else{
|
else{
|
||||||
return success(PageResult.empty());
|
return success(PageResult.empty());
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
// 查询订单
|
// 查询订单
|
||||||
List<BrokerageRecordRespDTO> list = brokerageRecordApi.getBrokerageRecordPage(reqVO);
|
List<BrokerageRecordRespDTO> list = brokerageRecordApi.getBrokerageRecordPage(reqVO);
|
||||||
PageResult<BrokerageRecordRespDTO> pageResult = new PageResult<BrokerageRecordRespDTO>(list, Long.valueOf(list.size()));
|
PageResult<BrokerageRecordRespDTO> pageResult = new PageResult<BrokerageRecordRespDTO>(list, Long.valueOf(list.size()));
|
||||||
@ -101,7 +101,7 @@ public class agentOrderController {
|
|||||||
public void exportInfoExcel(@Valid BrokerageRecordPageReqDTO reqVO,
|
public void exportInfoExcel(@Valid BrokerageRecordPageReqDTO reqVO,
|
||||||
HttpServletResponse response) throws IOException {
|
HttpServletResponse response) throws IOException {
|
||||||
reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
reqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||||
List<AdminUserRespDTO> userList = adminUserApi.getAdminUserByCode("super_admin");
|
/*List<AdminUserRespDTO> userList = adminUserApi.getAdminUserByCode("super_admin");
|
||||||
List<AdminUserRespDTO> users = adminUserApi.getAdminUserByCode("dfhg");
|
List<AdminUserRespDTO> users = adminUserApi.getAdminUserByCode("dfhg");
|
||||||
Long userId = getLoginUserId();
|
Long userId = getLoginUserId();
|
||||||
AgentInfoDO agentInfoDO = new AgentInfoDO();
|
AgentInfoDO agentInfoDO = new AgentInfoDO();
|
||||||
@ -110,7 +110,7 @@ public class agentOrderController {
|
|||||||
if(agentInfoDO != null){
|
if(agentInfoDO != null){
|
||||||
reqVO.setAgentId(agentInfoDO.getId());
|
reqVO.setAgentId(agentInfoDO.getId());
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
// 查询订单
|
// 查询订单
|
||||||
List<BrokerageRecordRespDTO> list = brokerageRecordApi.getBrokerageRecordPage(reqVO);
|
List<BrokerageRecordRespDTO> list = brokerageRecordApi.getBrokerageRecordPage(reqVO);
|
||||||
String productInfo = "";
|
String productInfo = "";
|
||||||
@ -126,9 +126,6 @@ public class agentOrderController {
|
|||||||
brokerageRecordRespDTO.setProductInfo(productInfo);
|
brokerageRecordRespDTO.setProductInfo(productInfo);
|
||||||
brokerageRecordRespDTO.setBelong(belong);
|
brokerageRecordRespDTO.setBelong(belong);
|
||||||
}
|
}
|
||||||
if(!userList.get(0).getId().equals(userId) && !users.get(0).getId().equals(userId) && agentInfoDO == null){
|
|
||||||
list = new ArrayList<>();
|
|
||||||
}
|
|
||||||
// 导出 Excel
|
// 导出 Excel
|
||||||
ExcelUtils.write(response, "分销订单.xls", "数据", BrokerageRecordRespDTO.class
|
ExcelUtils.write(response, "分销订单.xls", "数据", BrokerageRecordRespDTO.class
|
||||||
,list);
|
,list);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user