From 128afe950e721ff94d21beaef8c617edae5c6057 Mon Sep 17 00:00:00 2001 From: dzq Date: Thu, 5 Jun 2025 17:30:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=E6=89=80=E5=B1=9E=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=E5=8F=8A=E7=AD=9B=E9=80=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在商品查询接口和DTO中添加belongType字段 - 在商品列表页和详情页添加所属类型筛选和显示 - 根据所属类型控制编辑按钮的显示（仅智借还商品可编辑） - 在柜机商品配置弹窗中添加所属类型筛选 --- src/api/shop/goods.ts | 3 +++ .../cabinet-goods/cabinet-goods-config-modal.vue | 14 +++++++++++--- src/views/shop/goods/detail.vue | 5 +++-- src/views/shop/goods/index.vue | 8 ++++++++ 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/api/shop/goods.ts b/src/api/shop/goods.ts index 51724d8..b26c8bf 100644 --- a/src/api/shop/goods.ts +++ b/src/api/shop/goods.ts @@ -6,6 +6,7 @@ export interface GoodsQuery extends BasePageQuery { status?: number; goodsId?: number; autoApproval?: number; + belongType?: number; } /** 商品DTO */ @@ -50,6 +51,8 @@ export interface GoodsDTO { totalStock?: number; /** 商品使用说明 */ usageInstruction?: string; + /** 所属类型（0智借还 1固资通） */ + belongType: number; } /** 商品请求参数 */ diff --git a/src/views/shop/cabinet-goods/cabinet-goods-config-modal.vue b/src/views/shop/cabinet-goods/cabinet-goods-config-modal.vue index 3794aaa..53d7c37 100644 --- a/src/views/shop/cabinet-goods/cabinet-goods-config-modal.vue +++ b/src/views/shop/cabinet-goods/cabinet-goods-config-modal.vue @@ -21,7 +21,8 @@ const closeModal = () => { const searchFormParams = ref({ goodsName: "", - status: null + status: null, + belongType: null }); const pagination = ref({ @@ -93,14 +94,21 @@ defineExpose({ getList });