wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改套餐状态

Browse Source
This commit is contained in:
wuweihua
2026-09-20 10:29:10 +08:00
parent 24435e4113
commit cc5f1cf5de
15 changed files with 96 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-front/src/api/price/set.js
+7
View File
@@ -142,6 +142,13 @@ export function disablePriceSet(priceSetId) {
})
}
export function enablePriceSet(priceSetId) {
return request({
url: '/price/set/enable/' + priceSetId,
method: 'put'
})
}
export function copyPriceSet(priceSetId) {
return request({
url: '/price/set/copy/' + priceSetId,
bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue
+2 -2
View File
@@ -800,8 +800,8 @@ function removeProduct(productId) {
/* ---------------- 套餐绑定（prc_customer_price_set，一客户一套餐） ---------------- */
const setTypeMap = { FIXED: '固定价', DISCOUNT: '折扣' }
const priceSetStatusMap = { D: '草稿', A: '审核中', E: '生效', R: '驳回', S: '停用' }
const priceSetStatusTagType = { D: 'info', A: 'warning', E: 'success', R: 'danger', S: 'info' }
const priceSetStatusMap = { D: '待启用', A: '审核中', E: '生效', R: '驳回', S: '停用' }
const priceSetStatusTagType = { D: 'warning', A: 'warning', E: 'success', R: 'danger', S: 'info' }
const boundPriceSets = ref([])
const priceSetOptions = ref([])
bms-front/src/views/price/set/components/detail/SetDetailHeader.vue
+9 -8
View File
@@ -4,6 +4,7 @@
<div class="hd-line">
<h2 class="hd-name">{{ set.priceSetName || '套餐详情' }}</h2>
<span v-if="set.priceSetCode" class="hd-code">{{ set.priceSetCode }}</span>
<el-tag :type="setStatusTagType(set)" size="small">{{ setStatusLabel(set) }}</el-tag>
</div>
<div class="hd-line hd-meta">
<el-tag :type="isFixedType(set.setType) ? 'warning' : 'primary'" size="small" effect="plain">
@@ -15,31 +16,31 @@
<div class="hd-actions">
<el-button @click="emit('back')">返回列表</el-button>
<el-button
v-if="set.status === 'E' && !set.expired"
v-if="set.status === 'E'"
type="danger"
plain
@click="emit('disable')"
v-hasPermi="['price:set:audit']"
>停用</el-button>
<el-button
v-else-if="set.status === 'S'"
type="primary"
v-if="set.status !== 'E'"
type="success"
plain
@click="emit('copy')"
v-hasPermi="['price:set:add']"
>复用新建</el-button>
@click="emit('enable')"
v-hasPermi="['price:set:audit']"
>启用</el-button>
</div>
</div>
</template>
<script setup name="SetDetailHeader">
import { isFixedType, setTypeLabel } from '../../utils/priceSet'
import { isFixedType, setTypeLabel, setStatusLabel, setStatusTagType } from '../../utils/priceSet'
defineProps({
set: { type: Object, required: true }
})
const emit = defineEmits(['back', 'disable', 'copy'])
const emit = defineEmits(['back', 'disable', 'enable'])
</script>
<style scoped>
bms-front/src/views/price/set/create.vue
+2 -2
View File
@@ -23,7 +23,7 @@
<el-button @click="goBack">取消</el-button>
<el-button v-if="active > 0 && !directStep2" @click="active--">上一步</el-button>
<el-button v-if="active === 0" type="primary" :loading="creating" @click="goStep2">创建套餐价格</el-button>
<el-button v-if="active === 0" type="info" :loading="saving" @click="saveDraft">保存草稿</el-button>
<el-button v-if="active === 0" type="info" :loading="saving" @click="saveDraft">保存</el-button>
<el-button v-if="active === 1" type="primary" @click="finishEdit">完成</el-button>
</div>
@@ -199,7 +199,7 @@ async function saveDraft() {
try {
const priceSetId = await runSaveWithProgress(buildPayload())
form.priceSetId = priceSetId
proxy.$modal.msgSuccess('草稿已保存，套餐ID=' + priceSetId)
proxy.$modal.msgSuccess('已保存（待启用），套餐ID=' + priceSetId)
goBack()
} catch (e) {
// surfaced
bms-front/src/views/price/set/detail.vue
+5 -8
View File
@@ -13,7 +13,7 @@
:set="set"
@back="goList"
@disable="onDisable"
@copy="onCopy"
@enable="onEnable"
/>
<set-basic-info-card :set="set" />
@@ -77,7 +77,7 @@ import SetVersionDetailDrawer from './components/detail/SetVersionDetailDrawer.v
import PriceEditPanel from './components/create/PriceEditPanel.vue'
import { usePriceSetRefData } from './composables/usePriceSetRefData'
import {
getPriceSet, disablePriceSet, copyPriceSet, activatePriceSetVersion, copyPriceSetVersion, deletePriceSetVersion
getPriceSet, disablePriceSet, enablePriceSet, activatePriceSetVersion, copyPriceSetVersion, deletePriceSetVersion
} from '@/api/price/set'
const { proxy } = getCurrentInstance()
@@ -121,6 +121,9 @@ function confirmAction(text, request, successText, done) {
function onDisable() {
confirmAction('停用后不再参与计费命中，确认停用？', () => disablePriceSet(set.value.priceSetId), '已停用')
}
function onEnable() {
confirmAction('启用后套餐将重新参与计费命中，确认启用？', () => enablePriceSet(set.value.priceSetId), '已启用')
}
function formatNow() {
const d = new Date()
const p = n => String(n).padStart(2, '0')
@@ -199,12 +202,6 @@ function submitActivate() {
})
})
}
function onCopy() {
copyPriceSet(set.value.priceSetId).then(res => {
proxy.$modal.msgSuccess('已复制为草稿')
proxy.$router.push({ path: '/customer/setCreate', query: { priceSetId: res.data } })
})
}
function onCopyVersion(row) {
if (!row || row.psvId == null) return
const hasDraft = (set.value.versions || []).some(v => v && String(v.status) === '0')
bms-front/src/views/price/set/priceSet.vue
+23 -16
View File
@@ -25,10 +25,6 @@
</el-tag>
</template>
<template #col-dateRange="{ row }">
{{ formatDate(row.effectiveDate) }} ~ {{ row.expireDate ? formatDate(row.expireDate) : '长期' }}
</template>
<template #col-status="{ row }">
<el-tag :type="statusTag(row)" size="small">{{ statusLabel(row) }}</el-tag>
</template>
@@ -46,11 +42,19 @@
<template #col-action="{ row }">
<el-button link type="primary" @click="handleDetail(row)" v-hasPermi="['price:set:query']">详情</el-button>
<el-button
v-if="row.status === 'E'"
link
type="warning"
@click="handleDisable(row)"
v-hasPermi="['price:set:audit']"
>停用</el-button>
<el-button
v-if="row.status === 'D' || row.status === 'S'"
link
type="success"
@click="handleEnable(row)"
v-hasPermi="['price:set:audit']"
>启用</el-button>
</template>
</basic-table>
@@ -65,10 +69,10 @@
<script setup name="PriceSet">
import {
listPriceSet, disablePriceSet, copyPriceSet, getPriceSet
listPriceSet, disablePriceSet, enablePriceSet, copyPriceSet, getPriceSet
} from '@/api/price/set'
import { parseTime } from '@/utils/ruoyi'
import SetVersionDetailDrawer from './components/detail/SetVersionDetailDrawer.vue'
import { setStatusLabel, setStatusTagType } from './utils/priceSet'
const { proxy } = getCurrentInstance()
const tableRef = ref()
@@ -91,6 +95,7 @@ const searchColumns = [
prop: 'status',
component: 'select',
options: [
{ label: '待启用', value: 'D' },
{ label: '生效', value: 'E' },
{ label: '已停用', value: 'S' }
],
@@ -105,6 +110,7 @@ const columns = [
{ label: '套餐名称', prop: 'priceSetName', minWidth: 160 },
{ label: '类型', prop: 'setType', width: 140 },
{ label: '说明', prop: 'priceSetNote', minWidth: 160 },
{ label: '状态', prop: 'status', width: 90 },
{ label: '生效明细', prop: 'activeDetail', width: 100 },
{ label: '操作', prop: 'action', width: 160, showInToolbar: false }
]
@@ -113,20 +119,12 @@ function queryList(params) {
return listPriceSet(params)
}
function formatDate(val) {
return val ? parseTime(val, '{y}-{m}-{d}') : ''
}
function statusLabel(row) {
if (row.expired) return '已过期'
const map = { D: '草稿', A: '审核中', E: '生效', R: '驳回', S: '已停用' }
return map[row.status] || row.status
return setStatusLabel(row)
}
function statusTag(row) {
if (row.expired) return 'danger'
const map = { D: 'warning', A: 'primary', E: 'success', R: 'danger', S: 'info' }
return map[row.status] || 'info'
return setStatusTagType(row)
}
function handleCreate() {
@@ -184,6 +182,15 @@ function handleDisable(row) {
}).catch(() => {})
}
function handleEnable(row) {
proxy.$modal.confirm('启用后该套餐将重新参与计费命中，确认启用【' + row.priceSetName + '】？').then(() => {
return enablePriceSet(row.priceSetId)
}).then(() => {
proxy.$modal.msgSuccess('已启用')
tableRef.value.refresh()
}).catch(() => {})
}
function handleCopy(row) {
copyPriceSet(row.priceSetId).then(res => {
proxy.$modal.msgSuccess('已复制为草稿')
bms-front/src/views/price/set/utils/priceSet.js
+10 -8
View File
@@ -12,7 +12,7 @@ export const SET_TYPE = {
DISCOUNT: 'DISCOUNT'
}
/** 套餐状态枚举：D 草稿 / A 审核中 / E 生效中 / R 驳回 / S 已停用 */
/** 套餐状态枚举：D 待启用 / A 审核中 / E 生效 / R 驳回 / S 已停用 */
export const SET_STATUS = {
DRAFT: 'D',
AUDIT: 'A',
@@ -22,9 +22,9 @@ export const SET_STATUS = {
}
const STATUS_LABEL = {
D: '草稿',
D: '待启用',
A: '审核中',
E: '生效中',
E: '生效',
R: '驳回',
S: '已停用'
}
@@ -83,19 +83,21 @@ export function nextVersionNo(versions) {
return 'V' + (max + 1)
}
/** 状态文案（已过期优先） */
/** Package status label */
export function setStatusLabel(set) {
if (set && set.expired) return '已过期'
return STATUS_LABEL[set && set.status] || (set && set.status) || '-'
if (set && set.status && STATUS_LABEL[set.status]) return STATUS_LABEL[set.status]
return set && set.status ? String(set.status) : '-'
}
/** 状态标签色（已过期优先） */
/** Package status tag type */
export function setStatusTagType(set) {
if (set && set.expired) return 'danger'
return STATUS_TAG[set && set.status] || 'info'
if (set && set.status && STATUS_TAG[set.status]) return STATUS_TAG[set.status]
return 'info'
}
/** 明细 / 客户是否可维护：草稿、驳回、生效中 */
/** 明细 / 客户是否可维护：待启用、驳回、生效 */
export function isChildEditable(status) {
return [SET_STATUS.DRAFT, SET_STATUS.REJECT, SET_STATUS.EFFECTIVE].includes(status)
}