From 42fee5ed407537390a57a235c42ad73bf6b3dd6f Mon Sep 17 00:00:00 2001 From: dzq Date: Fri, 9 May 2025 16:06:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=9C=E6=9C=BA=E7=AD=9B=E9=80=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E6=A0=BC=E5=8F=A3=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在订单管理页面中新增了柜机筛选功能，用户可以通过左侧的柜机列表筛选订单。同时，在格口开启记录页面中添加了格口ID的显示列，以方便用户查看和管理格口信息。 --- src/api/shop/order.ts | 2 + src/views/cabinet/operation/index.vue | 1 + src/views/cabinet/smart-cabinet/index.vue | 3 +- src/views/shop/order/index.vue | 239 ++++++++++++---------- 4 files changed, 136 insertions(+), 109 deletions(-) diff --git a/src/api/shop/order.ts b/src/api/shop/order.ts index 4b939f8..4eee8e7 100644 --- a/src/api/shop/order.ts +++ b/src/api/shop/order.ts @@ -3,6 +3,8 @@ import { http } from "@/utils/http"; export interface OrderQuery extends BasePageQuery { /** 订单编号 */ orderId?: number; + /** 柜机id */ + cabinetId?: number; /** 格口id */ cellId?: number; /** diff --git a/src/views/cabinet/operation/index.vue b/src/views/cabinet/operation/index.vue index 65b6aff..05a7501 100644 --- a/src/views/cabinet/operation/index.vue +++ b/src/views/cabinet/operation/index.vue @@ -111,6 +111,7 @@ getList(); + diff --git a/src/views/cabinet/smart-cabinet/index.vue b/src/views/cabinet/smart-cabinet/index.vue index 78d5847..14e4b70 100644 --- a/src/views/cabinet/smart-cabinet/index.vue +++ b/src/views/cabinet/smart-cabinet/index.vue @@ -199,8 +199,7 @@ getList(); 编辑 - + 格口 -import { ref, watch } from "vue"; +import { ref, watch, onMounted } from "vue"; import { PureTableBar } from "@/components/RePureTableBar"; import { useRenderIcon } from "@/components/ReIcon/src/hooks"; import { getOrderListApi, exportOrderExcelApi, type OrderDTO, OrderQuery } from "@/api/shop/order"; +import { allCabinets, SmartCabinetDTO } from "@/api/cabinet/smart-cabinet"; import Search from "@iconify-icons/ep/search"; import Refresh from "@iconify-icons/ep/refresh"; import { ElMessage } from "element-plus"; @@ -15,8 +16,10 @@ const route = useRoute(); const formRef = ref(); const tableRef = ref(); +const cabinets = ref([]); const searchFormParams = ref({ + cabinetId: null, orderId: null, cellId: null, status: null, @@ -36,6 +39,15 @@ const pagination = ref({ const loading = ref(false); const dataList = ref([]); +onMounted(async () => { + const { data } = await allCabinets(); + cabinets.value = data; + if (data.length > 0) { + searchFormParams.value.cabinetId = data[0].cabinetId; + getList(); + } +}); + const getList = async () => { try { loading.value = true; @@ -107,125 +119,138 @@ getList();