提交价格功能绑定

This commit is contained in:
wuweihua
2026-09-07 10:41:21 +08:00
parent 7204497a65
commit 10352fca6d
12 changed files with 578 additions and 105 deletions
+197 -45
View File
@@ -23,7 +23,7 @@
@click="form.setType = 'FIXED'"
>
<div class="t-title">FIXED 固定价</div>
<div class="t-desc">每个产品×国家×重量段独立配置运费单价 + 挂号费,覆盖默认价</div>
<div class="t-desc">可不填明细(走产品默认价);有明细则按产品×国家×重量段覆盖运费+挂号费</div>
</div>
<div
class="type-card"
@@ -77,7 +77,7 @@
:closable="false"
show-icon
class="mb12"
title="FIXED 模式:每个产品 × 国家 × 重量段独立配置运费单价(RMB/KG)+ 挂号费(RMB/票)。命中时直接取该固定价。"
title="FIXED 模式:可不填明细(计费取 bms_product_country 默认运费/挂号费);有明细时按产品×国家×重量段覆盖固定价。"
/>
<el-alert
v-else
@@ -88,24 +88,57 @@
title="DISCOUNT 模式:可不填明细(全部产品适用默认折扣),或按产品限定折扣范围。"
/>
<el-table :data="form.details" border empty-text="暂无明细,点击添加明细行">
<el-table-column label="产品" min-width="150">
<el-table-column label="产品" min-width="180">
<template #default="{ row }">
<el-select v-model="row.productCode" filterable allow-create placeholder="产品" @change="onProductChange(row)">
<el-select
v-model="row.productCode"
filterable
clearable
placeholder="选择产品"
style="width: 100%"
@change="onProductChange(row)"
>
<el-option v-for="p in productOptions" :key="p.value" :label="p.label" :value="p.value" />
</el-select>
</template>
</el-table-column>
<el-table-column v-if="form.setType === 'FIXED'" label="国家" min-width="130">
<el-table-column v-if="form.setType === 'FIXED'" label="国家" min-width="140">
<template #default="{ row }">
<el-select v-model="row.countryCode" filterable allow-create placeholder="国家" @change="onCountryChange(row)">
<el-option v-for="c in countryOptions" :key="c.value" :label="c.label" :value="c.value" />
<el-select
v-model="row._countryKey"
filterable
clearable
placeholder="选择国家"
style="width: 100%"
:disabled="!row.productCode"
@change="onCountryChange(row)"
>
<el-option
v-for="c in countryOptionsOf(row)"
:key="c.key"
:label="c.label"
:value="c.key"
/>
</el-select>
</template>
</el-table-column>
<el-table-column v-if="form.setType === 'FIXED'" label="重量段" min-width="150">
<template #default="{ row }">
<el-select v-model="row.weightLabel" filterable allow-create placeholder="重量段">
<el-option v-for="w in weightOptions" :key="w.value" :label="w.label" :value="w.value" />
<el-select
v-model="row.weightLabel"
filterable
clearable
placeholder="选择重量段"
style="width: 100%"
:disabled="!row._countryKey"
@change="onWeightChange(row)"
>
<el-option
v-for="w in weightOptionsOf(row)"
:key="w.value"
:label="w.label"
:value="w.value"
/>
</el-select>
</template>
</el-table-column>
@@ -212,6 +245,7 @@
<script setup name="PriceSetCreate">
import { getPriceSet, savePriceSet, validatePriceSet } from '@/api/price/set'
import { listProduct, listProductCountries } from '@/api/price/product'
const { proxy } = getCurrentInstance()
const route = useRoute()
@@ -219,25 +253,9 @@ const active = ref(0)
const saving = ref(false)
const formRef = ref()
const checkItems = ref([])
const productOptions = [
{ value: 'WSP037', label: 'WSP037 球衣' },
{ value: 'WSP038', label: 'WSP038 普货' },
{ value: 'WSP034', label: 'WSP034 带电' },
{ value: 'WSP035', label: 'WSP035 敏感' },
{ value: 'WSP066', label: 'WSP066 鞋盒' }
]
const countryOptions = [
{ value: 'DE', label: '德国 DE' },
{ value: 'FR', label: '法国 FR' },
{ value: 'IT', label: '意大利 IT' },
{ value: 'ES', label: '西班牙 ES' }
]
const weightOptions = [
{ value: '0.01≤W≤0.3', label: '0.01≤W≤0.3' },
{ value: '0.3<W≤1', label: '0.3<W≤1' },
{ value: '1<W≤2', label: '1<W≤2' }
]
const productOptions = ref([])
/** productCode -> bms_product_country rows */
const countryCache = reactive({})
const form = reactive({
priceSetId: undefined,
@@ -257,13 +275,93 @@ const rules = {
effectiveDate: [{ required: true, message: '生效日期不能为空', trigger: 'change' }]
}
function trimNum(v) {
if (v == null || v === '') return ''
const n = Number(v)
if (Number.isNaN(n)) return String(v)
return String(parseFloat(n.toFixed(6)))
}
function formatWeightLabel(min, max) {
return `${trimNum(min)}≤W≤${trimNum(max)}`
}
function countryKeyOf(row) {
if (!row) return ''
if (row.countryCode) return row.countryCode
if (row.countryName) return 'N:' + row.countryName
return ''
}
function matchCountry(detail, item) {
if (detail.countryCode && item.countryCode) {
return detail.countryCode === item.countryCode
}
return detail.countryName && item.countryName === detail.countryName
}
function loadProducts() {
return listProduct({ status: '0', pageNum: 1, pageSize: 1000 }).then(res => {
const rows = res.rows || []
productOptions.value = rows.map(p => ({
value: p.productCode,
label: `${p.productCode} ${p.productName || ''}`.trim(),
name: p.productName
}))
})
}
function ensureCountries(productCode) {
if (!productCode) return Promise.resolve([])
if (countryCache[productCode]) return Promise.resolve(countryCache[productCode])
return listProductCountries(productCode).then(res => {
const rows = res.data || []
countryCache[productCode] = rows
return rows
})
}
function countryOptionsOf(row) {
const rows = countryCache[row.productCode] || []
const map = new Map()
rows.forEach(item => {
const key = countryKeyOf(item)
if (!key || map.has(key)) return
map.set(key, {
key,
code: item.countryCode || undefined,
name: item.countryName,
label: item.countryCode ? `${item.countryName} ${item.countryCode}` : item.countryName
})
})
return [...map.values()]
}
function weightOptionsOf(row) {
const rows = (countryCache[row.productCode] || []).filter(item => matchCountry(row, item))
const map = new Map()
rows.forEach(item => {
if (item.weightMin == null && item.weightMax == null) return
const value = formatWeightLabel(item.weightMin, item.weightMax)
if (map.has(value)) return
map.set(value, {
value,
label: value,
freightPrice: item.freightPrice,
registrationFee: item.registrationFee
})
})
return [...map.values()]
}
function emptyDetail() {
return {
productCode: undefined,
productName: undefined,
countryCode: form.setType === 'FIXED' ? 'DE' : undefined,
countryName: form.setType === 'FIXED' ? '德国' : undefined,
weightLabel: form.setType === 'FIXED' ? '0.3<W≤1' : undefined,
countryCode: undefined,
countryName: undefined,
_countryKey: undefined,
weightLabel: undefined,
fvValue: undefined,
fvRegistrationFee: undefined,
discountValue: undefined
@@ -288,22 +386,74 @@ function addCustomerRow() {
form.customers.push(emptyCustomer())
}
function clearCascadeAfterProduct(row) {
row.countryCode = undefined
row.countryName = undefined
row._countryKey = undefined
row.weightLabel = undefined
row.fvValue = undefined
row.fvRegistrationFee = undefined
}
function onProductChange(row) {
const found = productOptions.find(p => p.value === row.productCode)
row.productName = found ? found.label.replace(row.productCode + ' ', '') : row.productCode
const found = productOptions.value.find(p => p.value === row.productCode)
row.productName = found ? found.name : row.productCode
clearCascadeAfterProduct(row)
if (!row.productCode || form.setType !== 'FIXED') return
ensureCountries(row.productCode)
}
function onCountryChange(row) {
const found = countryOptions.find(c => c.value === row.countryCode)
row.countryName = found ? found.label.replace(' ' + row.countryCode, '') : row.countryCode
const opt = countryOptionsOf(row).find(c => c.key === row._countryKey)
row.countryCode = opt ? opt.code : undefined
row.countryName = opt ? opt.name : undefined
row.weightLabel = undefined
row.fvValue = undefined
row.fvRegistrationFee = undefined
}
function onWeightChange(row) {
const opt = weightOptionsOf(row).find(w => w.value === row.weightLabel)
if (!opt) return
if (opt.freightPrice != null) row.fvValue = Number(opt.freightPrice)
if (opt.registrationFee != null) row.fvRegistrationFee = Number(opt.registrationFee)
}
function hydrateDetailRow(d) {
const row = {
...d,
_countryKey: countryKeyOf(d)
}
// normalize historical weight labels to min≤W≤max when possible
if (row.productCode && form.setType === 'FIXED') {
ensureCountries(row.productCode).then(rows => {
if (!row.weightLabel) return
const hit = rows.find(item => {
if (!matchCountry(row, item)) return false
return formatWeightLabel(item.weightMin, item.weightMax) === row.weightLabel
|| row.weightLabel.includes(String(item.weightMin)) && row.weightLabel.includes(String(item.weightMax))
})
if (hit) {
row.weightLabel = formatWeightLabel(hit.weightMin, hit.weightMax)
row._countryKey = countryKeyOf(hit)
if (!row.countryCode) row.countryCode = hit.countryCode
if (!row.countryName) row.countryName = hit.countryName
}
})
}
return row
}
function buildPayload(submitFlag) {
const details = (form.details || []).filter(d => d.productCode).map(d => ({
...d,
productCode: d.productCode,
productName: d.productName,
countryCode: d.countryCode || undefined,
countryName: d.countryName || undefined,
weightLabel: d.weightLabel || undefined,
fvValue: d.fvValue,
fvRegistrationFee: d.fvRegistrationFee
fvRegistrationFee: d.fvRegistrationFee,
discountValue: d.discountValue
}))
const customers = (form.customers || [])
.filter(c => c.customerId)
@@ -392,7 +542,7 @@ function checkTag(result) {
}
function checkLabel(result) {
const map = { PASS: '? 通过', WARN: '? 待确认', FAIL: '? 失败', INFO: '? 提示' }
const map = { PASS: '通过', WARN: '待确认', FAIL: '失败', INFO: '提示' }
return map[result] || result
}
@@ -406,18 +556,20 @@ function loadExisting(id) {
form.effectiveDate = data.effectiveDate
form.expireDate = data.expireDate
form.priceSetNote = data.priceSetNote
form.details = (data.details || []).map(d => ({ ...d }))
form.details = (data.details || []).map(d => hydrateDetailRow(d))
form.customers = (data.customers || []).map(c => ({ ...c }))
})
}
onMounted(() => {
const id = route.query.priceSetId
if (id) {
loadExisting(id)
} else {
addDetailRow()
}
loadProducts().finally(() => {
const id = route.query.priceSetId
if (id) {
loadExisting(id)
} else {
addDetailRow()
}
})
})
</script>