From 397198b47fe3744e763eef2ad3c087fc3859390c Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Fri, 8 Mar 2024 17:19:34 +0800 Subject: [PATCH] =?UTF-8?q?[update]=E5=B7=A5=E7=A8=8B=E6=A8=A1=E5=9D=97Bom?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=83=A8=E5=88=86=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E4=B8=9A=E5=8A=A1=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=B5=81=EF=BC=8C=E5=88=9B=E5=BB=BA=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/ErpBomController.java | 2 +- .../main/resources/templates/erp/bom/add.html | 7 ----- .../main/resources/templates/erp/bom/bom.html | 11 +++++--- .../resources/templates/erp/bom/equals.html | 26 +++++++++++-------- .../templates/erp/bom/taskGcjlVerify.html | 2 +- .../templates/erp/bom/taskGczgVerify.html | 2 +- .../templates/erp/bom/taskModifyApply.html | 2 +- .../templates/erp/bom/taskYfzjVerify.html | 4 +-- 8 files changed, 28 insertions(+), 28 deletions(-) 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 fcdf2abf..173e533b 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 @@ -202,7 +202,7 @@ public class ErpBomController extends BaseController String instanceId = erpBomVo.getInstanceId(); //获取实例类型 String instanceType = erpBomVo.getInstanceType(); - boolean approvedFlag = processService.complete(taskId, instanceId, erpBomVo.getApplyTitle(), erpBomVo.getMaterialNo(), "erpBom", new HashMap(), request); + boolean approvedFlag = processService.complete(taskId, instanceId, erpBomVo.getApplyTitle(), erpBomVo.getBomNo(), "erpBom", new HashMap(), request); if(!approvedFlag){ // 审核状态-审核拒绝 erpBomVo.setAuditStatus("2"); diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html index ce5e09f3..687d0b94 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html @@ -15,7 +15,6 @@
@@ -458,12 +457,6 @@ }) layer.close(index); } - // function doSubmit(index, layero){ - // var body = layer.getChildFrame('body', index); - // $("#treeId").val(body.find('#treeId').val()); - // $("#treeName").val(body.find('#treeName').val()); - // layer.close(index); - // } /* 新增表格行 */ function insertRow(){ var url = ctx + "erp/material/select"; diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html index 3e5cd772..f12669e3 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html @@ -76,12 +76,12 @@ 添加 - + - - +- + 删除 + --> 导出 @@ -112,6 +112,9 @@ var processMethodDatas = [[${@dict.getType('processMethod')}]]; var auditStatusDatas = [[${@dict.getType('auditStatus')}]]; var useStatusDatas = [[${@dict.getType('useStatus')}]]; + var userName = [[${@permission.getPrincipalProperty('userName')}]]; + var currentUser = [[${currentUser}]]; + var loginName = currentUser.loginName; var prefix = ctx + "erp/bom"; $(function() { // $('#selectMaterialType').on('select2:select', function (e) { diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/equals.html b/ruoyi-admin/src/main/resources/templates/erp/bom/equals.html index 0f586f49..9d16f8cc 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/equals.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/equals.html @@ -8,8 +8,8 @@
- -
+ +
-
- - 搜索 - - -
+
+
+ + 搜索 + + + 重置 +
@@ -84,6 +84,10 @@ $("#bom-ton").html(""); $("#bom1-dif").html(""); $("#bom2-dif").html(""); + if (bomNo1 == "" || bomNo2 == ""){ + $.modal.msgError("请选择bom号"); + return; + } $.ajax({ url: prefix + "/equalsBom", async:true, //true所有请求均为异步请求 diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html index ae542db4..de3f7b60 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html @@ -236,7 +236,7 @@ } }) - var prefix = ctx + "erp/material"; + var prefix = ctx + "erp/bom"; $("#form-edit").validate({ focusCleanup: true }); diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html index 385bf7ef..269f4989 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html @@ -244,7 +244,7 @@ } }) - var prefix = ctx + "erp/material"; + var prefix = ctx + "erp/bom"; $("#form-edit").validate({ focusCleanup: true }); diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html index c0fb7fee..f8b4f76b 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html @@ -229,7 +229,7 @@ } }) - var prefix = ctx + "erp/material"; + var prefix = ctx + "erp/bom"; $("#form-edit").validate({ onkeyup: false, rules:{ diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html index 66aa3aa1..c6ba75fe 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html @@ -14,7 +14,7 @@
- +
@@ -236,7 +236,7 @@ } }) - var prefix = ctx + "erp/material"; + var prefix = ctx + "erp/bom"; $("#form-edit").validate({ focusCleanup: true });