lilei 3 lat temu
rodzic
commit
0173a17f8c

+ 75 - 75
src/config/router.config.js

@@ -319,31 +319,31 @@ export const asyncRouterMap = [
               }
             ]
           },
-          {
-            path: '/salesManagement/salesman',
-            redirect: '/salesManagement/salesman/list',
-            name: 'salesman',
-            component: BlankLayout,
-            meta: {
-              title: '业务员管理',
-              icon: 'file-search',
-              permission: 'M_salesman_list'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesmanList',
-                component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesman/list.vue'),
-                meta: {
-                  title: '业务员列表',
-                  icon: 'file-search',
-                  hidden: true,
-                  permission: 'M_salesman_list'
-                }
-              }
-            ]
-          }
+          // {
+          //   path: '/salesManagement/salesman',
+          //   redirect: '/salesManagement/salesman/list',
+          //   name: 'salesman',
+          //   component: BlankLayout,
+          //   meta: {
+          //     title: '业务员管理',
+          //     icon: 'file-search',
+          //     permission: 'M_salesman_list'
+          //   },
+          //   hideChildrenInMenu: true,
+          //   children: [
+          //     {
+          //       path: 'list',
+          //       name: 'salesmanList',
+          //       component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesman/list.vue'),
+          //       meta: {
+          //         title: '业务员列表',
+          //         icon: 'file-search',
+          //         hidden: true,
+          //         permission: 'M_salesman_list'
+          //       }
+          //     }
+          //   ]
+          // }
         ]
       },
       // 采购管理
@@ -1149,31 +1149,31 @@ export const asyncRouterMap = [
               }
             ]
           },
-          {
-            path: '/inventoryManagement/inventoryImport',
-            redirect: '/inventoryManagement/inventoryImport/list',
-            name: 'inventoryImport',
-            component: BlankLayout,
-            meta: {
-              title: '库存导入',
-              icon: 'frown'
-              // permission: 'M_bulkReturnGoodsList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'inventoryImportList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryImport/list.vue'),
-                meta: {
-                  title: '库存导入列表',
-                  icon: 'frown',
-                  hidden: true
-                  // permission: 'M_bulkReturnGoodsList'
-                }
-              }
-            ]
-          },
+          // {
+          //   path: '/inventoryManagement/inventoryImport',
+          //   redirect: '/inventoryManagement/inventoryImport/list',
+          //   name: 'inventoryImport',
+          //   component: BlankLayout,
+          //   meta: {
+          //     title: '库存导入',
+          //     icon: 'frown'
+          //     // permission: 'M_bulkReturnGoodsList'
+          //   },
+          //   hideChildrenInMenu: true,
+          //   children: [
+          //     {
+          //       path: 'list',
+          //       name: 'inventoryImportList',
+          //       component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryImport/list.vue'),
+          //       meta: {
+          //         title: '库存导入列表',
+          //         icon: 'frown',
+          //         hidden: true
+          //         // permission: 'M_bulkReturnGoodsList'
+          //       }
+          //     }
+          //   ]
+          // },
           {
             path: '/inventoryManagement/warehouse',
             redirect: '/inventoryManagement/warehouse/list',
@@ -1328,31 +1328,31 @@ export const asyncRouterMap = [
               }
             ]
           },
-          {
-            path: '/bulkManagement/bulkImport',
-            redirect: '/bulkManagement/bulkImport/list',
-            name: 'bulkImport',
-            component: BlankLayout,
-            meta: {
-              title: '散件导入',
-              icon: 'frown'
-              // permission: 'M_bulkReturnGoodsList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'bulkImportList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkImport/list.vue'),
-                meta: {
-                  title: '散件导入列表',
-                  icon: 'frown',
-                  hidden: true
-                  // permission: 'M_bulkReturnGoodsList'
-                }
-              }
-            ]
-          }
+          // {
+          //   path: '/bulkManagement/bulkImport',
+          //   redirect: '/bulkManagement/bulkImport/list',
+          //   name: 'bulkImport',
+          //   component: BlankLayout,
+          //   meta: {
+          //     title: '散件导入',
+          //     icon: 'frown'
+          //     // permission: 'M_bulkReturnGoodsList'
+          //   },
+          //   hideChildrenInMenu: true,
+          //   children: [
+          //     {
+          //       path: 'list',
+          //       name: 'bulkImportList',
+          //       component: () => import(/* webpackChunkName: "shop" */ '@/views/bulkManagement/bulkImport/list.vue'),
+          //       meta: {
+          //         title: '散件导入列表',
+          //         icon: 'frown',
+          //         hidden: true
+          //         // permission: 'M_bulkReturnGoodsList'
+          //       }
+          //     }
+          //   ]
+          // }
         ]
       },
       // 报表

+ 2 - 2
src/layouts/RouteView.vue

@@ -26,8 +26,8 @@ export default {
     // if (!getters.multiTab && !meta.keepAlive) {
     //   return notKeep
     // }
-    return this.keepAlive || getters.multiTab || meta.keepAlive ? inKeep : notKeep
-    // return meta.keepAlive ? inKeep : notKeep
+    // return this.keepAlive || getters.multiTab || meta.keepAlive ? inKeep : notKeep
+    return meta.keepAlive ? inKeep : notKeep
   }
 }
 </script>

+ 8 - 0
src/views/salesManagement/salesQuery/detail.vue

@@ -237,6 +237,14 @@ export default {
   },
   mounted () {
     this.getDetail()
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (!vm.disabled) {
+        vm.getDetail()
+        vm.$refs.table.refresh()
+      }
+    })
   }
 }
 </script>

+ 8 - 0
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -182,6 +182,14 @@ export default {
   },
   mounted () {
     this.getDetail()
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (!vm.disabled) {
+        vm.getDetail()
+        vm.$refs.table.refresh()
+      }
+    })
   }
 }
 </script>