feat(商品管理): 新增作业要求(拣货/复核/打包/合并)与列表筛选(是否有作业要求、毛重)

This commit is contained in:
liufumingren 2026-09-30 02:22:54 +08:00
parent 2cf3806edf
commit e21a19cc85
3 changed files with 149 additions and 12 deletions

View File

@ -213,20 +213,57 @@
</div>
</div>
<!-- 打包要求卡片 -->
<!-- 作业要求卡片:要求合并=Y 时只填一个「要求」(提交到打包要求),否则三个要求各传各的 -->
<div class="info-card">
<div class="card-header">
<h4>打包要求</h4>
<el-tooltip content="复核流程和打包流程可见包装要求" placement="top">
<h4>作业要求</h4>
<el-tooltip content="拣货、复核、打包流程分别可见对应的作业要求" placement="top">
<el-icon>
<InfoFilled />
</el-icon>
</el-tooltip>
</div>
<el-form-item prop="packing_requirements" label-width="0">
<el-input v-model="formData.packing_requirements" type="textarea" :rows="4" placeholder="请输入打包要求" clearable />
<!-- 要求合并:Y=是,N=否;开启后所有接口输出都会输出该商品的打包要求 -->
<el-form-item prop="merge_requirements">
<template #label>
<span>
要求合并
<el-tooltip content="开启后只需填一个「要求」(提交到打包要求),且所有接口输出都会输出该商品的打包要求" placement="top">
<el-icon><InfoFilled /></el-icon>
</el-tooltip>
</span>
</template>
<el-radio-group v-model="formData.merge_requirements">
<el-radio :label="'Y'">是</el-radio>
<el-radio :label="'N'">否</el-radio>
</el-radio-group>
</el-form-item>
<!-- 合并开启:只填一个要求,值提交到 packing_requirements,其余要求传空字符串 -->
<el-form-item
v-if="formData.merge_requirements === 'Y'"
prop="packing_requirements"
label="要求"
label-position="top"
>
<el-input v-model="formData.packing_requirements" type="textarea" :rows="3" placeholder="请输入要求" clearable />
</el-form-item>
<!-- 合并关闭:打包/拣货/复核要求各传各的 -->
<template v-else>
<el-form-item prop="packing_requirements" label="打包要求" label-position="top">
<el-input v-model="formData.packing_requirements" type="textarea" :rows="3" placeholder="请输入打包要求" clearable />
</el-form-item>
<el-form-item prop="pick_requirements" label="拣货要求" label-position="top">
<el-input v-model="formData.pick_requirements" type="textarea" :rows="3" placeholder="请输入拣货要求" clearable />
</el-form-item>
<el-form-item prop="recheck_requirements" label="复核要求" label-position="top">
<el-input v-model="formData.recheck_requirements" type="textarea" :rows="3" placeholder="请输入复核要求" clearable />
</el-form-item>
</template>
</div>
</el-form>
@ -512,6 +549,13 @@ const handleBoxSpecToggle = (value: any) => {
const prepareSaveData = () => {
const data = { ...formData }
// 要求合并开启:值提交到打包要求,拣货/复核要求传空字符串;未合并则三项各传各的
if (String(data.merge_requirements ?? '').trim().toUpperCase() === 'Y') {
data.pick_requirements = ''
data.recheck_requirements = ''
}
if (!data.enable_box_spec) {
data.box_unit = ''
data.quantity_per_box = 0

View File

@ -362,26 +362,81 @@
</div>
</el-card>
<!-- 打包要求卡片 -->
<!-- 作业要求卡片:要求合并=Y 时只填一个「要求」(提交到打包要求),否则三个要求各传各的 -->
<el-card class="info-card" shadow="never" style="margin-top: 20px;">
<template #header>
<div class="card-header">
<span>打包要求</span>
<el-tooltip content="复核流程和打包流程可见包装要求" placement="top">
<span>作业要求</span>
<el-tooltip content="拣货、复核、打包流程分别可见对应的作业要求" placement="top">
<el-icon><QuestionFilled /></el-icon>
</el-tooltip>
</div>
</template>
<el-form-item prop="packing_requirements" label-width="0">
<!-- 要求合并:Y=是,N=否;开启后所有接口输出都会输出该商品的打包要求 -->
<el-form-item prop="merge_requirements">
<template #label>
<span>
要求合并
<el-tooltip content="开启后只需填一个「要求」(提交到打包要求),且所有接口输出都会输出该商品的打包要求" placement="top">
<el-icon><QuestionFilled /></el-icon>
</el-tooltip>
</span>
</template>
<el-radio-group v-model="formData.merge_requirements">
<el-radio :label="'Y'">是</el-radio>
<el-radio :label="'N'">否</el-radio>
</el-radio-group>
</el-form-item>
<!-- 合并开启:只填一个要求,值提交到 packing_requirements,其余要求传空字符串 -->
<el-form-item
v-if="formData.merge_requirements === 'Y'"
prop="packing_requirements"
label="要求"
label-position="top"
>
<el-input
v-model="formData.packing_requirements"
type="textarea"
:rows="4"
placeholder="请输入打包要求"
:rows="3"
placeholder="请输入要求"
clearable
/>
</el-form-item>
<!-- 合并关闭:打包/拣货/复核要求各传各的 -->
<template v-else>
<el-form-item prop="packing_requirements" label="打包要求" label-position="top">
<el-input
v-model="formData.packing_requirements"
type="textarea"
:rows="3"
placeholder="请输入打包要求"
clearable
/>
</el-form-item>
<el-form-item prop="pick_requirements" label="拣货要求" label-position="top">
<el-input
v-model="formData.pick_requirements"
type="textarea"
:rows="3"
placeholder="请输入拣货要求"
clearable
/>
</el-form-item>
<el-form-item prop="recheck_requirements" label="复核要求" label-position="top">
<el-input
v-model="formData.recheck_requirements"
type="textarea"
:rows="3"
placeholder="请输入复核要求"
clearable
/>
</el-form-item>
</template>
</el-card>
</el-col>
</el-row>
@ -749,6 +804,12 @@ function toFiniteNumber(v: unknown, fallback = 0): number {
}
function normalizeStockInfoFormNumbers() {
// 作业要求:文本字段兜底为空串,合并要求只接受 Y/N(缺省 Y)
formData.pick_requirements = formData.pick_requirements ?? ''
formData.recheck_requirements = formData.recheck_requirements ?? ''
formData.packing_requirements = formData.packing_requirements ?? ''
const mergeRaw = String(formData.merge_requirements ?? '').trim().toUpperCase()
formData.merge_requirements = mergeRaw === 'N' ? 'N' : 'Y'
formData.tag_price = toFiniteNumber(formData.tag_price, 0)
formData.retail_price = toFiniteNumber(formData.retail_price, 0)
formData.gross_weight = toFiniteNumber(formData.gross_weight, 0)
@ -872,7 +933,13 @@ async function fetchStockInfo(stockId: number) {
function prepareSaveData() {
const data = { ...formData }
// 要求合并开启:值提交到打包要求,拣货/复核要求传空字符串;未合并则三项各传各的
if (String(data.merge_requirements ?? '').trim().toUpperCase() === 'Y') {
data.pick_requirements = ''
data.recheck_requirements = ''
}
if (!data.enable_box_spec) {
data.box_unit = ''
data.quantity_per_box = 0

View File

@ -346,6 +346,20 @@ export const availableFields = [
type: 'boolean',
placeholder: '请选择是否已绑定外部商品'
}),
stockScanField('attribute', {
value: 'has_requirements',
label: '是否有作业要求',
type: 'select',
placeholder: '请选择作业要求',
options: [
{ value: 'Y', label: '有作业要求' },
{ value: 'N', label: '无作业要求' },
{ value: 'pick', label: '拣货要求不为空' },
{ value: 'recheck', label: '复核要求不为空' },
{ value: 'packing', label: '打包要求不为空' }
],
required: false
}),
stockScanField('attribute', {
value: 'level',
label: 'ABC分类',
@ -383,6 +397,14 @@ export const availableFields = [
operators: ['eq', 'ne', 'gt', 'lt', 'ge', 'le'],
defaultOperator: 'gt'
}),
stockScanField('price', {
value: 'gross_weight',
label: '毛重',
type: 'number',
placeholder: '请输入毛重(g)',
operators: ['eq', 'ne', 'gt', 'lt', 'ge', 'le', 'between'],
defaultOperator: 'ge'
}),
// ===== 库存信息(合并为一组,对齐波次列表 ScanBox) =====
{ ...scanWorkflowField({
@ -493,7 +515,11 @@ export const stockDefaultFormData = {
item_name: '',
sku_property: '',
stock_unit: '',
// 作业要求:合并要求为 Y/N(Y=表单只填一个「要求」并提交到 packing_requirements,拣货/复核要求传空字符串;N=三项各传各的)
pick_requirements: '',
recheck_requirements: '',
packing_requirements: '',
merge_requirements: 'Y',
length: 0.00,
width: 0.00,
height: 0.00,