增加专属报价功能

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
@@ -0,0 +1,565 @@
<template>
<div class="app-container">
<div v-if="showBasic" class="create-section">
<step-basic-info ref="basicRef" v-model="form.basic" />
</div>
<div class="create-section">
<step-details
ref="detailsRef"
:details="form.details"
:products="form.products"
:price-set-id="form.priceSetId"
:psv-id="form.version.psvId"
@update:psv-id="onPsvIdUpdate"
:set-type="form.basic.setType"
:price-build-mode="form.version.priceBuildMode"
@update:price-build-mode="onPriceBuildModeUpdate"
@update:pef-id="onPefIdUpdate"
:version-no="form.version.versionNo"
:version-status="form.version.status"
:ref-data="refData"
:live-persist="livePersist"
:build-mode-dirty="buildModeDirty"
:build-mode-ready="pageReady"
:show-import-inherit="false"
:header-title="detailsHeaderTitle"
/>
</div>
<div class="wizard-actions">
<el-button @click="goBack">取消</el-button>
<el-button type="primary" :loading="creating" @click="finishEdit">完成</el-button>
</div>
<el-dialog
v-model="progressVisible"
:title="mod.labels.saveProgressTitle"
width="420px"
:close-on-click-modal="false"
:close-on-press-escape="false"
:show-close="false"
append-to-body
>
<div class="save-progress">
<el-progress :percentage="progressPercent" :status="progressStatus" />
<p class="save-progress__msg">{{ progressMessage }}</p>
<p class="save-progress__hint">请勿关闭页面,大量明细保存可能需要一些时间</p>
</div>
</el-dialog>
</div>
</template>
<script setup name="ExclusiveQuoteCreate">
import StepBasicInfo from '../set/components/create/StepBasicInfo.vue'
import StepDetails from '../set/components/create/StepDetails.vue'
import { usePriceSetRefData } from '../set/composables/usePriceSetRefData'
import {
createEmptyBasicInfo,
isBuildModeLockedVersion,
nextVersionNo,
toCustomerPayload,
toDetailPayload
} from '../set/utils/priceSet'
import { exclusiveQuoteApi } from '@/api/price/exclusive'
import { providePriceSetModule, createExclusiveModule } from '../set/composables/usePriceSetModule'
// Same-component inject cannot see provide(); use return value for this page, provide for children.
const mod = providePriceSetModule(createExclusiveModule(exclusiveQuoteApi))
const { proxy } = getCurrentInstance()
const route = useRoute()
const refData = usePriceSetRefData()
const creating = ref(false)
const progressVisible = ref(false)
const progressPercent = ref(0)
const progressMessage = ref('')
const progressStatus = ref(undefined)
const basicRef = ref()
const detailsRef = ref()
const copyMode = computed(() => String(route.query.copyVersion || '') === '1')
const newVersionMode = computed(() => String(route.query.newVersion || '') === '1')
/** copy / newVersion: defer DB write until finish */
const deferPersist = computed(() => copyMode.value || newVersionMode.value)
/** Continue-config / copy / new-version: hide basic (package already exists) */
const showBasic = 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)
/** Brand-new package has no prior version — hide IMPORT inherit card. */
const showImportInherit = computed(() => newVersionMode.value || copyMode.value)
const detailsHeaderTitle = '编辑产品价格'
const form = reactive({
priceSetId: undefined,
basic: createEmptyBasicInfo(),
version: { psvId: undefined, versionNo: 'V1', effectiveTime: undefined, expireTime: undefined, status: undefined, priceBuildMode: 'IMPORT_FRESH' },
details: [],
products: [],
customers: []
})
/** Draft IMPORT Excel attachment id; stamped onto prc_price_set_product on finish */
const draftPefId = ref(undefined)
const draftPefIds = ref([])
const savedPriceBuildMode = ref(undefined)
const savedProductsSnapshot = ref([])
const buildModeDirty = computed(() =>
String(form.version.priceBuildMode || '') !== String(savedPriceBuildMode.value || '')
)
/** Gate build-mode cards until package payload applied (avoids first click being wiped). */
const pageReady = ref(!route.query.priceSetId)
function mapSaveProgressMessage(message) {
const m = message || ''
if (!m) return ''
if (m === 'queued') return '排队中'
if (m === 'pulling library') return '拉取产品库'
if (m === 'details exist, skip pull') return '明细已存在,跳过拉取'
if (m === 'saving basic') return '保存基本信息'
if (m === 'saving version') return '保存版本'
if (m.startsWith('saving details ')) return '保存明细 ' + m.slice('saving details '.length)
if (m === 'saving surcharges') return '保存附加费'
if (m === 'details unchanged') return '明细未变更'
if (m === 'saving customers') return '保存客户'
if (m === 'finishing') return '收尾中'
if (m === 'done') return '完成'
if (m === 'failed') return '失败'
return m
}
async function runSaveWithProgress(payload) {
progressVisible.value = true
progressPercent.value = 0
progressMessage.value = ''
progressStatus.value = undefined
try {
const result = await mod.api.savePriceSetAsync(payload, (task) => {
progressPercent.value = Math.min(100, Number(task.percent) || 0)
progressMessage.value = mapSaveProgressMessage(task.message)
if (task.status === 'FAIL') {
progressStatus.value = 'exception'
} else if (task.status === 'SUCCESS') {
progressStatus.value = 'success'
} else {
progressStatus.value = undefined
}
})
progressPercent.value = 100
progressStatus.value = 'success'
return result.priceSetId
} catch (e) {
progressStatus.value = 'exception'
const msg = (e && e.task && e.task.error) || (e && e.message) || '保存失败'
progressMessage.value = msg
if (proxy && proxy.$modal) {
proxy.$modal.msgError(msg)
}
await new Promise(resolve => setTimeout(resolve, 800))
throw e
} finally {
progressVisible.value = false
}
}
/** Finish: create/copy async save all; edit already live-saved. */
async function finishEdit() {
if (livePersist.value) {
if (!form.priceSetId) {
goBack()
return
}
if (buildModeDirty.value) {
if (!form.version.priceBuildMode) {
proxy.$modal.msgWarning("请先选择创建价格方式")
return
}
creating.value = true
try {
const payload = buildPayload()
delete payload.pullFromLibrary
delete payload.forcePullLibrary
delete payload.details
await runSaveWithProgress(payload)
savedPriceBuildMode.value = form.version.priceBuildMode
await nextTick()
if (form.version.priceBuildMode === 'PULL' && detailsRef.value && detailsRef.value.pullAllFromLibrary) {
await detailsRef.value.pullAllFromLibrary({ silent: true })
savedProductsSnapshot.value = (form.products || []).map(p => ({ ...p }))
proxy.$modal.msgSuccess("建价方式已保存")
} else if (form.version.priceBuildMode === 'IMPORT') {
// Backend copied prior version into this draft; refresh product list from current psv
await refreshProductsFromCurrentVersion()
proxy.$modal.msgSuccess("建价方式已保存,已带出上一版产品")
} else if (form.version.priceBuildMode === 'IMPORT_FRESH') {
savedProductsSnapshot.value = (form.products || []).map(p => ({ ...p }))
proxy.$modal.msgSuccess("建价方式已保存,可直接导入 Excel 建价(不延用以前的产品价格)")
} else {
savedProductsSnapshot.value = (form.products || []).map(p => ({ ...p }))
proxy.$modal.msgSuccess("建价方式已保存")
}
} catch (e) {
return
} finally {
creating.value = false
}
} else {
proxy.$modal.msgSuccess("修改已实时落库")
}
const obj = {
path: mod.routes.detail,
query: { priceSetId: form.priceSetId }
}
if (proxy.$tab) {
proxy.$tab.closeOpenPage(obj)
} else {
proxy.$router.push(obj)
}
return
}
if (showBasic.value) {
const validBasic = await basicRef.value.validate()
if (!validBasic) return
}
if (!form.version.priceBuildMode) {
proxy.$modal.msgWarning('请先选择创建价格方式')
return
}
const detailRows = (form.details || []).filter(d => d && d.productCode)
if (!detailRows.length) {
proxy.$modal.msgWarning('请先拉取产品或导入 Excel 建价')
return
}
creating.value = true
try {
if (newVersionMode.value && form.version.psvId == null && form.priceSetId) {
const verRes = await mod.api.createPriceSetVersion(form.priceSetId)
if (verRes.data != null) {
form.version.psvId = verRes.data
}
}
const payload = buildPayload({ forceDetails: true })
const priceSetId = await runSaveWithProgress(payload)
form.priceSetId = priceSetId
proxy.$modal.msgSuccess(mod.labels.savedSuccess)
const obj = {
path: mod.routes.detail,
query: { priceSetId }
}
if (proxy.$tab) {
proxy.$tab.closeOpenPage(obj)
} else {
proxy.$router.push(obj)
}
} catch (e) {
// surfaced
} finally {
creating.value = false
}
}
function buildPayload(opts = {}) {
const { basic, version } = form
const detailRows = form.details.filter(d => d && d.productCode)
// Edit live-save: omit details when all rows already have psdId.
// Create finish: forceDetails sends all rows (psdId cleared) for insert.
const hasUnsavedDetail = detailRows.some(d => d.psdId == null)
const payload = {
priceSetId: form.priceSetId,
priceSetName: basic.priceSetName,
setType: 'FIXED',
defaultDiscount: undefined,
priceSetNote: basic.priceSetNote,
version: {
psvId: (copyMode.value || (newVersionMode.value && version.psvId == null)) ? undefined : version.psvId,
versionNo: version.versionNo,
priceBuildMode: version.priceBuildMode || undefined
}
}
if (draftPefIds.value.length) {
payload.pefIds = draftPefIds.value.slice()
} else if (draftPefId.value != null) {
payload.pefId = draftPefId.value
}
if (opts.forceDetails || hasUnsavedDetail) {
payload.details = detailRows.map(d => {
const p = toDetailPayload(d)
if (opts.forceDetails) {
delete p.psdId
delete p.pspId
delete p.priceSetId
delete p.psvId
}
return p
})
}
const customers = form.customers.filter(c => c && c.customerCode).map(toCustomerPayload)
if (customers.length) {
payload.customers = customers
}
return payload
}
/**
* New-version flow creates an empty draft as soon as user clicks "新建价格版本".
* If user cancels without finishing (no build mode / no details on server), remove that orphan draft.
*/
async function tryDeleteEmptyNewVersionDraft() {
if (!newVersionMode.value || !form.priceSetId || form.version.psvId == null) return
const psvId = form.version.psvId
try {
const res = await mod.api.getPriceSet(form.priceSetId)
const versions = (res.data || {}).versions || []
const v = versions.find(x => x && String(x.psvId) === String(psvId))
if (!v || String(v.status) !== '0') return
const noMode = !v.priceBuildMode
const noDetails = !(Number(v.detailCount) > 0) && !(v.details || []).length
if (noMode && noDetails) {
await mod.api.deletePriceSetVersion(psvId)
}
} catch (e) {
// ignore cleanup errors; still navigate back
}
}
async function goBack() {
await tryDeleteEmptyNewVersionDraft()
const obj = (newVersionMode.value || copyMode.value) && form.priceSetId
? { path: mod.routes.detail, query: { priceSetId: form.priceSetId } }
: { path: mod.routes.list }
if (proxy.$tab) {
proxy.$tab.closeOpenPage(obj)
} else {
proxy.$router.push(obj)
}
}
function onPsvIdUpdate(psvId) {
if (psvId != null && psvId !== '') form.version.psvId = psvId
}
function onPefIdUpdate(pefId) {
draftPefId.value = pefId
if (pefId == null || pefId === '') return
const id = String(pefId)
if (!draftPefIds.value.some(x => String(x) === id)) {
draftPefIds.value.push(pefId)
}
}
/** Step2 chose PULL / IMPORT / IMPORT_FRESH: edit live-saves mode; create only local + optional preview pull. */
function onPriceBuildModeUpdate(mode) {
if (!mode) return
if (isBuildModeLockedVersion(form.version.status)) return
if (mode === form.version.priceBuildMode) return
const leavingSaved = livePersist.value
&& String(form.version.priceBuildMode || '') === String(savedPriceBuildMode.value || '')
if (leavingSaved) {
savedProductsSnapshot.value = (form.products || []).map(p => ({ ...p }))
}
form.version.priceBuildMode = mode
if (mode !== 'IMPORT' && mode !== 'IMPORT_FRESH') {
draftPefId.value = undefined
draftPefIds.value = []
}
form.details.splice(0, form.details.length)
if (detailsRef.value && detailsRef.value.clearLocalDraft) {
detailsRef.value.clearLocalDraft()
}
if (livePersist.value) {
const backToSaved = String(mode || '') === String(savedPriceBuildMode.value || '')
if (backToSaved) {
form.products.splice(0, form.products.length, ...(savedProductsSnapshot.value || []).map(p => ({ ...p })))
if (!form.products.length && form.priceSetId) {
reloadSavedProductsForCreate()
} else {
proxy.$modal.msgSuccess("已恢复原建价方式及产品列表(未保存,库数据未变)")
}
return
}
form.products.splice(0, form.products.length)
proxy.$modal.msgSuccess("已切换建价方式(本地),请点「完成」保存后再拉取或导入;切回原方式可恢复列表")
return
}
form.products.splice(0, form.products.length)
if (mode === 'PULL' && detailsRef.value && detailsRef.value.pullAllFromLibrary) {
nextTick(() => {
detailsRef.value.pullAllFromLibrary({ silent: true }).then(() => {
proxy.$modal.msgSuccess("已拉取产品列表,可继续编辑价格")
}).catch(() => {})
})
} else if (mode === 'IMPORT' && showImportInherit.value) {
nextTick(async () => {
// newVersion/copy: wait until loadExisting fills priceSetId
const qid = route.query.priceSetId
if (!form.priceSetId && qid) {
for (let i = 0; i < 50 && !form.priceSetId; i++) {
await new Promise(r => setTimeout(r, 100))
}
}
const loader = detailsRef.value && detailsRef.value.loadLatestPriorVersionDraft
if (!loader) {
proxy.$modal.msgSuccess("请导入 Excel 建价")
return
}
if (!form.priceSetId) {
proxy.$modal.msgSuccess("请直接导入 Excel 建价")
return
}
try {
const ok = await loader()
proxy.$modal.msgSuccess(ok
? "已带出上一版全部产品,导入 Excel 按产品+国家覆盖或新增"
: "未找到含产品的上一版,请导入 Excel 建价")
} catch (e) {
proxy.$modal.msgSuccess("请导入 Excel 建价")
}
})
} else if (mode === 'IMPORT_FRESH') {
proxy.$modal.msgSuccess("请直接导入 Excel 建价(不延用以前的产品价格)")
}
}
function reloadSavedProductsForCreate() {
mod.api.getPriceSet(form.priceSetId).then(res => {
const data = res.data || {}
const versions = data.versions || []
const qPsv = form.version.psvId
const byQuery = qPsv != null ? versions.find(v => String(v.psvId) === String(qPsv)) : null
const current = byQuery || data.version || versions[0] || {}
const list = (current.products || []).map(p => ({ ...p }))
form.products.splice(0, form.products.length, ...list)
savedProductsSnapshot.value = list.map(p => ({ ...p }))
proxy.$modal.msgSuccess("已恢复原建价方式及产品列表(未保存,库数据未变)")
})
}
async function refreshProductsFromCurrentVersion() {
if (!form.priceSetId) return
const res = await mod.api.getPriceSet(form.priceSetId)
const data = res.data || {}
const versions = data.versions || []
const qPsv = form.version.psvId
const byQuery = qPsv != null ? versions.find(v => String(v.psvId) === String(qPsv)) : null
const current = byQuery || data.version || versions[0] || {}
const list = (current.products || []).map(p => ({ ...p }))
form.products.splice(0, form.products.length, ...list)
form.details.splice(0, form.details.length)
savedProductsSnapshot.value = list.map(p => ({ ...p }))
}
function applySetData(data, asCopy, asNewVersion) {
form.priceSetId = data.priceSetId
Object.assign(form.basic, {
priceSetName: data.priceSetName,
setType: 'FIXED',
defaultDiscount: data.defaultDiscount != null ? Number(data.defaultDiscount) : 88,
priceSetNote: data.priceSetNote
})
const versions = data.versions || []
const qPsv = route.query.psvId
const byQuery = qPsv != null ? versions.find(v => String(v.psvId) === String(qPsv)) : null
const fromData = (data.version && data.version.psvId) ? data.version : null
const current = byQuery || fromData || versions[0] || {}
if (asCopy) {
const keptMode = form.version.priceBuildMode
const keptProducts = keptMode ? form.products.slice() : []
const keptDetails = keptMode ? form.details.slice() : []
form.version.psvId = undefined
form.version.versionNo = nextVersionNo(versions)
form.version.effectiveTime = undefined
form.version.expireTime = undefined
form.version.status = undefined
form.version.priceBuildMode = keptMode || undefined
draftPefId.value = undefined
draftPefIds.value = []
savedPriceBuildMode.value = undefined
if (keptMode) {
form.products.splice(0, form.products.length, ...keptProducts)
form.details.splice(0, form.details.length, ...keptDetails)
} else {
form.details = []
form.products = []
}
} else if (asNewVersion) {
// Draft is created on finish only. Resume only when query has psvId (legacy empty draft).
// Keep mode/products if user already chose a build mode before this response landed.
const keptMode = form.version.priceBuildMode
const keptProducts = keptMode ? form.products.slice() : []
const keptDetails = keptMode ? form.details.slice() : []
const resume = qPsv != null ? byQuery : null
form.version.psvId = resume ? resume.psvId : undefined
form.version.versionNo = (resume && resume.versionNo) || nextVersionNo(versions)
form.version.effectiveTime = undefined
form.version.expireTime = undefined
form.version.status = (resume && resume.status) || '0'
form.version.priceBuildMode = keptMode || undefined
draftPefId.value = undefined
draftPefIds.value = []
savedPriceBuildMode.value = undefined
if (keptMode) {
form.products.splice(0, form.products.length, ...keptProducts)
form.details.splice(0, form.details.length, ...keptDetails)
} else {
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.status = current.status
form.version.priceBuildMode = current.priceBuildMode || undefined
draftPefId.value = undefined
draftPefIds.value = []
savedPriceBuildMode.value = current.priceBuildMode || undefined
form.details = []
form.products = (current.products || []).map(p => ({ ...p }))
savedProductsSnapshot.value = form.products.map(p => ({ ...p }))
}
form.customers = (data.customers || []).map(c => ({ ...c }))
}
function loadExisting(id, asCopy, asNewVersion) {
pageReady.value = false
return mod.api.getPriceSet(id).then(res => {
applySetData(res.data || {}, asCopy, asNewVersion)
}).finally(() => {
pageReady.value = true
})
}
onMounted(() => {
refData.loadProducts().finally(() => {
const id = route.query.priceSetId
if (id) {
loadExisting(id, copyMode.value, newVersionMode.value)
} else {
pageReady.value = true
}
})
})
</script>
<style scoped>
.create-section {
margin-bottom: 16px;
}
.wizard-actions {
text-align: center;
padding: 8px 0 24px;
}
.save-progress__msg {
margin: 12px 0 4px;
color: #606266;
font-size: 13px;
word-break: break-all;
}
.save-progress__hint {
margin: 0;
color: #909399;
font-size: 12px;
}
</style>
@@ -0,0 +1,538 @@
<template>
<div class="app-container" v-loading="loading">
<!-- 编辑模式:整屏切换,等同独立页面 -->
<price-edit-panel
v-if="editVisible"
:price-set-id="set.priceSetId"
:psv-id="editPsvId"
@close="closeEdit"
/>
<template v-else>
<set-detail-header
:set="set"
@back="goList"
@disable="onDisable"
@enable="onEnable"
/>
<set-basic-info-card :set="set" />
<set-customer-table :set="set" @refresh="load" />
<set-version-table
v-model="currentPsvId"
:versions="set.versions || []"
:removing-psv-id="removingPsvId"
@create-version="onCreateVersion"
@open-details="onOpenVersionDetails"
@view-import-attach="onViewImportAttach"
@activate="onActivateVersion"
@reschedule="onRescheduleVersion"
@edit="onEditVersion"
@remove="onRemoveVersion"
/>
<set-version-detail-drawer
v-model="detailDrawerVisible"
:version="detailVersion"
:set-type="set.setType"
/>
<set-version-excel-file-drawer ref="versionExcelDrawerRef" />
<el-dialog
v-model="activateVisible"
:title="activateDialogTitle"
width="460px"
append-to-body
@closed="onActivateClosed"
>
<el-form ref="activateFormRef" :model="activateForm" :rules="activateRules" label-width="100px">
<el-form-item label="生效时间" prop="effectiveTime">
<el-date-picker
v-model="activateForm.effectiveTime"
type="datetime"
format="YYYY-MM-DD HH:00"
value-format="YYYY-MM-DD HH:00:00"
popper-class="activate-hour-picker"
:placeholder="activatePh"
:disabled-date="disabledActivateDate"
:disabled-hours="disabledActivateHours"
style="width: 100%"
@change="onActivateTimeChange"
@visible-change="onActivatePickerVisible"
/>
</el-form-item>
<div class="activate-hint">{{ activateDialogHint }}</div>
</el-form>
<template #footer>
<el-button @click="activateVisible = false">取消</el-button>
<el-button type="primary" :loading="activateSubmitting" @click="submitActivate">{{ activateConfirmText }}</el-button>
</template>
</el-dialog>
</template>
</div>
</template>
<script setup name="ExclusiveQuoteDetail">
import SetDetailHeader from '../set/components/detail/SetDetailHeader.vue'
import SetBasicInfoCard from '../set/components/detail/SetBasicInfoCard.vue'
import SetCustomerTable from '../set/components/detail/SetCustomerTable.vue'
import SetVersionTable from '../set/components/detail/SetVersionTable.vue'
import SetVersionDetailDrawer from '../set/components/detail/SetVersionDetailDrawer.vue'
import SetVersionExcelFileDrawer from '../set/components/detail/SetVersionExcelFileDrawer.vue'
import PriceEditPanel from '../set/components/create/PriceEditPanel.vue'
import { usePriceSetRefData } from '../set/composables/usePriceSetRefData'
import { exclusiveQuoteApi } from '@/api/price/exclusive'
import { providePriceSetModule, createExclusiveModule } from '../set/composables/usePriceSetModule'
import { isDraftVersion, isPendingVersion, isEffectVersion, isImportFreshBuildMode } from '../set/utils/priceSet'
// Same-component inject cannot see provide(); use return value for this page, provide for children.
const mod = providePriceSetModule(createExclusiveModule(exclusiveQuoteApi))
const { proxy } = getCurrentInstance()
const route = useRoute()
const router = useRouter()
const refData = usePriceSetRefData()
const loading = ref(false)
const removingPsvId = ref(null)
const set = ref({})
const currentPsvId = ref()
const detailDrawerVisible = ref(false)
const detailVersion = ref(null)
const versionExcelDrawerRef = ref()
const editVisible = ref(false)
const editPsvId = ref(undefined)
/** 已加载的套餐ID;页面被 keep-alive 缓存复用时据此判断是否需要重新加载 */
const loadedId = ref(null)
/** 从详情页跳到新建/编辑套餐版本页后,返回时套餐版本数据可能已变化,需强制刷新 */
const pendingRefresh = ref(false)
/** 切换到另一个套餐时,重置所有临时面板状态,避免残留上一套餐的数据 */
function resetTransientState() {
set.value = {}
currentPsvId.value = undefined
detailDrawerVisible.value = false
detailVersion.value = null
editVisible.value = false
editPsvId.value = undefined
activateVisible.value = false
activateSubmitting.value = false
activateMode.value = 'activate'
activateForm.psvId = undefined
activateForm.versionNo = ''
activateForm.effectiveTime = undefined
activatePrevEffectiveTime.value = undefined
}
function onOpenVersionDetails(row) {
detailVersion.value = row || null
detailDrawerVisible.value = true
}
function onViewImportAttach(row) {
if (!row || row.psvId == null) return
versionExcelDrawerRef.value?.open?.(row)
}
function load() {
const id = route.query.priceSetId
if (!id) return
// 立即标记,首次挂载后紧随的 activated 不会重复请求
loadedId.value = String(id)
loading.value = true
mod.api.getPriceSet(id).then(res => {
set.value = res.data || {}
const versions = set.value.versions || []
const cur = set.value.version || versions[0]
currentPsvId.value = cur ? cur.psvId : undefined
}).finally(() => {
loading.value = false
})
}
/**
* keep-alive 复用同一组件实例时同步数据:
* - priceSetId 变化:加载新套餐
* - 从新建/编辑版本页返回(force):即使套餐相同也强制重载,保证版本列表最新
*/
function syncFromRoute(force) {
const id = route.query.priceSetId
if (!id) return
pendingRefresh.value = false
if (!force && String(id) === String(loadedId.value)) return
resetTransientState()
load()
}
function confirmAction(text, request, successText, done) {
proxy.$modal.confirm(text).then(() => request()).then(() => {
proxy.$modal.msgSuccess(successText)
done ? done() : load()
}).catch(() => {})
}
function onDisable() {
confirmAction(mod.labels.disableConfirm.replace('{name}', set.value.priceSetName || ''), () => mod.api.disablePriceSet(set.value.priceSetId), '已停用')
}
function onEnable() {
confirmAction(mod.labels.enableConfirm.replace('{name}', set.value.priceSetName || ''), () => mod.api.enablePriceSet(set.value.priceSetId), '已启用')
}
/** Effective time precision: hour only (mm:ss always 00) */
function pad2(n) {
return String(n).padStart(2, '0')
}
function formatHour(d) {
if (!d || Number.isNaN(d.getTime())) return undefined
return d.getFullYear() + '-' + pad2(d.getMonth() + 1) + '-' + pad2(d.getDate())
+ ' ' + pad2(d.getHours()) + ':00:00'
}
function normalizeToHour(val) {
if (val == null || val === '') return val
if (val instanceof Date) return formatHour(val)
const s = String(val).trim().replace('T', ' ')
const m = s.match(/^(\d{4}-\d{2}-\d{2})[ ](\d{2})/)
if (m) return m[1] + ' ' + m[2] + ':00:00'
return formatHour(new Date(s.replace(/-/g, '/'))) || val
}
function formatNow() {
const d = new Date()
d.setHours(9, 0, 0, 0)
return formatHour(d)
}
function onActivateTimeChange(val) {
activateForm.effectiveTime = normalizeToHour(val)
if (activateFormRef.value) {
activateFormRef.value.validateField('effectiveTime')
}
}
const activateVisible = ref(false)
const activateSubmitting = ref(false)
const activateFormRef = ref()
const activateMode = ref('activate')
const activatePh = '请选择生效时间'
const activateForm = reactive({
psvId: undefined,
versionNo: '',
effectiveTime: undefined
})
const activateDialogTitle = computed(() =>
activateMode.value === 'reschedule' ? '修改生效时间' : '启动版本'
)
const activateConfirmText = computed(() =>
activateMode.value === 'reschedule' ? '确认修改' : '确认启动'
)
const activatePrevEffectiveTime = ref(undefined)
const activateIsImportFresh = ref(false)
/** Other versions' effective/expire times (hour) — forbidden for IMPORT_FRESH */
const activateBoundaryTimes = ref([])
const activateEffBeforePrevMsg = '生效时间不能早于上一版本的生效时间'
const activateEffHitBoundaryMsg = '生效时间不能与已有版本的生效时间或失效时间相同'
const activateDialogHint = computed(() => {
if (activateIsImportFresh.value) {
const base = activateMode.value === 'reschedule'
? 'Excel 新建价:生效时间可落在历史版本区间内,将自动截断该版本失效时间并同步产品/明细。'
: 'Excel 新建价:生效时间可落在历史版本区间内;落在版本 B 区间时,B 失效时间改为本次启动时间,本版本失效时间取 B 原失效时间,并同步双方产品/明细。'
return base + '不可与已有版本的生效时间或失效时间相同。'
}
const base = activateMode.value === 'reschedule'
? '仅待生效版本可修改;若时间晚于当前仍为待生效,到时自动生效并使上一版本失效。'
: '若生效时间晚于当前,版本将进入「待生效」;到时自动生效并使上一版本失效。'
const prev = activatePrevEffectiveTime.value
if (!prev) return base
return base + '不得早于上一版:' + prev + '。'
})
const activateRules = computed(() => ({
effectiveTime: [
{ required: true, message: '请选择生效时间', trigger: 'change' },
{
validator: (_r, v, cb) => {
if (!v) return cb()
if (activateIsImportFresh.value) {
const ms = toTimeMs(v)
if (activateBoundaryTimes.value.some(b => toTimeMs(b) === ms)) {
return cb(new Error(activateEffHitBoundaryMsg))
}
return cb()
}
const prev = activatePrevEffectiveTime.value
if (prev && toTimeMs(v) < toTimeMs(prev)) return cb(new Error(activateEffBeforePrevMsg))
cb()
},
trigger: 'change'
}
]
}))
function toTimeMs(val) {
if (val == null || val === '') return NaN
const n = normalizeToHour(val)
if (!n) return NaN
return new Date(String(n).replace(/-/g, '/')).getTime()
}
function findPrevVersionEffectiveTime(row) {
if (!row) return undefined
const versions = set.value.versions || []
const curSeq = Number(row.versionSeq) || 0
let prev = null
for (const v of versions) {
if (!v || v.psvId == null || String(v.psvId) === String(row.psvId)) continue
const vs = Number(v.versionSeq) || 0
if (vs >= curSeq || !v.effectiveTime) continue
if (!prev || vs > (Number(prev.versionSeq) || 0)) prev = v
}
return prev ? normalizeToHour(prev.effectiveTime) : undefined
}
/** Collect other versions' effective/expire hour times (forbidden for IMPORT_FRESH). */
function collectActivateBoundaryTimes(excludePsvId) {
const out = []
const seen = new Set()
for (const v of set.value.versions || []) {
if (!v || v.psvId == null || String(v.psvId) === String(excludePsvId)) continue
;[v.effectiveTime, v.expireTime].forEach(t => {
const n = t ? normalizeToHour(t) : ''
if (!n || seen.has(n)) return
seen.add(n)
out.push(n)
})
}
return out
}
function pickActivateDefaultTime(prev, importFresh) {
const now = formatNow()
if (importFresh || !prev) return now
return toTimeMs(now) >= toTimeMs(prev) ? now : prev
}
function disabledActivateDate(date) {
if (activateIsImportFresh.value) return false
const prev = activatePrevEffectiveTime.value
if (!prev || !date) return false
const prevDay = new Date(String(prev).replace(/-/g, '/'))
prevDay.setHours(0, 0, 0, 0)
const d = new Date(date)
d.setHours(0, 0, 0, 0)
return d.getTime() < prevDay.getTime()
}
function disabledActivateHours() {
const cur = activateForm.effectiveTime
const curD = cur
? new Date(String(normalizeToHour(cur)).replace(/-/g, '/'))
: new Date()
if (activateIsImportFresh.value) {
const hours = new Set()
for (const b of activateBoundaryTimes.value) {
const bd = new Date(String(b).replace(/-/g, '/'))
if (
bd.getFullYear() === curD.getFullYear() &&
bd.getMonth() === curD.getMonth() &&
bd.getDate() === curD.getDate()
) {
hours.add(bd.getHours())
}
}
return [...hours]
}
const prev = activatePrevEffectiveTime.value
if (!prev) return []
const prevD = new Date(String(prev).replace(/-/g, '/'))
if (
prevD.getFullYear() !== curD.getFullYear() ||
prevD.getMonth() !== curD.getMonth() ||
prevD.getDate() !== curD.getDate()
) {
return []
}
const minH = prevD.getHours()
const hours = []
for (let h = 0; h < minH; h++) hours.push(h)
return hours
}
function onActivatePickerVisible(visible) {
if (visible && activateFormRef.value) {
activateFormRef.value.validateField('effectiveTime')
}
}
function openActivateDialog(row, mode) {
if (!row || row.psvId == null) return
activateMode.value = mode
activateForm.psvId = row.psvId
activateForm.versionNo = row.versionNo || ''
activateIsImportFresh.value = isImportFreshBuildMode(row.priceBuildMode)
activatePrevEffectiveTime.value = findPrevVersionEffectiveTime(row)
activateBoundaryTimes.value = activateIsImportFresh.value
? collectActivateBoundaryTimes(row.psvId)
: []
const prev = activatePrevEffectiveTime.value
if (mode === 'reschedule') {
const cur = normalizeToHour(row.effectiveTime)
if (activateIsImportFresh.value) {
activateForm.effectiveTime = cur || pickActivateDefaultTime(prev, true)
} else if (cur && (!prev || toTimeMs(cur) >= toTimeMs(prev))) {
activateForm.effectiveTime = cur
} else {
activateForm.effectiveTime = pickActivateDefaultTime(prev, false)
}
} else {
activateForm.effectiveTime = pickActivateDefaultTime(prev, activateIsImportFresh.value)
}
activateVisible.value = true
}
function onActivateVersion(row) {
openActivateDialog(row, 'activate')
}
function onRescheduleVersion(row) {
openActivateDialog(row, 'reschedule')
}
function onActivateClosed() {
activateMode.value = 'activate'
activateForm.psvId = undefined
activateForm.versionNo = ''
activateForm.effectiveTime = undefined
activatePrevEffectiveTime.value = undefined
activateIsImportFresh.value = false
activateBoundaryTimes.value = []
activateFormRef.value && activateFormRef.value.clearValidate()
}
function submitActivate() {
activateFormRef.value.validate(valid => {
if (!valid) return
activateForm.effectiveTime = normalizeToHour(activateForm.effectiveTime)
activateSubmitting.value = true
mod.api.activatePriceSetVersion(activateForm.psvId, { effectiveTime: activateForm.effectiveTime })
.then(() => {
const eff = activateForm.effectiveTime
const pending = eff && new Date(eff.replace(/-/g, '/')).getTime() > Date.now()
const okMsg = activateMode.value === 'reschedule'
? (pending ? '已更新为待生效' : '生效时间已更新,版本已生效')
: (pending ? '已设为待生效' : '版本已启动')
proxy.$modal.msgSuccess(okMsg)
activateVisible.value = false
load()
})
.finally(() => {
activateSubmitting.value = false
})
})
}
function onCreateVersion() {
const priceSetId = set.value.priceSetId
if (priceSetId == null) return
const hasDraft = (set.value.versions || []).some(v => v && String(v.status) === '0')
if (hasDraft) {
proxy.$modal.msgWarning('已有草稿版本,请先启动或删除后再新建')
return
}
// Do not insert draft until user clicks finish on the build-price page.
router.push({
path: mod.routes.create,
query: { priceSetId, step: '2', newVersion: '1' }
})
}
function onRemoveVersion(row) {
if (!row || row.psvId == null) return
const msg = isEffectVersion(row)
? "确认软删除已生效版本(生效时间:" + (row.effectiveTime || '未设置') + ")?版本及产品、明细将标记为已删除,上一版将自动恢复生效并清空失效时间。"
: "确认删除" + (isPendingVersion(row) ? "待生效" : "草稿") + "版本(生效时间:" + (row.effectiveTime || '未设置') + ")?其明细与附加费将一并删除。"
proxy.$modal.confirm(msg).then(() => {
removingPsvId.value = row.psvId
proxy.$modal.loading("正在删除,请稍候...")
return mod.api.deletePriceSetVersion(row.psvId).then(() => {
proxy.$modal.msgSuccess("版本已删除")
load()
}).finally(() => {
removingPsvId.value = null
proxy.$modal.closeLoading()
})
}).catch(() => {})
}
function onEditVersion(row) {
if (!row || row.psvId == null) return
const priceSetId = set.value.priceSetId
const noMode = !row.priceBuildMode
const noProducts = !(row.products || []).some(p => p && p.productCode)
// Empty unfinished draft (new version, not finished): resume create step2 with build-mode choice
if (isDraftVersion(row) && noMode && noProducts && priceSetId != null) {
router.push({
path: mod.routes.create,
query: { priceSetId, psvId: row.psvId, step: '2', newVersion: '1' }
})
return
}
editPsvId.value = row.psvId
editVisible.value = true
}
/** 关闭内嵌编辑面板,刷新版本列表(明细数、状态可能变化) */
function closeEdit() {
editVisible.value = false
load()
}
function goList() {
const obj = { path: mod.routes.list }
if (proxy.$tab) {
proxy.$tab.closeOpenPage(obj)
} else {
proxy.$router.push(obj)
}
}
onMounted(() => {
refData.loadProducts()
load()
})
// 从其他页签切回(新建完成跳转、列表点另一条详情)时同步数据;
// 从新建/编辑版本页返回时即使套餐ID相同也强制刷新版本列表
onActivated(() => {
syncFromRoute(pendingRefresh.value)
})
// 组件已处于激活状态时路由 query 变化的兜底
watch(() => route.query.priceSetId, () => {
syncFromRoute(false)
})
// 离开详情页去新建/编辑套餐版本,返回后需要重新加载
onBeforeRouteLeave((to) => {
if (to && to.path === mod.routes.create) {
pendingRefresh.value = true
}
})
</script>
<style scoped>
.activate-hint {
margin: -4px 0 0 100px;
color: #909399;
font-size: 12px;
line-height: 1.5;
}
</style>
<style>
/* Hour-only: hide minute/second columns in activate datetime popper */
.activate-hour-picker .el-time-spinner__wrapper:nth-child(2),
.activate-hour-picker .el-time-spinner__wrapper:nth-child(3) {
display: none;
}
.activate-hour-picker .el-time-spinner__wrapper:nth-child(1) {
width: 100%;
}
</style>
@@ -0,0 +1,297 @@
<template>
<div class="app-container">
<basic-table
ref="tableRef"
:columns="columns"
:search-columns="searchColumns"
:query="queryList"
row-key="priceSetId"
>
<template #toolbar>
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleCreate"
v-hasPermi="addPerm"
>{{ mod.labels.createButton }}</el-button>
</el-col>
</template>
<template #search-customerId="{ model }">
<customer-select
v-model="model.customerId"
option-select
remote-search
:page-size="20"
placeholder="客户名称 / 代码"
style="width: 240px"
/>
</template>
<template #col-setType="{ row }">
<el-tag :type="row.setType === 'FIXED' ? 'warning' : 'primary'" size="small" effect="plain">
{{ row.setType === 'FIXED' ? 'FIXED 固定价' : 'DISCOUNT 折扣' }}
</el-tag>
</template>
<template #col-status="{ row }">
<el-tag :type="statusTag(row)" size="small">{{ statusLabel(row) }}</el-tag>
</template>
<template #col-boundCustomers="{ row }">
<span v-if="row.boundCustomers">{{ row.boundCustomers }}</span>
<span v-else class="text-muted">-</span>
<el-tag v-if="row.customerCount > 0" size="small" type="info" effect="plain" class="cust-count">{{ row.customerCount }}</el-tag>
</template>
<template #col-activeDetail="{ row }">
<el-button
link
type="primary"
:loading="activeLoadingId === row.priceSetId"
@click="handleActiveDetail(row)"
v-hasPermi="queryPerm"
>查看明细</el-button>
</template>
<template #col-action="{ row }">
<el-button link type="primary" @click="handleDetail(row)" v-hasPermi="queryPerm">详情</el-button>
<el-button link type="primary" @click="openBasicEdit(row)" v-hasPermi="editPerm">修改</el-button>
<el-button
v-if="row.status === 'E'"
link
type="warning"
@click="handleDisable(row)"
v-hasPermi="auditPerm"
>停用</el-button>
<el-button
v-if="row.status === 'D' || row.status === 'S'"
link
type="success"
@click="handleEnable(row)"
v-hasPermi="auditPerm"
>启用</el-button>
</template>
</basic-table>
<el-dialog v-model="basicDialog.visible" :title="basicDialogTitle" width="520px" append-to-body destroy-on-close>
<el-form ref="basicFormRef" :model="basicForm" :rules="basicRules" label-width="96px">
<el-form-item :label="mod.labels.entityCode">
<el-input :model-value="basicForm.priceSetCode" disabled />
</el-form-item>
<el-form-item :label="mod.labels.entityName" prop="priceSetName">
<el-input v-model="basicForm.priceSetName" maxlength="50" show-word-limit :placeholder="'请输入' + mod.labels.entityName" />
</el-form-item>
<el-form-item label="说明备注" prop="priceSetNote">
<el-input v-model="basicForm.priceSetNote" type="textarea" :rows="3" maxlength="200" show-word-limit placeholder="可选" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="basicDialog.visible = false">取消</el-button>
<el-button type="primary" :loading="basicDialog.saving" @click="submitBasicEdit">确定</el-button>
</template>
</el-dialog>
<set-version-detail-drawer
v-model="drawerVisible"
:version="activeVersion"
:set-type="drawerSetType"
/>
</div>
</template>
<script setup name="ExclusiveQuote">
import SetVersionDetailDrawer from '../set/components/detail/SetVersionDetailDrawer.vue'
import CustomerSelect from '@/components/CustomerSelect/index.vue'
import { setStatusLabel, setStatusTagType } from '../set/utils/priceSet'
import { exclusiveQuoteApi } from '@/api/price/exclusive'
import { providePriceSetModule, createExclusiveModule } from '../set/composables/usePriceSetModule'
// Same-component inject cannot see provide(); use return value for this page, provide for children.
const mod = providePriceSetModule(createExclusiveModule(exclusiveQuoteApi))
const addPerm = [`${mod.permPrefix}:add`]
const queryPerm = [`${mod.permPrefix}:query`]
const editPerm = [`${mod.permPrefix}:edit`]
const auditPerm = [`${mod.permPrefix}:audit`]
const { proxy } = getCurrentInstance()
const tableRef = ref()
const isFirstActivate = ref(true)
const searchColumns = computed(() => [
{
label: '状态',
prop: 'status',
component: 'select',
options: [
{ label: '待启用', value: 'D' },
{ label: '生效', value: 'E' },
{ label: '已停用', value: 'S' }
],
placeholder: '全部状态',
width: '140px'
},
{ label: '关键字', prop: 'keyword', component: 'input', placeholder: mod.labels.keywordPlaceholder, width: '200px' },
{ label: '客户', prop: 'customerId', placeholder: '客户名称 / 代码', width: '240px' }
])
const columns = computed(() => [
{ label: mod.labels.entityCode, prop: 'priceSetCode', width: 110 },
{ label: mod.labels.entityName, prop: 'priceSetName', minWidth: 160 },
{ label: '类型', prop: 'setType', width: 140 },
{ label: '绑定客户', prop: 'boundCustomers', minWidth: 220 },
{ label: '说明', prop: 'priceSetNote', minWidth: 140 },
{ label: '状态', prop: 'status', width: 90 },
{ label: '生效明细', prop: 'activeDetail', width: 100 },
{ label: '操作', prop: 'action', width: 200, showInToolbar: false }
])
function queryList(params) {
return mod.api.listPriceSet(params)
}
function statusLabel(row) {
return setStatusLabel(row)
}
function statusTag(row) {
return setStatusTagType(row)
}
function handleCreate() {
proxy.$router.push({ path: mod.routes.create })
}
function handleDetail(row) {
proxy.$router.push({ path: mod.routes.detail, query: { priceSetId: row.priceSetId } })
}
const basicDialog = reactive({ visible: false, saving: false })
const basicFormRef = ref()
const basicForm = reactive({
priceSetId: null,
priceSetCode: '',
priceSetName: '',
priceSetNote: ''
})
const basicRules = {
priceSetName: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
}
const basicDialogTitle = computed(() => mod.labels.basicEditTitle)
function openBasicEdit(row) {
if (!row || row.priceSetId == null) return
basicForm.priceSetId = row.priceSetId
basicForm.priceSetCode = row.priceSetCode || ''
basicForm.priceSetName = row.priceSetName || ''
basicForm.priceSetNote = row.priceSetNote || ''
basicDialog.visible = true
nextTick(() => basicFormRef.value && basicFormRef.value.clearValidate())
}
function submitBasicEdit() {
basicFormRef.value.validate(valid => {
if (!valid) return
basicDialog.saving = true
mod.api.updatePriceSetBasic({
priceSetId: basicForm.priceSetId,
priceSetName: basicForm.priceSetName,
priceSetNote: basicForm.priceSetNote
}).then(() => {
proxy.$modal.msgSuccess('保存成功')
basicDialog.visible = false
refresh()
}).finally(() => {
basicDialog.saving = false
})
})
}
/** 生效明细:拉详情找生效版本(status=1)弹抽屉 */
const drawerVisible = ref(false)
const activeVersion = ref(null)
const drawerSetType = ref('FIXED')
const activeLoadingId = ref(null)
function handleActiveDetail(row) {
activeLoadingId.value = row.priceSetId
mod.api.getPriceSet(row.priceSetId).then(res => {
const data = res.data || {}
const versions = data.versions || []
const active = versions.find(v => String(v.status) === '1')
if (!active || active.psvId == null) {
proxy.$modal.msgWarning(mod.labels.noActiveVersion)
return
}
drawerSetType.value = row.setType
activeVersion.value = { psvId: active.psvId, versionNo: active.versionNo }
drawerVisible.value = true
}).finally(() => {
activeLoadingId.value = null
})
}
function refresh() {
tableRef.value?.refresh()
}
onActivated(() => {
if (isFirstActivate.value) {
isFirstActivate.value = false
return
}
tableRef.value?.reload()
})
function handleDisable(row) {
proxy.$modal.confirm(mod.labels.disableConfirm.replace('{name}', row.priceSetName)).then(() => {
return mod.api.disablePriceSet(row.priceSetId)
}).then(() => {
proxy.$modal.msgSuccess('已停用')
refresh()
}).catch(() => {})
}
function handleEnable(row) {
proxy.$modal.confirm(mod.labels.enableConfirm.replace('{name}', row.priceSetName)).then(() => {
return mod.api.enablePriceSet(row.priceSetId)
}).then(() => {
proxy.$modal.msgSuccess('已启用')
tableRef.value.refresh()
}).catch(() => {})
}
function handleCopy(row) {
mod.api.copyPriceSet(row.priceSetId).then(res => {
proxy.$modal.msgSuccess('已复制为草稿')
proxy.$router.push({ path: mod.routes.create, query: { priceSetId: res.data } })
})
}
</script>
<style scoped>
.text-muted { color: #909399; }
.cust-count { margin-left: 6px; vertical-align: middle; }
.hint-card {
margin-top: 16px;
}
.hint-body {
font-size: 13px;
color: #595959;
line-height: 1.7;
padding: 8px 12px;
background: #f6ffed;
border: 1px solid #b7eb8f;
border-radius: 6px;
}
.hint-body b {
color: #ff4d4f;
}
</style>
@@ -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) {
@@ -0,0 +1,77 @@
import { inject, provide } from 'vue'
import { priceSetApi } from '@/api/price/set'
export const PRICE_SET_MODULE_KEY = 'priceSetModule'
const defaultModule = Object.freeze({
api: priceSetApi,
permPrefix: 'price:set',
exclusiveQuote: false,
onlyImportFresh: false,
routes: Object.freeze({
list: '/customer/set',
create: '/customer/setCreate',
detail: '/customer/setDetail'
}),
labels: Object.freeze({
entity: '套餐',
entityCode: '套餐编码',
entityName: '套餐名称',
createButton: '新建套餐',
saveProgressTitle: '正在保存套餐',
savedSuccess: '套餐已保存',
noActiveVersion: '该套餐暂无生效版本',
disableConfirm: '停用后该套餐不再参与计费命中,确认停用【{name}】?',
enableConfirm: '启用后该套餐将重新参与计费命中,确认启用【{name}】?',
basicEditTitle: '修改套餐基本信息',
keywordPlaceholder: '套餐编码 / 名称',
detailTitleFallback: '套餐详情'
})
})
export function createExclusiveModule(api) {
return Object.freeze({
api,
permPrefix: 'price:exclusive',
exclusiveQuote: true,
onlyImportFresh: true,
routes: Object.freeze({
list: '/exclusive/quote',
create: '/exclusive/quoteCreate',
detail: '/exclusive/quoteDetail'
}),
labels: Object.freeze({
entity: '专属报价',
entityCode: '报价编码',
entityName: '报价名称',
createButton: '新建报价',
saveProgressTitle: '正在保存专属报价',
savedSuccess: '专属报价已保存',
noActiveVersion: '该专属报价暂无生效版本',
disableConfirm: '停用后该专属报价不再参与计费命中,确认停用【{name}】?',
enableConfirm: '启用后该专属报价将重新参与计费命中,确认启用【{name}】?',
basicEditTitle: '修改专属报价基本信息',
keywordPlaceholder: '报价编码 / 名称',
detailTitleFallback: '专属报价详情'
})
})
}
/**
* Provide module for child inject, and return cfg for the providing page itself
* (same-component inject cannot see its own provide).
*/
export function providePriceSetModule(moduleConfig) {
const cfg = moduleConfig || defaultModule
provide(PRICE_SET_MODULE_KEY, cfg)
return cfg
}
export function usePriceSetModule() {
return inject(PRICE_SET_MODULE_KEY, defaultModule)
}
export function usePriceSetPerm(action) {
const mod = usePriceSetModule()
return [`${mod.permPrefix}:${action}`]
}
+16 -14
View File
@@ -34,7 +34,7 @@
<el-dialog
v-model="progressVisible"
:title="'正在保存套餐'"
:title="mod.labels.saveProgressTitle"
width="420px"
:close-on-click-modal="false"
:close-on-press-escape="false"
@@ -61,7 +61,9 @@ import {
toCustomerPayload,
toDetailPayload
} from './utils/priceSet'
import { getPriceSet, savePriceSetAsync, createPriceSetVersion, deletePriceSetVersion } from '@/api/price/set'
import { usePriceSetModule } from './composables/usePriceSetModule'
const mod = usePriceSetModule()
const { proxy } = getCurrentInstance()
const route = useRoute()
@@ -131,7 +133,7 @@ async function runSaveWithProgress(payload) {
progressMessage.value = ''
progressStatus.value = undefined
try {
const result = await savePriceSetAsync(payload, (task) => {
const result = await mod.api.savePriceSetAsync(payload, (task) => {
progressPercent.value = Math.min(100, Number(task.percent) || 0)
progressMessage.value = mapSaveProgressMessage(task.message)
if (task.status === 'FAIL') {
@@ -204,7 +206,7 @@ async function finishEdit() {
proxy.$modal.msgSuccess("修改已实时落库")
}
const obj = {
path: '/customer/setDetail',
path: mod.routes.detail,
query: { priceSetId: form.priceSetId }
}
if (proxy.$tab) {
@@ -230,7 +232,7 @@ async function finishEdit() {
creating.value = true
try {
if (newVersionMode.value && form.version.psvId == null && form.priceSetId) {
const verRes = await createPriceSetVersion(form.priceSetId)
const verRes = await mod.api.createPriceSetVersion(form.priceSetId)
if (verRes.data != null) {
form.version.psvId = verRes.data
}
@@ -238,9 +240,9 @@ async function finishEdit() {
const payload = buildPayload({ forceDetails: true })
const priceSetId = await runSaveWithProgress(payload)
form.priceSetId = priceSetId
proxy.$modal.msgSuccess('套餐已保存')
proxy.$modal.msgSuccess(mod.labels.savedSuccess)
const obj = {
path: '/customer/setDetail',
path: mod.routes.detail,
query: { priceSetId }
}
if (proxy.$tab) {
@@ -305,14 +307,14 @@ async function tryDeleteEmptyNewVersionDraft() {
if (!newVersionMode.value || !form.priceSetId || form.version.psvId == null) return
const psvId = form.version.psvId
try {
const res = await getPriceSet(form.priceSetId)
const res = await mod.api.getPriceSet(form.priceSetId)
const versions = (res.data || {}).versions || []
const v = versions.find(x => x && String(x.psvId) === String(psvId))
if (!v || String(v.status) !== '0') return
const noMode = !v.priceBuildMode
const noDetails = !(Number(v.detailCount) > 0) && !(v.details || []).length
if (noMode && noDetails) {
await deletePriceSetVersion(psvId)
await mod.api.deletePriceSetVersion(psvId)
}
} catch (e) {
// ignore cleanup errors; still navigate back
@@ -322,8 +324,8 @@ async function tryDeleteEmptyNewVersionDraft() {
async function goBack() {
await tryDeleteEmptyNewVersionDraft()
const obj = (newVersionMode.value || copyMode.value) && form.priceSetId
? { path: '/customer/setDetail', query: { priceSetId: form.priceSetId } }
: { path: '/customer/set' }
? { path: mod.routes.detail, query: { priceSetId: form.priceSetId } }
: { path: mod.routes.list }
if (proxy.$tab) {
proxy.$tab.closeOpenPage(obj)
} else {
@@ -418,7 +420,7 @@ function onPriceBuildModeUpdate(mode) {
}
function reloadSavedProductsForCreate() {
getPriceSet(form.priceSetId).then(res => {
mod.api.getPriceSet(form.priceSetId).then(res => {
const data = res.data || {}
const versions = data.versions || []
const qPsv = form.version.psvId
@@ -433,7 +435,7 @@ function reloadSavedProductsForCreate() {
async function refreshProductsFromCurrentVersion() {
if (!form.priceSetId) return
const res = await getPriceSet(form.priceSetId)
const res = await mod.api.getPriceSet(form.priceSetId)
const data = res.data || {}
const versions = data.versions || []
const qPsv = form.version.psvId
@@ -520,7 +522,7 @@ function applySetData(data, asCopy, asNewVersion) {
function loadExisting(id, asCopy, asNewVersion) {
pageReady.value = false
return getPriceSet(id).then(res => {
return mod.api.getPriceSet(id).then(res => {
applySetData(res.data || {}, asCopy, asNewVersion)
}).finally(() => {
pageReady.value = true
+12 -12
View File
@@ -83,11 +83,11 @@ import SetVersionDetailDrawer from './components/detail/SetVersionDetailDrawer.v
import SetVersionExcelFileDrawer from './components/detail/SetVersionExcelFileDrawer.vue'
import PriceEditPanel from './components/create/PriceEditPanel.vue'
import { usePriceSetRefData } from './composables/usePriceSetRefData'
import {
getPriceSet, disablePriceSet, enablePriceSet, activatePriceSetVersion, deletePriceSetVersion
} from '@/api/price/set'
import { usePriceSetModule } from './composables/usePriceSetModule'
import { isDraftVersion, isPendingVersion, isEffectVersion, isImportFreshBuildMode } from './utils/priceSet'
const mod = usePriceSetModule()
const { proxy } = getCurrentInstance()
const route = useRoute()
const router = useRouter()
@@ -140,7 +140,7 @@ function load() {
// 立即标记,首次挂载后紧随的 activated 不会重复请求
loadedId.value = String(id)
loading.value = true
getPriceSet(id).then(res => {
mod.api.getPriceSet(id).then(res => {
set.value = res.data || {}
const versions = set.value.versions || []
const cur = set.value.version || versions[0]
@@ -172,10 +172,10 @@ function confirmAction(text, request, successText, done) {
}
function onDisable() {
confirmAction('停用后不再参与计费命中,确认停用?', () => disablePriceSet(set.value.priceSetId), '已停用')
confirmAction(mod.labels.disableConfirm.replace('{name}', set.value.priceSetName || ''), () => mod.api.disablePriceSet(set.value.priceSetId), '已停用')
}
function onEnable() {
confirmAction('启用后套餐将重新参与计费命中,确认启用?', () => enablePriceSet(set.value.priceSetId), '已启用')
confirmAction(mod.labels.enableConfirm.replace('{name}', set.value.priceSetName || ''), () => mod.api.enablePriceSet(set.value.priceSetId), '已启用')
}
/** Effective time precision: hour only (mm:ss always 00) */
function pad2(n) {
@@ -413,7 +413,7 @@ function submitActivate() {
if (!valid) return
activateForm.effectiveTime = normalizeToHour(activateForm.effectiveTime)
activateSubmitting.value = true
activatePriceSetVersion(activateForm.psvId, { effectiveTime: activateForm.effectiveTime })
mod.api.activatePriceSetVersion(activateForm.psvId, { effectiveTime: activateForm.effectiveTime })
.then(() => {
const eff = activateForm.effectiveTime
const pending = eff && new Date(eff.replace(/-/g, '/')).getTime() > Date.now()
@@ -439,7 +439,7 @@ function onCreateVersion() {
}
// Do not insert draft until user clicks finish on the build-price page.
router.push({
path: '/customer/setCreate',
path: mod.routes.create,
query: { priceSetId, step: '2', newVersion: '1' }
})
}
@@ -451,7 +451,7 @@ function onRemoveVersion(row) {
proxy.$modal.confirm(msg).then(() => {
removingPsvId.value = row.psvId
proxy.$modal.loading("正在删除,请稍候...")
return deletePriceSetVersion(row.psvId).then(() => {
return mod.api.deletePriceSetVersion(row.psvId).then(() => {
proxy.$modal.msgSuccess("版本已删除")
load()
}).finally(() => {
@@ -468,7 +468,7 @@ function onEditVersion(row) {
// Empty unfinished draft (new version, not finished): resume create step2 with build-mode choice
if (isDraftVersion(row) && noMode && noProducts && priceSetId != null) {
router.push({
path: '/customer/setCreate',
path: mod.routes.create,
query: { priceSetId, psvId: row.psvId, step: '2', newVersion: '1' }
})
return
@@ -483,7 +483,7 @@ function closeEdit() {
load()
}
function goList() {
const obj = { path: '/customer/set' }
const obj = { path: mod.routes.list }
if (proxy.$tab) {
proxy.$tab.closeOpenPage(obj)
} else {
@@ -509,7 +509,7 @@ watch(() => route.query.priceSetId, () => {
// 离开详情页去新建/编辑套餐版本,返回后需要重新加载
onBeforeRouteLeave((to) => {
if (to && to.path === '/customer/setCreate') {
if (to && to.path === mod.routes.create) {
pendingRefresh.value = true
}
})
+37 -34
View File
@@ -14,8 +14,8 @@
plain
icon="Plus"
@click="handleCreate"
v-hasPermi="['price:set:add']"
>新建套餐</el-button>
v-hasPermi="addPerm"
>{{ mod.labels.createButton }}</el-button>
</el-col>
</template>
@@ -52,37 +52,37 @@
type="primary"
:loading="activeLoadingId === row.priceSetId"
@click="handleActiveDetail(row)"
v-hasPermi="['price:set:query']"
v-hasPermi="queryPerm"
>查看明细</el-button>
</template>
<template #col-action="{ row }">
<el-button link type="primary" @click="handleDetail(row)" v-hasPermi="['price:set:query']">详情</el-button>
<el-button link type="primary" @click="openBasicEdit(row)" v-hasPermi="['price:set:edit']">修改</el-button>
<el-button link type="primary" @click="handleDetail(row)" v-hasPermi="queryPerm">详情</el-button>
<el-button link type="primary" @click="openBasicEdit(row)" v-hasPermi="editPerm">修改</el-button>
<el-button
v-if="row.status === 'E'"
link
type="warning"
@click="handleDisable(row)"
v-hasPermi="['price:set:audit']"
v-hasPermi="auditPerm"
>停用</el-button>
<el-button
v-if="row.status === 'D' || row.status === 'S'"
link
type="success"
@click="handleEnable(row)"
v-hasPermi="['price:set:audit']"
v-hasPermi="auditPerm"
>启用</el-button>
</template>
</basic-table>
<el-dialog v-model="basicDialog.visible" :title="basicDialogTitle" width="520px" append-to-body destroy-on-close>
<el-form ref="basicFormRef" :model="basicForm" :rules="basicRules" label-width="96px">
<el-form-item label="套餐编码">
<el-form-item :label="mod.labels.entityCode">
<el-input :model-value="basicForm.priceSetCode" disabled />
</el-form-item>
<el-form-item label="套餐名称" prop="priceSetName">
<el-input v-model="basicForm.priceSetName" maxlength="50" show-word-limit placeholder="请输入套餐名称" />
<el-form-item :label="mod.labels.entityName" prop="priceSetName">
<el-input v-model="basicForm.priceSetName" maxlength="50" show-word-limit :placeholder="'请输入' + mod.labels.entityName" />
</el-form-item>
<el-form-item label="说明备注" prop="priceSetNote">
<el-input v-model="basicForm.priceSetNote" type="textarea" :rows="3" maxlength="200" show-word-limit placeholder="可选" />
@@ -104,18 +104,21 @@
</template>
<script setup name="PriceSet">
import {
listPriceSet, disablePriceSet, enablePriceSet, copyPriceSet, getPriceSet, updatePriceSetBasic
} from '@/api/price/set'
import SetVersionDetailDrawer from './components/detail/SetVersionDetailDrawer.vue'
import CustomerSelect from '@/components/CustomerSelect/index.vue'
import { setStatusLabel, setStatusTagType } from './utils/priceSet'
import { usePriceSetModule, usePriceSetPerm } from './composables/usePriceSetModule'
const { proxy } = getCurrentInstance()
const mod = usePriceSetModule()
const addPerm = usePriceSetPerm('add')
const queryPerm = usePriceSetPerm('query')
const editPerm = usePriceSetPerm('edit')
const auditPerm = usePriceSetPerm('audit')
const tableRef = ref()
const isFirstActivate = ref(true)
const searchColumns = [
const searchColumns = computed(() => [
{
label: '状态',
prop: 'status',
@@ -128,23 +131,23 @@ const searchColumns = [
placeholder: '全部状态',
width: '140px'
},
{ label: '关键字', prop: 'keyword', component: 'input', placeholder: '套餐编码 / 名称', width: '200px' },
{ label: '关键字', prop: 'keyword', component: 'input', placeholder: mod.labels.keywordPlaceholder, width: '200px' },
{ label: '客户', prop: 'customerId', placeholder: '客户名称 / 代码', width: '240px' }
]
])
const columns = [
{ label: '套餐编码', prop: 'priceSetCode', width: 110 },
{ label: '套餐名称', prop: 'priceSetName', minWidth: 160 },
const columns = computed(() => [
{ label: mod.labels.entityCode, prop: 'priceSetCode', width: 110 },
{ label: mod.labels.entityName, prop: 'priceSetName', minWidth: 160 },
{ label: '类型', prop: 'setType', width: 140 },
{ label: '绑定客户', prop: 'boundCustomers', minWidth: 220 },
{ label: '说明', prop: 'priceSetNote', minWidth: 140 },
{ label: '状态', prop: 'status', width: 90 },
{ label: '生效明细', prop: 'activeDetail', width: 100 },
{ label: '操作', prop: 'action', width: 200, showInToolbar: false }
]
])
function queryList(params) {
return listPriceSet(params)
return mod.api.listPriceSet(params)
}
function statusLabel(row) {
@@ -156,11 +159,11 @@ function statusTag(row) {
}
function handleCreate() {
proxy.$router.push({ path: '/customer/setCreate' })
proxy.$router.push({ path: mod.routes.create })
}
function handleDetail(row) {
proxy.$router.push({ path: '/customer/setDetail', query: { priceSetId: row.priceSetId } })
proxy.$router.push({ path: mod.routes.detail, query: { priceSetId: row.priceSetId } })
}
@@ -173,9 +176,9 @@ const basicForm = reactive({
priceSetNote: ''
})
const basicRules = {
priceSetName: [{ required: true, message: '套餐名称不能为空', trigger: 'blur' }]
priceSetName: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
}
const basicDialogTitle = computed(() => '修改套餐基本信息')
const basicDialogTitle = computed(() => mod.labels.basicEditTitle)
function openBasicEdit(row) {
if (!row || row.priceSetId == null) return
@@ -191,7 +194,7 @@ function submitBasicEdit() {
basicFormRef.value.validate(valid => {
if (!valid) return
basicDialog.saving = true
updatePriceSetBasic({
mod.api.updatePriceSetBasic({
priceSetId: basicForm.priceSetId,
priceSetName: basicForm.priceSetName,
priceSetNote: basicForm.priceSetNote
@@ -214,12 +217,12 @@ const activeLoadingId = ref(null)
function handleActiveDetail(row) {
activeLoadingId.value = row.priceSetId
getPriceSet(row.priceSetId).then(res => {
mod.api.getPriceSet(row.priceSetId).then(res => {
const data = res.data || {}
const versions = data.versions || []
const active = versions.find(v => String(v.status) === '1')
if (!active || active.psvId == null) {
proxy.$modal.msgWarning('该套餐暂无生效版本')
proxy.$modal.msgWarning(mod.labels.noActiveVersion)
return
}
drawerSetType.value = row.setType
@@ -245,8 +248,8 @@ onActivated(() => {
function handleDisable(row) {
proxy.$modal.confirm('停用后该套餐不再参与计费命中,确认停用【' + row.priceSetName + '】?').then(() => {
return disablePriceSet(row.priceSetId)
proxy.$modal.confirm(mod.labels.disableConfirm.replace('{name}', row.priceSetName)).then(() => {
return mod.api.disablePriceSet(row.priceSetId)
}).then(() => {
proxy.$modal.msgSuccess('已停用')
refresh()
@@ -254,8 +257,8 @@ function handleDisable(row) {
}
function handleEnable(row) {
proxy.$modal.confirm('启用后该套餐将重新参与计费命中,确认启用【' + row.priceSetName + '】?').then(() => {
return enablePriceSet(row.priceSetId)
proxy.$modal.confirm(mod.labels.enableConfirm.replace('{name}', row.priceSetName)).then(() => {
return mod.api.enablePriceSet(row.priceSetId)
}).then(() => {
proxy.$modal.msgSuccess('已启用')
tableRef.value.refresh()
@@ -263,9 +266,9 @@ function handleEnable(row) {
}
function handleCopy(row) {
copyPriceSet(row.priceSetId).then(res => {
mod.api.copyPriceSet(row.priceSetId).then(res => {
proxy.$modal.msgSuccess('已复制为草稿')
proxy.$router.push({ path: '/customer/setCreate', query: { priceSetId: res.data } })
proxy.$router.push({ path: mod.routes.create, query: { priceSetId: res.data } })
})
}
</script>