diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java index f691399e..8b267d4a 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java @@ -10,8 +10,10 @@ import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; /** @@ -119,6 +121,18 @@ public class GoodsController extends BaseController @PutMapping("/sku") public AjaxResult editSku(@RequestBody OGoodsSku sku) { + String skuName=""; + if(StringUtils.hasText(sku.getColorValue())){ + skuName+=sku.getColorValue(); + } + if(StringUtils.hasText(sku.getSizeValue())){ + skuName+=" "+sku.getSizeValue(); + } + if(StringUtils.hasText(sku.getStyleValue())){ + skuName+=" "+sku.getStyleValue(); + } + sku.setSkuName(skuName); + sku.setUpdateTime(new Date()); return toAjax(skuService.updateById(sku)); } diff --git a/vue/src/views/goods/goods/goods.vue b/vue/src/views/goods/goods/goods.vue index 84e5d751..48aa8af2 100644 --- a/vue/src/views/goods/goods/goods.vue +++ b/vue/src/views/goods/goods/goods.vue @@ -115,13 +115,14 @@ - - - + + + + @@ -150,9 +151,9 @@ --> - - - + + +