lilei 2 tahun lalu
induk
melakukan
2efd0d1f01

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

@@ -715,7 +715,32 @@ export const asyncRouterMap = [
                 }
               }
             ]
-          }
+          },
+          {
+            path: '/salesReturnManagement/returnConfirmation',
+            redirect: '/salesReturnManagement/returnConfirmation/list',
+            name: 'returnConfirmation',
+            component: BlankLayout,
+            meta: {
+              title: '销售退货确认',
+              icon: 'vertical-align-top',
+              permission: 'M_returnConfirmationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'returnConfirmationList',
+                component: () => import(/* webpackChunkName: "salesReturnManagement" */ '@/views/salesReturnManagement/returnConfirmation/list.vue'),
+                meta: {
+                  title: '销售退货确认列表',
+                  icon: 'vertical-align-top',
+                  hidden: true,
+                  permission: 'M_returnConfirmationList'
+                }
+              }
+            ]
+          },
         ]
       },
       // 采购管理
@@ -828,7 +853,7 @@ export const asyncRouterMap = [
       // 财务管理
       {
         path: '/financialManagement',
-        redirect: '/financialManagement/returnConfirmation',
+        redirect: '/financialManagement/warehousingConfirmation',
         component: PageView,
         meta: {
           title: '财务管理',
@@ -861,92 +886,6 @@ export const asyncRouterMap = [
               }
             ]
           },
-          {
-            path: '/financialManagement/returnConfirmation',
-            redirect: '/financialManagement/returnConfirmation/list',
-            name: 'returnConfirmation',
-            component: BlankLayout,
-            meta: {
-              title: '销售退货确认',
-              icon: 'vertical-align-top',
-              permission: 'M_returnConfirmationList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'returnConfirmationList',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/returnConfirmation/list.vue'),
-                meta: {
-                  title: '销售退货确认列表',
-                  icon: 'vertical-align-top',
-                  hidden: true,
-                  permission: 'M_returnConfirmationList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/financialManagement/allocateReturnConfirmation',
-            redirect: '/financialManagement/allocateReturnConfirmation/list',
-            name: 'allocateReturnConfirmation',
-            component: BlankLayout,
-            meta: {
-              title: '调拨退货确认',
-              icon: 'vertical-align-top',
-              permission: 'M_allocateReturnConfirmationList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'allocateReturnConfirmationList',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/allocateReturnConfirmation/list.vue'),
-                meta: {
-                  title: '调拨退货确认列表',
-                  icon: 'vertical-align-top',
-                  hidden: true,
-                  permission: 'M_allocateReturnConfirmationList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/financialManagement/inventoryConfirmation',
-            redirect: '/financialManagement/inventoryConfirmation/list',
-            name: 'inventoryConfirmation',
-            component: BlankLayout,
-            meta: {
-              title: '盘点确认',
-              icon: 'monitor',
-              permission: 'M_inventoryConfirmationList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'inventoryConfirmationList',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/inventoryConfirmation/list.vue'),
-                meta: {
-                  title: '盘点确认列表',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'M_inventoryConfirmationList'
-                }
-              },
-              {
-                path: 'detail/:sn',
-                name: 'inventoryConfirmationDetail',
-                component: () => import(/* webpackChunkName: "financialManagement" */ '@/views/financialManagement/inventoryConfirmation/detail.vue'),
-                meta: {
-                  title: '盘点确认详情',
-                  icon: 'monitor',
-                  hidden: true,
-                  permission: 'B_inventoryConfirmationDetail'
-                }
-              }
-            ]
-          },
           {
             path: '/financialManagement/financialCollection',
             redirect: '/financialManagement/financialCollection/list',
@@ -1276,6 +1215,42 @@ export const asyncRouterMap = [
               }
             ]
           },
+          {
+            path: '/inventoryManagement/inventoryConfirmation',
+            redirect: '/inventoryManagement/inventoryConfirmation/list',
+            name: 'inventoryConfirmation',
+            component: BlankLayout,
+            meta: {
+              title: '盘点确认',
+              icon: 'monitor',
+              permission: 'M_inventoryConfirmationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'inventoryConfirmationList',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryConfirmation/list.vue'),
+                meta: {
+                  title: '盘点确认列表',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'M_inventoryConfirmationList'
+                }
+              },
+              {
+                path: 'detail/:sn',
+                name: 'inventoryConfirmationDetail',
+                component: () => import(/* webpackChunkName: "inventoryManagement" */ '@/views/inventoryManagement/inventoryConfirmation/detail.vue'),
+                meta: {
+                  title: '盘点确认详情',
+                  icon: 'monitor',
+                  hidden: true,
+                  permission: 'B_inventoryConfirmationDetail'
+                }
+              }
+            ]
+          },
           {
             path: '/inventoryManagement/inventoryWarning',
             redirect: '/inventoryManagement/inventoryWarning/list',
@@ -1562,6 +1537,31 @@ export const asyncRouterMap = [
                 }
               }
             ]
+          },
+          {
+            path: '/allocationManagement/allocateReturnConfirmation',
+            redirect: '/allocationManagement/allocateReturnConfirmation/list',
+            name: 'allocateReturnConfirmation',
+            component: BlankLayout,
+            meta: {
+              title: '调拨退货确认',
+              icon: 'vertical-align-top',
+              permission: 'M_allocateReturnConfirmationList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'allocateReturnConfirmationList',
+                component: () => import(/* webpackChunkName: "allocationManagement" */ '@/views/allocationManagement/allocateReturnConfirmation/list.vue'),
+                meta: {
+                  title: '调拨退货确认列表',
+                  icon: 'vertical-align-top',
+                  hidden: true,
+                  permission: 'M_allocateReturnConfirmationList'
+                }
+              }
+            ]
           }
         ]
       },

+ 0 - 0
src/views/financialManagement/allocateReturnConfirmation/detailModal.vue → src/views/allocationManagement/allocateReturnConfirmation/detailModal.vue


+ 0 - 0
src/views/financialManagement/allocateReturnConfirmation/list.vue → src/views/allocationManagement/allocateReturnConfirmation/list.vue


+ 1 - 1
src/views/financialManagement/inventoryConfirmation/detail.vue → src/views/inventoryManagement/inventoryConfirmation/detail.vue

@@ -169,7 +169,7 @@ export default {
   methods: {
     //  返回列表
     handleBack () {
-      this.$router.push({ path: '/financialManagement/inventoryConfirmation/list', query: { closeLastOldTab: true } })
+      this.$router.push({ name: 'inventoryConfirmationList', query: { closeLastOldTab: true } })
     },
     // 重置
     resetSearchForm () {

+ 1 - 1
src/views/financialManagement/inventoryConfirmation/list.vue → src/views/inventoryManagement/inventoryConfirmation/list.vue

@@ -154,7 +154,7 @@ export default {
     // 详情
     handleDetail (row) {
       if (this.$hasPermissions('B_inventoryConfirmationDetail')) {
-        this.$router.push({ path: `/financialManagement/inventoryConfirmation/detail/${row.checkWarehouseSn}` })
+        this.$router.push({ name:"inventoryConfirmationDetail",params:{sn:row.checkWarehouseSn} })
       }
     },
     // 盘点确认

+ 0 - 0
src/views/financialManagement/returnConfirmation/detailModal.vue → src/views/salesReturnManagement/returnConfirmation/detailModal.vue


+ 0 - 0
src/views/financialManagement/returnConfirmation/list.vue → src/views/salesReturnManagement/returnConfirmation/list.vue