修复：bom审核修改经理审核可全部权限。修改审核页面跳转判定。

ruoyi-admin/src/main/resources/templates/erp/bom/add.html

@@ -168,6 +168,7 @@
                                 "<option value='" + usertData[i].loginName + "'>" + usertData[i].loginName + "</option>");
                         }
                         $("#selectEngineer").val(loginName);
+                        $("input[name='engineer']").val(loginName);
                     } else {
                         $.modal.msgError(res.msg);
                     }

ruoyi-admin/src/main/resources/templates/erp/bom/bom.html

@@ -220,7 +220,7 @@
                             // 有待办人展示审批按钮，
                             if (row.todoUserId) {
                                 var todoUserIdList = row.todoUserId.split(",");
-                                if(todoUserIdList.includes(loginName) || todoUserIdList.includes("admin")){
+                                if(todoUserIdList.includes(loginName)){
                                     var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
                                     actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+row.instanceTypeName+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
                                 }

ruoyi-admin/src/main/resources/templates/erp/bom/detail.html

@@ -256,13 +256,19 @@
                                 if (num < 0 || num > 100) {
                                     return '损耗率必须大于等于0小于等于100';
                                 }
-                            }
+                            },
                         },
                         formatter: function (value,row,index){
-                            if(value == null){
+                            if (value == null || value == ''){
                                 return "%";
                             }
+                            const regex = /(\d+(?:\.\d+)?)%/g; // 创建正则表达式，g标志表示全局匹配
+                            const match = value.match(regex); // 使用match方法查找所有匹配
+                            if (match) {
+                                return value;
+                            }else{
                                 return value + "%";
+                            }
                         },
                     },
                     {

ruoyi-admin/src/main/resources/templates/erp/bom/edit.html

@@ -290,7 +290,7 @@
                     {
                         field: 'processMethod',
                         align: 'center',
-                        title: '半成品类型',
+                        title: '加工方式',
                         formatter: function(value, row, index) {
                             return $.table.selectDictLabel(processMethodDatas, value);
                         }

ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html

@@ -263,7 +263,6 @@
             $.operate.save(prefix + "/complete/" + taskId, $('#form-edit').serialize());
         }
     }
-
 </script>
 </body>
 </html>