Refactor billing options retrieval to include data permissions and add effective date handling for product imports
This commit is contained in:
@@ -1,6 +1,12 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-steps :active="active" finish-status="success" align-center class="wizard-steps">
|
||||
<el-steps
|
||||
v-if="!newVersionMode"
|
||||
:active="active"
|
||||
finish-status="success"
|
||||
align-center
|
||||
class="wizard-steps"
|
||||
>
|
||||
<el-step :title="step1Title" />
|
||||
<el-step :title="step2Title" />
|
||||
</el-steps>
|
||||
@@ -23,6 +29,7 @@
|
||||
:version-no="form.version.versionNo"
|
||||
:ref-data="refData"
|
||||
:live-persist="livePersist"
|
||||
:header-title="detailsHeaderTitle"
|
||||
/>
|
||||
|
||||
<div class="wizard-actions">
|
||||
@@ -78,13 +85,19 @@ const progressStatus = ref(undefined)
|
||||
const basicRef = ref()
|
||||
const detailsRef = ref()
|
||||
const copyMode = computed(() => String(route.query.copyVersion || '') === '1')
|
||||
/** Entered from detail: continue-config / copy-version jump to step2 — hide 上一步 */
|
||||
const directStep2 = computed(() => copyMode.value || String(route.query.step || '') === '2')
|
||||
/** Edit existing version: live PUT/pull/import. New create / copy-version: defer until finish. */
|
||||
const livePersist = computed(() => !!form.priceSetId && !copyMode.value)
|
||||
const newVersionMode = computed(() => String(route.query.newVersion || '') === '1')
|
||||
/** copy / newVersion: defer DB write until finish (same as create step2) */
|
||||
const deferPersist = computed(() => copyMode.value || newVersionMode.value)
|
||||
/** Entered from detail: continue-config / copy-version / new-version jump to step2 */
|
||||
const directStep2 = computed(() => deferPersist.value || String(route.query.step || '') === '2')
|
||||
/** Edit existing version: live PUT/pull/import. New create / copy / newVersion: defer until finish. */
|
||||
const livePersist = computed(() => !!form.priceSetId && !deferPersist.value)
|
||||
|
||||
const step1Title = '基本信息'
|
||||
const step2Title = '编辑产品价格'
|
||||
const detailsHeaderTitle = computed(() =>
|
||||
newVersionMode.value ? '编辑产品价格' : '第 2 步 · 编辑产品价格'
|
||||
)
|
||||
|
||||
const form = reactive({
|
||||
priceSetId: undefined,
|
||||
@@ -271,7 +284,9 @@ function buildPayload(opts = {}) {
|
||||
}
|
||||
|
||||
function goBack() {
|
||||
const obj = { path: '/customer/set' }
|
||||
const obj = (newVersionMode.value || copyMode.value) && form.priceSetId
|
||||
? { path: '/customer/setDetail', query: { priceSetId: form.priceSetId } }
|
||||
: { path: '/customer/set' }
|
||||
if (proxy.$tab) {
|
||||
proxy.$tab.closeOpenPage(obj)
|
||||
} else {
|
||||
@@ -322,7 +337,7 @@ async function onPriceBuildModeUpdate(mode) {
|
||||
}
|
||||
}
|
||||
|
||||
function applySetData(data, asCopy) {
|
||||
function applySetData(data, asCopy, asNewVersion) {
|
||||
form.priceSetId = data.priceSetId
|
||||
Object.assign(form.basic, {
|
||||
priceSetName: data.priceSetName,
|
||||
@@ -341,22 +356,33 @@ function applySetData(data, asCopy) {
|
||||
form.version.effectiveTime = undefined
|
||||
form.version.expireTime = undefined
|
||||
form.version.priceBuildMode = undefined
|
||||
form.details = []
|
||||
form.products = []
|
||||
} else if (asNewVersion) {
|
||||
// Pre-created empty draft from detail page; same step2 UX as create package
|
||||
form.version.psvId = current.psvId
|
||||
form.version.versionNo = current.versionNo || nextVersionNo(versions)
|
||||
form.version.effectiveTime = undefined
|
||||
form.version.expireTime = undefined
|
||||
form.version.priceBuildMode = undefined
|
||||
form.details = []
|
||||
form.products = []
|
||||
} else {
|
||||
form.version.psvId = current.psvId
|
||||
form.version.versionNo = current.versionNo || nextVersionNo(versions)
|
||||
form.version.effectiveTime = current.effectiveTime
|
||||
form.version.expireTime = current.expireTime
|
||||
form.version.priceBuildMode = current.priceBuildMode || undefined
|
||||
form.details = []
|
||||
form.products = (current.products || []).map(p => ({ ...p }))
|
||||
}
|
||||
form.details = []
|
||||
form.products = asCopy ? [] : ((current.products || []).map(p => ({ ...p })))
|
||||
form.customers = (data.customers || []).map(c => ({ ...c }))
|
||||
}
|
||||
|
||||
function loadExisting(id, asCopy) {
|
||||
function loadExisting(id, asCopy, asNewVersion) {
|
||||
getPriceSet(id).then(res => {
|
||||
applySetData(res.data || {}, asCopy)
|
||||
if (asCopy || String(route.query.step || '') === '2') {
|
||||
applySetData(res.data || {}, asCopy, asNewVersion)
|
||||
if (asCopy || asNewVersion || String(route.query.step || '') === '2') {
|
||||
active.value = 1
|
||||
}
|
||||
})
|
||||
@@ -366,7 +392,7 @@ onMounted(() => {
|
||||
refData.loadProducts().finally(() => {
|
||||
const id = route.query.priceSetId
|
||||
if (id) {
|
||||
loadExisting(id, copyMode.value)
|
||||
loadExisting(id, copyMode.value, newVersionMode.value)
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user