diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java index 4c1910dd..1d0347e9 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/customer/customerinfo/service/impl/BmsCustomerPriceSetServiceImpl.java @@ -69,10 +69,6 @@ public class BmsCustomerPriceSetServiceImpl implements IBmsCustomerPriceSetServi throw new ServiceException("仅生效中的套餐允许绑定,当前套餐状态不可用"); } if (bind.getPrBegindate() == null) - { - bind.setPrBegindate(set.getEffectiveDate()); - } - if (bind.getPrBegindate() == null) { throw new ServiceException("绑定生效日期不能为空"); } diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml index e16b8d51..32898fe2 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/customer/BmsCustomerPriceSetMapper.xml @@ -22,8 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - @@ -32,8 +30,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - @@ -41,8 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" c.bind_priority, c.pr_begindate, c.pr_enddate, c.price_set_note, c.created_by, c.create_time, c.updated_by, c.update_time, s.price_set_code, s.price_set_name, s.set_type, - s.status as price_set_status, - s.effective_date as set_effective_date, s.expire_date as set_expire_date + s.status as price_set_status from prc_customer_price_set c left join prc_price_set s on s.price_set_id = c.price_set_id @@ -104,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue b/bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue index 6962c1a8..8a12e077 100644 --- a/bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue +++ b/bms-front/src/views/customersuppliermanagement/customerinfo/customeredit/index.vue @@ -666,9 +666,9 @@ {{ setTypeMap[selectedPriceSet.setType] || selectedPriceSet.setType }} - - 套餐有效期:{{ selectedPriceSet.effectiveDate || '-' }} 至 {{ selectedPriceSet.expireDate || '长期' }} - + + {{ priceSetStatusMap[selectedPriceSet.status] || selectedPriceSet.status || '-' }} + @@ -855,12 +855,10 @@ function openPriceSetDialog(row) { nextTick(() => proxy.$refs['priceSetRef'] && proxy.$refs['priceSetRef'].clearValidate()) } -/** 选择套餐后,生效日期未填时默认带出套餐生效日期 */ +/** 选择套餐后,生效日期未填时默认今天 */ function onPriceSetChange(priceSetId) { - const opt = priceSetOptions.value.find(o => o.priceSetId === priceSetId) - if (opt && !priceSetForm.value.prBegindate) { - priceSetForm.value.prBegindate = opt.effectiveDate || null - } + if (!priceSetId || priceSetForm.value.prBegindate) return + priceSetForm.value.prBegindate = proxy.parseTime(new Date(), '{y}-{m}-{d}') } function submitPriceSetForm() {