From f8421e4441abe4bedf94ed5a11b0aab8f075f584 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 5 Nov 2026 15:28:36 +0800 Subject: [PATCH] =?UTF-8?q?feat(product):=20=E5=95=86=E5=93=81=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=88=97=E8=A1=A8=E8=A1=A5=E5=85=85=E8=B4=A7=E4=B8=BB?= =?UTF-8?q?/SKU=E8=A7=84=E6=A0=BC/=E6=9D=A1=E7=A0=81/=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 商品选择弹窗(出入库、订单、记录与导出筛选复用)列改为:图片 / 商品编码 / 商品名称 / 货主 / SKU规格 / 条码 / 操作,弹窗加宽以容纳新增列 - 组合商品「系统商品」与「已添加组合明细」新增图片、条码列,编辑可回显 - 店铺商品绑定弹窗「系统商品」新增图片、货主、条码列 - /api/products/search 与组合明细商品字段补充 image Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- backend/app/controller/comboProduct.js | 2 +- backend/app/controller/product.js | 2 +- frontend/src/api/comboProduct.ts | 4 +++ frontend/src/api/product.ts | 2 ++ frontend/src/components/ProductSelect.vue | 34 ++++++++++++++------ frontend/src/views/ComboProduct/Index.vue | 39 +++++++++++++++++++++++ frontend/src/views/ShopProduct/Index.vue | 23 +++++++++++-- 7 files changed, 92 insertions(+), 14 deletions(-) diff --git a/backend/app/controller/comboProduct.js b/backend/app/controller/comboProduct.js index 886c85b..1960822 100644 --- a/backend/app/controller/comboProduct.js +++ b/backend/app/controller/comboProduct.js @@ -4,7 +4,7 @@ const { Controller } = require('egg'); const { parsePagination, buildPageResult } = require('../lib/pagination'); /** 明细里冗余返回的系统商品可选字段,便于前端直接展示 */ -const PRODUCT_ATTRS = [ 'id', 'item_code', 'item_name', 'sku_property', 'stock_unit', 'retail_price', 'subsidiary_id' ]; +const PRODUCT_ATTRS = [ 'id', 'item_code', 'item_name', 'sku_property', 'stock_unit', 'retail_price', 'barcode', 'image', 'subsidiary_id' ]; /** * 归一化组合明细:过滤非法行、同一商品去重合并为一条(数量取整且大于 0)。 diff --git a/backend/app/controller/product.js b/backend/app/controller/product.js index 9725cdc..6749b24 100644 --- a/backend/app/controller/product.js +++ b/backend/app/controller/product.js @@ -695,7 +695,7 @@ class ProductController extends Controller { const rows = await ctx.model.Product.findAll({ where, - attributes: [ 'id', 'item_code', 'goods_code', 'barcode', 'item_name', 'sku_property', 'stock_unit', 'status', 'subsidiary_id' ], + attributes: [ 'id', 'item_code', 'goods_code', 'barcode', 'item_name', 'sku_property', 'stock_unit', 'status', 'image', 'subsidiary_id' ], include: [ { model: ctx.model.PrincipalSubsidiary, as: 'subsidiary', attributes: [ 'id', 'name' ], required: false }, ], diff --git a/frontend/src/api/comboProduct.ts b/frontend/src/api/comboProduct.ts index 886d182..6954555 100644 --- a/frontend/src/api/comboProduct.ts +++ b/frontend/src/api/comboProduct.ts @@ -11,6 +11,10 @@ export interface ComboItemProduct { item_name: string sku_property: string | null stock_unit: string | null + /** 条码(明细商品快照) */ + barcode?: string | null + /** 主图(明细商品快照) */ + image?: string | null retail_price?: number | string } diff --git a/frontend/src/api/product.ts b/frontend/src/api/product.ts index cf355d0..b1df518 100644 --- a/frontend/src/api/product.ts +++ b/frontend/src/api/product.ts @@ -66,6 +66,8 @@ export interface ProductSearchItem { item_name: string sku_property: string | null stock_unit: string | null + /** 主图(搜索接口返回,用于选择列表缩略图) */ + image?: string | null status: number } diff --git a/frontend/src/components/ProductSelect.vue b/frontend/src/components/ProductSelect.vue index 2bb83d4..d7c849f 100644 --- a/frontend/src/components/ProductSelect.vue +++ b/frontend/src/components/ProductSelect.vue @@ -1,6 +1,7 @@