chore(env): 启用开发环境API地址并清理冗余文件

- 启用 .env.development 中的 VITE_API_URL 配置
- 删除 src/views/glt/shopDealerOrder/components/Import.vue 文件
- 删除 src/views/glt/shopDealerOrder2/components/Import.vue 文件
- 删除 src/views/glt/shopDealerWithdraw/components/Import.vue 文件
- 删除 src/views/glt/shopDealerApply/index.vue 文件
- 删除 src/views/glt/shopDealerCapital/index.vue 文件
- 删除 src/views/glt/shopDealerOrder/index.vue 文件
- 从 shopDealerOrder 组件中移除导入模板说明信息
This commit is contained in:
2026-01-26 21:14:04 +08:00
parent b4c4f03dd0
commit c605d0619d
36 changed files with 373 additions and 7002 deletions

View File

@@ -7,7 +7,6 @@
:columns="columns"
:datasource="datasource"
:customRow="customRow"
v-model:selection="selection"
tool-class="ele-toolbar-form"
class="sys-org-table"
>
@@ -24,11 +23,13 @@
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'title'">
<div>{{ record.title }}</div>
<div class="text-gray-400">用户ID{{ record.userId }}</div>
<div class="text-gray-400"
>{{ record.nickname }}({{ record.userId }})</div
>
</template>
<template v-if="column.key === 'orderPrice'">
{{ record.orderPrice.toFixed(2) }}
{{ parseFloat(record.orderPrice).toFixed(2) }}
</template>
<template v-if="column.key === 'degreePrice'">
@@ -36,7 +37,7 @@
</template>
<template v-if="column.key === 'price'">
{{ record.price }}
{{ record.price || 0 }}
</template>
<template v-if="column.key === 'settledPrice'">
@@ -47,6 +48,30 @@
{{ record.payPrice.toFixed(2) }}
</template>
<template v-if="column.key === 'firstNickname'">
<div>{{ record.firstMoney }}</div>
<div class="text-gray-400">{{ record.firstNickname || '-' }}</div>
</template>
<template v-if="column.key === 'secondNickname'">
<div>{{ record.secondMoney }}</div>
<div class="text-gray-400">{{ record.secondNickname || '-' }}</div>
</template>
<template v-if="column.key === 'firstDividendUserName'">
<div>{{ record.firstDividend }}</div>
<div class="text-gray-400"
>{{ record.firstDividendUserName || '-' }}</div
>
</template>
<template v-if="column.key === 'secondDividendUserName'">
<div>{{ record.secondDividend }}</div>
<div class="text-gray-400"
>{{ record.secondDividendUserName || '-' }}</div
>
</template>
<template v-if="column.key === 'dealerInfo'">
<div class="dealer-info">
<div v-if="record.firstUserId" class="dealer-level">
@@ -93,9 +118,22 @@
<template v-if="column.key === 'action'">
<template v-if="record.isSettled === 0 && record.isInvalid === 0">
<a @click="openEdit(record)" class="ele-text-success"> 结算 </a>
<a @click="settleOrder(record)" class="ele-text-success">
结算
</a>
<a-divider type="vertical" />
</template>
<!-- <template v-if="record.isInvalid === 0">-->
<!-- <a-popconfirm-->
<!-- title="确定要标记此订单为失效吗?"-->
<!-- @confirm="invalidateOrder(record)"-->
<!-- placement="topRight"-->
<!-- >-->
<!-- <a class="text-purple-500">-->
<!-- 验证-->
<!-- </a>-->
<!-- </a-popconfirm>-->
<!-- </template>-->
<a-popconfirm
v-if="record.isSettled === 0"
title="确定要删除吗?"
@@ -121,7 +159,10 @@
<script lang="ts" setup>
import { createVNode, ref } from 'vue';
import { message, Modal } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import {
ExclamationCircleOutlined,
DollarOutlined
} from '@ant-design/icons-vue';
import type { EleProTable } from 'ele-admin-pro';
import type {
DatasourceFunction,
@@ -139,7 +180,10 @@
ShopDealerOrder,
ShopDealerOrderParam
} from '@/api/shop/shopDealerOrder/model';
import { exportShopDealerOrder } from '@/api/shop/shopDealerOrder';
import {
exportShopDealerOrder,
updateShopDealerOrder
} from '@/api/shop/shopDealerOrder';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -169,9 +213,8 @@
}
// 保存当前搜索条件用于导出
currentWhere.value = { ...where };
// 结算订单
where.isSettled = 0;
where.myOrder = 1;
// 结算订单
where.isSettled = 1;
return pageShopDealerOrder({
...where,
...orders,
@@ -182,88 +225,77 @@
// 表格列配置
const columns = ref<ColumnItem[]>([
{
key: 'index',
width: 48,
align: 'center',
fixed: 'left',
hideInSetting: true,
customRender: ({ index }) => index + (tableRef.value?.tableIndex ?? 0)
},
{
title: '订单编号',
dataIndex: 'orderNo',
key: 'orderNo'
key: 'orderNo',
align: 'center',
width: 200
},
{
title: '客户名称',
title: '买家',
dataIndex: 'title',
key: 'title',
width: 220
key: 'title'
},
{
title: '结算电量',
title: '订单金额',
dataIndex: 'orderPrice',
key: 'orderPrice',
align: 'center'
},
{
title: '换算成度',
dataIndex: 'degreePrice',
key: 'degreePrice',
title: '一级佣金(10%)',
dataIndex: 'firstNickname',
key: 'firstNickname',
align: 'center'
},
{
title: '结算单价',
dataIndex: 'price',
key: 'price',
title: '二级佣金(5%)',
dataIndex: 'secondNickname',
key: 'secondNickname',
align: 'center'
},
{
title: '结算金额',
dataIndex: 'settledPrice',
key: 'settledPrice',
title: '一级门店分红(2%/3%)',
dataIndex: 'firstDividendUserName',
key: 'firstDividendUserName',
align: 'center'
},
{
title: '税费',
dataIndex: 'rate',
key: 'rate',
title: '二级门店分红(1%)',
dataIndex: 'secondDividendUserName',
key: 'secondDividendUserName',
align: 'center'
},
{
title: '实发金额',
dataIndex: 'payPrice',
key: 'payPrice',
align: 'center'
},
{
title: '签约状态',
dataIndex: 'isInvalid',
key: 'isInvalid',
align: 'center',
width: 100
},
{
title: '月份',
dataIndex: 'month',
key: 'month',
align: 'center',
width: 100
},
{
title: '结算状态',
dataIndex: 'isSettled',
key: 'isSettled',
align: 'center',
width: 100
align: 'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
},
{
title: '操作',
key: 'action',
width: 180,
fixed: 'right',
align: 'center',
hideInSetting: true
width: 180
}
// {
// title: '操作',
// key: 'action',
// width: 180,
// fixed: 'right',
// align: 'center',
// hideInSetting: true
// }
]);
/* 搜索 */
@@ -272,6 +304,37 @@
tableRef?.value?.reload({ where: where });
};
/* 结算单个订单 */
const settleOrder = (row: ShopDealerOrder) => {
const totalCommission = (
parseFloat(row.firstMoney || '0') +
parseFloat(row.secondMoney || '0') +
parseFloat(row.thirdMoney || '0')
).toFixed(2);
Modal.confirm({
title: '确认结算',
content: `确定要结算此订单吗?总佣金金额:¥${totalCommission}`,
icon: createVNode(DollarOutlined),
okText: '确认结算',
okType: 'primary',
cancelText: '取消',
onOk: () => {
const hide = message.loading('正在结算...', 0);
// 这里调用结算API
updateShopDealerOrder({
...row,
isSettled: 1
});
setTimeout(() => {
hide();
message.success('结算成功');
reload();
}, 1000);
}
});
};
/* 批量结算 */
const batchSettle = () => {
if (!selection.value.length) {
@@ -327,7 +390,7 @@
/* 打开编辑弹窗 */
const openEdit = (row?: ShopDealerOrder) => {
current.value = row ?? null;
showEdit.value = true;
// showEdit.value = true;
};
/* 删除单个 */