From 13c98b2922238b7fa6e7ee47731cc138f3d80018 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 31 Jul 2023 09:13:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  1 +
 src/api/{mes/pro => plan}/order.js            |  7 +++++++
 src/api/{mes => plan}/plan.js                 |  0
 src/api/{mes/pro => plan}/workorder.js        |  0
 src/api/{mes/pro => technology}/baseFile.js   |  0
 src/api/{mes/pro => technology}/process.js    |  0
 .../{mes/pro => technology}/processcontent.js |  0
 src/api/{mes/pro => technology}/proroute.js   |  0
 src/api/{mes/pro => technology}/recipe.js     |  0
 .../{mes/pro => technology}/recipecontent.js  |  0
 .../{mes/pro => technology}/routeprocess.js   |  0
 .../pro => technology}/routeprodproduct.js    |  0
 src/components/TopNav/index.vue               |  4 +++-
 src/layout/components/Navbar.vue              |  4 ++--
 src/settings.js                               |  4 ++++
 src/store/modules/settings.js                 |  3 ++-
 src/views/{mes/pro => plan}/order/index.vue   | 19 +++++++++++++++----
 src/views/{mes => plan}/plan/index.vue        |  2 +-
 .../{mes/pro => plan}/workorder/index.vue     |  2 +-
 .../pro => technology}/baseFile/index.vue     |  2 +-
 .../pro => technology}/process/content.vue    |  2 +-
 .../{mes/pro => technology}/process/index.vue |  2 +-
 .../pro => technology}/proroute/index.vue     |  2 +-
 .../proroute/routeprocess.vue                 |  2 +-
 .../proroute/routeprodproduct.vue             |  2 +-
 .../pro => technology}/recipe/content.vue     |  2 +-
 .../{mes/pro => technology}/recipe/index.vue  |  2 +-
 27 files changed, 44 insertions(+), 18 deletions(-)
 rename src/api/{mes/pro => plan}/order.js (92%)
 rename src/api/{mes => plan}/plan.js (100%)
 rename src/api/{mes/pro => plan}/workorder.js (100%)
 rename src/api/{mes/pro => technology}/baseFile.js (100%)
 rename src/api/{mes/pro => technology}/process.js (100%)
 rename src/api/{mes/pro => technology}/processcontent.js (100%)
 rename src/api/{mes/pro => technology}/proroute.js (100%)
 rename src/api/{mes/pro => technology}/recipe.js (100%)
 rename src/api/{mes/pro => technology}/recipecontent.js (100%)
 rename src/api/{mes/pro => technology}/routeprocess.js (100%)
 rename src/api/{mes/pro => technology}/routeprodproduct.js (100%)
 rename src/views/{mes/pro => plan}/order/index.vue (98%)
 rename src/views/{mes => plan}/plan/index.vue (99%)
 rename src/views/{mes/pro => plan}/workorder/index.vue (99%)
 rename src/views/{mes/pro => technology}/baseFile/index.vue (99%)
 rename src/views/{mes/pro => technology}/process/content.vue (99%)
 rename src/views/{mes/pro => technology}/process/index.vue (99%)
 rename src/views/{mes/pro => technology}/proroute/index.vue (99%)
 rename src/views/{mes/pro => technology}/proroute/routeprocess.vue (99%)
 rename src/views/{mes/pro => technology}/proroute/routeprodproduct.vue (98%)
 rename src/views/{mes/pro => technology}/recipe/content.vue (99%)
 rename src/views/{mes/pro => technology}/recipe/index.vue (99%)

diff --git a/package.json b/package.json
index 5bdc0f6..337a9d5 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 c1a115e..6b4c819 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 9fb8dd8..c15b0df 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -7,7 +7,8 @@
     <template v-for="(item, index) in topMenus">
       <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
         ><svg-icon :icon-class="item.meta.icon" />
-        {{ item.meta.title }}</el-menu-item
+        {{ item.meta.title }}
+        </el-menu-item
       >
     </template>
 
@@ -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 996385b..4c345ec 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -18,7 +18,7 @@
       <template v-if="device !== 'mobile'">
         <el-select
           v-model="poolName"
-          placeholder="请选择园区"
+          placeholder="请选择工厂数据源"
           @change="handleChange"
           :disabled="poolNameList.length <= 1"
           class="right-menu-item hover-effect"
