修改套餐价格

This commit is contained in:
wuweihua
2026-09-16 17:14:19 +08:00
parent 7172621fd3
commit 4441aa12bf
48 changed files with 4258 additions and 682 deletions
@@ -22,10 +22,7 @@
*/
import SetSectionCard from './SetSectionCard.vue'
import {
formatDateRange,
isDiscountType,
setStatusLabel,
setStatusTagType,
setTypeLabel
} from '../../utils/priceSet'
@@ -50,8 +47,6 @@ const items = computed(() => {
value: discount ? `${s.defaultDiscount}%` : '不适用(FIXED)',
muted: !discount
},
{ label: '状态', value: setStatusLabel(s), tag: setStatusTagType(s) },
{ label: '有效期', value: formatDateRange(s.effectiveDate, s.expireDate) },
{ label: '创建人', value: s.createBy || '-' },
{ label: '创建时间', value: s.createTime || '-' },
{ label: '最后更新', value: (s.updateTime || '-') + ' ' + updater }
@@ -5,17 +5,6 @@
:count="customers.length"
sub="一个客户只能绑定一个套餐"
>
<template #action>
<el-button
v-if="editable"
type="primary"
size="small"
icon="Plus"
@click="dialogRef.open()"
v-hasPermi="['price:set:edit']"
>添加客户</el-button>
</template>
<el-table :data="customers" border class="customer-table" empty-text="暂未绑定客户">
<el-table-column label="客户代码" prop="customerCode" min-width="140" show-overflow-tooltip>
<template #default="{ row }">
@@ -29,62 +18,18 @@
<span v-else class="priority">{{ row.bindPriority }}</span>
</template>
</el-table-column>
<el-table-column label="有效期" min-width="220">
<template #default="{ row }">{{ formatDateRange(row.prBegindate, row.prEnddate) }}</template>
</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>
</template>
</el-table-column>
</el-table>
<div class="table-hint">解绑后该客户可绑定其他套餐;生效中的套餐修改绑定会即时影响计费命中。</div>
<set-customer-dialog
ref="dialogRef"
:price-set-id="set.priceSetId"
:default-begindate="set.effectiveDate"
:default-enddate="set.expireDate"
@success="emit('refresh')"
/>
</set-section-card>
</template>
<script setup name="SetCustomerTable">
/**
* 套餐详情 · 绑定客户表格
* 自带新增 / 编辑弹窗与解绑,数据变更后 emit('refresh') 由页面重新拉取详情。
*/
import SetSectionCard from './SetSectionCard.vue'
import SetCustomerDialog from './SetCustomerDialog.vue'
import { formatDateRange, isChildEditable } from '../../utils/priceSet'
import { delSetCustomer } from '@/api/price/set'
const props = defineProps({
/** 套餐详情对象 */
set: {
type: Object,
required: true
}
set: { type: Object, required: true }
})
const emit = defineEmits(['refresh'])
const { proxy } = getCurrentInstance()
const dialogRef = ref()
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.msgSuccess('已解绑')
emit('refresh')
}).catch(() => {})
}
</script>
<style scoped>
@@ -104,10 +49,4 @@ function remove(row) {
.priority {
color: #303133;
}
.table-hint {
margin-top: 10px;
font-size: 12px;
color: #909399;
line-height: 1.6;
}
</style>
@@ -82,6 +82,7 @@
/>
<span class="ps-field__unit">RMB/KG</span>
</div>
<div class="ps-hint">可留空:原基础表无值时表示不覆盖运费,按产品基础价计费</div>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -6,60 +6,40 @@
<span v-if="set.priceSetCode" class="hd-code">{{ set.priceSetCode }}</span>
</div>
<div class="hd-line hd-meta">
<el-tag :type="statusTagType" size="small" effect="dark">{{ statusText }}</el-tag>
<el-tag :type="isFixedType(set.setType) ? 'warning' : 'primary'" size="small" effect="plain">
{{ setTypeLabel(set.setType) }}
</el-tag>
<span class="hd-range">
<el-icon class="hd-icon"><Calendar /></el-icon>
{{ dateRange }}
</span>
</div>
</div>
<div class="hd-actions">
<el-button @click="emit('back')">返回列表</el-button>
<template v-if="editableStatus">
<el-button type="primary" @click="emit('edit')" v-hasPermi="['price:set:edit']">继续配置</el-button>
<el-button type="primary" plain @click="emit('submit')" v-hasPermi="['price:set:audit']">提交审核</el-button>
</template>
<template v-else-if="set.status === 'A'">
<el-button type="success" @click="emit('approve')" v-hasPermi="['price:set:audit']">审批生效</el-button>
<el-button type="warning" plain @click="emit('reject')" v-hasPermi="['price:set:audit']">驳回</el-button>
</template>
<el-button
v-else-if="set.status === 'E' && !set.expired"
v-if="set.status === 'E' && !set.expired"
type="danger"
plain
@click="emit('disable')"
v-hasPermi="['price:set:audit']"
>停用</el-button>
<el-button v-else-if="set.status === 'S'" type="primary" plain @click="emit('copy')" v-hasPermi="['price:set:add']">复用新建</el-button>
<el-button
v-else-if="set.status === 'S'"
type="primary"
plain
@click="emit('copy')"
v-hasPermi="['price:set:add']"
>复用新建</el-button>
</div>
</div>
</template>
<script setup name="SetDetailHeader">
/**
* 套餐详情 · 页头
* 只负责展示套餐标识 / 状态与派发操作事件,接口调用与确认框由页面处理。
*/
import { SET_STATUS, formatDateRange, isFixedType, setStatusLabel, setStatusTagType, setTypeLabel } from '../../utils/priceSet'
import { isFixedType, setTypeLabel } from '../../utils/priceSet'
const props = defineProps({
/** 套餐详情对象 */
set: {
type: Object,
required: true
}
defineProps({
set: { type: Object, required: true }
})
const emit = defineEmits(['back', 'edit', 'submit', 'approve', 'reject', 'disable', 'copy'])
const statusText = computed(() => setStatusLabel(props.set))
const statusTagType = computed(() => setStatusTagType(props.set))
const dateRange = computed(() => formatDateRange(props.set.effectiveDate, props.set.expireDate))
const editableStatus = computed(() => [SET_STATUS.DRAFT, SET_STATUS.REJECT].includes(props.set.status))
const emit = defineEmits(['back', 'disable', 'copy'])
</script>
<style scoped>
@@ -76,9 +56,7 @@ const editableStatus = computed(() => [SET_STATUS.DRAFT, SET_STATUS.REJECT].incl
border-left: 3px solid #1890ff;
border-radius: 8px;
}
.hd-main {
min-width: 0;
}
.hd-main { min-width: 0; }
.hd-line {
display: flex;
align-items: center;
@@ -101,19 +79,7 @@ const editableStatus = computed(() => [SET_STATUS.DRAFT, SET_STATUS.REJECT].incl
border-radius: 4px;
padding: 1px 8px;
}
.hd-meta {
margin-top: 10px;
}
.hd-range {
display: inline-flex;
align-items: center;
gap: 4px;
font-size: 13px;
color: #909399;
}
.hd-icon {
font-size: 14px;
}
.hd-meta { margin-top: 10px; }
.hd-actions {
display: flex;
align-items: center;
@@ -36,8 +36,13 @@
<el-table-column label="重量段" prop="weightLabel" min-width="130" />
<el-table-column label="运费单价" min-width="130" align="right">
<template #default="{ row }">
<span class="hl">{{ row.fvValue }}</span>
<span class="unit"> RMB/KG</span>
<template v-if="row.fvValue == null">
<span class="unit">未覆盖</span>
</template>
<template v-else>
<span class="hl">{{ row.fvValue }}</span>
<span class="unit"> RMB/KG</span>
</template>
</template>
</el-table-column>
<el-table-column label="挂号费" min-width="120" align="right">
@@ -57,7 +62,7 @@
<el-table-column label="附加费" min-width="220">
<template #default="{ row }">
<surcharge-tags :list="surchargesOf(row)" />
<surcharge-tags :list="surchargesOfRow(row)" />
</template>
</el-table-column>
@@ -116,6 +121,11 @@ const { bms_round_mode } = useDict('bms_round_mode')
const { surchargesOf } = props.refData
function surchargesOfRow(row) {
if (row && row.surcharges && row.surcharges.length) return row.surcharges
return surchargesOf(row)
}
const dialogRef = ref()
const details = computed(() => props.set.details || [])
@@ -126,7 +136,7 @@ const subTitle = computed(() => isFixedType(props.set.setType)
: '按产品限定折扣,留空走套餐默认折扣')
const hint = computed(() => isFixedType(props.set.setType)
? '运费单价单位 RMB/KG,挂号费单位 RMB/票;附加费来自产品关联配置,此处只读展示。'
? '运费单价单位 RMB/KG(留空表示不覆盖,按产品基础价计费),挂号费单位 RMB/票;附加费来自产品关联配置,此处只读展示。'
: '未配置明细时全部在售产品均适用套餐默认折扣。')
function roundModeLabel(mode) {
@@ -0,0 +1,222 @@
<template>
<el-drawer
:model-value="modelValue"
:title="title"
size="72%"
destroy-on-close
@close="close"
>
<div class="drawer-body" v-loading="loading">
<div class="toolbar">
<el-input
v-model="query.keyword"
clearable
:placeholder="phSearch"
style="width: 280px"
@keyup.enter="search"
/>
<el-button type="primary" @click="search">查询</el-button>
<el-button @click="reset">重置</el-button>
</div>
<el-table :data="rows" border height="calc(100vh - 220px)" empty-text="暂无明细">
<el-table-column :label="colProduct" min-width="180">
<template #default="{ row }">
<div class="cell-product">
<span class="p-code">{{ row.productCode }}</span>
<span class="p-name">{{ row.productName || '' }}</span>
</div>
</template>
</el-table-column>
<template v-if="isFixed">
<el-table-column :label="colCountry" min-width="120">
<template #default="{ row }">{{ row.countryName || row.countryCode || '-' }}</template>
</el-table-column>
<el-table-column :label="colZone" min-width="110">
<template #default="{ row }">{{ row.zoneName || row.zoneCode || '-' }}</template>
</el-table-column>
<el-table-column :label="colWeight" prop="weightLabel" min-width="120" />
<el-table-column :label="colFv" min-width="130" align="right">
<template #default="{ row }">
<template v-if="row.fvValue == null">
<span class="unit">未覆盖</span>
</template>
<template v-else>
<span class="hl">{{ row.fvValue }}</span>
<span class="unit"> RMB/KG</span>
</template>
</template>
</el-table-column>
<el-table-column :label="colReg" min-width="120" align="right">
<template #default="{ row }">
<span class="reg">{{ row.fvRegistrationFee }}</span>
<span class="unit"> RMB/票</span>
</template>
</el-table-column>
</template>
<el-table-column v-else :label="colDisc" min-width="120" align="center">
<template #default="{ row }">
<el-tag v-if="row.discountValue == null" size="small" type="info" effect="plain">默认折扣</el-tag>
<span v-else class="pct">{{ row.discountValue }}%</span>
</template>
</el-table-column>
<el-table-column :label="colSc" min-width="200">
<template #default="{ row }">
<surcharge-tags :list="row.surcharges || []" :empty-text="noneSc" />
</template>
</el-table-column>
<el-table-column :label="colRound" min-width="100" align="center">
<template #default="{ row }">{{ roundModeLabel(row.roundMode) }}</template>
</el-table-column>
</el-table>
<div class="pager">
<pagination
v-show="total > 0"
:total="total"
v-model:page="query.pageNum"
v-model:limit="query.pageSize"
@pagination="load"
/>
</div>
</div>
<template #footer>
<el-button @click="close">关闭</el-button>
</template>
</el-drawer>
</template>
<script setup name="SetVersionDetailDrawer">
import SurchargeTags from '../SurchargeTags.vue'
import { isFixedType } from '../../utils/priceSet'
import { listSetDetail } from '@/api/price/set'
const props = defineProps({
modelValue: { type: Boolean, default: false },
version: { type: Object, default: null },
setType: { type: String, default: 'FIXED' }
})
const emit = defineEmits(['update:modelValue'])
const { bms_round_mode } = useDict('bms_round_mode')
const loading = ref(false)
const rows = ref([])
const total = ref(0)
const query = reactive({
pageNum: 1,
pageSize: 20,
keyword: ''
})
const phSearch = '产品/国家/分区/重量段'
const colProduct = '产品'
const colCountry = '国家'
const colZone = '分区'
const colWeight = '重量段'
const colFv = '运费单价'
const colReg = '挂号费'
const colDisc = '产品折扣'
const colSc = '附加费'
const colRound = '取值方式'
const noneSc = '无'
const isFixed = computed(() => isFixedType(props.setType))
const title = computed(() => {
const v = props.version || {}
return (v.versionNo || '-') + ' · 版本明细'
})
function roundModeLabel(mode) {
const hit = (bms_round_mode.value || []).find(d => d.value === mode)
return hit ? hit.label : (mode || '四舍五入')
}
function close() {
emit('update:modelValue', false)
}
function search() {
query.pageNum = 1
load()
}
function reset() {
query.keyword = ''
query.pageNum = 1
load()
}
function load() {
const psvId = props.version && props.version.psvId
if (!psvId) {
rows.value = []
total.value = 0
return
}
loading.value = true
listSetDetail({
psvId,
keyword: query.keyword || undefined,
pageNum: query.pageNum,
pageSize: query.pageSize
}).then(res => {
rows.value = res.rows || []
total.value = res.total || 0
}).finally(() => {
loading.value = false
})
}
watch(
() => [props.modelValue, props.version && props.version.psvId],
([open]) => {
if (open) {
query.pageNum = 1
query.keyword = ''
load()
}
}
)
</script>
<style scoped>
.drawer-body {
display: flex;
flex-direction: column;
height: 100%;
min-height: 0;
}
.toolbar {
display: flex;
gap: 8px;
margin-bottom: 12px;
flex-wrap: wrap;
}
.pager {
margin-top: 12px;
}
.cell-product {
display: flex;
align-items: baseline;
gap: 6px;
}
.p-code {
font-family: Consolas, Monaco, monospace;
font-size: 12px;
color: #606266;
background: #f4f4f5;
border-radius: 3px;
padding: 0 6px;
}
.p-name { color: #303133; }
.hl { color: #1890ff; font-weight: 600; }
.reg { color: #d48806; font-weight: 600; }
.pct { color: #1890ff; font-weight: 600; }
.unit { font-size: 12px; color: #909399; }
</style>
@@ -0,0 +1,131 @@
<template>
<set-section-card :title="title" tone="green" :count="filteredVersions.length">
<el-tabs v-model="statusTab" class="ver-tabs">
<el-tab-pane :label="tabLabel('all')" name="all" />
<el-tab-pane :label="tabLabel('0')" name="0" />
<el-tab-pane :label="tabLabel('1')" name="1" />
<el-tab-pane :label="tabLabel('2')" name="2" />
</el-tabs>
<el-table :data="filteredVersions" border empty-text="暂无版本">
<el-table-column :label="colNo" width="100">
<template #default="{ row }">
<el-button link type="primary" @click="openDetails(row)">{{ row.versionNo || '-' }}</el-button>
</template>
</el-table-column>
<el-table-column :label="colEff" min-width="170">
<template #default="{ row }">{{ row.effectiveTime || '-' }}</template>
</el-table-column>
<el-table-column :label="colExp" min-width="170">
<template #default="{ row }">{{ row.expireTime || '-' }}</template>
</el-table-column>
<el-table-column :label="colStatus" width="100" align="center">
<template #default="{ row }">
<el-tag :type="versionStatusTag(row.status)" size="small">{{ versionStatusLabel(row.status) }}</el-tag>
</template>
</el-table-column>
<el-table-column :label="colRows" width="100" align="center">
<template #default="{ row }">{{ detailCount(row) }}</template>
</el-table-column>
<el-table-column :label="colAction" width="320" align="center" fixed="right">
<template #default="{ row }">
<el-button link type="primary" @click="openDetails(row)">查看详情</el-button>
<el-button
v-if="String(row.status) === '0'"
link
type="primary"
@click="emit('edit', row)"
v-hasPermi="['price:set:edit']"
>继续配置</el-button>
<el-button
v-if="String(row.status) === '0'"
link
type="success"
@click="emit('activate', row)"
v-hasPermi="['price:set:edit']"
>启动</el-button>
<el-button
v-if="String(row.status) === '0'"
link
type="danger"
@click="emit('remove', row)"
v-hasPermi="['price:set:edit']"
>删除</el-button>
<el-button
v-if="String(row.status) === '1'"
link
type="primary"
@click="emit('copy-version', row)"
v-hasPermi="['price:set:add']"
>复制为新版本</el-button>
</template>
</el-table-column>
</el-table>
</set-section-card>
</template>
<script setup name="SetVersionTable">
import SetSectionCard from './SetSectionCard.vue'
import { versionStatusLabel, versionStatusTag } from '../../utils/priceSet'
const props = defineProps({
versions: { type: Array, default: () => [] },
modelValue: { type: [Number, String], default: undefined }
})
const emit = defineEmits(['update:modelValue', 'copy-version', 'open-details', 'activate', 'edit', 'remove'])
const title = '套餐版本'
const colNo = '版本号'
const colEff = '生效时间'
const colExp = '失效时间'
const colStatus = '状态'
const colRows = '明细行数'
const colAction = '操作'
const statusTab = ref('all')
const counts = computed(() => {
const map = { all: 0, '0': 0, '1': 0, '2': 0 }
;(props.versions || []).forEach(v => {
map.all++
const s = String(v.status == null ? '' : v.status)
if (map[s] != null) map[s]++
})
return map
})
function tabLabel(key) {
const labels = {
all: '全部',
'0': '草稿',
'1': '生效',
'2': '失效'
}
return labels[key] + ' (' + (counts.value[key] || 0) + ')'
}
const filteredVersions = computed(() => {
const list = props.versions || []
if (statusTab.value === 'all') return list
return list.filter(v => String(v.status) === statusTab.value)
})
function detailCount(row) {
if (row && row.detailCount != null) return row.detailCount
return (row && row.details || []).length
}
function openDetails(row) {
if (!row || row.psvId == null) return
emit('update:modelValue', row.psvId)
emit('open-details', row)
}
</script>
<style scoped>
.ver-tabs {
margin-bottom: 8px;
}
.ver-tabs :deep(.el-tabs__header) {
margin-bottom: 8px;
}
</style>