Merge branch 'projects/mes-test' into projects/mes-zhp

2025-01-08 16:11:12 +08:00
parent 04a5359eda 7ae7dfad95
commit 97acb4faac
28 changed files with 223 additions and 2257 deletions
--- a/src/api/quality/processTraceability.js
+++ b/src/api/quality/processTraceability.js
@@ -27,7 +27,7 @@ export function getWorkOrderList(query) {

 export function getCoreProduct(id) {
  return request({
-    url: '/base/core-product/get?id=' + id,
+    url: '/base/core-product-material/get?id=' + id,
    method: 'get'
  })
 }
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -44,11 +44,7 @@ export function updateRole(data) {
 }

 // 角色状态修改
-export function changeRoleStatus(id, status) {
-  const data = {
-    id,
-    status
-  }
+export function changeRoleStatus(data) {
  return request({
    url: '/system/role/update-status',
    method: 'put',