This commit is contained in:
@@ -32,11 +32,7 @@
|
||||
import DetailPage from '@/components/common/DetailPage.vue'
|
||||
import type { DetailSection } from '@/components/common/DetailPage.vue'
|
||||
import { AgentRechargeService } from '@/api/modules'
|
||||
import type {
|
||||
AgentRecharge,
|
||||
AgentRechargeStatus,
|
||||
AgentRechargePaymentMethod
|
||||
} from '@/types/api'
|
||||
import type { AgentRecharge, AgentRechargeStatus, AgentRechargePaymentMethod } from '@/types/api'
|
||||
import { formatDateTime } from '@/utils/business/format'
|
||||
import { RoutesAlias } from '@/router/routesAlias'
|
||||
|
||||
@@ -100,7 +96,8 @@
|
||||
},
|
||||
{
|
||||
label: '状态',
|
||||
render: (data) => h(ElTag, { type: getStatusType(data.status) }, () => getStatusText(data.status))
|
||||
render: (data) =>
|
||||
h(ElTag, { type: getStatusType(data.status) }, () => getStatusText(data.status))
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -194,8 +191,8 @@
|
||||
|
||||
.detail-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 16px;
|
||||
align-items: center;
|
||||
margin-bottom: 24px;
|
||||
|
||||
.detail-title {
|
||||
@@ -209,10 +206,10 @@
|
||||
.loading-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 12px;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 60px 0;
|
||||
gap: 12px;
|
||||
color: var(--el-text-color-secondary);
|
||||
|
||||
.el-icon {
|
||||
|
||||
@@ -259,21 +259,14 @@
|
||||
>
|
||||
<ElAlert
|
||||
:title="
|
||||
resolveAction === 'release'
|
||||
? '确认将该笔待审佣金记录入账'
|
||||
: '确认将该笔待审佣金记录作废'
|
||||
resolveAction === 'release' ? '确认将该笔待审佣金记录入账' : '确认将该笔待审佣金记录作废'
|
||||
"
|
||||
:type="resolveAction === 'release' ? 'success' : 'warning'"
|
||||
style="margin-bottom: 16px"
|
||||
:closable="false"
|
||||
/>
|
||||
|
||||
<ElForm
|
||||
ref="resolveFormRef"
|
||||
:model="resolveForm"
|
||||
:rules="resolveRules"
|
||||
label-width="100px"
|
||||
>
|
||||
<ElForm ref="resolveFormRef" :model="resolveForm" :rules="resolveRules" label-width="100px">
|
||||
<ElFormItem v-if="resolveAction === 'release'" label="入账金额" prop="amount">
|
||||
<ElInputNumber
|
||||
v-model="resolveForm.amount"
|
||||
@@ -284,7 +277,7 @@
|
||||
style="width: 100%"
|
||||
placeholder="请输入入账金额(分)"
|
||||
/>
|
||||
<div style="color: var(--el-text-color-secondary); font-size: 12px; margin-top: 4px">
|
||||
<div style=" margin-top: 4px; font-size: 12px;color: var(--el-text-color-secondary)">
|
||||
金额单位为分,例如:100元 = 10000分
|
||||
</div>
|
||||
</ElFormItem>
|
||||
@@ -736,7 +729,10 @@
|
||||
}
|
||||
|
||||
// 处理佣金修正
|
||||
const handleResolveCommission = (row: ShopCommissionRecordItem, action: CommissionResolveAction) => {
|
||||
const handleResolveCommission = (
|
||||
row: ShopCommissionRecordItem,
|
||||
action: CommissionResolveAction
|
||||
) => {
|
||||
currentCommissionId.value = row.id
|
||||
resolveAction.value = action
|
||||
resolveForm.amount = undefined
|
||||
|
||||
@@ -22,7 +22,12 @@
|
||||
style="margin-top: 20px"
|
||||
>
|
||||
<template #left>
|
||||
<ElButton type="primary" @click="showWithdrawalDialog" v-permission="'my_commission:add'">发起提现</ElButton>
|
||||
<ElButton
|
||||
type="primary"
|
||||
@click="showWithdrawalDialog"
|
||||
v-permission="'my_commission:add'"
|
||||
>发起提现</ElButton
|
||||
>
|
||||
</template>
|
||||
</ArtTableHeader>
|
||||
|
||||
|
||||
@@ -10,7 +10,9 @@
|
||||
@refresh="handleRefresh"
|
||||
>
|
||||
<template #left>
|
||||
<ElButton type="primary" @click="showDialog" v-permission="'withdrawal_settings:add'">新增配置</ElButton>
|
||||
<ElButton type="primary" @click="showDialog" v-permission="'withdrawal_settings:add'"
|
||||
>新增配置</ElButton
|
||||
>
|
||||
</template>
|
||||
</ArtTableHeader>
|
||||
|
||||
|
||||
@@ -25,9 +25,7 @@
|
||||
</ElDescriptionsItem>
|
||||
|
||||
<ElDescriptionsItem label="实际退款金额">
|
||||
{{
|
||||
refund.approved_refund_amount ? formatCurrency(refund.approved_refund_amount) : '-'
|
||||
}}
|
||||
{{ refund.approved_refund_amount ? formatCurrency(refund.approved_refund_amount) : '-' }}
|
||||
</ElDescriptionsItem>
|
||||
<ElDescriptionsItem label="实收金额">
|
||||
{{ formatCurrency(refund.actual_received_amount) }}
|
||||
@@ -95,12 +93,7 @@
|
||||
width="500px"
|
||||
@closed="handleApproveDialogClosed"
|
||||
>
|
||||
<ElForm
|
||||
ref="approveFormRef"
|
||||
:model="approveForm"
|
||||
:rules="approveRules"
|
||||
label-width="120px"
|
||||
>
|
||||
<ElForm ref="approveFormRef" :model="approveForm" :rules="approveRules" label-width="120px">
|
||||
<ElFormItem label="退款单号">
|
||||
<span>{{ refund?.refund_no }}</span>
|
||||
</ElFormItem>
|
||||
@@ -341,9 +334,7 @@
|
||||
}
|
||||
|
||||
// 获取状态标签类型
|
||||
const getStatusType = (
|
||||
status: RefundStatus
|
||||
): 'warning' | 'success' | 'danger' | 'info' => {
|
||||
const getStatusType = (status: RefundStatus): 'warning' | 'success' | 'danger' | 'info' => {
|
||||
const statusMap: Record<RefundStatus, 'warning' | 'success' | 'danger' | 'info'> = {
|
||||
1: 'warning', // 待审批
|
||||
2: 'success', // 已通过
|
||||
@@ -551,15 +542,15 @@
|
||||
|
||||
.card-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.action-buttons {
|
||||
margin-top: 20px;
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
justify-content: flex-end;
|
||||
margin-top: 20px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -183,12 +183,7 @@
|
||||
width="500px"
|
||||
@closed="handleRejectDialogClosed"
|
||||
>
|
||||
<ElForm
|
||||
ref="rejectFormRef"
|
||||
:model="rejectForm"
|
||||
:rules="rejectRules"
|
||||
label-width="120px"
|
||||
>
|
||||
<ElForm ref="rejectFormRef" :model="rejectForm" :rules="rejectRules" label-width="120px">
|
||||
<ElFormItem label="退款单号">
|
||||
<span>{{ currentRefund?.refund_no }}</span>
|
||||
</ElFormItem>
|
||||
@@ -220,12 +215,7 @@
|
||||
width="500px"
|
||||
@closed="handleReturnDialogClosed"
|
||||
>
|
||||
<ElForm
|
||||
ref="returnFormRef"
|
||||
:model="returnForm"
|
||||
:rules="returnRules"
|
||||
label-width="120px"
|
||||
>
|
||||
<ElForm ref="returnFormRef" :model="returnForm" :rules="returnRules" label-width="120px">
|
||||
<ElFormItem label="退款单号">
|
||||
<span>{{ currentRefund?.refund_no }}</span>
|
||||
</ElFormItem>
|
||||
@@ -460,9 +450,7 @@
|
||||
|
||||
const createRules = reactive<FormRules>({
|
||||
order_id: [{ required: true, message: '请输入订单ID', trigger: 'blur' }],
|
||||
requested_refund_amount: [
|
||||
{ required: true, message: '请输入申请退款金额', trigger: 'blur' }
|
||||
],
|
||||
requested_refund_amount: [{ required: true, message: '请输入申请退款金额', trigger: 'blur' }],
|
||||
actual_received_amount: [{ required: true, message: '请输入实收金额', trigger: 'blur' }]
|
||||
})
|
||||
|
||||
@@ -519,9 +507,7 @@
|
||||
}
|
||||
|
||||
// 获取状态标签类型
|
||||
const getStatusType = (
|
||||
status: RefundStatus
|
||||
): 'warning' | 'success' | 'danger' | 'info' => {
|
||||
const getStatusType = (status: RefundStatus): 'warning' | 'success' | 'danger' | 'info' => {
|
||||
const statusMap: Record<RefundStatus, 'warning' | 'success' | 'danger' | 'info'> = {
|
||||
1: 'warning', // 待审批
|
||||
2: 'success', // 已通过
|
||||
@@ -998,10 +984,7 @@
|
||||
}
|
||||
|
||||
// 已拒绝或已退回状态可以重新提交
|
||||
if (
|
||||
currentOperatingRefund.value.status === 3 ||
|
||||
currentOperatingRefund.value.status === 4
|
||||
) {
|
||||
if (currentOperatingRefund.value.status === 3 || currentOperatingRefund.value.status === 4) {
|
||||
items.push({
|
||||
key: 'resubmit',
|
||||
label: '重新提交'
|
||||
|
||||
Reference in New Issue
Block a user