增加专属报价功能

This commit is contained in:
wuweihua
2026-11-05 12:57:13 +08:00
parent 557d43a0b8
commit 308526ecee
32 changed files with 3817 additions and 567 deletions
@@ -44,7 +44,9 @@ import { ArrowLeft } from '@element-plus/icons-vue'
import StepDetails from './StepDetails.vue'
import { usePriceSetRefData } from '../../composables/usePriceSetRefData'
import { isBuildModeLockedVersion } from '../../utils/priceSet'
import { getPriceSet, savePriceSetAsync } from '@/api/price/set'
import { usePriceSetModule } from '../../composables/usePriceSetModule'
const { api } = usePriceSetModule()
const props = defineProps({
priceSetId: { type: [Number, String], default: undefined },
@@ -82,7 +84,7 @@ function load() {
}
loading.value = true
loaded.value = false
getPriceSet(id).then(res => {
api.getPriceSet(id).then(res => {
const data = res.data || {}
setType.value = data.setType || 'FIXED'
priceSetName.value = data.priceSetName || ''
@@ -137,7 +139,7 @@ function reloadSavedProducts() {
const id = props.priceSetId
if (!id) return
loading.value = true
getPriceSet(id).then(res => {
api.getPriceSet(id).then(res => {
const data = res.data || {}
const versions = data.versions || []
const qPsv = props.psvId || version.psvId
@@ -154,7 +156,7 @@ function reloadSavedProducts() {
async function reloadProductsAfterImportModeSave() {
const id = props.priceSetId
if (!id) return
const res = await getPriceSet(id)
const res = await api.getPriceSet(id)
const data = res.data || {}
const versions = data.versions || []
const qPsv = props.psvId || version.psvId
@@ -190,7 +192,7 @@ async function finish() {
priceBuildMode: version.priceBuildMode
}
}
await savePriceSetAsync(payload)
await api.savePriceSetAsync(payload)
savedPriceBuildMode.value = version.priceBuildMode
await nextTick()
if (version.priceBuildMode === 'PULL' && detailsRef.value && detailsRef.value.pullAllFromLibrary) {
@@ -14,7 +14,7 @@
@click="handlePullLibrary"
>拉取产品列表</el-button>
<el-dropdown
v-if="showImportAction && !isModifyImport"
v-if="showImportAction && !isModifyImport && showCountryImport"
trigger="click"
@command="handleImportCommand"
>
@@ -48,6 +48,7 @@
<p class="build-choice__tip">创建价格方式</p>
<div class="build-choice__cards">
<button
v-if="!onlyImportFresh"
type="button"
class="build-card build-card--pull"
:class="{ selected: isPullBuildMode(priceBuildMode) }"
@@ -58,7 +59,7 @@
<div class="build-card__desc">按产品库基础价生成套餐产品列表,可再导入 Excel 修改价格</div>
</button>
<button
v-if="showImportInherit"
v-if="showImportInherit && !onlyImportFresh"
type="button"
class="build-card build-card--import"
:class="{ selected: isImportBuildMode(priceBuildMode) }"
@@ -76,7 +77,7 @@
@click="chooseBuildMode('IMPORT_FRESH')"
>
<div class="build-card__title">Excel 新建价</div>
<div class="build-card__desc">不延用以前的产品价格,不带出上一版,上传 Excel 直接生成套餐销售价</div>
<div class="build-card__desc">{{ importFreshCardDesc }}</div>
</button>
</div>
</div>
@@ -227,9 +228,14 @@ import {
surchargeAppliesToRow,
toDetailPayload
} from '../../utils/priceSet'
import { getPriceSet, listSetDetailByProduct, listSetDetailByVersion, importSetDetailPricesAsync, pullSetDetailsFromLibraryAsync, previewPullFromLibrary, previewImportDetailPrices, updateSetDetail, updateSetDetailSurchargeAsync, delSetDetail } from '@/api/price/set'
import { usePriceSetModule } from '../../composables/usePriceSetModule'
import { listRegionOptions } from '@/api/data/region'
const mod = usePriceSetModule()
const { api } = mod
const onlyImportFresh = computed(() => !!mod.onlyImportFresh)
const showCountryImport = computed(() => !mod.exclusiveQuote)
const props = defineProps({
details: { type: Array, required: true },
products: { type: Array, default: () => [] },
@@ -326,7 +332,18 @@ const importActionLabel = computed(() =>
isModifyImport.value ? '导入修改价格' : '导入 Excel 建价'
)
const importDialogTitle = computed(() => importActionLabel.value)
const importFreshCardDesc = computed(() => onlyImportFresh.value
? '仅支持大客折扣报价表(目的地/运费/操作费),导入后直接生成专属报价明细'
: '不延用以前的产品价格,不带出上一版,上传 Excel 直接生成套餐销售价'
)
const importDesc = computed(() => {
if (onlyImportFresh.value) {
return [
'\u4e13\u5c5e\u62a5\u4ef7\u4ec5\u652f\u6301\u5927\u5ba2\u6298\u6263\u62a5\u4ef7\u8868\uff08\u542b\u300c\u4ea7\u54c1\u76ee\u5f55\u300d\u4e0e\u5404\u56fd\u4ef7\u8868\uff09\u3002',
'\u8868\u5934\u4e3a\u76ee\u7684\u5730 / \u91cd\u91cf\u6bb5 / \u8fd0\u8d39(CNY/KG) / \u64cd\u4f5c\u8d39(CNY/PCS)\uff0c\u4e0e\u666e\u901a\u5957\u9910 Excel \u6a21\u677f\u4e0d\u540c\u3002',
'\u4ec5\u300cExcel \u65b0\u5efa\u4ef7\u300d\uff1a\u4e0d\u62c9\u53d6\u4ea7\u54c1\u5e93\u3001\u4e0d\u5ef6\u7528\u4e0a\u4e00\u7248\uff0c\u5bfc\u5165\u540e\u76f4\u63a5\u751f\u6210\u9500\u552e\u4ef7\u660e\u7ec6\u3002'
]
}
if (isModifyImport.value) {
return [
'适用威狮B2C小包价表(含「产品目录」)。',
@@ -377,7 +394,7 @@ async function resolvePsvId(force) {
return resolvedPsvId.value
}
if (!props.priceSetId) return null
const res = await getPriceSet(props.priceSetId)
const res = await api.getPriceSet(props.priceSetId)
const data = res.data || {}
const versions = data.versions || []
const fromData = (data.version && data.version.psvId) ? data.version : null
@@ -420,7 +437,7 @@ async function loadLatestPriorVersionDraft() {
if (!props.priceSetId) return false
pulling.value = true
try {
const res = await getPriceSet(props.priceSetId)
const res = await api.getPriceSet(props.priceSetId)
const data = res.data || {}
const versions = data.versions || []
// Only exclude the draft being edited. Do NOT use resolvedPsvId — it may
@@ -437,7 +454,7 @@ async function loadLatestPriorVersionDraft() {
return row
})
if (!products.length) return false
const detailRes = await listSetDetailByVersion(prior.psvId)
const detailRes = await api.listSetDetailByVersion(prior.psvId)
applyLocalDraft(products, detailRes.data || [])
return true
} finally {
@@ -455,7 +472,7 @@ async function loadProductDetails(productCode, force) {
}
const psvId = await resolvePsvId(false)
if (!psvId) return []
const res = await listSetDetailByProduct(psvId, productCode)
const res = await api.listSetDetailByProduct(psvId, productCode)
const rows = (res.data || []).map(d => hydrateRow(d, props.setType))
detailByProduct[productCode] = rows
// keep parent details array in sync for any legacy callers
@@ -586,6 +603,18 @@ async function canOpenImport() {
return true
}
watch(
() => [onlyImportFresh.value, props.priceBuildMode, props.buildModeReady],
() => {
if (!onlyImportFresh.value || !props.buildModeReady) return
if (props.priceBuildMode) return
if (buildModeLocked.value) return
emit('update:priceBuildMode', 'IMPORT_FRESH')
},
{ immediate: true }
)
async function openImport() {
if (!(await canOpenImport())) return
importRef.value && importRef.value.open()
@@ -625,7 +654,7 @@ async function runImportAsync(uploadFile, countryCode) {
}
const replaceByProductCountry = !isModifyImport.value || !!countryCode
if (!props.livePersist) {
const res = await previewImportDetailPrices(files, {
const res = await api.previewImportDetailPrices(files, {
updateOnly: isModifyImport.value && !countryCode,
replaceByProductCountry,
countryCode: countryCode || undefined,
@@ -640,7 +669,7 @@ async function runImportAsync(uploadFile, countryCode) {
applyLocalDraft(products, data.details || [])
return data.message || '导入完成'
}
const { task } = await importSetDetailPricesAsync(
const { task } = await api.importSetDetailPricesAsync(
files,
{
priceSetId: props.priceSetId,
@@ -693,7 +722,7 @@ async function reloadDetailsFromServer() {
if (!props.priceSetId) return
try {
clearDetailCache()
const res = await getPriceSet(props.priceSetId)
const res = await api.getPriceSet(props.priceSetId)
const data = res.data || {}
const versions = data.versions || []
const qPsv = resolvedPsvId.value || props.psvId
@@ -754,7 +783,7 @@ async function pullAllFromLibrary(opts = {}) {
if (!props.livePersist) {
importProgressMessage.value = '正在拉取产品库…'
importProgressPercent.value = 40
const res = await previewPullFromLibrary()
const res = await api.previewPullFromLibrary()
const data = res.data || {}
applyLocalDraft(data.products || [], data.details || [])
importProgressPercent.value = 100
@@ -764,7 +793,7 @@ async function pullAllFromLibrary(opts = {}) {
}
return { added: (props.products || []).length }
}
const { task } = await pullSetDetailsFromLibraryAsync(
const { task } = await api.pullSetDetailsFromLibraryAsync(
{ priceSetId: props.priceSetId, psvId: await resolvePsvId(false), force },
applyBuildProgress
)
@@ -864,7 +893,7 @@ async function persistDetail(row, withSurcharge) {
const payload = toDetailPayload(row)
payload.priceSetId = props.priceSetId
if (!withSurcharge) delete payload.surcharges
await updateSetDetail(payload)
await api.updateSetDetail(payload)
}
/** drawer hover remove surcharge -> write snapshot for this row */
@@ -1035,7 +1064,7 @@ function onSurchargeConfirm(picked) {
return
}
proxy.$modal.msgSuccess(okText + ',正在后台写入…')
updateSetDetailSurchargeAsync(payload).then(() => {
api.updateSetDetailSurchargeAsync(payload).then(() => {
proxy.$modal.msgSuccess(okText + ',已写入数据库')
}).catch(e => {
proxy.$modal.msgError((e && e.message) ? e.message : '附加费后台写入失败')
@@ -1048,7 +1077,7 @@ async function removeProduct(code) {
const rows = await loadProductDetails(code)
const ids = rows.filter(d => d && d.psdId).map(d => d.psdId)
if (ids.length) {
await delSetDetail(ids.join(','))
await api.delSetDetail(ids.join(','))
}
} catch (e) {
return
@@ -83,7 +83,9 @@
* 套餐绑定客户 · 新增(支持批量) / 编辑弹窗
*/
import { createEmptyCustomerRow } from '../../utils/priceSet'
import { batchAddSetCustomer, updateSetCustomer } from '@/api/price/set'
import { usePriceSetModule } from '../../composables/usePriceSetModule'
const { api } = usePriceSetModule()
const props = defineProps({
priceSetId: {
@@ -174,7 +176,7 @@ async function submit() {
try {
if (isEdit.value) {
const payload = { ...form.value, priceSetId: props.priceSetId }
await updateSetCustomer(payload)
await api.updateSetCustomer(payload)
proxy.$modal.msgSuccess('保存成功')
} else {
const customers = selectedCustomers.value.map(c => ({
@@ -182,7 +184,7 @@ async function submit() {
customerCode: c.customerCode,
customerName: c.customerName
}))
const res = await batchAddSetCustomer({
const res = await api.batchAddSetCustomer({
priceSetId: props.priceSetId,
bindPriority: form.value.bindPriority,
prBegindate: form.value.prBegindate,
@@ -12,7 +12,7 @@
size="small"
icon="Plus"
@click="dialogRef.open()"
v-hasPermi="['price:set:edit']"
v-hasPermi="editPerm"
>添加客户</el-button>
</template>
@@ -31,8 +31,8 @@
</el-table-column>
<el-table-column v-if="editable" label="操作" width="120" align="center" fixed="right">
<template #default="{ row }">
<el-button link type="primary" @click="dialogRef.open(row)" v-hasPermi="['price:set:edit']">编辑</el-button>
<el-button link type="danger" @click="remove(row)" v-hasPermi="['price:set:edit']">解绑</el-button>
<el-button link type="primary" @click="dialogRef.open(row)" v-hasPermi="editPerm">编辑</el-button>
<el-button link type="danger" @click="remove(row)" v-hasPermi="editPerm">解绑</el-button>
</template>
</el-table-column>
</el-table>
@@ -55,7 +55,10 @@
import SetSectionCard from './SetSectionCard.vue'
import SetCustomerDialog from './SetCustomerDialog.vue'
import { isChildEditable } from '../../utils/priceSet'
import { delSetCustomer } from '@/api/price/set'
import { usePriceSetModule, usePriceSetPerm } from '../../composables/usePriceSetModule'
const { api } = usePriceSetModule()
const editPerm = usePriceSetPerm('edit')
const props = defineProps({
/** 套餐详情对象 */
@@ -75,7 +78,7 @@ const customers = computed(() => props.set.customers || [])
const editable = computed(() => isChildEditable(props.set.status))
function remove(row) {
proxy.$modal.confirm('确认解绑该客户?').then(() => delSetCustomer(row.customerPricesetId)).then(() => {
proxy.$modal.confirm('确认解绑该客户?').then(() => api.delSetCustomer(row.customerPricesetId)).then(() => {
proxy.$modal.msgSuccess('已解绑')
emit('refresh')
}).catch(() => {})
@@ -164,7 +164,9 @@
import SurchargeTags from '../SurchargeTags.vue'
import { useDetailCascade } from '../../composables/usePriceSetRefData'
import { createEmptyDetailRow, isFixedType, toEditableDetailRow } from '../../utils/priceSet'
import { addSetDetail, updateSetDetail } from '@/api/price/set'
import { usePriceSetModule } from '../../composables/usePriceSetModule'
const { api } = usePriceSetModule()
const props = defineProps({
/** 所属套餐ID */
@@ -228,7 +230,7 @@ async function submit() {
const payload = { ...form.value, priceSetId: props.priceSetId }
delete payload._countryKey
submitting.value = true
const req = payload.psdId ? updateSetDetail(payload) : addSetDetail(payload)
const req = payload.psdId ? api.updateSetDetail(payload) : api.addSetDetail(payload)
req.then(() => {
proxy.$modal.msgSuccess('保存成功')
visible.value = false
@@ -2,7 +2,7 @@
<div class="set-header">
<div class="hd-main">
<div class="hd-line">
<h2 class="hd-name">{{ set.priceSetName || '套餐详情' }}</h2>
<h2 class="hd-name">{{ set.priceSetName || mod.labels.detailTitleFallback }}</h2>
<span v-if="set.priceSetCode" class="hd-code">{{ set.priceSetCode }}</span>
<el-tag :type="setStatusTagType(set)" size="small">{{ setStatusLabel(set) }}</el-tag>
</div>
@@ -20,14 +20,14 @@
type="danger"
plain
@click="emit('disable')"
v-hasPermi="['price:set:audit']"
v-hasPermi="auditPerm"
>停用</el-button>
<el-button
v-if="set.status !== 'E'"
type="success"
plain
@click="emit('enable')"
v-hasPermi="['price:set:audit']"
v-hasPermi="auditPerm"
>启用</el-button>
</div>
</div>
@@ -35,6 +35,10 @@
<script setup name="SetDetailHeader">
import { isFixedType, setTypeLabel, setStatusLabel, setStatusTagType } from '../../utils/priceSet'
import { usePriceSetModule, usePriceSetPerm } from '../../composables/usePriceSetModule'
const mod = usePriceSetModule()
const auditPerm = usePriceSetPerm('audit')
defineProps({
set: { type: Object, required: true }
@@ -12,7 +12,7 @@
size="small"
icon="Plus"
@click="dialogRef.open()"
v-hasPermi="['price:set:edit']"
v-hasPermi="editPerm"
>添加明细</el-button>
</template>
@@ -86,8 +86,8 @@
<el-table-column v-if="editable" label="操作" width="120" align="center" fixed="right">
<template #default="{ row }">
<el-button link type="primary" @click="dialogRef.open(row)" v-hasPermi="['price:set:edit']">编辑</el-button>
<el-button link type="danger" @click="remove(row)" v-hasPermi="['price:set:edit']">删除</el-button>
<el-button link type="primary" @click="dialogRef.open(row)" v-hasPermi="editPerm">编辑</el-button>
<el-button link type="danger" @click="remove(row)" v-hasPermi="editPerm">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -113,7 +113,10 @@ import SetSectionCard from './SetSectionCard.vue'
import SetDetailDialog from './SetDetailDialog.vue'
import SurchargeTags from '../SurchargeTags.vue'
import { isChildEditable, isFixedType } from '../../utils/priceSet'
import { delSetDetail } from '@/api/price/set'
import { usePriceSetModule, usePriceSetPerm } from '../../composables/usePriceSetModule'
const { api } = usePriceSetModule()
const editPerm = usePriceSetPerm('edit')
const props = defineProps({
/** 套餐详情对象 */
@@ -172,7 +175,7 @@ function roundModeLabel(mode) {
}
function remove(row) {
proxy.$modal.confirm('确认删除该明细?').then(() => delSetDetail(row.psdId)).then(() => {
proxy.$modal.confirm('确认删除该明细?').then(() => api.delSetDetail(row.psdId)).then(() => {
proxy.$modal.msgSuccess('已删除')
emit('refresh')
}).catch(() => {})
@@ -129,7 +129,9 @@
import { ArrowLeft } from '@element-plus/icons-vue'
import SurchargeTags from '../SurchargeTags.vue'
import { isFixedType } from '../../utils/priceSet'
import { listSetDetailByProduct, listSetDetailOptions } from '@/api/price/set'
import { usePriceSetModule } from '../../composables/usePriceSetModule'
const { api } = usePriceSetModule()
const props = defineProps({
modelValue: { type: Boolean, default: false },
@@ -318,7 +320,7 @@ async function loadProducts() {
products.value = fromVersion
return
}
const res = await listSetDetailOptions(psvId)
const res = await api.listSetDetailOptions(psvId)
const data = res.data || {}
products.value = normalizeProducts(data.products || [])
} finally {
@@ -335,7 +337,7 @@ async function openProductDetail(row) {
detailKeyword.value = ''
detailLoading.value = true
try {
const res = await listSetDetailByProduct(psvId, row.productCode)
const res = await api.listSetDetailByProduct(psvId, row.productCode)
detailRows.value = res.data || []
} catch (e) {
detailRows.value = []
@@ -18,7 +18,9 @@
</template>
<script setup>
import { listPriceSetVersionExcelFiles } from '@/api/price/set'
import { usePriceSetModule } from '../../composables/usePriceSetModule'
const { api } = usePriceSetModule()
const { proxy } = getCurrentInstance()
@@ -39,7 +41,7 @@ function open(row) {
function loadList() {
if (!version.value || version.value.psvId == null) return
loading.value = true
listPriceSetVersionExcelFiles(version.value.psvId).then(res => {
api.listPriceSetVersionExcelFiles(version.value.psvId).then(res => {
list.value = res.data || []
}).finally(() => {
loading.value = false
@@ -6,7 +6,7 @@
plain
size="small"
:disabled="hasDraft"
v-hasPermi="['price:set:add']"
v-hasPermi="addPerm"
@click="emit('create-version')"
>新建价格版本</el-button>
</template>
@@ -50,14 +50,14 @@
link
type="success"
@click="emit('activate', row)"
v-hasPermi="['price:set:edit']"
v-hasPermi="editPerm"
>启动</el-button>
<el-button
v-if="isPendingVersion(row)"
link
type="primary"
@click="emit('reschedule', row)"
v-hasPermi="['price:set:edit']"
v-hasPermi="editPerm"
>修改生效时间</el-button>
<el-button
v-if="isDraftVersion(row) || isPendingVersion(row) || isEffectVersion(row)"
@@ -66,7 +66,7 @@
:loading="isRemoving(row)"
:disabled="removingPsvId != null"
@click="emit('remove', row)"
v-hasPermi="['price:set:edit']"
v-hasPermi="editPerm"
>删除</el-button>
</template>
</el-table-column>
@@ -78,6 +78,11 @@
import SetSectionCard from './SetSectionCard.vue'
import { versionStatusLabel, versionStatusTag, isDraftVersion, isPendingVersion, isEffectVersion, isPriceEditableVersion } from '../../utils/priceSet'
import { checkPermi } from '@/utils/permission'
import { usePriceSetModule, usePriceSetPerm } from '../../composables/usePriceSetModule'
const mod = usePriceSetModule()
const addPerm = usePriceSetPerm('add')
const editPerm = usePriceSetPerm('edit')
const props = defineProps({
versions: { type: Array, default: () => [] },
@@ -164,8 +169,8 @@ function detailCount(row) {
}
function showEditButton(row) {
if (checkPermi(['price:set:forceEdit'])) return true
return isPriceEditableVersion(row) && checkPermi(['price:set:edit'])
if (checkPermi([mod.permPrefix + ':forceEdit'])) return true
return isPriceEditableVersion(row) && checkPermi([mod.permPrefix + ':edit'])
}
function isRemoving(row) {