diff --git a/package.json b/package.json index 5bdc0f6e..337a9d59 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "js-beautify": "1.13.0", "js-cookie": "3.0.1", "jsencrypt": "3.0.0-rc.1", + "moment": "^2.29.4", "nprogress": "0.2.0", "quill": "1.3.7", "screenfull": "5.0.2", diff --git a/src/api/mes/pro/order.js b/src/api/plan/order.js similarity index 92% rename from src/api/mes/pro/order.js rename to src/api/plan/order.js index c1a115e7..6b4c819a 100644 --- a/src/api/mes/pro/order.js +++ b/src/api/plan/order.js @@ -84,3 +84,10 @@ export function delOrder(id) { method: 'delete' }); } +// 同步SAP订单 +export function syncSAP() { + return request({ + url: '/mes/order/syncSAP', + method: 'post' + }); +} diff --git a/src/api/mes/plan.js b/src/api/plan/plan.js similarity index 100% rename from src/api/mes/plan.js rename to src/api/plan/plan.js diff --git a/src/api/mes/pro/workorder.js b/src/api/plan/workorder.js similarity index 100% rename from src/api/mes/pro/workorder.js rename to src/api/plan/workorder.js diff --git a/src/api/mes/pro/baseFile.js b/src/api/technology/baseFile.js similarity index 100% rename from src/api/mes/pro/baseFile.js rename to src/api/technology/baseFile.js diff --git a/src/api/mes/pro/process.js b/src/api/technology/process.js similarity index 100% rename from src/api/mes/pro/process.js rename to src/api/technology/process.js diff --git a/src/api/mes/pro/processcontent.js b/src/api/technology/processcontent.js similarity index 100% rename from src/api/mes/pro/processcontent.js rename to src/api/technology/processcontent.js diff --git a/src/api/mes/pro/proroute.js b/src/api/technology/proroute.js similarity index 100% rename from src/api/mes/pro/proroute.js rename to src/api/technology/proroute.js diff --git a/src/api/mes/pro/recipe.js b/src/api/technology/recipe.js similarity index 100% rename from src/api/mes/pro/recipe.js rename to src/api/technology/recipe.js diff --git a/src/api/mes/pro/recipecontent.js b/src/api/technology/recipecontent.js similarity index 100% rename from src/api/mes/pro/recipecontent.js rename to src/api/technology/recipecontent.js diff --git a/src/api/mes/pro/routeprocess.js b/src/api/technology/routeprocess.js similarity index 100% rename from src/api/mes/pro/routeprocess.js rename to src/api/technology/routeprocess.js diff --git a/src/api/mes/pro/routeprodproduct.js b/src/api/technology/routeprodproduct.js similarity index 100% rename from src/api/mes/pro/routeprodproduct.js rename to src/api/technology/routeprodproduct.js diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue index 9fb8dd81..c15b0dfa 100644 --- a/src/components/TopNav/index.vue +++ b/src/components/TopNav/index.vue @@ -7,7 +7,8 @@ @@ -120,6 +121,7 @@ export default { }, // 菜单选择事件 handleSelect(key, keyPath) { + this.currentIndex = key; const route = this.routers.find(item => item.path === key); if (this.ishttp(key)) { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 996385bd..4c345ec8 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -18,7 +18,7 @@