Merge branch 'test' into feauture-20261104
# Conflicts: # bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcOrderBillMapper.java
This commit is contained in:
@@ -626,19 +626,6 @@ const searchColumns = [
|
||||
collapseTagsTooltip: true
|
||||
}
|
||||
},
|
||||
{
|
||||
label: '\u8ba1\u8d39\u5931\u8d25',
|
||||
prop: 'billingFailStatuses',
|
||||
component: 'select',
|
||||
options: billingFailStatusOptions,
|
||||
placeholder: '\u8bf7\u9009\u62e9',
|
||||
props: {
|
||||
multiple: true,
|
||||
clearable: true,
|
||||
collapseTags: true,
|
||||
collapseTagsTooltip: true
|
||||
}
|
||||
},
|
||||
{
|
||||
label: '计费时间',
|
||||
prop: 'bizDateRange',
|
||||
@@ -659,6 +646,19 @@ const searchColumns = [
|
||||
clearable: true,
|
||||
defaultTime: [new Date(2000, 0, 1, 0, 0, 0), new Date(2000, 0, 1, 23, 59, 59)]
|
||||
}
|
||||
},
|
||||
{
|
||||
label: '\u8ba1\u8d39\u5931\u8d25',
|
||||
prop: 'billingFailStatuses',
|
||||
component: 'select',
|
||||
options: billingFailStatusOptions,
|
||||
placeholder: '\u8bf7\u9009\u62e9',
|
||||
props: {
|
||||
multiple: true,
|
||||
clearable: true,
|
||||
collapseTags: true,
|
||||
collapseTagsTooltip: true
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
|
||||
@@ -448,8 +448,8 @@ function onCreateVersion() {
|
||||
function onRemoveVersion(row) {
|
||||
if (!row || row.psvId == null) return
|
||||
const msg = isEffectVersion(row)
|
||||
? "确认软删除已生效版本(生效时间:" + (row.effectiveTime || '未设置') + ")?版本及产品、明细将标记为已删除,上一版将自动恢复生效并清空失效时间。"
|
||||
: "确认删除" + (isPendingVersion(row) ? "待生效" : "草稿") + "版本(生效时间:" + (row.effectiveTime || '未设置') + ")?其明细与附加费将一并删除。"
|
||||
? "确认删除该版本(生效时间:" + (row.effectiveTime || '未设置') + ")?若订单已引用该版本则仅软删版本记录;若无订单引用则整版本硬删。产品与明细均会物理删除,且上一版将自动恢复生效。"
|
||||
: "确认删除" + (isPendingVersion(row) ? "待生效" : "草稿") + "版本(生效时间:" + (row.effectiveTime || '未设置') + ")?若订单已引用该版本则仅软删版本记录;若无订单引用则整版本硬删。产品与明细均会物理删除。"
|
||||
proxy.$modal.confirm(msg).then(() => {
|
||||
removingPsvId.value = row.psvId
|
||||
proxy.$modal.loading("正在删除,请稍候...")
|
||||
|
||||
@@ -36,23 +36,23 @@ export function createExclusiveModule(api) {
|
||||
exclusiveQuote: true,
|
||||
onlyImportFresh: true,
|
||||
routes: Object.freeze({
|
||||
list: '/exclusive/quote',
|
||||
create: '/exclusive/quoteCreate',
|
||||
detail: '/exclusive/quoteDetail'
|
||||
list: '/customer/quote',
|
||||
create: '/customer/quoteCreate',
|
||||
detail: '/customer/quoteDetail'
|
||||
}),
|
||||
labels: Object.freeze({
|
||||
entity: '专属报价',
|
||||
entityCode: '报价编码',
|
||||
entityName: '报价名称',
|
||||
createButton: '新建报价',
|
||||
saveProgressTitle: '正在保存专属报价',
|
||||
savedSuccess: '专属报价已保存',
|
||||
noActiveVersion: '该专属报价暂无生效版本',
|
||||
disableConfirm: '停用后该专属报价不再参与计费命中,确认停用【{name}】?',
|
||||
enableConfirm: '启用后该专属报价将重新参与计费命中,确认启用【{name}】?',
|
||||
basicEditTitle: '修改专属报价基本信息',
|
||||
keywordPlaceholder: '报价编码 / 名称',
|
||||
detailTitleFallback: '专属报价详情'
|
||||
entity: '专属套餐',
|
||||
entityCode: '套餐编码',
|
||||
entityName: '套餐名称',
|
||||
createButton: '新建专属套餐',
|
||||
saveProgressTitle: '正在保存专属套餐',
|
||||
savedSuccess: '专属套餐已保存',
|
||||
noActiveVersion: '该专属套餐暂无生效版本',
|
||||
disableConfirm: '停用后该专属套餐不再参与计费命中,确认停用【{name}】?',
|
||||
enableConfirm: '启用后该专属套餐将重新参与计费命中,确认启用【{name}】?',
|
||||
basicEditTitle: '修改专属套餐基本信息',
|
||||
keywordPlaceholder: '套餐编码 / 名称',
|
||||
detailTitleFallback: '专属套餐详情'
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
@@ -465,8 +465,8 @@ function onCreateVersion() {
|
||||
function onRemoveVersion(row) {
|
||||
if (!row || row.psvId == null) return
|
||||
const msg = isEffectVersion(row)
|
||||
? "确认软删除已生效版本(生效时间:" + (row.effectiveTime || '未设置') + ")?版本及产品、明细将标记为已删除,上一版将自动恢复生效并清空失效时间。"
|
||||
: "确认删除" + (isPendingVersion(row) ? "待生效" : "草稿") + "版本(生效时间:" + (row.effectiveTime || '未设置') + ")?其明细与附加费将一并删除。"
|
||||
? "确认删除该版本(生效时间:" + (row.effectiveTime || '未设置') + ")?若订单已引用该版本则仅软删版本记录;若无订单引用则整版本硬删。产品与明细均会物理删除,且上一版将自动恢复生效。"
|
||||
: "确认删除" + (isPendingVersion(row) ? "待生效" : "草稿") + "版本(生效时间:" + (row.effectiveTime || '未设置') + ")?若订单已引用该版本则仅软删版本记录;若无订单引用则整版本硬删。产品与明细均会物理删除。"
|
||||
proxy.$modal.confirm(msg).then(() => {
|
||||
removingPsvId.value = row.psvId
|
||||
proxy.$modal.loading("正在删除,请稍候...")
|
||||
|
||||
Reference in New Issue
Block a user