diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java index 11002678..c73af039 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java @@ -246,6 +246,8 @@ public class ErpBomController extends BaseController erpBomService.updateErpBom(erpBomVo); // 驳回申请后继续申请,可能修改表单 if (saveEntityBoolean) { + erpBomVo.setAuditStatus("0"); + erpBomVo.setUseStatus("0"); erpBomService.updateErpBom(erpBomVo); } return success("任务已完成"); diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html index ff0b3e14..8b761f04 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html @@ -309,11 +309,11 @@ title: '备注', editable : { type : 'text', - title : '损耗率', + title : '备注', mode:'inline', validate : function(value) { if (!value) { - return '用量不能为空'; + return '备注'; } } }