套餐启用增加生效时间

bms-front/src/views/price/set/components/detail/SetVersionTable.vue

@@ -3,6 +3,7 @@
     <el-tabs v-model="statusTab" class="ver-tabs">
       <el-tab-pane :label="tabLabel('all')" name="all" />
       <el-tab-pane :label="tabLabel('0')" name="0" />
+      <el-tab-pane :label="tabLabel('3')" name="3" />
       <el-tab-pane :label="tabLabel('1')" name="1" />
       <el-tab-pane :label="tabLabel('2')" name="2" />
     </el-tabs>
@@ -31,28 +32,28 @@
         <template #default="{ row }">
           <el-button link type="primary" @click="openDetails(row)">查看详情</el-button>
           <el-button
-            v-if="String(row.status) === '0'"
+            v-if="isPriceEditableVersion(row)"
             link
             type="primary"
             @click="emit('edit', row)"
             v-hasPermi="['price:set:edit']"
           >继续配置</el-button>
           <el-button
-            v-if="String(row.status) === '0'"
+            v-if="isDraftVersion(row)"
             link
             type="success"
             @click="emit('activate', row)"
             v-hasPermi="['price:set:edit']"
           >启动</el-button>
           <el-button
-            v-if="String(row.status) === '0'"
+            v-if="isDraftVersion(row)"
             link
             type="danger"
             @click="emit('remove', row)"
             v-hasPermi="['price:set:edit']"
           >删除</el-button>
           <el-button
-            v-if="String(row.status) === '1'"
+            v-if="String(row.status) === '1' && !hasDraft"
             link
             type="primary"
             @click="emit('copy-version', row)"
@@ -66,7 +67,7 @@
 
 <script setup name="SetVersionTable">
 import SetSectionCard from './SetSectionCard.vue'
