diff --git a/bms-back/ruoyi-admin/src/main/resources/i18n/messages.properties b/bms-back/ruoyi-admin/src/main/resources/i18n/messages.properties index c29af558..b7ebe259 100644 --- a/bms-back/ruoyi-admin/src/main/resources/i18n/messages.properties +++ b/bms-back/ruoyi-admin/src/main/resources/i18n/messages.properties @@ -148,7 +148,7 @@ price.bill.bizDateRequired=业务日期为空 price.set.version.effectiveTime.empty=版本生效时间不能为空 price.set.version.notExists=套餐版本不存在 -price.set.version.activate.statusNotAllowed=仅草稿版本可启动 +price.set.version.activate.statusNotAllowed=仅草稿或待生效版本可设置生效时间 price.set.version.delete.statusNotAllowed=仅草稿版本可删除 price.set.version.copy.draftExists=已有草稿版本,请先启动或删除后再复制 price.set.save.task.notExists=保存任务不存在或已过期 diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcPriceSetService.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcPriceSetService.java index 51e42b63..6a8f5803 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcPriceSetService.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcPriceSetService.java @@ -35,7 +35,7 @@ public interface IPrcPriceSetService public int disable(Long priceSetId, String updateBy); /** - * Activate a draft version with user-specified effectiveTime. + * Activate a draft or reschedule a pending version with user-specified effectiveTime. * effectiveTime <= now -> EFFECT; future -> PENDING(3). Then refresh 0/3/1/2. */ public int activateVersion(Long psvId, Date effectiveTime, String updateBy); diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcPriceSetServiceImpl.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcPriceSetServiceImpl.java index b17cd4ab..08316833 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcPriceSetServiceImpl.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcPriceSetServiceImpl.java @@ -288,7 +288,7 @@ public class PrcPriceSetServiceImpl implements IPrcPriceSetService { throw new ServiceException(MessageUtils.message("price.set.version.notExists")); } - if (!VER_DRAFT.equals(version.getStatus())) + if (!VER_DRAFT.equals(version.getStatus()) && !VER_PENDING.equals(version.getStatus())) { throw new ServiceException(MessageUtils.message("price.set.version.activate.statusNotAllowed")); } diff --git a/bms-front/src/layout/components/Navbar.vue b/bms-front/src/layout/components/Navbar.vue index 20221b52..c54f3d3a 100644 --- a/bms-front/src/layout/components/Navbar.vue +++ b/bms-front/src/layout/components/Navbar.vue @@ -12,14 +12,6 @@