diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index 3853b90334..5a6f914622 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -93,6 +93,7 @@ public class ScmVehicleReturnService extends MybatisBaseService 0) { + variables.put("isLoan", true); + } else { + variables.put("isLoan", false); + } + if (scmVehicleReturnDto.getDetailsList().size() == 0) { + return rb.setMsg("请选择需要退库的车辆"); + } String busSid = scmVehicleReturnDto.getBusinessSid(); if (org.apache.commons.lang3.StringUtils.isBlank(busSid)) { ResultBean resultBean = saveOrUpdateVehicleReturn(scmVehicleReturnDto); @@ -252,7 +261,7 @@ public class ScmVehicleReturnService extends MybatisBaseService 0) { + if (Double.parseDouble(money) > 0) { bv.getFormVariables().put("isLoan", true); } else { bv.getFormVariables().put("isLoan", false); diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuInfo.vue index c47c09f0cd..ce2ea98dee 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuInfo.vue @@ -59,7 +59,7 @@