gxwebsoft/guilixu-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat(shopOrder): 添加订单商品明细展开功能并优化订单状态显示

Browse Source 
- 在订单列表中增加商品明细的展开/收起功能，默认显示2条商品信息
- 支持点击“展开全部 N 件”切换显示全部或折叠商品明细
- 优化订单状态栏支付状态、发货状态、开票状态及操作按钮中的分隔线统一风格
- 将shop/dashboard运行天数改为基于租户创建时间，而非订阅生效时间，保证准确性
- 调整订单列表表格列宽及显示顺序，改善界面布局和信息展示
- 注释和代码格式微调，删除无用的组件显示及注释代码，提升代码整洁度
- 修复了部分变量定义和模板标签排版，完善代码可维护性
This commit is contained in:
赵忠林
2026-07-29 00:44:54 +08:00
parent 4ab90c9d89
commit e87e60fd6a
5 changed files with 795 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.workbuddy/memory/2026-07-28.md
View File

@@ -4,3 +4,21 @@
- 文件：`src/views/shop/shopOrder/index.vue` 的 `column.key === 'action'` 操作列模板。
- 改动：原本操作列按钮只用 `<a-space>` 包裹、无分隔线；现按 `shop/shopGoods` 的写法，在「详情」与各条件块之间、以及块内多个按钮之间加入 `<a-divider type="vertical" />`。
- 分隔线放在各 `<template v-if>` 条件块内部，仅当对应操作出现时才渲染，避免多余竖线。
## 订单列表商品明细展开/收起（方案一已落地）
- 文件：`src/views/shop/shopOrder/index.vue`。
- 需求：商品明细较多时列表行被撑高，加「展开/收起」。采用方案一（单元格内展开），已确认执行。
- 实现：
- 新增 `expandedOrderIds: ref<Set<string>>`（用 `String(record.orderId)` 作 key，因 orderId 为 number|undefined）。
- 新增 `collapsedGoodsCount = 2`、`isOrderGoodsExpanded(record)`、`toggleOrderGoodsExpanded(record)`。
- 改写 `column.key === 'orderGoods'` 模板：默认 `record.orderGoods.slice(0, 2)`，超过 2 件显示「展开全部 N 件」，点击切换，展开后文案变「收起」。
- 类型检查：`vue-tsc --noEmit` 仅有的 3 处报错（line 2 `$router`/page-header、line 696/734 未用变量）均为项目既有，与本次改动无关。
## shop/dashboard 运行天数改为取租户创建时间
- 文件：`src/views/shop/dashboard/index.vue`。
- 需求：/dashboard 的"运行天数"要改用「租户创建时间」而不是订阅生效时间。
- 现状调查：
- `cms/dashboard`（站点控制台，标题"系统运行天数"）已在提交 894592c 改为 `getTenantInfo().createTime`（租户创建时间），已是目标行为。
- `shop/dashboard`（商城后台，标签"运行天数"）原用 `currentSubscription.startTime`（订阅生效时间）。
- 改动：将 shop/dashboard 的 `runDays` computed 改为取 `tenantStore.company?.createTime`（loadData 已 `tenantStore.fetchTenantInfo()` 写入 company）。同步更新顶部数据来源注释。
- 数据源说明：`getTenantInfo()` 返回 `Company`，其 `createTime` 字段即租户创建时间（`src/api/system/company/model/index.ts` line 164）；`site.ts` 的 `runDays` getter 仍用 `siteInfo.createTime`（站点创建时间），目前 cms/dashboard 已不依赖它。

20
src/views/shop/dashboard/index.vue
View File

