diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java index ab431463c1..78ffce061c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java @@ -14,8 +14,8 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -31,25 +31,25 @@ public class BusSalesOrderAllDto implements Dto { private String sid; @ApiModelProperty(value = "用户sid", required = true) - @NotBlank(message = "用户sid不能为空") + @NotBlank(message = "参数错误:用户sid") private String userSid; @ApiModelProperty(value = "销售部门sid", required = true) - @NotBlank(message = "销售部门sid不能为空") + @NotBlank(message = "参数错误:销售部门sid") private String orgSid; @ApiModelProperty(value = "销售部门", required = true) - @NotBlank(message = "销售部门不能为空") + @NotBlank(message = "参数错误:销售部门") private String orgName; @ApiModelProperty(value = "客户名称", required = true) @NotBlank(message = "客户名称不能为空") private String customerName; @ApiModelProperty(value = "客户sid", required = true) - @NotBlank(message = "客户sid不能为空") + @NotBlank(message = "参数错误:客户sid") private String customerSid; @ApiModelProperty(value = "销售专员", required = true) @NotBlank(message = "销售专员不能为空") private String staffName; @ApiModelProperty(value = "销售专员sid", required = true) - @NotBlank(message = "销售专员sid不能为空") + @NotBlank(message = "参数错误:销售专员sid") private String staffSid; @ApiModelProperty(value = "客户联系电话", required = true) @NotBlank(message = "客户联系电话不能为空") @@ -83,7 +83,7 @@ public class BusSalesOrderAllDto implements Dto { @NotBlank(message = "销售订单车辆类型不能为空") private String type; @ApiModelProperty(value = "主车车型信息") - @NotNull(message = "车型信息不能为空") + @Valid private BusSalesOrderModelDto busSalesOrderModel; @ApiModelProperty(value = "现车车辆信息") private List busSalesOrderVehicleList; @@ -92,12 +92,14 @@ public class BusSalesOrderAllDto implements Dto { @ApiModelProperty(value = "上装配置信息") private BusSalesOrderMakeupDto busSalesOrderMakeup; @ApiModelProperty(value = "价格信息") + @Valid private BusSalesOrderPriceDto busSalesOrderPrice; @ApiModelProperty(value = "主车优惠明细") private List busSalesOrderDiscountList; @ApiModelProperty(value = "保险说明") private BusSalesOrderInsuranceDto busSalesOrderInsurance; @ApiModelProperty(value = "订金信息") + @Valid private BusSalesOrderDepositDto busSalesOrderDeposit; @ApiModelProperty(value = "虚拟订单和订金关联信息") private List busDepositFictitiousList; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 423d017399..e7c95c2ca9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -33,6 +33,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; + /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderFeign.java
@@ -62,7 +64,7 @@ public interface BusSalesOrderFeign { @ApiOperation("新增或修改") @PostMapping("/saveOrUpdate") @ResponseBody - public ResultBean save(@RequestBody BusSalesOrderAllDto dto); + public ResultBean save(@Valid @RequestBody BusSalesOrderAllDto dto); @ApiOperation("删除/批量删除") @DeleteMapping("/delBySids") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java index 374ff19d61..3d3164c578 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderDepositDto.java
@@ -49,13 +51,17 @@ import lombok.Data; public class BusSalesOrderDepositDto implements Dto { private static final long serialVersionUID = -5178085916707721474L; - @ApiModelProperty("单台订金") + @ApiModelProperty(value = "单台订金", required = true) + @NotBlank(message = "参数错误:订金信息单台订金不能为空") private String deposit; - @ApiModelProperty("订金合计") + @ApiModelProperty(value = "订金合计", required = true) + @NotBlank(message = "参数错误:订金信息订金合计不能为空") private String depositAll; - @ApiModelProperty("订金交纳方式") + @ApiModelProperty(value = "订金交纳方式", required = true) + @NotBlank(message = "参数错误:订金信息订金交纳方式不能为空") private String depositType; - @ApiModelProperty("订金交纳方式key") + @ApiModelProperty(value = "订金交纳方式key", required = true) + @NotBlank(message = "参数错误:订金交纳方式key") private String depositTypeKey; @ApiModelProperty("需补交订金") private String makeUpDeposit; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java index d5d2cbf687..7fada7cfe2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -52,18 +54,24 @@ import java.util.Date; public class BusSalesOrderPriceDto implements Dto { private static final long serialVersionUID = -1959772405551004198L; - @ApiModelProperty("单台指导价(主车加上装)") + @ApiModelProperty(value = "单台指导价(主车加上装)", required = true) + @NotBlank(message = "参数错误:价格信息单台指导价不能为空") private String singleGuildPrice; - @ApiModelProperty("单台成交价(主车加上装)") + @ApiModelProperty(value = "单台成交价(主车加上装)", required = true) + @NotBlank(message = "参数错误:价格信息单台成交价不能为空") private String singleFinalPrice; @ApiModelProperty("台数") + @NotNull(message = "参数错误:价格信息台数不能为空") private Integer quantity; @ApiModelProperty("车价合计") + @NotBlank(message = "参数错误:车价合计不能为空") private String priceSum; @ApiModelProperty("计划提车地点") + @NotBlank(message = "参数错误:计划提车地点不能为空") private String plannedPickUpLocation; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("计划提车日期") + @NotNull(message = "参数错误:计划提车日期不能为空") private Date plannedPickUpDate; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index b6fce02ca8..0cdb098341 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -315,6 +315,8 @@ public class BusSalesOrderService extends MybatisBaseService - // import('@/views/xiaoshouguanli/xiaodaijinrongfangan/xiaodaijinrongfanganAdd.vue'), - // name: 'xiaodaijinrongfanganAdd', - // meta: { - // title: '消贷业务金融方案添加' - // } - // }, - // { - // path: '/xiaoshouguanli/xiaodaijinrongfanganInfo', - // component: () => - // import('@/views/xiaoshouguanli/xiaodaijinrongfangan/xiaodaijinrongfanganinfo.vue'), - // name: 'xiaodaijinrongfanganInfo', - // meta: { - // title: '消贷业务金融方案详情' - // } - // }, - // 挂车配置 + { + path: '/xiaoshouguanli/xiaoshouzhengce', + component: () => + import('@/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengce.vue'), + name: 'xiaoshouzhengce', + meta: { + title: '销售政策管理' + } + }, { path: '/xiaoshouguanli/guachepeizhixinxi', component: () => @@ -317,16 +306,6 @@ export const constantRoutes = [{ title: '挂车配置' } }, - // 上装配置 - // { - // path: '/xiaoshouguanli/shangzhuanpeizhi', - // component: () => - // import('@/views/xiaoshouguanli/jiaochedingdan/shangzhuanpeizhi.vue'), - // name: 'shangzhuanpeizhi', - // meta: { - // title: '上装配置' - // } - // }, // 车辆交付 { path: '/xiaoshouguanli/cheliangjiaofu', @@ -668,6 +647,7 @@ export const constantRoutes = [{ // import('@/views/workflow/hetongguanliFlow/hetongdanganguanli/hetongdangan.vue'), // name: 'hetongdangan', // }, + // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue index 40768212fe..e239b02ecc 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue @@ -243,7 +243,8 @@ useMessage = this.detailsList[i].useMessage this.isShow = false this.isShowLook = true - this.$refs['divUserInfo'].showInfo(useMessage, vinNo) + const createBtn = false + this.$refs['divUserInfo'].showInfo(useMessage, vinNo,createBtn) } } }, @@ -328,7 +329,8 @@ this.temp.sid = sid this.detailsList = response.data.listVo for (var i = 0; i < this.detailsList.length; i++) { - if (JSON.stringify(this.detailsList[i].useMessage) !== '{}') { + //JSON.stringify() + if (this.detailsList[i].useMessage.vinNo !== '') { this.detailsList[i].isExist = '1' } } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue index 478a30b1b0..0d0b6ca3cc 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue @@ -46,8 +46,8 @@ - - + + @@ -99,7 +99,7 @@