@@ -310,7 +310,7 @@ export default {
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
   .exceptionHandling {
 /*  line-height: 50px;
-    display: inline-block; 
+    display: inline-block;
     color: black;*/
     vertical-align: text-bottom;
     cursor: pointer;
diff --git a/src/settings.js b/src/settings.js
index fd24806..60d7fbd 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -13,6 +13,10 @@ module.exports = {
    * 是否显示顶部导航
    */
   topNav: true,
+  /**
+   * 是否显示数据源选择下拉框
+   */
+  poolNav:true,
 
   /**
    * 是否显示 tagsView
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 2455a1e..8bc8b0f 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,6 +1,6 @@
 import defaultSettings from '@/settings'
 
-const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
+const { sideTheme, showSettings,poolNav, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
 
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
@@ -9,6 +9,7 @@ const state = {
   sideTheme: storageSetting.sideTheme || sideTheme,
   showSettings: showSettings,
   topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
+  poolNav: poolNav,
   tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
   fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
   sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
diff --git a/src/views/mes/pro/order/index.vue b/src/views/plan/order/index.vue
similarity index 98%
rename from src/views/mes/pro/order/index.vue
rename to src/views/plan/order/index.vue
index e284555..c2fd29d 100644
--- a/src/views/mes/pro/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -75,7 +75,7 @@
           plain
           icon="el-icon-download"
           size="mini"
-          @click="handleExport"
+          @click="handleSyncSAP"
           v-hasPermi="['mes:pro:order:add']"
         >SAP同步
         </el-button>
@@ -366,8 +366,9 @@
     getOrder,
     delOrder,
     addOrder,
-    updateOrder
-  } from "@/api/mes/pro/order";
+    updateOrder,
+    syncSAP
+  } from "@/api/plan/order";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -967,8 +968,18 @@
         if (this.productData[0].atrr1 == '' || this.productData[0].atrr1 == null) {
           this.formFields[this.formFields.length - 1].batchQuantity = '';
         }
-      }
+      },
+      /** SAP同步按钮操作 */
+      handleSyncSAP() {
+        this.$modal.confirm('是否确认SAP同步操作步骤？').then(function() {
+          return syncSAP(contentIds);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("同步成功");
+        }).catch(() => {});
+      },
     }
+
   };
 </script>
 <style>
diff --git a/src/views/mes/plan/index.vue b/src/views/plan/plan/index.vue
similarity index 99%
rename from src/views/mes/plan/index.vue
rename to src/views/plan/plan/index.vue
index 6589528..27a6af8 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/plan/plan/index.vue
@@ -318,7 +318,7 @@
 </template>
 
 <script>
-import { updatePlanDetail,getPlanDetailList,addWetPlan,getBMSList,getProductList,getBucketList,getWorkOrderList,listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/mes/plan";
+import { updatePlanDetail,getPlanDetailList,addWetPlan,getBMSList,getProductList,getBucketList,getWorkOrderList,listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/plan/plan";
 
 export default {
 	name: "Plan",
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/plan/workorder/index.vue
similarity index 99%
rename from src/views/mes/pro/workorder/index.vue
rename to src/views/plan/workorder/index.vue
index 12a16a0..f5fcde2 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -268,7 +268,7 @@
 </template>
 
 <script>
-import { listWorkorder, getWorkorder, delWorkorder,downWorkorder, addWorkorder, updateWorkorder } from "@/api/mes/pro/workorder";
+import { listWorkorder, getWorkorder, delWorkorder,downWorkorder, addWorkorder, updateWorkorder } from "@/api/plan/workorder";
 import moment from 'moment';
 export default {
 	name: "Workorder",
diff --git a/src/views/mes/pro/baseFile/index.vue b/src/views/technology/baseFile/index.vue
similarity index 99%
rename from src/views/mes/pro/baseFile/index.vue
rename to src/views/technology/baseFile/index.vue
index 92430bd..0568168 100644
--- a/src/views/mes/pro/baseFile/index.vue
+++ b/src/views/technology/baseFile/index.vue
@@ -140,7 +140,7 @@
 </template>
 
 <script>
-import { listBaseFile, getBaseFile, delBaseFile, addBaseFile, updateBaseFile } from "@/api/mes/pro/baseFile";
+import { listBaseFile, getBaseFile, delBaseFile, addBaseFile, updateBaseFile } from "@/api/technology/baseFile";
 
 export default {
 	name: "BaseFile",
diff --git a/src/views/mes/pro/process/content.vue b/src/views/technology/process/content.vue
similarity index 99%
rename from src/views/mes/pro/process/content.vue
rename to src/views/technology/process/content.vue
index 5001cc1..2e784c8 100644
--- a/src/views/mes/pro/process/content.vue
+++ b/src/views/technology/process/content.vue
@@ -134,7 +134,7 @@
 </template>
 
 <script>
-import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/mes/pro/processcontent";
+import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/technology/processcontent";
 import ItemSelect  from "@/components/itemSelect/index.vue";
 export default {
   name: "Processcontent",
diff --git a/src/views/mes/pro/process/index.vue b/src/views/technology/process/index.vue
similarity index 99%
rename from src/views/mes/pro/process/index.vue
rename to src/views/technology/process/index.vue
index 52f28ee..f03705d 100644
--- a/src/views/mes/pro/process/index.vue
+++ b/src/views/technology/process/index.vue
@@ -324,7 +324,7 @@
 </template>
 
 <script>
-import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/mes/pro/process";
+import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/technology/process";
 import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment";
 import Processcontent from "./content.vue";
 
diff --git a/src/views/mes/pro/proroute/index.vue b/src/views/technology/proroute/index.vue
similarity index 99%
rename from src/views/mes/pro/proroute/index.vue
rename to src/views/technology/proroute/index.vue
index 9a260eb..0ddff30 100644
--- a/src/views/mes/pro/proroute/index.vue
+++ b/src/views/technology/proroute/index.vue
@@ -288,7 +288,7 @@
 </template>
 
 <script>
-import { listProroute, getProroute, delProroute, addProroute, updateProroute } from "@/api/mes/pro/proroute";
+import { listProroute, getProroute, delProroute, addProroute, updateProroute } from "@/api/technology/proroute";
 import Routeprocess from "./routeprocess";
 import Routeprodproduct from "./routeprodproduct";
 export default {
diff --git a/src/views/mes/pro/proroute/routeprocess.vue b/src/views/technology/proroute/routeprocess.vue
similarity index 99%
rename from src/views/mes/pro/proroute/routeprocess.vue
rename to src/views/technology/proroute/routeprocess.vue
index 36975b4..e0ac6f2 100644
--- a/src/views/mes/pro/proroute/routeprocess.vue
+++ b/src/views/technology/proroute/routeprocess.vue
@@ -133,7 +133,7 @@
 </template>
 
 <script>
-import { listRouteprocess, getRouteprocess, delRouteprocess, addRouteprocess, updateRouteprocess } from "@/api/mes/pro/routeprocess";
+import { listRouteprocess, getRouteprocess, delRouteprocess, addRouteprocess, updateRouteprocess } from "@/api/technology/routeprocess";
 import {listAllProcess} from "@/api/mes/pro/process";
 export default {
   name: "Routeprocess",
diff --git a/src/views/mes/pro/proroute/routeprodproduct.vue b/src/views/technology/proroute/routeprodproduct.vue
similarity index 98%
rename from src/views/mes/pro/proroute/routeprodproduct.vue
rename to src/views/technology/proroute/routeprodproduct.vue
index fa37ecc..8feb154 100644
--- a/src/views/mes/pro/proroute/routeprodproduct.vue
+++ b/src/views/technology/proroute/routeprodproduct.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { getListProduct, addProduct , updateProduct, getProduct, delProduct} from "@/api/mes/pro/routeprodproduct";
+import { getListProduct, addProduct , updateProduct, getProduct, delProduct} from "@/api/technology/routeprodproduct";
 
 export default {
   name: "Routeprodproduct",
diff --git a/src/views/mes/pro/recipe/content.vue b/src/views/technology/recipe/content.vue
similarity index 99%
rename from src/views/mes/pro/recipe/content.vue
rename to src/views/technology/recipe/content.vue
index 1fcd5df..e75c123 100644
--- a/src/views/mes/pro/recipe/content.vue
+++ b/src/views/technology/recipe/content.vue
@@ -160,7 +160,7 @@
 </template>
 
 <script>
-import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/mes/pro/recipecontent";
+import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/technology/recipecontent";
 import ItemSelect  from "@/components/itemSelect/index.vue";
 export default {
   name: "Processcontent",
diff --git a/src/views/mes/pro/recipe/index.vue b/src/views/technology/recipe/index.vue
similarity index 99%
rename from src/views/mes/pro/recipe/index.vue
rename to src/views/technology/recipe/index.vue
index 0ffa044..284906b 100644
--- a/src/views/mes/pro/recipe/index.vue
+++ b/src/views/technology/recipe/index.vue
@@ -207,7 +207,7 @@
 </template>
 
 <script>
-import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/mes/pro/recipe";
+import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/technology/recipe";
 import Processcontent from "./content.vue";
 
 export default {