@@ -344,10 +344,10 @@ const { loading: statisticsLoading } = storeToRefs(statisticsStore);
// ============================================================
// 基本信息：数据来源拆分
// - 身份信息（系统名称/版本号/运行状态）来自 app_product (productId=65)
// - 时间线（创建时间/到期时间/系统运行天数）来自 app_subscription
// · 创建时间 = subscription.startTime（订阅生效时间）
// - 时间线（开通时间/到期时间）来自 app_subscription
// · 开通时间 = subscription.startTime（订阅生效时间）
// · 到期时间 = subscription.expireTime
// · 系统运行天数 = 自 subscription.createTime 起累计
// - 系统运行天数 = 自租户创建时间起累计（tenantStore.company.createTime）
// ============================================================
// 当前应用产品（按固定 productId=65 查询）
const currentProduct = ref<AppProduct | null>(null);
@@ -643,15 +643,13 @@ const onPayModalClose = () => {
// 计算属性
const now = ref(Date.now());
let runDaysTimer: ReturnType<typeof setInterval>;
// 系统运行天数：自订阅生效时间起累计
// 锚定 currentSubscription.startTime（与"创建时间"行同源，语义统一）。
// 注意：若后端续费为新增订阅记录，此处取的是 expireTime 最新的 active 订阅，
// startTime 可能是续费生效日，runDays 会从续费日重新计数。
// 如需"累计运行天数"，应改用最早的 active 订阅 startTime 或后端额外提供字段。
// 系统运行天数：自租户创建时间起累计
// 锚定 tenantStore.company.createTime（租户建档时间），与后台租户创建时间一致。
// 数据来源：loadData 中已调用 tenantStore.fetchTenantInfo() 写入 tenantStore.company。
const runDays = computed(() => {
const startTime = currentSubscription.value?.startTime;
if (!startTime) return 0;
return Math.floor((now.value - new Date(startTime).getTime()) / (24 * 60 * 60 * 1000));
const createTime = tenantStore.company?.createTime;
if (!createTime) return 0;
return Math.floor((now.value - new Date(createTime).getTime()) / (24 * 60 * 60 * 1000));
});
const userCount = computed(() => statisticsStore.userCount);
const orderCount = computed(() => statisticsStore.orderCount);

78
src/views/shop/shopOrder/components/search.vue
View File

@@ -17,53 +17,51 @@
allow-clear
v-model:value="where.orderNo"
placeholder="订单编号"
style="width: 260px"
style="width: 240px"
@search="reload"
@pressEnter="reload"
/>
<!-- <a-select-->
<!-- v-model:value="where.type"-->
<!-- style="width: 150px"-->
<!-- placeholder="订单类型"-->
<!-- @change="search"-->
<!-- >-->
<!-- <a-select-option value="">全部</a-select-option>-->
<!-- <a-select-option :value="1">普通订单</a-select-option>-->
<!-- <a-select-option :value="2">秒杀订单</a-select-option>-->
<!-- <a-select-option :value="3">拼团订单</a-select-option>-->
<!-- </a-select>-->
<!-- <a-select-->
<!-- v-model:value="where.payStatus"-->
<!-- style="width: 150px"-->
<!-- placeholder="付款状态"-->
<!-- @change="search"-->
<!-- >-->
<!-- <a-select-option value="">全部</a-select-option>-->
<!-- <a-select-option :value="1">已付款</a-select-option>-->
<!-- <a-select-option :value="0">未付款</a-select-option>-->
<!-- </a-select>-->
<!-- <a-select-->
<!-- v-model:value="where.type"-->
<!-- style="width: 150px"-->
<!-- placeholder="订单类型"-->
<!-- @change="search"-->
<!-- >-->
<!-- <a-select-option value="">全部</a-select-option>-->
<!-- <a-select-option :value="1">普通订单</a-select-option>-->
<!-- <a-select-option :value="2">秒杀订单</a-select-option>-->
<!-- <a-select-option :value="3">拼团订单</a-select-option>-->
<!-- </a-select>-->
<a-select
v-model:value="where.orderStatus"
v-model:value="where.payStatus"
style="width: 150px"
placeholder="订单状态"
placeholder="付款状态"
@change="search"
>
<a-select-option value="">全部</a-select-option>
<a-select-option :value="1">已完成</a-select-option>
<!-- <a-select-option :value="0">未完成</a-select-option>-->
<!-- <a-select-option :value="2">未使用</a-select-option>-->
<a-select-option :value="3">已取消</a-select-option>
<a-select-option :value="4">退款中</a-select-option>
<a-select-option :value="5">退款被拒</a-select-option>
<a-select-option :value="6">退款成功</a-select-option>
<a-select-option :value="1">已付款</a-select-option>
<a-select-option :value="0">未付款</a-select-option>
</a-select>
<!-- <a-select-->
<!-- :options="getPayType()"-->
<!-- v-model:value="where.payType"-->
<!-- style="width: 150px"-->
<!-- placeholder="付款方式"-->
<!-- @change="search"-->
<!-- />-->
<!-- <a-select-->
<!-- v-model:value="where.orderStatus"-->
<!-- style="width: 150px"-->
<!-- placeholder="订单状态"-->
<!-- @change="search"-->
<!-- >-->
<!-- <a-select-option value="">全部</a-select-option>-->
<!-- <a-select-option :value="1">已完成</a-select-option>-->
<!-- <a-select-option :value="3">已取消</a-select-option>-->
<!-- <a-select-option :value="4">退款中</a-select-option>-->
<!-- <a-select-option :value="5">退款被拒</a-select-option>-->
<!-- <a-select-option :value="6">退款成功</a-select-option>-->
<!-- </a-select>-->
<a-select
:options="getPayType()"
v-model:value="where.payType"
style="width: 150px"
placeholder="付款方式"
@change="search"
/>
<a-range-picker
v-model:value="dateRange"
@@ -265,14 +263,14 @@ const handleExport = async () => {
]
];
await listShopOrder({ ...where, statusFilter: props.statusFilter })
await listShopOrder({...where, statusFilter: props.statusFilter})
.then(async (list) => {
orders.value = list;
// 列表接口不返回 orderGoods，按订单逐个补齐商品明细（含名称/规格/数量）
const goodsList = await Promise.all(
(list ?? []).map((d) =>
d.orderId
? listShopOrderGoods({ orderId: d.orderId }).catch(() => [])
? listShopOrderGoods({orderId: d.orderId}).catch(() => [])
: Promise.resolve([])
)
);

547
src/views/shop/shopOrder/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
<a-card style="margin-bottom: 20px">
<div class="p-3 mb-2 bg-white">
<search
@search="reload"
:selection="selection"
@@ -9,40 +9,40 @@
@remove="removeBatch"
@batchMove="openMove"
/>
</a-card>
<a-card :bordered="false" :body-style="{ padding: '16px' }">
<div class="order-notify-bar">
<a-space>
<span class="order-notify-label">新订单提醒</span>
<a-switch
v-model:checked="notifyEnabled"
checked-children="开"
un-checked-children="关"
@change="onNotifyToggle"
/>
<a-tooltip
title="开启后每60秒自动检测新订单，检测到后播放叮声并语音播报"
>
<InfoCircleOutlined class="order-notify-tip" />
</a-tooltip>
<a-button
type="link"
size="small"
:disabled="!notifyEnabled"
@click="onTestNotify"
>
测试提醒
</a-button>
</a-space>
</div>
<a-card :bordered="false" :body-style="{ padding: '16px' }">
<!-- <div class="order-notify-bar">-->
<!-- <a-space>-->
<!-- <span class="order-notify-label">新订单提醒</span>-->
<!-- <a-switch-->
<!-- v-model:checked="notifyEnabled"-->
<!-- checked-children="开"-->
<!-- un-checked-children="关"-->
<!-- @change="onNotifyToggle"-->
<!-- />-->
<!-- <a-tooltip-->
<!-- title="开启后每60秒自动检测新订单，检测到后播放叮声并语音播报"-->
<!-- >-->
<!-- <InfoCircleOutlined class="order-notify-tip" />-->
<!-- </a-tooltip>-->
<!-- <a-button-->
<!-- type="link"-->
<!-- size="small"-->
<!-- :disabled="!notifyEnabled"-->
<!-- @click="onTestNotify"-->
<!-- >-->
<!-- 测试提醒-->
<!-- </a-button>-->
<!-- </a-space>-->
<!-- </div>-->
<a-tabs type="card" v-model:activeKey="activeKey" @change="onTabs">
<a-tab-pane key="all" tab="全部" />
<a-tab-pane key="unpaid" tab="待付款" />
<a-tab-pane key="undelivered" tab="待发货" />
<a-tab-pane key="unreceived" tab="待收货" />
<a-tab-pane key="completed" tab="已完成" />
<a-tab-pane key="refunded" tab="退货/售后" />
<a-tab-pane key="cancelled" tab="已关闭" />
<a-tab-pane key="all" tab="全部"/>
<a-tab-pane key="unpaid" tab="待付款"/>
<a-tab-pane key="undelivered" tab="待发货"/>
<a-tab-pane key="unreceived" tab="待收货"/>
<a-tab-pane key="completed" tab="已完成"/>
<a-tab-pane key="refunded" tab="退货/售后"/>
<a-tab-pane key="cancelled" tab="已关闭"/>
</a-tabs>
<ele-pro-table
ref="tableRef"
@@ -50,14 +50,15 @@
:columns="columns"
:datasource="datasource"
:customRow="customRow"
:scroll="{ x: 1800 }"
v-model:selection="selection"
:scroll="{ x: 1600 }"
size="small"
cache-key="proShopOrderTable"
:toolbar="false"
tool-class="ele-toolbar-form"
class="sys-org-table"
>
<template #toolbar> </template>
<template #toolbar></template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'userInfo'">
<a-space :size="8">
@@ -70,10 +71,7 @@
<div class="leading-tight">
<div class="cursor-pointer" @click.stop="onSearch(record)">
{{
record.nickname ||
record.realName ||
record.name ||
'匿名'
record.realName
}}
</div>
<div
@@ -91,16 +89,6 @@
<template v-if="column.key === 'statusInfo'">
<div class="py-1">
<a-space :size="6" wrap>
<!-- 货到付款标识 -->
<a-tag
v-if="record.payType === 8"
color="blue"
>货到付款</a-tag>
<!-- 线下付款标识 -->
<a-tag
v-if="record.payType === 9"
color="orange"
>线下付款</a-tag>
<!-- 支付状态 -->
<a-tag
@@ -108,109 +96,123 @@
color="green"
@click.stop="updatePayStatus(record)"
class="cursor-pointer"
>已付款</a-tag
>已付款
</a-tag
>
<a-tag
v-else-if="record.payStatus == 1 && record.payType === 8"
color="green"
@click.stop="updatePayStatus(record)"
class="cursor-pointer"
>待收货付款</a-tag
>待收货付款
</a-tag
>
<a-tag
v-else-if="record.payStatus == 1 && record.payType === 9"
color="green"
@click.stop="updatePayStatus(record)"
class="cursor-pointer"
>已确认收款</a-tag
>已确认收款
</a-tag
>
<a-tag
v-else-if="record.payStatus == 0 && record.payType === 9"
color="orange"
@click.stop="updatePayStatus(record)"
class="cursor-pointer"
>待确认收款</a-tag
>待确认收款
</a-tag
>
<a-tag
v-else-if="record.payStatus == 0 || record.payStatus == null"
@click.stop="updatePayStatus(record)"
class="cursor-pointer"
>未付款</a-tag
>未付款
</a-tag
>
<a-tag
v-else-if="record.payStatus == 3"
color="orange"
@click.stop="updatePayStatus(record)"
class="cursor-pointer"
>占场中</a-tag
>占场中
</a-tag
>
<!-- 发货状态 -->
<a-tag
v-if="record.deliveryStatus == 10"
class="cursor-pointer"
>未发货</a-tag
>未发货
</a-tag
>
<a-tag v-if="record.deliveryStatus == 20" color="green"
>已发货</a-tag
>已发货
</a-tag
>
<a-tag v-if="record.deliveryStatus == 30" color="blue"
>部分发货</a-tag
>部分发货
</a-tag
>
<!-- 开票状态 -->
<!-- <a-tag v-if="record.isInvoice == 0">未开具</a-tag>-->
<!-- <a-tag v-if="record.isInvoice == 0">未开具</a-tag>-->
<a-tag v-if="record.isInvoice == 1" color="green">已开具</a-tag>
<a-tag v-if="record.isInvoice == 2" color="blue">不能开具</a-tag>
<!-- 订单状态 -->
<a-tag v-if="record.orderStatus === 0">未完成</a-tag>
<a-tag v-if="record.orderStatus === 1" color="green"
>已完成</a-tag
>已完成
</a-tag
>
<a-tag v-if="record.orderStatus === 2">已关闭</a-tag>
<a-tag v-if="record.orderStatus === 3" color="red"
>关闭中</a-tag
>关闭中
</a-tag
>
<a-tag v-if="record.orderStatus === 4" color="red"
>退款申请中</a-tag
>退款申请中
</a-tag
>
<a-tag v-if="record.orderStatus === 5" color="red"
>退款被拒绝</a-tag
>退款被拒绝
</a-tag
>
<a-tag v-if="record.orderStatus === 6" color="orange"
>已退款</a-tag
>已退款
</a-tag
>
<a-tag v-if="record.orderStatus === 7" color="pink"
>客户端申请退款</a-tag
>客户端申请退款
</a-tag
>
<!-- 结算状态 -->
<!-- <a-tag v-if="record.isSettled === 0">未结算</a-tag>-->
<!-- <a-tag v-if="record.isSettled === 1" color="green"-->
<!-- >已结算</a-tag-->
<!-- >-->
<!-- <a-tag v-if="record.isSettled === 0">未结算</a-tag>-->
<!-- <a-tag v-if="record.isSettled === 1" color="green"-->
<!-- >已结算</a-tag-->
<!-- >-->
</a-space>
</div>
</template>
<template v-if="column.key === 'orderGoods'">
<template
<a-space
v-for="(item, index) in isOrderGoodsExpanded(record)
? record.orderGoods
: (record.orderGoods || []).slice(0, collapsedGoodsCount)"
:key="index"
>
<div class="item py-1">
<a-space :id="`g-${index}`">
<a-avatar :src="getCompressedImageUrl(item.image,{ width: 100 })" shape="square" :size="50" />
<a-avatar :src="getCompressedImageUrl(item.image,{ width: 100 })" shape="square" :size="50"/>
<div class="flex flex-col">
<span>{{ item.goodsName }}</span>
</a-space>
<span class="text-gray-400 text-xs"> x {{ item.totalNum }} </span>
</div>
</template>
</a-space>
<div
v-if="record.orderGoods && record.orderGoods.length > collapsedGoodsCount"
class="mt-1"
>
<a @click.stop="toggleOrderGoodsExpanded(record)">
<a @click.stop="toggleOrderGoodsExpanded(record)" class="text-xs">
<template v-if="isOrderGoodsExpanded(record)">收起</template>
<template v-else>展开全部 {{ record.orderGoods.length }} 件</template>
</a>
@@ -219,11 +221,11 @@
<template v-if="column.key === 'payType'">
<!-- 货到付款特殊标识 -->
<template v-if="record.payType === 8">
<a-tag color="blue">货到付款</a-tag>
<span>货到付款</span>
</template>
<!-- 线下付款特殊标识 -->
<template v-else-if="record.payType === 9">
<a-tag color="orange">线下付款</a-tag>
<span class="text-sm">线下付款</span>
</template>
<template v-else>
<template v-for="item in getPayType()">
@@ -239,7 +241,7 @@
</template>
</template>
<template v-if="column.key === 'image'">
<a-image :src="record.image" :width="50" />
<a-image :src="record.image" :width="50"/>
</template>
<template v-if="column.key === 'sex'">
<a-tag v-if="record.sex === 1">男</a-tag>
@@ -272,35 +274,37 @@
<!-- 未付款状态的操作（排除线下付款） -->
<template v-if="!record.payStatus && record.orderStatus === 0 && record.payType !== 9">
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a @click.stop="handleEditOrder(record)">
修改
</a>
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a @click.stop="handleCancelOrder(record)">
<span class="ele-text-warning"> 关闭 </span>
</a>
</template>
<!-- 线下付款·待确认收款状态的操作（支持先发货后结款） -->
<template v-if="!record.payStatus && record.orderStatus === 0 && record.payType === 9 && record.deliveryStatus === 10">
<a-divider type="vertical" />
<template
v-if="!record.payStatus && record.orderStatus === 0 && record.payType === 9 && record.deliveryStatus === 10">
<a-divider type="vertical"/>
<a @click.stop="handleConfirmOfflinePayment(record)" class="ele-text-success">
确认收款
</a>
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a @click.stop="handleDelivery(record)" class="ele-text-primary">
发货
</a>
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a @click.stop="handleCancelOrder(record)">
<span class="ele-text-warning"> 关闭 </span>
</a>
</template>
<!-- 线下付款·已发货未收款状态的操作（先发货后结款） -->
<template v-if="!record.payStatus && record.orderStatus === 0 && record.payType === 9 && record.deliveryStatus === 20">
<a-divider type="vertical" />
<template
v-if="!record.payStatus && record.orderStatus === 0 && record.payType === 9 && record.deliveryStatus === 20">
<a-divider type="vertical"/>
<a @click.stop="handleConfirmOfflinePayment(record)" class="ele-text-success">
确认收款
</a>
@@ -316,11 +320,11 @@
!isRefundStatus(record.orderStatus)
"
>
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a @click.stop="handleDelivery(record)" class="ele-text-primary">
发货
</a>
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a v-permission="'shop:shopOrder:refund'" @click.stop="handleApplyRefund(record)">
退款
</a>
@@ -334,14 +338,14 @@
record.orderStatus === 0
"
>
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a
@click.stop="handleConfirmReceive(record)"
class="ele-text-primary"
>
确认收货
</a>
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a v-permission="'shop:shopOrder:refund'" @click.stop="handleApplyRefund(record)">
退款
</a>
@@ -352,14 +356,14 @@
<template
v-if="record.orderStatus === 4 || record.orderStatus === 7"
>
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a
@click.stop="handleApproveRefund(record)"
class="ele-text-success"
>
同意退款
</a>
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a
@click.stop="handleRejectRefund(record)"
class="ele-text-danger"
@@ -369,7 +373,7 @@
</template>
<template v-if="record.orderStatus === 5">
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a @click.stop="handleRetryRefund(record)">
重新处理
</a>
@@ -378,7 +382,7 @@
<!-- 已完成状态的操作 -->
<template v-if="record.orderStatus === 1">
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a v-permission="'shop:shopOrder:refund'" @click.stop="handleApplyRefund(record)">
退款
</a>
@@ -386,7 +390,7 @@
<!-- 删除操作 - 已完成、已关闭、退款成功的订单可以删除 -->
<template v-if="canDeleteOrder(record)">
<a-divider type="vertical" />
<a-divider type="vertical"/>
<a-popconfirm
title="确定要删除此订单吗？删除后无法恢复。"
@confirm="remove(record)"
@@ -403,7 +407,7 @@
</a-card>
<!-- 编辑弹窗 -->
<OrderInfo v-model:visible="showEdit" :data="current" @done="reload" />
<OrderInfo v-model:visible="showEdit" :data="current" @done="reload"/>
<!-- 发货弹窗 -->
<DeliveryModal
@@ -422,71 +426,70 @@
</template>
<script lang="ts" setup>
import { createVNode, ref, onMounted, onActivated, computed } from 'vue';
import { useRoute } from 'vue-router';
import type { EleProTable } from 'ele-admin-pro';
import type {
import {createVNode, ref, onMounted, onActivated, computed} from 'vue';
import {useRoute} from 'vue-router';
import type {EleProTable} from 'ele-admin-pro';
import type {
DatasourceFunction,
ColumnItem
} from 'ele-admin-pro/es/ele-pro-table/types';
import {
} from 'ele-admin-pro/es/ele-pro-table/types';
import {
ExclamationCircleOutlined,
InfoCircleOutlined
} from '@ant-design/icons-vue';
import Search from './components/search.vue';
import { getPageTitle } from '@/utils/common';
import { toDateString } from 'ele-admin-pro';
import OrderInfo from './components/orderInfo.vue';
import DeliveryModal from './components/deliveryModal.vue';
import OfflinePaymentModal from './components/OfflinePaymentModal.vue';
import { ShopOrder, ShopOrderParam } from '@/api/shop/shopOrder/model';
import {
} from '@ant-design/icons-vue';
import Search from './components/search.vue';
import {getPageTitle} from '@/utils/common';
import {toDateString} from 'ele-admin-pro';
import OrderInfo from './components/orderInfo.vue';
import DeliveryModal from './components/deliveryModal.vue';
import OfflinePaymentModal from './components/OfflinePaymentModal.vue';
import {ShopOrder, ShopOrderParam} from '@/api/shop/shopOrder/model';
import {
pageShopOrder,
repairOrder,
removeShopOrder,
removeBatchShopOrder,
updateShopOrder, refundShopOrder
} from '@/api/shop/shopOrder';
import { updateUser } from '@/api/system/user';
import { getPayType } from '@/utils/shop';
import { getCompressedImageUrl } from '@/utils/image';
import { message, Modal } from 'ant-design-vue';
import { useOrderNotify } from './useOrderNotify';
} from '@/api/shop/shopOrder';
import {updateUser} from '@/api/system/user';
import {getPayType} from '@/utils/shop';
import {getCompressedImageUrl} from '@/utils/image';
import {message, Modal} from 'ant-design-vue';
import {useOrderNotify} from './useOrderNotify';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
// 表格选中数据
const selection = ref<ShopOrder[]>([]);
// 当前编辑数据
const current = ref<ShopOrder | null>(null);
// 是否显示编辑弹窗
const showEdit = ref(false);
// 是否显示批量移动弹窗
const showMove = ref(false);
// 是否显示发货弹窗
const showDelivery = ref(false);
// 是否显示确认线下收款弹窗
const showOfflinePayment = ref(false);
// 加载状态
const loading = ref(true);
// 激活的标签（支持从路由参数初始化，如 /shop/shopOrder?tab=all）
const route = useRoute();
const validTabs = ['all', 'unpaid', 'undelivered', 'unreceived', 'completed', 'refunded', 'cancelled'];
const tabFromQuery = route.query.tab as string;
const activeKey = ref<string>(
// 表格选中数据
const selection = ref<ShopOrder[]>([]);
// 当前编辑数据
const current = ref<ShopOrder | null>(null);
// 是否显示编辑弹窗
const showEdit = ref(false);
// 是否显示批量移动弹窗
const showMove = ref(false);
// 是否显示发货弹窗
const showDelivery = ref(false);
// 是否显示确认线下收款弹窗
const showOfflinePayment = ref(false);
// 加载状态
const loading = ref(true);
// 激活的标签（支持从路由参数初始化，如 /shop/shopOrder?tab=all）
const route = useRoute();
const validTabs = ['all', 'unpaid', 'undelivered', 'unreceived', 'completed', 'refunded', 'cancelled'];
const tabFromQuery = route.query.tab as string;
const activeKey = ref<string>(
validTabs.includes(tabFromQuery) ? tabFromQuery : 'all'
);
);
// 商品明细展开状态：记录已展开商品明细的订单 orderId
const expandedOrderIds = ref<Set<string>>(new Set());
// 商品明细默认折叠时显示的条数
const collapsedGoodsCount = 2;
// 当前订单的商品明细是否已展开
const isOrderGoodsExpanded = (record: ShopOrder) =>
// 商品明细展开状态：记录已展开商品明细的订单 orderId
const expandedOrderIds = ref<Set<string>>(new Set());
// 商品明细默认折叠时显示的条数
const collapsedGoodsCount = 2;
// 当前订单的商品明细是否已展开
const isOrderGoodsExpanded = (record: ShopOrder) =>
expandedOrderIds.value.has(String(record.orderId));
// 切换订单商品明细的展开/收起
const toggleOrderGoodsExpanded = (record: ShopOrder) => {
// 切换订单商品明细的展开/收起
const toggleOrderGoodsExpanded = (record: ShopOrder) => {
const next = new Set(expandedOrderIds.value);
if (next.has(String(record.orderId))) {
next.delete(String(record.orderId));
@@ -494,25 +497,25 @@
next.add(String(record.orderId));
}
expandedOrderIds.value = next;
};
};
// ============ 新订单提醒 ============
const { enabled: notifyEnabled, toggle: onNotifyToggle, testNotify: onTestNotify, clearBadge } = useOrderNotify({
// ============ 新订单提醒 ============
const {enabled: notifyEnabled, toggle: onNotifyToggle, testNotify: onTestNotify, clearBadge} = useOrderNotify({
onNewOrder: () => reload()
});
// 进入订单列表页时清除菜单红点（标记已查看），并同步 lastOrderId 为当前最新订单
// 兼容 keep-alive：onMounted 处理首次进入，onActivated 处理缓存再次激活
let orderBadgeMounted = false;
onMounted(() => {
});
// 进入订单列表页时清除菜单红点（标记已查看），并同步 lastOrderId 为当前最新订单
// 兼容 keep-alive：onMounted 处理首次进入，onActivated 处理缓存再次激活
let orderBadgeMounted = false;
onMounted(() => {
clearBadge();
orderBadgeMounted = true;
});
onActivated(() => {
});
onActivated(() => {
if (orderBadgeMounted) clearBadge();
});
// 根据tab key获取对应的statusFilter值
// undefined全部，0待付款，1待发货，2待核销，3待收货，4待评价，5已完成，6已退款，7已删除，8已关闭
const getStatusFilterByTab = (key: string): number | undefined => {
});
// 根据tab key获取对应的statusFilter值
// undefined全部，0待付款，1待发货，2待核销，3待收货，4待评价，5已完成，6已退款，7已删除，8已关闭
const getStatusFilterByTab = (key: string): number | undefined => {
const filterMap: Record<string, number> = {
unpaid: 0,
undelivered: 1,
@@ -525,15 +528,15 @@
cancelled: 8
};
return filterMap[key];
};
};
// 导出时跟随当前标签的筛选状态（如「待发货」=1），避免导出混入其它状态的订单
const statusFilterForExport = computed(() =>
// 导出时跟随当前标签的筛选状态（如「待发货」=1），避免导出混入其它状态的订单
const statusFilterForExport = computed(() =>
getStatusFilterByTab(activeKey.value)
);
);
// 表格数据源
const datasource: DatasourceFunction = ({
// 表格数据源
const datasource: DatasourceFunction = ({
page,
limit,
where,
@@ -554,62 +557,55 @@
page,
limit
});
};
};
// 表格列配置
const columns = ref<ColumnItem[]>([
// 表格列配置
const columns = ref<ColumnItem[]>([
{
title: '订单编号',
dataIndex: 'orderNo',
key: 'orderNo',
width: 200,
align: 'center'
width: 150
},
{
title: '用户信息',
title: '买家信息',
dataIndex: 'userId',
key: 'userInfo'
key: 'userInfo',
width: 150
},
{
title: '商品信息',
dataIndex: 'orderGoods',
key: 'orderGoods'
key: 'orderGoods',
width: 300,
},
{
title: '实付金额',
dataIndex: 'payPrice',
key: 'payPrice',
align: 'center',
width: 120,
customRender: ({ text }) => '￥' + text
customRender: ({text}) => '￥' + text
},
{
title: '支付方式',
dataIndex: 'payType',
key: 'payType'
},
// {
// title: '支付方式',
// dataIndex: 'payType',
// key: 'payType',
// align: 'center',
// width: 120,
// },
{
title: '状态',
dataIndex: 'orderStatus',
key: 'statusInfo',
align: 'center'
},
// {
// title: '备注',
// dataIndex: 'comments',
// key: 'comments',
// align: 'center',
// },
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
width: 180,
align: 'center',
sorter: true,
customRender: ({ text }) => toDateString(text)
customRender: ({text}) => toDateString(text)
},
{
title: '操作',
@@ -618,42 +614,42 @@
fixed: 'right',
hideInSetting: true
}
]);
]);
/* 搜索 */
const reload = (where?: ShopOrderParam) => {
/* 搜索 */
const reload = (where?: ShopOrderParam) => {
selection.value = [];
tableRef?.value?.reload({ where: where });
};
tableRef?.value?.reload({where: where});
};
const onTabs = () => {
const onTabs = () => {
const filterParams: Record<string, any> = {};
const sf = getStatusFilterByTab(activeKey.value);
if (sf !== undefined) {
filterParams.statusFilter = sf;
}
reload(filterParams);
};
};
const onSearch = (item: ShopOrder) => {
reload({ userId: item.userId });
};
const onSearch = (item: ShopOrder) => {
reload({userId: item.userId});
};
/* 打开编辑弹窗 */
const openEdit = (row?: ShopOrder) => {
/* 打开编辑弹窗 */
const openEdit = (row?: ShopOrder) => {
current.value = row ?? null;
showEdit.value = true;
};
};
/* 打开批量移动弹窗 */
const openMove = () => {
/* 打开批量移动弹窗 */
const openMove = () => {
showMove.value = true;
};
};
/**
/**
* 修复订单支付状态
*/
const updatePayStatus = (record: ShopOrder) => {
const updatePayStatus = (record: ShopOrder) => {
// 修复订单数据
repairOrder({
...record
@@ -663,43 +659,44 @@
updateUser({
userId: record.userId,
realName: record.realName
}).then(() => {});
}).then(() => {
});
}
reload();
});
};
};
/* 查询 */
const query = () => {
/* 查询 */
const query = () => {
loading.value = true;
};
};
/* 辅助判断函数 */
// 判断是否为关闭状态
const isCancelledStatus = (orderStatus?: number) => {
/* 辅助判断函数 */
// 判断是否为关闭状态
const isCancelledStatus = (orderStatus?: number) => {
return [2, 3].includes(orderStatus || 0);
};
};
// 判断是否为退款相关状态
const isRefundStatus = (orderStatus?: number) => {
// 判断是否为退款相关状态
const isRefundStatus = (orderStatus?: number) => {
return [4, 5, 6, 7].includes(orderStatus || 0);
};
};
// 判断是否可以删除订单
const canDeleteOrder = (order: ShopOrder) => {
// 判断是否可以删除订单
const canDeleteOrder = (order: ShopOrder) => {
// 已完成、已关闭、退款成功的订单可以删除 （原来是[1, 2, 6],后面改成只有关闭的订单能删除）
return [2].includes(order.orderStatus || 0);
};
};
/* 订单操作方法 */
// 修改订单
const handleEditOrder = (record: ShopOrder) => {
/* 订单操作方法 */
// 修改订单
const handleEditOrder = (record: ShopOrder) => {
message.info('订单修改功能开发中...');
// TODO: 实现订单修改功能
};
};
// 关闭订单
const handleCancelOrder = (record: ShopOrder) => {
// 关闭订单
const handleCancelOrder = (record: ShopOrder) => {
Modal.confirm({
title: '确认关闭订单',
content: '确定要关闭此订单吗？关闭后无法恢复。',
@@ -716,22 +713,22 @@
}
}
});
};
};
// 确认线下付款收款
const handleConfirmOfflinePayment = (record: ShopOrder) => {
// 确认线下付款收款
const handleConfirmOfflinePayment = (record: ShopOrder) => {
current.value = record;
showOfflinePayment.value = true;
};
};
// 发货处理
const handleDelivery = (record: ShopOrder) => {
// 发货处理
const handleDelivery = (record: ShopOrder) => {
current.value = record;
showDelivery.value = true;
};
};
// 点击"未发货"标签快速发货：检查关联GltTicketOrder的riderId是否>0，若是则直接标记为已发货
const handleQuickDelivery = async (record: ShopOrder) => {
// 点击"未发货"标签快速发货：检查关联GltTicketOrder的riderId是否>0，若是则直接标记为已发货
const handleQuickDelivery = async (record: ShopOrder) => {
if (!record.orderNo) {
message.warning('订单编号不存在，无法查询配送信息');
return;
@@ -749,10 +746,10 @@
} catch (e: any) {
message.error(e.message || '操作失败');
}
};
};
// 确认收货
const handleConfirmReceive = (record: ShopOrder) => {
// 确认收货
const handleConfirmReceive = (record: ShopOrder) => {
Modal.confirm({
title: '确认收货',
content: '确定要将此订单标记为已收货并完成吗？',
@@ -770,10 +767,10 @@
}
}
});
};
};
// 同意退款
const handleApproveRefund = (record: ShopOrder) => {
// 同意退款
const handleApproveRefund = (record: ShopOrder) => {
Modal.confirm({
title: '同意退款',
content: '确定要同意此订单的退款申请吗？',
@@ -794,10 +791,10 @@
}
}
});
};
};
// 拒绝退款
const handleRejectRefund = (record: ShopOrder) => {
// 拒绝退款
const handleRejectRefund = (record: ShopOrder) => {
Modal.confirm({
title: '拒绝退款',
content: '确定要拒绝此订单的退款申请吗？',
@@ -814,10 +811,10 @@
}
}
});
};
};
// 重新处理退款
const handleRetryRefund = (record: ShopOrder) => {
// 重新处理退款
const handleRetryRefund = (record: ShopOrder) => {
Modal.confirm({
title: '重新处理退款',
content: '确定要重新处理此订单的退款吗？',
@@ -834,10 +831,10 @@
}
}
});
};
};
// 申请退款
const handleApplyRefund = (record: ShopOrder) => {
// 申请退款
const handleApplyRefund = (record: ShopOrder) => {
Modal.confirm({
title: '申请退款',
content: '确定要为此订单申请退款吗？',
@@ -858,10 +855,10 @@
}
}
});
};
};
/* 删除单个订单 */
const remove = (row: ShopOrder) => {
/* 删除单个订单 */
const remove = (row: ShopOrder) => {
removeShopOrder(row.orderId)
.then(() => {
message.success('删除成功');
@@ -870,10 +867,10 @@
.catch((e) => {
message.error(e.message);
});
};
};
/* 批量删除订单 */
const removeBatch = () => {
/* 批量删除订单 */
const removeBatch = () => {
if (!selection.value.length) {
message.error('请至少选择一条数据');
return;
@@ -895,10 +892,10 @@
});
}
});
};
};
/* 自定义行属性 */
const customRow = (record: ShopOrder) => {
/* 自定义行属性 */
const customRow = (record: ShopOrder) => {
return {
// 行点击事件
onClick: () => {
@@ -909,36 +906,36 @@
openEdit(record);
}
};
};
query();
};
query();
</script>
<script lang="ts">
import * as MenuIcons from '@/layout/menu-icons';
import * as MenuIcons from '@/layout/menu-icons';
export default {
export default {
name: 'BszxOrder',
components: MenuIcons
};
};
</script>
<style lang="less" scoped>
.order-notify-bar {
.order-notify-bar {
display: flex;
align-items: center;
margin-bottom: 12px;
padding: 8px 12px;
background: var(--ant-color-fill-alter, #fafafa);
border-radius: 6px;
}
}
.order-notify-label {
.order-notify-label {
font-size: 14px;
font-weight: 500;
}
}
.order-notify-tip {
.order-notify-tip {
color: var(--ant-color-text-secondary, #999);
cursor: help;
}
}
</style>

6
src/views/system/user/index.vue
View File

@@ -2,7 +2,7 @@
<a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
<!-- 高级筛选 -->
<a-form layout="inline" class="ele-form-inline" style="margin-bottom: 16px">
<a-form-item label="角色">
<a-form-item>
<a-select
v-model:value="searchWhere.roleId"
placeholder="全部角色"
@@ -17,7 +17,7 @@
>
</a-select>
</a-form-item>
<a-form-item label="注册来源">
<a-form-item>
<a-select
v-model:value="searchWhere.platform"
placeholder="全部来源"
@@ -29,7 +29,7 @@
<a-select-option value="WEB">Web</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="类型">
<a-form-item>
<a-select
v-model:value="searchWhere.isAdmin"
placeholder="全部"