From 8478c204cc057af177d039d075d51dd99e04642e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=8A=E9=92=8A?= <13512071256@163.com> Date: Fri, 20 Dec 2024 13:22:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=95=8C=E9=9D=A2=E5=8F=8A=E7=B1=BB=E5=9E=8B=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/manage/orders/types.ts | 18 +-- src/views/manage/orders/index.vue | 240 ++++++++++++------------------ 2 files changed, 105 insertions(+), 153 deletions(-) diff --git a/src/api/manage/orders/types.ts b/src/api/manage/orders/types.ts index d8c8e3f..4001e54 100644 --- a/src/api/manage/orders/types.ts +++ b/src/api/manage/orders/types.ts @@ -61,7 +61,7 @@ export interface OrdersVO { /** * 订单状态 */ - orderStatus: number; + orderStatus?: number | string; /** * 物流名称 @@ -82,7 +82,6 @@ export interface OrdersVO { * 备注 */ remark: string; - } export interface OrdersForm extends BaseEntity { @@ -144,7 +143,7 @@ export interface OrdersForm extends BaseEntity { /** * 订单状态 */ - orderStatus?: number; + orderStatus?: number | string; /** * 物流名称 @@ -160,11 +159,9 @@ export interface OrdersForm extends BaseEntity { * 备注 */ remark?: string; - } export interface OrdersQuery extends PageQuery { - /** * 订单号 */ @@ -230,11 +227,8 @@ export interface OrdersQuery extends PageQuery { */ logisticsNumber?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } - - - diff --git a/src/views/manage/orders/index.vue b/src/views/manage/orders/index.vue index 971617f..b19817c 100644 --- a/src/views/manage/orders/index.vue +++ b/src/views/manage/orders/index.vue @@ -1,44 +1,53 @@ @@ -176,7 +107,7 @@ import { OrdersVO, OrdersQuery, OrdersForm } from '@/api/manage/orders/types'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { dy_order_status } = toRefs(proxy?.useDict('dy_order_status')); - +const autoTableHeight = ref(750); const ordersList = ref([]); const buttonLoading = ref(false); const loading = ref(true); @@ -329,7 +260,17 @@ const handleAdd = () => { dialog.visible = true; dialog.title = "添加订单信息"; } - +/** + * 发货 撤销发货 + */ +const handleOrderStatus = async (row: OrdersVO,type:string|number) => { + await proxy?.$modal.confirm('是否确认' + (type == '0' ? '撤销发货' : '发货') + '商品名称为"' + row.productName + '"的数据项？'); + row.orderStatus = type; + buttonLoading.value = true; + await updateOrders(row).finally(() => (buttonLoading.value = false)); + proxy?.$modal.msgSuccess('操作成功'); + getList(); +} /** 修改按钮操作 */ const handleUpdate = async (row?: OrdersVO) => { reset(); @@ -375,5 +316,22 @@ const handleExport = () => { onMounted(() => { getList(); + nextTick(() => { + autoTableHeight.value = proxy?.autoTableHeight(); + }); + window.onresize = () => { + autoTableHeight.value = proxy?.autoTableHeight(); + }; }); +