修复已知问题

This commit is contained in:
2024-09-27 14:17:12 +08:00
parent c0328fa23e
commit 5e56c31300
299 changed files with 17512 additions and 987 deletions

View File

@@ -187,6 +187,30 @@
<template v-if="column.key === 'action'">
<a-space>
<a @click="openEdit(record)">详情</a>
<template v-if="record.deliveryStatus === 10">
<a-divider type="vertical" />
<a @click="openDelivery(record)">发货</a>
</template>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link" @click.prevent>
更多
<DownOutlined />
</a>
<template #overlay>
<a-menu>
<a-menu-item>
<a href="javascript:;">打印小票</a>
</a-menu-item>
<a-menu-item>
<a href="javascript:;">直接退款</a>
</a-menu-item>
<a-menu-item>
<a href="javascript:;">订单备注</a>
</a-menu-item>
</a-menu>
</template>
</a-dropdown>
</a-space>
</template>
</template>
@@ -194,6 +218,8 @@
</a-card>
<!-- 编辑弹窗 -->
<OrderInfo v-model:visible="showEdit" :data="current" @done="reload" />
<!-- 发货弹窗 -->
<Delivery v-model:visible="showDelivery" :data="current" @done="reload" />
</div>
</div>
</template>
@@ -205,8 +231,11 @@
ExclamationCircleOutlined,
CheckOutlined,
CloseOutlined,
AlipayCircleOutlined
AlipayCircleOutlined,
EllipsisOutlined,
DownOutlined
} from '@ant-design/icons-vue';
import { EleProTable, toDateString } from 'ele-admin-pro';
import type {
DatasourceFunction,
@@ -214,10 +243,11 @@
} from 'ele-admin-pro/es/ele-pro-table/types';
import Search from './components/search.vue';
import OrderInfo from './components/orderInfo.vue';
import Delivery from './components/delivery.vue';
import { pageOrder, removeOrder, removeBatchOrder } from '@/api/shop/order';
import type { Order, OrderParam } from '@/api/shop/order/model';
import { formatNumber } from 'ele-admin-pro/es';
import { getMerchantId } from "@/utils/merchant";
import { getMerchantId } from '@/utils/merchant';
// 表格实例
const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -228,6 +258,8 @@
const current = ref<Order | null>(null);
// 是否显示编辑弹窗
const showEdit = ref(false);
// 是否显示发货弹窗
const showDelivery = ref(false);
// 是否显示批量移动弹窗
const showMove = ref(false);
// 加载状态
@@ -359,7 +391,7 @@
{
title: '操作',
key: 'action',
width: 120,
width: 180,
fixed: 'right',
align: 'center',
hideInSetting: true
@@ -378,6 +410,11 @@
showEdit.value = true;
};
const openDelivery = (row?: Order) => {
current.value = row ?? null;
showDelivery.value = true;
};
/* 打开批量移动弹窗 */
const openMove = () => {
showMove.value = true;