-import { versionStatusLabel, versionStatusTag } from '../../utils/priceSet'
+import { versionStatusLabel, versionStatusTag, isDraftVersion, isPriceEditableVersion } from '../../utils/priceSet'
 
 const props = defineProps({
   versions: { type: Array, default: () => [] },
@@ -84,7 +85,7 @@ const colAction = '操作'
 const statusTab = ref('all')
 
 const counts = computed(() => {
-  const map = { all: 0, '0': 0, '1': 0, '2': 0 }
+  const map = { all: 0, '0': 0, '3': 0, '1': 0, '2': 0 }
   ;(props.versions || []).forEach(v => {
     map.all++
     const s = String(v.status == null ? '' : v.status)
@@ -97,12 +98,15 @@ function tabLabel(key) {
   const labels = {
     all: '全部',
     '0': '草稿',
+    '3': '待生效',
     '1': '生效',
     '2': '失效'
   }
   return labels[key] + ' (' + (counts.value[key] || 0) + ')'
 }
 
+const hasDraft = computed(() => (props.versions || []).some(v => isDraftVersion(v)))
+
 const filteredVersions = computed(() => {
   const list = props.versions || []
   if (statusTab.value === 'all') return list

bms-front/src/views/price/set/detail.vue

@@ -35,6 +35,34 @@
         :version="detailVersion"
         :set-type="set.setType"
       />
+
+      <el-dialog
+        v-model="activateVisible"
+        :title="activateTitle"
+        width="460px"
+        append-to-body
+        @closed="onActivateClosed"
+      >
+        <el-form ref="activateFormRef" :model="activateForm" :rules="activateRules" label-width="100px">
+          <el-form-item label="版本号">
+            <span>{{ activateForm.versionNo || '-' }}</span>
+          </el-form-item>
+          <el-form-item label="生效时间" prop="effectiveTime">
+            <el-date-picker
+              v-model="activateForm.effectiveTime"
+              type="datetime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :placeholder="activatePh"
+              style="width: 100%"
+            />
+          </el-form-item>
+          <div class="activate-hint">{{ activateHint }}</div>
+        </el-form>
+        <template #footer>
+          <el-button @click="activateVisible = false">取消</el-button>
+          <el-button type="primary" :loading="activateSubmitting" @click="submitActivate">确认启动</el-button>
+        </template>
+      </el-dialog>
     </template>
   </div>
 </template>
@@ -92,13 +120,59 @@ function confirmAction(text, request, successText, done) {
 function onDisable() {
   confirmAction('停用后不再参与计费命中，确认停用？', () => disablePriceSet(set.value.priceSetId), '已停用')
 }
+function formatNow() {
+  const d = new Date()
+  const p = n => String(n).padStart(2, '0')
+  return d.getFullYear() + '-' + p(d.getMonth() + 1) + '-' + p(d.getDate())
+    + ' ' + p(d.getHours()) + ':' + p(d.getMinutes()) + ':' + p(d.getSeconds())
+}
+
+const activateVisible = ref(false)
+const activateSubmitting = ref(false)
+const activateFormRef = ref()
+const activateTitle = '启动版本'
+const activatePh = '请选择生效时间'
+const activateHint = '若生效时间晚于当前，版本将进入「待生效」；到时自动生效并使上一版本失效。'
+const activateForm = reactive({
+  psvId: undefined,
+  versionNo: '',
+  effectiveTime: undefined
+})
+const activateRules = {
+  effectiveTime: [{ required: true, message: '请选择生效时间', trigger: 'change' }]
+}
+
 function onActivateVersion(row) {
   if (!row || row.psvId == null) return
-  confirmAction(
-    '确认启动版本 ' + (row.versionNo || '') + '？启动后将以当前时间生效，上一版本自动失效。',
-    () => activatePriceSetVersion(row.psvId),
-    '版本已启动'
-  )
+  activateForm.psvId = row.psvId
+  activateForm.versionNo = row.versionNo || ''
+  activateForm.effectiveTime = formatNow()
+  activateVisible.value = true
+}
+
+function onActivateClosed() {
+  activateForm.psvId = undefined
+  activateForm.versionNo = ''
+  activateForm.effectiveTime = undefined
+  activateFormRef.value && activateFormRef.value.clearValidate()
+}
+
+function submitActivate() {
+  activateFormRef.value.validate(valid => {
+    if (!valid) return
+    activateSubmitting.value = true
+    activatePriceSetVersion(activateForm.psvId, { effectiveTime: activateForm.effectiveTime })
+      .then(() => {
+        const eff = activateForm.effectiveTime
+        const pending = eff && new Date(eff.replace(/-/g, '/')).getTime() > Date.now()
+        proxy.$modal.msgSuccess(pending ? '已设为待生效' : '版本已启动')
+        activateVisible.value = false
+        load()
+      })
+      .finally(() => {
+        activateSubmitting.value = false
+      })
+  })
 }
 function onCopy() {
   copyPriceSet(set.value.priceSetId).then(res => {
@@ -108,6 +182,11 @@ function onCopy() {
 }
 function onCopyVersion(row) {
   if (!row || row.psvId == null) return
+  const hasDraft = (set.value.versions || []).some(v => v && String(v.status) === '0')
+  if (hasDraft) {
+    proxy.$modal.msgWarning('已有草稿版本，请先启动或删除后再复制')
+    return
+  }
   proxy.$modal.confirm(
     '确认复制版本 ' + (row.versionNo || '') + '为新草稿？将新增版本并拷贝全部明细。'
   ).then(() => copyPriceSetVersion(row.psvId)).then(res => {
@@ -153,3 +232,12 @@ onMounted(() => {
   load()
 })
 </script>
+
+<style scoped>
+.activate-hint {
+  margin: -4px 0 0 100px;
+  color: #909399;
+  font-size: 12px;
+  line-height: 1.5;
+}
+</style>

bms-front/src/views/price/set/utils/priceSet.js

@@ -40,23 +40,43 @@ const STATUS_TAG = {
 /** 默认取值方式 */
 export const DEFAULT_ROUND_MODE = 'HALF_UP'
 
-/** version status: 0 draft / 1 active / 2 expired */
+/** version status: 0 draft / 3 pending / 1 active / 2 expired */
 export const VER_STATUS = {
   DRAFT: '0',
+  PENDING: '3',
   EFFECT: '1',
   EXPIRED: '2'
 }
 
 export function versionStatusLabel(status) {
-  const map = { '0': '草稿', '1': '生效', '2': '失效' }
+  const map = {
+    '0': '草稿',
+    '3': '待生效',
+    '1': '生效',
+    '2': '失效'
+  }
   return map[status] || status || '-'
 }
 
 export function versionStatusTag(status) {
-  const map = { '0': 'warning', '1': 'success', '2': 'info' }
+  const map = { '0': 'warning', '3': 'primary', '1': 'success', '2': 'info' }
   return map[status] || 'info'
 }
 
+/** True draft only (not pending) */
+export function isDraftVersion(row) {
+  return !!row && String(row.status) === VER_STATUS.DRAFT
+}
+
+export function isPendingVersion(row) {
+  return !!row && String(row.status) === VER_STATUS.PENDING
+}
+
+/** Draft or pending: may continue editing price details */
+export function isPriceEditableVersion(row) {
+  return isDraftVersion(row) || isPendingVersion(row)
+}
+
 export function nextVersionNo(versions) {
   const seqs = (versions || []).map(v => Number(v.versionSeq) || 0)
   const max = seqs.length ? Math.max.apply(null, seqs) : 0