1.2.72

package.json

@@ -1,7 +1,7 @@
 {
   "name": "prodog-pc-client",
   "description": "Leanwo Prodog Client",
-  "version": "1.2.71",
+  "version": "1.2.72",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "ins": "npm install --registry=http://wuzhixin.vip:4873 -force",
@@ -19,7 +19,7 @@
     "click-outside-vue3": "^4.0.1",
     "client-base-v4": "^4.0.100",
     "client-dic-v3": "^3.0.48",
-    "client-eam-v3": "^3.0.84",
+    "client-eam-v3": "^3.0.85",
     "client-role-v3": "^3.0.24",
     "client-sensor-v3": "^1.0.2",
     "client-wms-v3": "^3.1.1",

src/routes/route-base-v4.js

@@ -60,8 +60,6 @@ import {
     PrinterConfiguration,
     CurdWindow1,
     ShortcutMenu,
-    AssetsDisposal,
-    ExecuteAssetDisposal,
 } from 'client-base-v4/dist/client-base-v4.js';
 
 
@@ -116,8 +114,6 @@ const router = [
 
             // 快捷菜单
             { path: 'shortcutMenu',name:'ShortcutMenu', component: ShortcutMenu },
-            { path: 'disposalApplication', component: AssetsDisposal },
-            { path: 'executeAssetDisposal', component: ExecuteAssetDisposal },
 
             // CRUD编辑窗口
             // eslint-disable-next-line

src/routes/route-eam-v3.js

@@ -36,10 +36,13 @@ import {
     AssetLabelPrint,
     AssetLabelPrinting,
     InventoryAssetInstanceSearch,
-    RunDataArchive, 
+    RunDataArchive,
     AssetRfidRecord,
     BatchUploadImages,
-    AssetInstanceFullCalendar
+    AssetInstanceFullCalendar,
+    InventoryGlobalView,
+    AssetsDisposal,
+    ExecuteAssetDisposal,
 } from 'client-eam-v3/dist/client-eam-v3.js';
 
 
@@ -273,6 +276,9 @@ const routes = [
     { path: '/eam/assetRfidRecord', component: AssetRfidRecord },
     { path: '/eam/batchUploadImages', component: BatchUploadImages },
     { path: '/eam/assetInstanceFullCalendar', component: AssetInstanceFullCalendar },
+    { path: '/eam/inventoryGlobalView', component: InventoryGlobalView, },
+    { path: '/eam/disposalApplication', component: AssetsDisposal }, // 处置申请单
+    { path: '/eam/executeAssetDisposal', component: ExecuteAssetDisposal }, // 执行处置
 ];