feat(product): 商品选择列表补充货主/SKU规格/条码/图片字段

- 商品选择弹窗(出入库、订单、记录与导出筛选复用)列改为:图片 / 商品编码 /
  商品名称 / 货主 / SKU规格 / 条码 / 操作,弹窗加宽以容纳新增列
- 组合商品「系统商品」与「已添加组合明细」新增图片、条码列,编辑可回显
- 店铺商品绑定弹窗「系统商品」新增图片、货主、条码列
- /api/products/search 与组合明细商品字段补充 image

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
liufumingren 2026-11-05 15:28:36 +08:00
parent 6e1e7a0f19
commit f8421e4441
7 changed files with 92 additions and 14 deletions

View File

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

View File

@ -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 },
],

View File

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

View File

@ -66,6 +66,8 @@ export interface ProductSearchItem {
item_name: string
sku_property: string | null
stock_unit: string | null
/** 主图(搜索接口返回,用于选择列表缩略图) */
image?: string | null
status: number
}

View File

@ -1,6 +1,7 @@
<script setup lang="ts">
import { computed, ref, watch } from 'vue'
import { DEFAULT_PAGE_SIZE } from '@/composables/useListPage'
import { mediaUrl } from '@/utils/media'
import {
getProducts,
searchProducts,
@ -156,8 +157,10 @@ function pickProduct(row: ProductItem) {
item_name: row.item_name,
sku_property: row.sku_property,
stock_unit: row.stock_unit,
image: row.image ?? null,
status: row.status,
subsidiary_id: row.subsidiary_id ?? null,
subsidiary_name: row.subsidiary_name || '',
}
// 前置校验不通过:保持弹窗,交由上层提示原因
if (props.beforeSelect && !props.beforeSelect(mapped)) return
@ -188,7 +191,7 @@ function pickProduct(row: ProductItem) {
<el-button size="small" :disabled="disabled" @click="openPicker">查询</el-button>
</div>
<el-dialog v-model="pickerVisible" title="商品查询" width="760px" append-to-body>
<el-dialog v-model="pickerVisible" title="商品查询" width="min(1040px, 94vw)" append-to-body>
<el-form :inline="true" class="picker-search">
<el-form-item label="关键词">
<el-input
@ -213,17 +216,30 @@ function pickProduct(row: ProductItem) {
highlight-current-row
@row-dblclick="pickProduct"
>
<el-table-column prop="item_code" label="商品编码" width="140" />
<el-table-column prop="item_name" label="商品名称" min-width="160" />
<el-table-column prop="sku_property" label="规格" width="140" />
<el-table-column prop="stock_unit" label="单位" width="80" />
<el-table-column label="状态" width="90">
<el-table-column label="图片" width="64" align="center">
<template #default="{ row }">
<el-tag :type="row.status === 1 ? 'success' : 'info'" size="small">
{{ row.status === 1 ? '启用' : '禁用' }}
</el-tag>
<el-image
v-if="row.image"
:src="mediaUrl(row.image)"
fit="cover"
style="width: 40px; height: 40px; border-radius: 4px"
:preview-src-list="[ mediaUrl(row.image) ]"
preview-teleported
/>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="item_code" label="商品编码" width="160" />
<el-table-column prop="item_name" label="商品名称" min-width="180" show-overflow-tooltip />
<el-table-column label="货主" width="130" show-overflow-tooltip>
<template #default="{ row }">{{ row.subsidiary_name || '-' }}</template>
</el-table-column>
<el-table-column prop="sku_property" label="SKU规格" width="130">
<template #default="{ row }">{{ row.sku_property || '-' }}</template>
</el-table-column>
<el-table-column prop="barcode" label="条码" width="150">
<template #default="{ row }">{{ row.barcode || '-' }}</template>
</el-table-column>
<el-table-column label="操作" width="80" fixed="right">
<template #default="{ row }">
<el-button link type="primary" @click="pickProduct(row)">选择</el-button>

View File

@ -14,6 +14,7 @@ import ExportButton from '@/components/ExportButton.vue'
import ListPager from '@/components/ListPager.vue'
import OperationLogPanel from '@/components/OperationLogPanel.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import { mediaUrl } from '@/utils/media'
const query = reactive({
page: 1,
@ -60,6 +61,8 @@ interface ComboRow {
item_code: string
sku_property: string | null
stock_unit: string | null
barcode: string | null
image: string | null
/** 商品所属货主(组合明细必须来自同一货主) */
subsidiary_id: number | null
subsidiary_name: string
@ -131,6 +134,8 @@ function addProduct(p: ProductSearchItem) {
item_code: p.item_code,
sku_property: p.sku_property,
stock_unit: p.stock_unit,
barcode: p.barcode ?? null,
image: p.image ?? null,
subsidiary_id: ownerId,
subsidiary_name: p.subsidiary_name || '',
})
@ -171,6 +176,8 @@ function openEdit(row: ComboProductItem) {
item_code: it.product?.item_code || '',
sku_property: it.product?.sku_property ?? null,
stock_unit: it.product?.stock_unit ?? null,
barcode: it.product?.barcode ?? null,
image: it.product?.image ?? null,
subsidiary_id: it.product?.subsidiary_id ?? null,
subsidiary_name: it.product?.subsidiary_name || '',
}))
@ -420,12 +427,28 @@ onMounted(fetchList)
:data="productList"
height="100%"
>
<el-table-column label="图片" width="64" align="center">
<template #default="{ row }">
<el-image
v-if="row.image"
:src="mediaUrl(row.image)"
fit="cover"
style="width: 40px; height: 40px; border-radius: 4px"
:preview-src-list="[ mediaUrl(row.image) ]"
preview-teleported
/>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="item_code" label="商品编码" width="120" />
<el-table-column prop="item_name" label="商品名称" min-width="140" show-overflow-tooltip />
<el-table-column label="货主" width="120" show-overflow-tooltip>
<template #default="{ row }">{{ row.subsidiary_name || '-' }}</template>
</el-table-column>
<el-table-column prop="sku_property" label="SKU规格" width="90" />
<el-table-column prop="barcode" label="条码" width="130" show-overflow-tooltip>
<template #default="{ row }">{{ row.barcode || '-' }}</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center">
<template #default="{ row }">
<el-button link type="primary" :disabled="isAdded(row.id)" @click="addProduct(row)">
@ -442,12 +465,28 @@ onMounted(fetchList)
<span class="pane-sub">共 {{ itemRows.length }} 项</span>
</div>
<DataTable :data="itemRows" height="100%">
<el-table-column label="图片" width="64" align="center">
<template #default="{ row }">
<el-image
v-if="row.image"
:src="mediaUrl(row.image)"
fit="cover"
style="width: 40px; height: 40px; border-radius: 4px"
:preview-src-list="[ mediaUrl(row.image) ]"
preview-teleported
/>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="item_name" label="商品名称" min-width="140" show-overflow-tooltip />
<el-table-column prop="item_code" label="商品编码" width="120" />
<el-table-column label="货主" width="120" show-overflow-tooltip>
<template #default="{ row }">{{ row.subsidiary_name || '-' }}</template>
</el-table-column>
<el-table-column prop="sku_property" label="SKU规格" width="90" />
<el-table-column prop="barcode" label="条码" width="130" show-overflow-tooltip>
<template #default="{ row }">{{ row.barcode || '-' }}</template>
</el-table-column>
<el-table-column label="数量" width="150">
<template #default="{ row }">
<el-input-number

View File

@ -20,6 +20,7 @@ import OperationLogPanel from '@/components/OperationLogPanel.vue'
import { DEFAULT_PAGE_SIZE, useListPage } from '@/composables/useListPage'
import VirtualSelect from '@/components/VirtualSelect.vue'
import { platformNameOf } from '@/constants/platform'
import { mediaUrl } from '@/utils/media'
const BIND_TAGS: Record<number, string> = { 0: 'info', 1: 'success', 2: 'warning' }
const BIND_LABELS: Record<number, string> = { 0: '未绑定', 1: '系统商品', 2: '组合商品' }
@ -728,13 +729,29 @@ onBeforeUnmount(() => {
</div>
<div class="bind-table">
<DataTable :loading="productLoading" :data="productList" height="100%">
<el-table-column label="图片" width="64" align="center">
<template #default="{ row }">
<el-image
v-if="row.image"
:src="mediaUrl(row.image)"
fit="cover"
style="width: 40px; height: 40px; border-radius: 4px"
:preview-src-list="[ mediaUrl(row.image) ]"
preview-teleported
/>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="item_code" label="商品编码" width="150" />
<el-table-column prop="item_name" label="商品名称" min-width="200" show-overflow-tooltip />
<el-table-column prop="sku_property" label="规格" width="140">
<el-table-column label="货主" width="130" show-overflow-tooltip>
<template #default="{ row }">{{ row.subsidiary_name || '-' }}</template>
</el-table-column>
<el-table-column prop="sku_property" label="SKU规格" width="140">
<template #default="{ row }">{{ row.sku_property || '-' }}</template>
</el-table-column>
<el-table-column prop="stock_unit" label="单位" width="80">
<template #default="{ row }">{{ row.stock_unit || '-' }}</template>
<el-table-column prop="barcode" label="条码" width="150">
<template #default="{ row }">{{ row.barcode || '-' }}</template>
</el-table-column>
<el-table-column label="零售价" width="100" align="right">
<template #default="{ row }">{{ row.retail_price ?? '-' }}</template>