diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java
index 1a1871f5..8c116373 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java
@@ -973,7 +973,8 @@ private ISysAttachService attachService;
// }else if(roleKeys.contains("gcjlRole")){
// variables.put("authority",2);
// }
-// if(roleKeys.contains("yfzjRole") || roleKeys.contains("admin")){
-// variables.put("authority",4);
+ if(roleKeys.contains("admin")) {
+ variables.put("authority", 4);
+ }
}
}
diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml
index dbad73a9..7aae3670 100644
--- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseOrderChildMapper.xml
@@ -71,6 +71,12 @@
+
+
+
insert into purchase_order_child
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/add.html b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
index dae9e10a..3b6bbff1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
@@ -365,7 +365,7 @@
return;
}
console.log( $('#form-customer-add').serialize());
- $.operate.save(prefix + "/ad", $('#form-customer-add').serialize());
+ $.operate.save(prefix + "/add", $('#form-customer-add').serialize());
}
}
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
index 4fc4d434..d2337c89 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
@@ -299,7 +299,7 @@
// 已作废
if(row.useStatus=="2" && !row.restoreInstanceId){
// 恢复
- actions.push(' 恢复 ');
+ actions.push(' 恢复 ');
}
// 有流程实例id
if (row.instanceId) {
@@ -308,7 +308,7 @@
var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName)){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
- actions.push(' '+nodeName+' ');
+ actions.push(' '+nodeName+' ');
}
}
// 审批历史