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 @@