前端

src/api/V2/warehouse/index.js

@@ -88,10 +88,8 @@ export const API_POST_EXPORTOUT = '/warehouseBaseInfo/exportOut'
 export const API_GET_PRINT = '/commonConstantFalse/getInfo'
 // 仓位号
 export const API_GET_WAREHOUSE_BINNUMBER = '/warehouseBaseInfo/getWarehouse'
-<<<<<<< HEAD
 // 储量明细
 export const API_GET_WAREHOUSE_BASEINFO_RESERVES = '/warehouseBaseInfo/reservesDetails'
-=======
 //添加折转
 export const API_POST_TURNAROUND_ADD = '/turnInfo/api/addTurn'
 //折转列表
@@ -100,7 +98,3 @@ export const API_GET_TURNAROUND_LIST = '/turnInfo/selectTurnInfo'
 export const API_GET_TURNAROUND_XIALA = '/turnInfo/getPositionAndGoodsName'
 //折转后货名
 export const API_get_goodsName_All = '/commonSysParameter/getInfo'
-
-
-
->>>>>>> origin

src/model/warehouse/index.js

@@ -43,14 +43,12 @@ import {
     API_GET_PRINT,
     API_POST_EXPORTOUT,
     API_GET_WAREHOUSE_BINNUMBER,
-<<<<<<< HEAD
-    API_GET_WAREHOUSE_BASEINFO_RESERVES
-=======
+
+    API_GET_WAREHOUSE_BASEINFO_RESERVES,
     API_GET_TURNAROUND_LIST,
     API_POST_TURNAROUND_ADD,
     API_GET_TURNAROUND_XIALA,
     API_get_goodsName_All,
->>>>>>> origin
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表

src/views/warehouse/component/router/index.js

@@ -268,7 +268,6 @@
 //     {
 //       path: 'warehouseManagementNoComplete',
             
-<<<<<<< HEAD
 //       component: () =>
 //         import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementNoComplete'),
 //       name: 'warehouseManagementNoComplete',
@@ -392,144 +391,3 @@
 //   ],
 // };
 // export default warehouseManagementRouter;
-=======
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementNoComplete'),
-      name: 'warehouseManagementNoComplete',
-      meta: {
-        title: 'warehouseManagementNoComplete',
-        shortcutEntrance: 'warehouseManagementNoComplete',
-        module: 'warehouseManagement.warehouse.warehouseInfo.view',
-        permissicon: [],
-        keepAlive: true
-      },
-      hidden:true
-    },
-    {
-      path: 'warehouseManagementPerfectput',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementPerfectput'),
-      name: 'warehouseManagementPerfectput',
-      meta: {
-        title: 'warehouseManagementPerfectput',
-        shortcutEntrance: 'warehouseManagementPerfectput',
-        module: 'warehouseManagement.warehouse.warehouseInfo.in',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    {
-      path: 'warehouseManagementNoWeightIn',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementNoWeightIn'),
-      name: 'warehouseManagementNoWeightIn',
-      meta: {
-        title: 'warehouseManagementNoWeightIn',
-        shortcutEntrance: 'warehouseManagementNoWeightIn',
-        module: 'warehouseManagement.warehouse.warehouseInfo.in',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    {
-      path: 'warehouseManagementPerfectDelivery',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementPerfectDelivery'),
-      name: 'warehouseManagementPerfectDelivery',
-      meta: {
-        title: 'warehouseManagementPerfectDelivery',
-        shortcutEntrance: 'warehouseManagementPerfectDelivery',
-        module: 'warehouseManagement.warehouse.warehouseInfo.out',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    {
-      path: 'warehouseManagementNoWeightOut',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementNoWeightOut'),
-      name: 'warehouseManagementNoWeightOut',
-      meta: {
-        title: 'warehouseManagementNoWeightOut',
-        shortcutEntrance: 'warehouseManagementNoWeightOut',
-        module: 'warehouseManagement.warehouse.warehouseInfo.out',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    // 出入库任务
-    {
-      path: 'warehouseManagementPutOut',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementPutOut'),
-      name: 'warehouseManagementPutOut',
-      meta: {
-        title: 'warehouseManagementPutOut',
-        shortcutEntrance: 'warehouseManagementPutOut',
-        module: 'warehouse.warehouseManagementPutOut',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
-    // 出入库任务查看
-    {
-      path: 'warehouseManagementPutOutLook',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementPutOutLook'),
-      name: 'warehouseManagementPutOutLook',
-      meta: {
-        title: 'warehouseManagementPutOutLook',
-        shortcutEntrance: 'warehouseManagementPutOutLook',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    }, 
-    // 出入库任务列表
-    {
-      path: 'tranManagementWarehouseInOutTask',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/tranManagementWarehouseInOutTask'),
-      name: 'tranManagementWarehouseInOutTask',
-      meta: {
-        title: 'tranManagementWarehouseInOutTask',
-        shortcutEntrance: 'tranManagementWarehouseInOutTask',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    }, 
-    // 折转
-    {
-      path: 'transformation',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/transformation'),
-      name: 'transformation',
-      meta: {
-        title: 'transformation',
-        shortcutEntrance: 'transformation',
-        module: 'warehouseManagement.warehouse.warehouseInfo',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },                                    
-  ],
-};
-export default warehouseManagementRouter;
->>>>>>> origin