From 17212721632f3a616b8cbf81bf4c89f95e43ffa0 Mon Sep 17 00:00:00 2001
From: pengsong <13980968324@163.com>
Date: Sun, 17 Dec 2023 16:55:18 +0800
Subject: [PATCH 1/2] keep-alive

---
 src/page/index/index.vue  |    4 +-
 src/page/index/layout.vue |    1 -
 src/router/views/index.js | 2363 ++++++++++++++++++-------------------
 3 files changed, 1180 insertions(+), 1188 deletions(-)

diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index 00a8915d..7956fd32 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -15,9 +15,9 @@
         <!-- 主体视图层 -->
         <div id="avue-view" v-show="!isSearch" v-if="isRefresh">
           <router-view #="{ Component }">
-            <!-- <keep-alive> -->
+            <keep-alive :include="$store.getters.tagsKeep">
               <component :is="Component" />
-            <!-- </keep-alive> -->
+            </keep-alive>
           </router-view>
         </div>
       </div>
diff --git a/src/page/index/layout.vue b/src/page/index/layout.vue
index ef13a581..0439730f 100644
--- a/src/page/index/layout.vue
+++ b/src/page/index/layout.vue
@@ -1,6 +1,5 @@
 <template>
   <router-view #="{ Component }">
-    <!-- {{ $store.getters.tagsKeep }} -->
     <keep-alive :include="$store.getters.tagsKeep">
       <component :is="Component" />
     </keep-alive>
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 058e8fda..84c17f65 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1,1378 +1,1371 @@
-import Layout from '@/page/index/layout.vue';
+import Layout from '@/page/index/index.vue';
 import Store from '@/store/';
 
 export default [
+
   {
-    path: '/',
-    component: () =>
-      Store.getters.isMacOs ? import('@/mac/index.vue') : import('@/page/index/index.vue'),
-    redirect: '/wel',
-    children: [
-      {
-        path: '/wel',
-        component: Layout,
-        redirect: '/wel/index',
-        children: [
-          {
-            path: 'index',
-            name: '首页',
-            meta: {
-              i18n: 'dashboard',
-            },
-            component: () => import(/* webpackChunkName: "views" */ '@/views/wel/index.vue'),
-          },
-          {
-            path: 'dashboard',
-            name: '控制台',
-            meta: {
-              i18n: 'dashboard',
-              menu: false,
-            },
-            component: () => import(/* webpackChunkName: "views" */ '@/views/wel/dashboard.vue'),
-          },
-        ],
-      },
-      {
-        path: '/distribution',
-        name: '统计页面',
+    path: '/wel',
+    component: Layout,
+    redirect: '/wel/index',
+    children: [
+      {
+        path: 'index',
+        name: '首页',
+        meta: {
+          i18n: 'dashboard',
+        },
+        component: () => import(/* webpackChunkName: "views" */ '@/views/wel/index.vue'),
+      },
+      {
+        path: 'dashboard',
+        name: '控制台',
         meta: {
           i18n: 'dashboard',
           menu: false,
         },
-        redirect: '/distribution/distributionStockArticleFrom',
-        component: Layout,
-        children: [
-          {
-            path: 'distributionStockArticleFrom',
-            component: () => import('@/views/distribution/inventory/distributionStockArticleFrom.vue'),
-          },
-        ],
-      },
-      {
-        path: '/basicdata',
-        redirect: '/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails',
-        component: Layout,
-        children: [
-          {
-            path: 'warehouse/goodsAllocation/BasicdataGoodsAllocationDetails',
-            name: '详情',
-            meta: {
-              i18n: 'dict',
-            },
-            query: {},
-            props: route => ({
-              name: route.query.name,
-              info: route.query.info,
-            }),
-            component: () =>
-              import('@/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue'),
-          },
-        ],
-      },
-      {
-        path: '/basicdata',
-        component: Layout,
-        redirect: '/basicdata/vehicle/basicdtaVehicleAddForm',
-        children: [
-          {
-            path: 'vehicle/basicdtaVehicleAddForm',
-            name: '车辆添加',
-            meta: {
-              i18n: 'dict',
-            },
-            component: () => import('@/views/basicdata/vehicle/basicdtaVehicleAddForm.vue'),
-          },
-        ],
-      },
-      {
-        path: '/test',
-        component: Layout,
-        redirect: '/test/index',
-        children: [
-          {
-            path: 'index',
-            name: '测试页',
-            meta: {
-              i18n: 'test',
-            },
-            component: () => import(/* webpackChunkName: "views" */ '@/views/util/test.vue'),
-          },
-        ],
-      },
-      {
-        path: '/dict-horizontal',
-        component: Layout,
-        redirect: '/dict-horizontal/index',
-        children: [
-          {
-            path: 'index',
-            name: '字典管理',
-            meta: {
-              i18n: 'dict',
-            },
-            component: () =>
-              import(/* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal.vue'),
-          },
-        ],
-      },
-      {
-        path: '/dict-vertical',
-        component: Layout,
-        redirect: '/dict-vertical/index',
-        children: [
-          {
-            path: 'index',
-            name: '字典管理',
-            meta: {
-              i18n: 'dict',
-            },
-            component: () =>
-              import(/* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical.vue'),
-          },
-        ],
-      },
-      {
-        path: '/info',
-        component: Layout,
-        redirect: '/info/index',
-        children: [
-          {
-            path: 'index',
-            name: '个人信息',
-            meta: {
-              i18n: 'info',
-            },
-            component: () => import(/* webpackChunkName: "views" */ '@/views/system/userinfo.vue'),
-          },
-        ],
-      },
-      {
-        path: '/work/process/leave',
-        component: Layout,
-        redirect: '/work/process/leave/form',
-        children: [
-          {
-            path: 'form/:processDefinitionId',
-            name: '请假流程',
-            meta: {
-              i18n: 'work',
-            },
-            component: () =>
-              import(/* webpackChunkName: "views" */ '@/views/work/process/leave/form.vue'),
-          },
-          {
-            path: 'handle/:taskId/:processInstanceId/:businessId',
-            name: '处理请假流程',
-            meta: {
-              i18n: 'work',
-            },
-            component: () =>
-              import(/* webpackChunkName: "views" */ '@/views/work/process/leave/handle.vue'),
-          },
-          {
-            path: 'detail/:processInstanceId/:businessId',
-            name: '请假流程详情',
-            meta: {
-              i18n: 'work',
-            },
-            component: () =>
-              import(/* webpackChunkName: "views" */ '@/views/work/process/leave/detail.vue'),
-          },
-        ],
-      },
-      {
-        path: '/distribution/artery',
-        component: Layout,
-        redirect: '/distribution/artery/zeroAdditionalRecording',
-        children: [
-          {
-            path: 'zeroAdditionalRecording',
-            name: '零担补录',
-            meta: {
-              i18n: 'data',
-            },
-            component: () =>
-              import(
+        component: () => import(/* webpackChunkName: "views" */ '@/views/wel/dashboard.vue'),
+      },
+    ],
+  },
+  {
+    path: '/distribution',
+    name: '统计页面',
+    meta: {
+      i18n: 'dashboard',
+      menu: false,
+    },
+    redirect: '/distribution/distributionStockArticleFrom',
+    component: Layout,
+    children: [
+      {
+        path: 'distributionStockArticleFrom',
+        component: () => import('@/views/distribution/inventory/distributionStockArticleFrom.vue'),
+      },
+    ],
+  },
+  {
+    path: '/basicdata',
+    redirect: '/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails',
+    component: Layout,
+    children: [
+      {
+        path: 'warehouse/goodsAllocation/BasicdataGoodsAllocationDetails',
+        name: '详情',
+        meta: {
+          i18n: 'dict',
+        },
+        query: {},
+        props: route => ({
+          name: route.query.name,
+          info: route.query.info,
+        }),
+        component: () =>
+          import('@/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue'),
+      },
+    ],
+  },
+  {
+    path: '/basicdata',
+    component: Layout,
+    redirect: '/basicdata/vehicle/basicdtaVehicleAddForm',
+    children: [
+      {
+        path: 'vehicle/basicdtaVehicleAddForm',
+        name: '车辆添加',
+        meta: {
+          i18n: 'dict',
+        },
+        component: () => import('@/views/basicdata/vehicle/basicdtaVehicleAddForm.vue'),
+      },
+    ],
+  },
+  {
+    path: '/test',
+    component: Layout,
+    redirect: '/test/index',
+    children: [
+      {
+        path: 'index',
+        name: '测试页',
+        meta: {
+          i18n: 'test',
+        },
+        component: () => import(/* webpackChunkName: "views" */ '@/views/util/test.vue'),
+      },
+    ],
+  },
+  {
+    path: '/dict-horizontal',
+    component: Layout,
+    redirect: '/dict-horizontal/index',
+    children: [
+      {
+        path: 'index',
+        name: '字典管理',
+        meta: {
+          i18n: 'dict',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal.vue'),
+      },
+    ],
+  },
+  {
+    path: '/dict-vertical',
+    component: Layout,
+    redirect: '/dict-vertical/index',
+    children: [
+      {
+        path: 'index',
+        name: '字典管理',
+        meta: {
+          i18n: 'dict',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical.vue'),
+      },
+    ],
+  },
+  {
+    path: '/info',
+    component: Layout,
+    redirect: '/info/index',
+    children: [
+      {
+        path: 'index',
+        name: '个人信息',
+        meta: {
+          i18n: 'info',
+        },
+        component: () => import(/* webpackChunkName: "views" */ '@/views/system/userinfo.vue'),
+      },
+    ],
+  },
+  {
+    path: '/work/process/leave',
+    component: Layout,
+    redirect: '/work/process/leave/form',
+    children: [
+      {
+        path: 'form/:processDefinitionId',
+        name: '请假流程',
+        meta: {
+          i18n: 'work',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/work/process/leave/form.vue'),
+      },
+      {
+        path: 'handle/:taskId/:processInstanceId/:businessId',
+        name: '处理请假流程',
+        meta: {
+          i18n: 'work',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/work/process/leave/handle.vue'),
+      },
+      {
+        path: 'detail/:processInstanceId/:businessId',
+        name: '请假流程详情',
+        meta: {
+          i18n: 'work',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/work/process/leave/detail.vue'),
+      },
+    ],
+  },
+  {
+    path: '/distribution/artery',
+    component: Layout,
+    redirect: '/distribution/artery/zeroAdditionalRecording',
+    children: [
+      {
+        path: 'zeroAdditionalRecording',
+        name: '零担补录',
+        meta: {
+          i18n: 'data',
+        },
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/distribution/artery/zeroAdditionalRecording.vue'
-              ),
-          },
-          {
-            path: 'AddVehicleStowage',
-            name: '新增配载',
-            meta: {
-              i18n: 'data',
-            },
-            component: () =>
-              import(
+          ),
+      },
+      {
+        path: 'AddVehicleStowage',
+        name: '新增配载',
+        meta: {
+          i18n: 'data',
+        },
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/distribution/artery/AddVehicleStowage.vue'
-              ),
-          },
-          {
-            path: 'truckLoadingDetails',
-            name: '装车明细',
-            meta: {
-              i18n: 'data',
-            },
-            component: () =>
-              import(
+          ),
+      },
+      {
+        path: 'truckLoadingDetails',
+        name: '装车明细',
+        meta: {
+          i18n: 'data',
+        },
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/distribution/artery/truckLoadingDetails.vue'
-              ),
-          },
-          {
-            path: 'addTripartiteTransfer',
-            name: '新增中转',
-            meta: {
-              i18n: 'data',
-            },
-            component: () =>
-              import(
+          ),
+      },
+      {
+        path: 'addTripartiteTransfer',
+        name: '新增中转',
+        meta: {
+          i18n: 'data',
+        },
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/distribution/artery/addTripartiteTransfer.vue'
-              ),
-          },
-          {
-            path: 'TripartiteTransferDetails',
-            name: '中转详情',
-            meta: {
-              i18n: 'data',
-            },
-            component: () =>
-              import(
+          ),
+      },
+      {
+        path: 'TripartiteTransferDetails',
+        name: '中转详情',
+        meta: {
+          i18n: 'data',
+        },
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/distribution/artery/TripartiteTransferDetails.vue'
-              ),
-          },
-        ],
-      },
-      // {
-      //   path: '/basic/pdarecords/basicPdarecords',
-      //   name:'pda维修记录',
-      //   meta:{
-      //     i18n:'work'
-      //   },
-      //   component: () => import(/* webpackChunkName: "views" */ '@/views/basic/pdarecords/basicPdarecords.vue'),
-      // },
+          ),
+      },
+    ],
+  },
+  // {
+  //   path: '/basic/pdarecords/basicPdarecords',
+  //   name:'pda维修记录',
+  //   meta:{
+  //     i18n:'work'
+  //   },
+  //   component: () => import(/* webpackChunkName: "views" */ '@/views/basic/pdarecords/basicPdarecords.vue'),
+  // },
+  {
+    path: '/basic/pdarecords/basicPdarecords',
+    component: Layout,
+    key: 'fullPath',
+    redirect: '/basic/pdarecords',
+    children: [
       {
         path: '/basic/pdarecords/basicPdarecords',
-        component: Layout,
-        key: 'fullPath',
-        redirect: '/basic/pdarecords',
-        children: [
-          {
-            path: '/basic/pdarecords/basicPdarecords',
-            name: 'pad编辑',
-            meta: {
-              data: 'data',
-            },
-            component: () =>
-              import(/* webpackChunkName: "views" */ '@/views/basic/pdarecords/basicPdarecords.vue'),
-          },
-        ],
-      },
-      {
-        path: '/distribution/inventory',
-        component: Layout,
-        // key: 'fullPath',
-        redirect: '/distribution/inventory/arteryDistrilbutionBillLadingList',
-        children: [
-          {
-            path: '/distribution/inventory/arteryDistrilbutionBillLadingList',
-            name: '干线提货管理',
-            meta: {
-              data: 'data',
-            },
-            component: () =>
-              import('@/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue'),
-          },
-          {
-            path: '/distribution/inventory/arteryDistrilbutionBillLadingListDetails',
-            name: '干线提货管理详情',
-            meta: {
-              data: 'data',
-            },
-            component: () =>
-              import(
+        name: 'pad编辑',
+        meta: {
+          data: 'data',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/basic/pdarecords/basicPdarecords.vue'),
+      },
+    ],
+  },
+  {
+    path: '/distribution/inventory',
+    component: Layout,
+    // key: 'fullPath',
+    redirect: '/distribution/inventory/arteryDistrilbutionBillLadingList',
+    children: [
+      {
+        path: '/distribution/inventory/arteryDistrilbutionBillLadingList',
+        name: '干线提货管理',
+        meta: {
+          data: 'data',
+        },
+        component: () =>
+          import('@/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue'),
+      },
+      {
+        path: '/distribution/inventory/arteryDistrilbutionBillLadingListDetails',
+        name: '干线提货管理详情',
+        meta: {
+          data: 'data',
+        },
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue'
-              ),
-          },
-          {
-            path: '/distribution/inventory/BookingNote',
-            name: '货物托运单',
-            meta: {
-              data: 'data',
-            },
-            component: () =>
-              import(/* webpackChunkName: "views" */ '@/views/distribution/inventory/BookingNote.vue'),
-          },
-          {
-            path: '/distribution/inventory/CreateOrder',
-            name: '创建订单',
-            meta: {
-              data: 'data',
-            },
-            component: () =>
-              import(/* webpackChunkName: "views" */ '@/views/distribution/inventory/CreateOrder.vue'),
-          },
-        ],
-      },
-      {
-        path: '/waybill',
-        component: Layout,
-        key: 'fullPath',
-        redirect: '/waybill/orderPackageListDetails',
-        children: [
-          // 包明细
-          {
-            path: 'orderPackageListDetails',
-            meta: {
-              data: 'data',
-              keepAlive: true,
-            },
-            component: () => import('@/views/waybill/orderPackageListDetails.vue'),
-          },
-          {
-            path: 'EditCustomerInfo/:ids/:info',
-            name: '客户信息修改',
-            meta: {
-              i18n: 'dict',
-              keepAlive: true,
-            },
-            component: () => import('@/views/waybill/EditCustomerInfo.vue'),
-          },
-          {
-            path: 'ComparativeStatement',
-            name: '对比报表',
-            meta: {
-              data: 'data',
-            },
-            component: () => import('@/views/waybill/ComparativeStatement.vue'),
-          },
-        ],
+          ),
+      },
+      {
+        path: '/distribution/inventory/BookingNote',
+        name: '货物托运单',
+        meta: {
+          data: 'data',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/distribution/inventory/BookingNote.vue'),
+      },
+      {
+        path: '/distribution/inventory/CreateOrder',
+        name: '创建订单',
+        meta: {
+          data: 'data',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/distribution/inventory/CreateOrder.vue'),
+      },
+    ],
+  },
+  {
+    path: '/waybill',
+    component: Layout,
+    key: 'fullPath',
+    redirect: '/waybill/orderPackageListDetails',
+    children: [
+      // 包明细
+      {
+        path: 'orderPackageListDetails',
+        meta: {
+          data: 'data',
+          keepAlive: true,
+        },
+        component: () => import('@/views/waybill/orderPackageListDetails.vue'),
+      },
+      {
+        path: 'EditCustomerInfo/:ids/:info',
+        name: '客户信息修改',
+        meta: {
+          i18n: 'dict',
+          keepAlive: true,
+        },
+        component: () => import('@/views/waybill/EditCustomerInfo.vue'),
       },
+      {
+        path: 'ComparativeStatement',
+        name: '对比报表',
+        meta: {
+          data: 'data',
+        },
+        component: () => import('@/views/waybill/ComparativeStatement.vue'),
+      },
+    ],
+  },
+  {
+    path: '/basic/pdarecords/basicPdarecordslist',
+    component: Layout,
+    key: 'fullPath',
+    redirect: '/basic/pdarecords',
+    children: [
       {
         path: '/basic/pdarecords/basicPdarecordslist',
-        component: Layout,
-        key: 'fullPath',
-        redirect: '/basic/pdarecords',
-        children: [
-          {
-            path: '/basic/pdarecords/basicPdarecordslist',
-            name: '维修总记录',
-            meta: {
-              data: 'data',
-            },
-            component: () =>
-              import(
+        name: '维修总记录',
+        meta: {
+          data: 'data',
+        },
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/basic/pdarecords/basicPdarecordslist.vue'
-              ),
-          },
-        ],
+          ),
       },
+    ],
+  },
+  {
+    path: '/basic/delinenode/basicDelineNode',
+    component: Layout,
+    redirect: '/basic/delinenode',
+    children: [
       {
         path: '/basic/delinenode/basicDelineNode',
-        component: Layout,
-        redirect: '/basic/delinenode',
-        children: [
-          {
-            path: '/basic/delinenode/basicDelineNode',
-            name: '提货线路节点',
-            meta: {
-              data: 'data',
-            },
-            component: () => import('@/views/basic/delinenode/basicDelineNode.vue'),
-          },
-        ],
+        name: '提货线路节点',
+        meta: {
+          data: 'data',
+        },
+        component: () => import('@/views/basic/delinenode/basicDelineNode.vue'),
       },
+    ],
+  },
+  {
+    path: '/factory/snm/staorderPackages',
+    component: Layout,
+    redirect: '/factory/snm',
+    children: [
       {
         path: '/factory/snm/staorderPackages',
-        component: Layout,
-        redirect: '/factory/snm',
-        children: [
-          {
-            path: '/factory/snm/staorderPackages',
-            name: '运单包件信息',
-            meta: {
-              data: 'data',
-            },
-            component: () => import('@/views/factory/snm/staorderPackages.vue'),
-          },
-        ],
+        name: '运单包件信息',
+        meta: {
+          data: 'data',
+        },
+        component: () => import('@/views/factory/snm/staorderPackages.vue'),
       },
+    ],
+  },
+  {
+    path: '/basicdata/brand/basicHistoricalContract',
+    component: Layout,
+    redirect: '/brand/basicHistoricalContract',
+    children: [
       {
         path: '/basicdata/brand/basicHistoricalContract',
-        component: Layout,
-        redirect: '/brand/basicHistoricalContract',
-        children: [
-          {
-            path: '/basicdata/brand/basicHistoricalContract',
-            name: '历史记录',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({ name: route.query.name, id: route.query.id }),
-            component: () =>
-              import(
+        name: '历史记录',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({ name: route.query.name, id: route.query.id }),
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicHistoricalContract.vue'
-              ),
-          },
-        ],
+          ),
       },
+    ],
+  },
+  {
+    path: '/basicdata/brand/basicStorageServices',
+    component: Layout,
+    redirect: '/brand/basicStorageServices',
+    children: [
       {
         path: '/basicdata/brand/basicStorageServices',
-        component: Layout,
-        redirect: '/brand/basicStorageServices',
-        children: [
-          {
-            path: '/basicdata/brand/basicStorageServices',
-            name: '服务仓',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({ name: route.query.name, id: route.query.id, type: route.query.type }),
-            component: () =>
-              import(
+        name: '服务仓',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({ name: route.query.name, id: route.query.id, type: route.query.type }),
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicStorageServices.vue'
-              ),
-          },
-        ],
+          ),
       },
+    ],
+  },
+  {
+    path: '/basicdata/brand/basicdataStoreBrand',
+    component: Layout,
+    redirect: '/brand/basicdataStoreBrand',
+    children: [
       {
         path: '/basicdata/brand/basicdataStoreBrand',
-        component: Layout,
-        redirect: '/brand/basicdataStoreBrand',
-        children: [
-          {
-            path: '/basicdata/brand/basicdataStoreBrand',
-            name: '品牌',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({ name: route.query.name, id: route.query.id }),
-            component: () =>
-              import(/* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataStoreBrand.vue'),
-          },
-        ],
+        name: '品牌',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({ name: route.query.name, id: route.query.id }),
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataStoreBrand.vue'),
       },
+    ],
+  },
+  {
+    path: '/basicdata/brand/basicZonePriceFrom',
+    component: Layout,
+    redirect: '/brand/basicZonePriceFrom',
+    children: [
       {
         path: '/basicdata/brand/basicZonePriceFrom',
-        component: Layout,
-        redirect: '/brand/basicZonePriceFrom',
-        children: [
-          {
-            path: '/basicdata/brand/basicZonePriceFrom',
-            name: '区域价格新增',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-              type: route.query.type,
-            }),
-            component: () =>
-              import(/* webpackChunkName: "views" */ '@/views/basicdata/brand/basicZonePriceFrom.vue'),
-          },
-        ],
-      },
+        name: '区域价格新增',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+          type: route.query.type,
+        }),
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/basicdata/brand/basicZonePriceFrom.vue'),
+      },
+    ],
+  },
+  {
+    path: '/basicdata/brand/basicdataFreightFrom',
+    component: Layout,
+    redirect: '/brand/basicdataFreightFrom',
+    children: [
       {
         path: '/basicdata/brand/basicdataFreightFrom',
-        component: Layout,
-        redirect: '/brand/basicdataFreightFrom',
-        children: [
-          {
-            path: '/basicdata/brand/basicdataFreightFrom',
-            name: '基础价格新增',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-              type: route.query.type,
-            }),
-            component: () =>
-              import(
+        name: '基础价格新增',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+          type: route.query.type,
+        }),
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataFreightFrom.vue'
-              ),
-          },
-        ],
+          ),
       },
+    ],
+  },
+  {
+    path: '/basicdata/brand/basicStoreContact',
+    component: Layout,
+    redirect: '/brand/basicStoreContact',
+    children: [
       {
         path: '/basicdata/brand/basicStoreContact',
-        component: Layout,
-        redirect: '/brand/basicStoreContact',
-        children: [
-          {
-            path: '/basicdata/brand/basicStoreContact',
-            name: '联系人',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-              type: route.query.type,
-            }),
-            component: () =>
-              import(/* webpackChunkName: "views" */ '@/views/basicdata/brand/basicStoreContact.vue'),
-          },
-        ],
-      },
+        name: '联系人',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+          type: route.query.type,
+        }),
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/basicdata/brand/basicStoreContact.vue'),
+      },
+    ],
+  },
+  {
+    path: '/basicdata/brand/basicdataCustomerBase',
+    component: Layout,
+    redirect: '/brand/basicdataCustomerBase',
+    children: [
       {
         path: '/basicdata/brand/basicdataCustomerBase',
-        component: Layout,
-        redirect: '/brand/basicdataCustomerBase',
-        children: [
-          {
-            path: '/basicdata/brand/basicdataCustomerBase',
-            name: '基地',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () =>
-              import(
+        name: '基地',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataCustomerBase.vue'
-              ),
-          },
-        ],
+          ),
       },
+    ],
+  },
+  {
+    path: '/basicdata/brand/basicdataCustomerStore',
+    component: Layout,
+    redirect: '/brand/basicdataCustomerStore',
+    children: [
       {
         path: '/basicdata/brand/basicdataCustomerStore',
-        component: Layout,
-        redirect: '/brand/basicdataCustomerStore',
-        children: [
-          {
-            path: '/basicdata/brand/basicdataCustomerStore',
-            name: '商场',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () =>
-              import(
+        name: '商场',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataCustomerStore.vue'
-              ),
-          },
-        ],
+          ),
       },
+    ],
+  },
+  {
+    path: '/basic/printTemplate/basicPrintTemplateFrom',
+    component: Layout,
+    redirect: '/basic/printTemplate',
+    children: [
       {
         path: '/basic/printTemplate/basicPrintTemplateFrom',
-        component: Layout,
-        redirect: '/basic/printTemplate',
-        children: [
-          {
-            path: '/basic/printTemplate/basicPrintTemplateFrom',
-            name: 'name',
-            meta: {
-              data: 'data',
-            },
-            component: () => import('@/views/basic/printTemplate/basicPrintTemplateFrom.vue'),
-          },
-        ],
+        name: 'name',
+        meta: {
+          data: 'data',
+        },
+        component: () => import('@/views/basic/printTemplate/basicPrintTemplateFrom.vue'),
       },
+    ],
+  },
+  {
+    path: '/basic/pda/basicPdaform',
+    component: Layout,
+    redirect: '/basic/pda',
+    children: [
       {
         path: '/basic/pda/basicPdaform',
-        component: Layout,
-        redirect: '/basic/pda',
-        children: [
-          {
-            path: '/basic/pda/basicPdaform',
-            name: 'pad信息',
-            meta: {},
-            component: () => import('@/views/basic/pda/basicPdaform.vue'),
-          },
-        ],
-      },
-      // 测试页面
+        name: 'pad信息',
+        meta: {},
+        component: () => import('@/views/basic/pda/basicPdaform.vue'),
+      },
+    ],
+  },
+  // 测试页面
+  {
+    path: '/basic/pda/basicPdatt',
+    component: Layout,
+    redirect: '/basic/pda',
+    children: [
       {
         path: '/basic/pda/basicPdatt',
-        component: Layout,
-        redirect: '/basic/pda',
-        children: [
-          {
-            path: '/basic/pda/basicPdatt',
-            name: 'pad信息',
-            meta: {},
-            component: () => import('@/views/basic/pda/basicPdatt.vue'),
-          },
-        ],
+        name: 'pad信息',
+        meta: {},
+        component: () => import('@/views/basic/pda/basicPdatt.vue'),
       },
+    ],
+  },
+  {
+    path: '/basic/property/basicPropertyform',
+    component: Layout,
+    redirect: '/basic/property',
+    children: [
       {
         path: '/basic/property/basicPropertyform',
-        component: Layout,
-        redirect: '/basic/property',
-        children: [
-          {
-            path: '/basic/property/basicPropertyform',
-            name: '编辑字段',
-            meta: {
-              data: 'data',
-            },
-            component: () => import('@/views/basic/property/basicPropertyform.vue'),
-          },
-        ],
+        name: '编辑字段',
+        meta: {
+          data: 'data',
+        },
+        component: () => import('@/views/basic/property/basicPropertyform.vue'),
       },
+    ],
+  },
+  {
+    path: '/distribution/reservation/reservationSubmitFrom',
+    component: Layout,
+    redirect: '/distribution/reservation/reservationSubmitFrom',
+    children: [
       {
         path: '/distribution/reservation/reservationSubmitFrom',
-        component: Layout,
-        redirect: '/distribution/reservation/reservationSubmitFrom',
-        children: [
-          {
-            path: '/distribution/reservation/reservationSubmitFrom',
-            name: '转预约单',
-            component: () => import('@/views/distribution/reservation/reservationSubmitFrom.vue'),
-          },
-        ],
+        name: '转预约单',
+        component: () => import('@/views/distribution/reservation/reservationSubmitFrom.vue'),
       },
+    ],
+  },
+  {
+    path: '/distribution/reservation/reservationAddFrom',
+    component: Layout,
+    redirect: '/distribution/reservation/reservationAddFrom',
+    children: [
       {
         path: '/distribution/reservation/reservationAddFrom',
-        component: Layout,
-        redirect: '/distribution/reservation/reservationAddFrom',
-        children: [
-          {
-            path: '/distribution/reservation/reservationAddFrom',
-            name: '新增预约单',
-            component: () => import('@/views/distribution/reservation/reservationAddFrom.vue'),
-          },
-        ],
+        name: '新增预约单',
+        component: () => import('@/views/distribution/reservation/reservationAddFrom.vue'),
       },
+    ],
+  },
 
+  {
+    path: '/distribution/reservation/atlas',
+    component: Layout,
+    redirect: '/distribution/reservation/atlas',
+    children: [
       {
         path: '/distribution/reservation/atlas',
-        component: Layout,
-        redirect: '/distribution/reservation/atlas',
-        children: [
-          {
-            path: '/distribution/reservation/atlas',
-            name: '市配地图展示',
-            id: 'id',
-            component: () => import('@/views/distribution/reservation/atlas.vue'),
-          },
-        ],
+        name: '市配地图展示',
+        id: 'id',
+        component: () => import('@/views/distribution/reservation/atlas.vue'),
       },
+    ],
+  },
+  {
+    path: '/distribution/reservation/atlas1',
+    component: Layout,
+    redirect: '/distribution/reservation/atlas1',
+    children: [
       {
         path: '/distribution/reservation/atlas1',
-        component: Layout,
-        redirect: '/distribution/reservation/atlas1',
-        children: [
-          {
-            path: '/distribution/reservation/atlas1',
-            name: '配送地图展示',
-            id: 'id',
-            component: () => import('@/views/distribution/reservation/atlas1.vue'),
-          },
-        ],
+        name: '配送地图展示',
+        id: 'id',
+        component: () => import('@/views/distribution/reservation/atlas1.vue'),
       },
+    ],
+  },
+  {
+    path: '/distribution/reservation/reservationDetails',
+    component: Layout,
+    redirect: '/distribution/reservation/reservationDetails',
+    children: [
       {
         path: '/distribution/reservation/reservationDetails',
-        component: Layout,
-        redirect: '/distribution/reservation/reservationDetails',
-        children: [
-          {
-            path: '/distribution/reservation/reservationDetails',
-            name: '预约单详情',
-            id: 'id',
-            component: () => import('@/views/distribution/reservation/reservationDetails.vue'),
-          },
-        ],
-      },
-      // {
-      //   path: '/distribution/deliverylist/distributionDeliveryList',
-      //   component: Layout,
-      //   redirect: '/distribution/deliverylist/distributionDeliveryList',
-      //   children: [
-      //     {
-      //       path: '/distribution/deliverylist/distributionDeliveryList',
-      //       id:'id',
-      //       name:'name',
-      //       component: () => import('@/views/distribution/deliverylist/distributionDeliveryList.vue'),
-      //     },
-      //   ],
-      // },
+        name: '预约单详情',
+        id: 'id',
+        component: () => import('@/views/distribution/reservation/reservationDetails.vue'),
+      },
+    ],
+  },
+  // {
+  //   path: '/distribution/deliverylist/distributionDeliveryList',
+  //   component: Layout,
+  //   redirect: '/distribution/deliverylist/distributionDeliveryList',
+  //   children: [
+  //     {
+  //       path: '/distribution/deliverylist/distributionDeliveryList',
+  //       id:'id',
+  //       name:'name',
+  //       component: () => import('@/views/distribution/deliverylist/distributionDeliveryList.vue'),
+  //     },
+  //   ],
+  // },
+  {
+    path: '/distribution/turndelivery/deliveryMarket',
+    component: Layout,
+    redirect: '/distribution/turndelivery/deliveryMarket',
+    children: [
       {
         path: '/distribution/turndelivery/deliveryMarket',
-        component: Layout,
-        redirect: '/distribution/turndelivery/deliveryMarket',
-        children: [
-          {
-            path: '/distribution/turndelivery/deliveryMarket',
-            name: 'name',
-            id: 'id',
-            component: () => import('@/views/distribution/turndelivery/deliveryMarket.vue'),
-          },
-        ],
-      },
-      // {
-      //   path: '/distribution/turndelivery/deliveryMarket',
-      //   component: Layout,
-      //   redirect: '/distribution/turndelivery/deliveryMarket',
-      //   children: [
-      //     {
-      //       path: '/distribution/turndelivery/deliveryMarket',
-      //       name: 'name',
-      //       deliveryId:'id',
-      //       component: () => import('@/views/distribution/turndelivery/deliveryMarket.vue'),
-      //     },
-      //   ],
-      // },
+        name: 'name',
+        id: 'id',
+        component: () => import('@/views/distribution/turndelivery/deliveryMarket.vue'),
+      },
+    ],
+  },
+  // {
+  //   path: '/distribution/turndelivery/deliveryMarket',
+  //   component: Layout,
+  //   redirect: '/distribution/turndelivery/deliveryMarket',
+  //   children: [
+  //     {
+  //       path: '/distribution/turndelivery/deliveryMarket',
+  //       name: 'name',
+  //       deliveryId:'id',
+  //       component: () => import('@/views/distribution/turndelivery/deliveryMarket.vue'),
+  //     },
+  //   ],
+  // },
+  {
+    path: '/distribution/turndelivery/deliveryDiscuss',
+    component: Layout,
+    redirect: '/distribution/turndelivery/deliveryDiscuss',
+    children: [
       {
         path: '/distribution/turndelivery/deliveryDiscuss',
-        component: Layout,
-        redirect: '/distribution/turndelivery/deliveryDiscuss',
-        children: [
-          {
-            path: '/distribution/turndelivery/deliveryDiscuss',
-            name: '商配计划',
-            component: () => import('@/views/distribution/turndelivery/deliveryDiscuss.vue'),
-          },
-        ],
+        name: '商配计划',
+        component: () => import('@/views/distribution/turndelivery/deliveryDiscuss.vue'),
       },
+    ],
+  },
+  {
+    path: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
+    component: Layout,
+    redirect: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
+    children: [
       {
         path: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
-        component: Layout,
-        redirect: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
-        children: [
-          {
-            path: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
-            name: '滞留明细' + 'name',
-            component: () =>
-              import('@/views/warehouse/warehouseRetentionRecord/warehouseRetentionDetails.vue'),
-          },
-        ],
+        name: '滞留明细' + 'name',
+        component: () =>
+          import('@/views/warehouse/warehouseRetentionRecord/warehouseRetentionDetails.vue'),
       },
+    ],
+  },
+  {
+    path: '/basic/property/basicrecordslist',
+    component: Layout,
+    key: 'fullPath',
+    redirect: '/basic/property',
+    children: [
       {
         path: '/basic/property/basicrecordslist',
-        component: Layout,
-        key: 'fullPath',
-        redirect: '/basic/property',
-        children: [
-          {
-            path: '/basic/property/basicrecordslist',
-            name: '维修总记录',
-            meta: {
-              data: 'data',
-            },
-            component: () =>
-              import(/* webpackChunkName: "views" */ '@/views/basic/property/basicrecordslist.vue'),
-          },
-        ],
+        name: '维修总记录',
+        meta: {
+          data: 'data',
+        },
+        component: () =>
+          import(/* webpackChunkName: "views" */ '@/views/basic/property/basicrecordslist.vue'),
       },
+    ],
+  },
+  {
+    path: '/basic/material/basicTripartiteMaterial',
+    component: Layout,
+    redirect: '/basic/material',
+    children: [
       {
         path: '/basic/material/basicTripartiteMaterial',
-        component: Layout,
-        redirect: '/basic/material',
-        children: [
-          {
-            path: '/basic/material/basicTripartiteMaterial',
-            name: '三方物料',
-            meta: {
-              data: 'data',
-            },
-            component: () =>
-              import(
+        name: '三方物料',
+        meta: {
+          data: 'data',
+        },
+        component: () =>
+          import(
                 /* webpackChunkName: "views" */ '@/views/basic/material/basicTripartiteMaterial.vue'
-              ),
-          },
-        ],
+          ),
       },
+    ],
+  },
+  {
+    path: '/distribution/inventory/distrilbutionBillLading',
+    component: Layout,
+    redirect: '/distribution/inventory',
+    children: [
       {
         path: '/distribution/inventory/distrilbutionBillLading',
-        component: Layout,
-        redirect: '/distribution/inventory',
-        children: [
-          {
-            path: '/distribution/inventory/distrilbutionBillLading',
-            name: '创建提货单',
-            meta: {
-              i18n: 'dict',
-              keepAlive: true
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () => import('@/views/distribution/inventory/distrilbutionBillLading.vue'),
-          },
-        ],
+        name: '创建提货单',
+        meta: {
+          i18n: 'dict',
+          keepAlive: true
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () => import('@/views/distribution/inventory/distrilbutionBillLading.vue'),
       },
+    ],
+  },
+  {
+    path: '/basicdata/brand/basicShopFrom',
+    component: Layout,
+    redirect: '/basicdata/brand/basicShopFrom',
+    children: [
       {
         path: '/basicdata/brand/basicShopFrom',
-        component: Layout,
-        redirect: '/basicdata/brand/basicShopFrom',
-        children: [
-          {
-            path: '/basicdata/brand/basicShopFrom',
-            name: '创建门店',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () => import('@/views/basicdata/brand/basicShopFrom.vue'),
-          },
-        ],
+        name: '创建门店',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () => import('@/views/basicdata/brand/basicShopFrom.vue'),
       },
+    ],
+  },
 
+  {
+    path: '/distribution/deliverylist/distributionDeliveryListedt',
+    component: Layout,
+    redirect: '/deliverylist/distributionDeliveryListedt',
+    children: [
       {
         path: '/distribution/deliverylist/distributionDeliveryListedt',
-        component: Layout,
-        redirect: '/deliverylist/distributionDeliveryListedt',
-        children: [
-          {
-            path: '/distribution/deliverylist/distributionDeliveryListedt',
-            name: '配送查看',
-            meta: {
-              i18n: 'dict',
-              keepAlive: true,
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () =>
-              import('@/views/distribution/deliverylist/distributionDeliveryListedt.vue'),
-          },
-        ],
-      },
-      // {
-      //   path: '/distribution/turndelivery/deliveryDiscuss',
-      //   component: Layout,
-      //   redirect: '/distribution/turndelivery/deliveryDiscuss',
-      //   children: [
-      //     {
-      //       path: '/distribution/turndelivery/deliveryDiscuss',
-      //       name: '配送编辑',
-      //       meta: {
-      //         i18n: 'dict',
-      //       },
-      //       props: route => ({
-      //         name: route.query.name,
-      //         id: route.query.id
-      //       }),
-      //       component: () => import('@/views/turndelivery/deliverylist/deliveryDiscuss.vue'),
-      //     },
-      //   ],
-      // },
+        name: '配送查看',
+        meta: {
+          i18n: 'dict',
+          keepAlive: true,
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () =>
+          import('@/views/distribution/deliverylist/distributionDeliveryListedt.vue'),
+      },
+    ],
+  },
+  // {
+  //   path: '/distribution/turndelivery/deliveryDiscuss',
+  //   component: Layout,
+  //   redirect: '/distribution/turndelivery/deliveryDiscuss',
+  //   children: [
+  //     {
+  //       path: '/distribution/turndelivery/deliveryDiscuss',
+  //       name: '配送编辑',
+  //       meta: {
+  //         i18n: 'dict',
+  //       },
+  //       props: route => ({
+  //         name: route.query.name,
+  //         id: route.query.id
+  //       }),
+  //       component: () => import('@/views/turndelivery/deliverylist/deliveryDiscuss.vue'),
+  //     },
+  //   ],
+  // },
+  {
+    path: '/basicdata/brand/basicdataTripartiteMall',
+    component: Layout,
+    redirect: '/brand/basicdataTripartiteMall',
+    children: [
       {
         path: '/basicdata/brand/basicdataTripartiteMall',
-        component: Layout,
-        redirect: '/brand/basicdataTripartiteMall',
-        children: [
-          {
-            path: '/basicdata/brand/basicdataTripartiteMall',
-            name: '三方商城',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () => import('@/views/basicdata/brand/basicdataTripartiteMall.vue'),
-          },
-        ],
+        name: '三方商城',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () => import('@/views/basicdata/brand/basicdataTripartiteMall.vue'),
       },
+    ],
+  },
+  {
+    path: '/basicdata/brand/basicClientFrom',
+    component: Layout,
+    redirect: '/brand/basicClientFrom',
+    children: [
       {
         path: '/basicdata/brand/basicClientFrom',
-        component: Layout,
-        redirect: '/brand/basicClientFrom',
-        children: [
-          {
-            path: '/basicdata/brand/basicClientFrom',
-            name: '新增',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () => import('@/views/basicdata/brand/basicClientFrom.vue'),
-          },
-        ],
+        name: '新增',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () => import('@/views/basicdata/brand/basicClientFrom.vue'),
       },
+    ],
+  },
+  {
+    path: '/basicdata/brand/basicClientDetail',
+    component: Layout,
+    redirect: '/brand/basicClientDetail',
+    children: [
       {
         path: '/basicdata/brand/basicClientDetail',
-        component: Layout,
-        redirect: '/brand/basicClientDetail',
-        children: [
-          {
-            path: '/basicdata/brand/basicClientDetail',
-            name: '查看详情',
-            meta: {
-              i18n: 'dict',
-            },
-            component: () => import('@/views/basicdata/brand/basicClientDetail.vue'),
-          },
-        ],
+        name: '查看详情',
+        meta: {
+          i18n: 'dict',
+        },
+        component: () => import('@/views/basicdata/brand/basicClientDetail.vue'),
       },
+    ],
+  },
+  {
+    path: '/distribution/inventory/distributionStockArticleFrom',
+    component: Layout,
+    redirect: '/inventory/distributionStockArticleFrom',
+    children: [
       {
         path: '/distribution/inventory/distributionStockArticleFrom',
-        component: Layout,
-        redirect: '/inventory/distributionStockArticleFrom',
-        children: [
-          {
-            path: '/distribution/inventory/distributionStockArticleFrom',
-            name: '转库存品',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () => import('@/views/distribution/inventory/distributionStockArticleFrom.vue'),
-          },
-        ],
+        name: '转库存品',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () => import('@/views/distribution/inventory/distributionStockArticleFrom.vue'),
       },
+    ],
+  },
+  {
+    path: '/distribution/inventory/distributionStockArticleDetails',
+    component: Layout,
+    redirect: '/inventory/distributionStockArticleDetails',
+    children: [
       {
         path: '/distribution/inventory/distributionStockArticleDetails',
-        component: Layout,
-        redirect: '/inventory/distributionStockArticleDetails',
-        children: [
-          {
-            path: '/distribution/inventory/distributionStockArticleDetails',
-            name: '查询订单详情',
-            meta: {
-              i18n: 'dict',
-              keepAlive: true,
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () =>
-              import('@/views/distribution/inventory/distributionStockArticleDetails.vue'),
-          },
-        ],
-      },
+        name: '查询订单详情',
+        meta: {
+          i18n: 'dict',
+          keepAlive: true,
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () =>
+          import('@/views/distribution/inventory/distributionStockArticleDetails.vue'),
+      },
+    ],
+  },
+  {
+    path: '/distribution/inventory/distributionStockListDetails',
+    component: Layout,
+    redirect: '/inventory/distributionStockListDetails',
+    children: [
       {
         path: '/distribution/inventory/distributionStockListDetails',
-        component: Layout,
-        redirect: '/inventory/distributionStockListDetails',
-        children: [
-          {
-            path: '/distribution/inventory/distributionStockListDetails',
-            name: '查询库存品详情',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () => import('@/views/distribution/inventory/distributionStockListDetails.vue'),
-          },
-        ],
+        name: '查询库存品详情',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () => import('@/views/distribution/inventory/distributionStockListDetails.vue'),
       },
+    ],
+  },
+  {
+    path: '/distribution/signfor/distributionSignforedt',
+    component: Layout,
+    redirect: '/distribution/distributionSignforedt',
+    children: [
       {
         path: '/distribution/signfor/distributionSignforedt',
-        component: Layout,
-        redirect: '/distribution/distributionSignforedt',
-        children: [
-          {
-            path: '/distribution/signfor/distributionSignforedt',
-            name: '签收查看',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () => import('@/views/distribution/signfor/distributionSignforedt.vue'),
-          },
-        ],
+        name: '签收查看',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () => import('@/views/distribution/signfor/distributionSignforedt.vue'),
       },
+    ],
+  },
+  {
+    path: '/distribution/signdetail/distributionSigndetaledt',
+    component: Layout,
+    redirect: '/distribution/signdetail',
+    children: [
       {
         path: '/distribution/signdetail/distributionSigndetaledt',
-        component: Layout,
-        redirect: '/distribution/signdetail',
-        children: [
-          {
-            path: '/distribution/signdetail/distributionSigndetaledt',
-            name: '订单查看',
-            meta: {
-              i18n: 'dict',
-            },
-            component: () => import('@/views/distribution/signdetail/distributionSigndetaledt.vue'),
-          },
-        ],
+        name: '订单查看',
+        meta: {
+          i18n: 'dict',
+        },
+        component: () => import('@/views/distribution/signdetail/distributionSigndetaledt.vue'),
       },
+    ],
+  },
+  {
+    path: '/distribution/stockup/distributionStockupDetails',
+    component: Layout,
+    redirect: '/stockup/distributionStockupDetails',
+    children: [
       {
         path: '/distribution/stockup/distributionStockupDetails',
-        component: Layout,
-        redirect: '/stockup/distributionStockupDetails',
-        children: [
-          {
-            path: '/distribution/stockup/distributionStockupDetails',
-            name: '备货明细',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () => import('@/views/distribution/stockup/distributionStockupDetails.vue'),
-          },
-        ],
+        name: '备货明细',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () => import('@/views/distribution/stockup/distributionStockupDetails.vue'),
       },
+    ],
+  },
+  {
+    path: '/distribution/stockup/distributionStockupDetailsSelf',
+    component: Layout,
+    redirect: '/stockup/distributionStockupDetailsSelf',
+    children: [
       {
         path: '/distribution/stockup/distributionStockupDetailsSelf',
-        component: Layout,
-        redirect: '/stockup/distributionStockupDetailsSelf',
-        children: [
-          {
-            path: '/distribution/stockup/distributionStockupDetailsSelf',
-            name: '自提明细',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () => import('@/views/distribution/stockup/distributionStockupDetailsSelf.vue'),
-          },
-        ],
+        name: '自提明细',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () => import('@/views/distribution/stockup/distributionStockupDetailsSelf.vue'),
       },
+    ],
+  },
+  {
+    path: '/distribution/inventory/distrilbutionBillLadingView',
+    component: Layout,
+    redirect: '/inventory/distrilbutionBillLadingView',
+    children: [
       {
         path: '/distribution/inventory/distrilbutionBillLadingView',
-        component: Layout,
-        redirect: '/inventory/distrilbutionBillLadingView',
-        children: [
-          {
-            path: '/distribution/inventory/distrilbutionBillLadingView',
-            name: '查看提货详情',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () => import('@/views/distribution/inventory/distrilbutionBillLadingView.vue'),
-          },
-        ],
+        name: '查看提货详情',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () => import('@/views/distribution/inventory/distrilbutionBillLadingView.vue'),
       },
+    ],
+  },
 
+  {
+    path: '/basicdata/warehouse/tray/basicdataTrayedt',
+    component: Layout,
+    redirect: '/warehouse/tray/basicdataTrayedt',
+    children: [
       {
         path: '/basicdata/warehouse/tray/basicdataTrayedt',
-        component: Layout,
-        redirect: '/warehouse/tray/basicdataTrayedt',
-        children: [
-          {
-            path: '/basicdata/warehouse/tray/basicdataTrayedt',
-            name: '在托货物',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () => import('@/views/basicdata/warehouse/tray/basicdataTrayedt.vue'),
-          },
-        ],
+        name: '在托货物',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () => import('@/views/basicdata/warehouse/tray/basicdataTrayedt.vue'),
       },
+    ],
+  },
+  {
+    path: '/basicdata/warehouse/tray/basicdataTrayhistory',
+    component: Layout,
+    redirect: '/warehouse/tray/basicdataTrayhistory',
+    children: [
       {
         path: '/basicdata/warehouse/tray/basicdataTrayhistory',
-        component: Layout,
-        redirect: '/warehouse/tray/basicdataTrayhistory',
-        children: [
-          {
-            path: '/basicdata/warehouse/tray/basicdataTrayhistory',
-            name: '托盘历史记录',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              name: route.query.name,
-              id: route.query.id,
-            }),
-            component: () => import('@/views/basicdata/warehouse/tray/basicdataTrayhistory.vue'),
-          },
-        ],
+        name: '托盘历史记录',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id,
+        }),
+        component: () => import('@/views/basicdata/warehouse/tray/basicdataTrayhistory.vue'),
       },
+    ],
+  },
+  {
+    path: '/basicdata/brand/basicClientDetail',
+    component: Layout,
+    redirect: '/basicdata/brand/basicClientDetail',
+    children: [
       {
         path: '/basicdata/brand/basicClientDetail',
-        component: Layout,
-        redirect: '/basicdata/brand/basicClientDetail',
-        children: [
-          {
-            path: '/basicdata/brand/basicClientDetail',
-            name: '客户查看详情',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              id: route.query.id,
-            }),
-            component: () => import('@/views/basicdata/brand/basicClientDetail.vue'),
-          },
-        ],
+        name: '客户查看详情',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          id: route.query.id,
+        }),
+        component: () => import('@/views/basicdata/brand/basicClientDetail.vue'),
       },
+    ],
+  },
+  {
+    path: '/basicdata/team/basicdataTeamStaff',
+    component: Layout,
+    redirect: '/team/basicdataTeamStaffl',
+    children: [
       {
         path: '/basicdata/team/basicdataTeamStaff',
-        component: Layout,
-        redirect: '/team/basicdataTeamStaffl',
-        children: [
-          {
-            path: '/basicdata/team/basicdataTeamStaff',
-            name: '班组列表',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              id: route.query.id,
-            }),
-            component: () => import('@/views/basicdata/team/basicdataTeamStaff.vue'),
-          },
-        ],
+        name: '班组列表',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          id: route.query.id,
+        }),
+        component: () => import('@/views/basicdata/team/basicdataTeamStaff.vue'),
       },
+    ],
+  },
 
+  {
+    path: '/basicdata/brand/basicClientAccount',
+    component: Layout,
+    redirect: '/basicdata/brand/basicClient',
+    children: [
       {
         path: '/basicdata/brand/basicClientAccount',
-        component: Layout,
-        redirect: '/basicdata/brand/basicClient',
-        children: [
-          {
-            path: '/basicdata/brand/basicClientAccount',
-            name: '客户账号列表',
-            meta: {
-              i18n: 'dict',
-            },
-            props: route => ({
-              id: route.query.id,
-            }),
-            component: () => import('@/views/basicdata/brand/basicClientAccount.vue'),
-          },
-        ],
+        name: '客户账号列表',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          id: route.query.id,
+        }),
+        component: () => import('@/views/basicdata/brand/basicClientAccount.vue'),
       },
+    ],
+  },
 
+  {
+    path: '/basicdata/warehouse/warehouse/basicdataWarehouse1',
+    component: Layout,
+    redirect: '/basicdata/warehouse/warehouse',
+    children: [
       {
         path: '/basicdata/warehouse/warehouse/basicdataWarehouse1',
-        component: Layout,
-        redirect: '/basicdata/warehouse/warehouse',
-        children: [
-          {
-            path: '/basicdata/warehouse/warehouse/basicdataWarehouse1',
-            name: '仓库资料管理',
-            component: () => import('@/views/basicdata/warehouse/warehouse/basicdataWarehouse1.vue'),
-          },
-        ],
+        name: '仓库资料管理',
+        component: () => import('@/views/basicdata/warehouse/warehouse/basicdataWarehouse1.vue'),
       },
+    ],
+  },
+  {
+    path: '/distribution/checkInventoryTask/createTaskfrom',
+    component: Layout,
+    redirect: '/distribution/checkInventoryTask/createTaskfrom',
+    children: [
       {
         path: '/distribution/checkInventoryTask/createTaskfrom',
-        component: Layout,
-        redirect: '/distribution/checkInventoryTask/createTaskfrom',
-        children: [
-          {
-            path: '/distribution/checkInventoryTask/createTaskfrom',
-            name: '盘点任务明细',
-            component: () => import('@/views/distribution/checkInventoryTask/createTaskfrom.vue'),
-          },
-        ],
+        name: '盘点任务明细',
+        component: () => import('@/views/distribution/checkInventoryTask/createTaskfrom.vue'),
       },
+    ],
+  },
 
-      // 下面的代码为 商场客户端的页面
+  // 下面的代码为 商场客户端的页面
 
+  {
+    path: '/mail/order/add',
+    component: Layout,
+    redirect: '/mail/order/add',
+    children: [
       {
         path: '/mail/order/add',
-        component: Layout,
-        redirect: '/mail/order/add',
-        children: [
-          {
-            path: '/mail/order/add',
-            name: '新建商场预约单',
-            component: () => import('@/views/mail/order/add.vue'),
-          },
-        ],
+        name: '新建商场预约单',
+        component: () => import('@/views/mail/order/add.vue'),
       },
+    ],
+  },
 
-      // {
-      //   path: '/aftersales/VueTemp',
-      //   component: Layout,
-      //   redirect: '/aftersales/VueTemp',
-      //   children: [
-      //     {
-      //       path: '/aftersales/VueTemp',
-      //       name: '工单',
-      //       component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'),
-      //     },
-      //   ],
-      // },
+  // {
+  //   path: '/aftersales/VueTemp',
+  //   component: Layout,
+  //   redirect: '/aftersales/VueTemp',
+  //   children: [
+  //     {
+  //       path: '/aftersales/VueTemp',
+  //       name: '工单',
+  //       component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'),
+  //     },
+  //   ],
+  // },
+  {
+    path: '/aftersales/aftersalesWorkOrderAdd',
+    component: Layout,
+    redirect: '/aftersales/aftersalesWorkOrderAdd',
+    children: [
       {
         path: '/aftersales/aftersalesWorkOrderAdd',
-        component: Layout,
-        redirect: '/aftersales/aftersalesWorkOrderAdd',
-        children: [
-          {
-            path: '/aftersales/aftersalesWorkOrderAdd',
-            name: '工单新增',
-            component: () => import('@/views/aftersales/aftersalesWorkOrderAdd.vue'),
-          },
-        ],
+        name: '工单新增',
+        component: () => import('@/views/aftersales/aftersalesWorkOrderAdd.vue'),
       },
+    ],
+  },
 
+  {
+    path: '/aftersales/aftersalesWorkOrderInfo',
+    component: Layout,
+    redirect: '/aftersales/aftersalesWorkOrderInfo',
+    children: [
       {
         path: '/aftersales/aftersalesWorkOrderInfo',
-        component: Layout,
-        redirect: '/aftersales/aftersalesWorkOrderInfo',
-        children: [
-          {
-            path: '/aftersales/aftersalesWorkOrderInfo',
-            name: '工单详情查看',
-            component: () => import('@/views/aftersales/aftersalesWorkOrderInfo.vue'),
-          },
-        ],
+        name: '工单详情查看',
+        component: () => import('@/views/aftersales/aftersalesWorkOrderInfo.vue'),
       },
+    ],
+  },
 
 
+  {
+    path: '/aftersales/aftersalesWorkOrderend',
+    component: Layout,
+    redirect: '/aftersales/aftersalesWorkOrderend',
+    children: [
       {
         path: '/aftersales/aftersalesWorkOrderend',
-        component: Layout,
-        redirect: '/aftersales/aftersalesWorkOrderend',
-        children: [
-          {
-            path: '/aftersales/aftersalesWorkOrderend',
-            name: '工单完结',
-            component: () => import('@/views/aftersales/aftersalesWorkOrderend.vue'),
-          },
-        ],
+        name: '工单完结',
+        component: () => import('@/views/aftersales/aftersalesWorkOrderend.vue'),
       },
+    ],
+  },
+  {
+    path: '/aftersales/WorkorderTimeout',
+    component: Layout,
+    redirect: '/aftersales/WorkorderTimeout',
+    children: [
       {
         path: '/aftersales/WorkorderTimeout',
-        component: Layout,
-        redirect: '/aftersales/WorkorderTimeout',
-        children: [
-          {
-            path: '/aftersales/WorkorderTimeout',
-            name: '工单超时罚款',
-            component: () => import('@/views/aftersales/WorkorderTimeout.vue'),
-          },
-        ],
+        name: '工单超时罚款',
+        component: () => import('@/views/aftersales/WorkorderTimeout.vue'),
       },
+    ],
+  },
+  {
+    path: '/aftersales/customerService',
+    component: Layout,
+    redirect: '/aftersales/customerService',
+    children: [
       {
         path: '/aftersales/customerService',
-        component: Layout,
-        redirect: '/aftersales/customerService',
-        children: [
-          {
-            path: '/aftersales/customerService',
-            name: '客服回复',
-            component: () => import('@/views/aftersales/customerService.vue'),
-          },
-        ],
+        name: '客服回复',
+        component: () => import('@/views/aftersales/customerService.vue'),
       },
+    ],
+  },
+  {
+    path: '/aftersales/aftersalesWorkOrdermodify',
+    component: Layout,
+    redirect: '/aftersales/aftersalesWorkOrdermodify',
+    children: [
       {
         path: '/aftersales/aftersalesWorkOrdermodify',
-        component: Layout,
-        redirect: '/aftersales/aftersalesWorkOrdermodify',
-        children: [
-          {
-            path: '/aftersales/aftersalesWorkOrdermodify',
-            name: '信息编辑',
-            component: () => import('@/views/aftersales/aftersalesWorkOrdermodify.vue'),
-          },
-        ],
-      },
-    
-      // {
-      //   path: '/aftersales/aftersalesWorkOrderSS',
-      //   component: Layout,
-      //   redirect: '/aftersales/aftersalesWorkOrderSS',
-      //   children: [
-      //     {
-      //       path: '/aftersales/aftersalesWorkOrderSS',
-      //       name: '工单A',
-      //       component: () => import('@/views/aftersales/aftersalesWorkOrderSS.vue'),
-      //     },
-      //   ],
-      // },
+        name: '信息编辑',
+        component: () => import('@/views/aftersales/aftersalesWorkOrdermodify.vue'),
+      },
+    ],
+  },
 
+  // {
+  //   path: '/aftersales/aftersalesWorkOrderSS',
+  //   component: Layout,
+  //   redirect: '/aftersales/aftersalesWorkOrderSS',
+  //   children: [
+  //     {
+  //       path: '/aftersales/aftersalesWorkOrderSS',
+  //       name: '工单A',
+  //       component: () => import('@/views/aftersales/aftersalesWorkOrderSS.vue'),
+  //     },
+  //   ],
+  // },
 
-      // {
-      //   path: '/distribution/turndelivery/devtmp',
-      //   component: Layout,
-      //   redirect: '/distribution/turndelivery/devtmp',
-      //   children: [
-      //     {
-      //       path: '/distribution/turndelivery/devtmp',
-      //       name: '商配计划重构',
-      //       component: () => import('@/views/distribution/turndelivery/devtmp.vue'),
-      //     },
-      //   ],
-      // },
-      // {
-      //   path: '/distribution/signfor/devtmp',
-      //   component: Layout,
-      //   redirect: '/distribution/signfor/devtmp',
-      //   children: [
-      //     {
-      //       path: '/distribution/signfor/devtmp',
-      //       name: '签收明细重构',
-      //       component: () => import('@/views/distribution/signfor/devtmp.vue'),
-      //     },
-      //   ],
-      // },
-      // {
-      //   path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
-      //   component: Layout,
-      //   redirect: '/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView',
-      //   children: [
-      //     {
-      //       path: '/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView',
-      //       name: '',
-      //       component: () => import(/* webpackChunkName: "views" */ '@/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue'),
-      //     },
-      //   ],
-      // },
-      // {
-      //   path: '/distribution/inventory/distributionPrints',
-      //   component: Layout,
-      //   redirect: '/distribution/inventory',
-      //   children: [
-      //     {
-      //       path: '/distribution/inventory/distributionPrints',
-      //       name: '创建提货单',
-      //       meta: {
-      //         i18n: 'dict',
-      //       },
-      //       props: route => ({
-      //         name: route.query.name,
-      //         id: route.query.id
-      //       }),
-      //       component: () => import('@/views/distribution/inventory/distributionPrints.vue'),
-      //       children:[
-      //         {
-      //           path: '/distribution/inventory/distributionPrints',
-      //           name: '创建提货单',
-      //           meta: {
-      //             i18n: 'dict',
-      //           },
-      //           props: route => ({
-      //             name: route.query.name,
-      //             id: route.query.id
-      //           }),
-      //           component: () => import('@/views/distribution/inventory/distributionStockArticle.vue'),
 
-      //         },
-      //       ]
-      //     },
+  // {
+  //   path: '/distribution/turndelivery/devtmp',
+  //   component: Layout,
+  //   redirect: '/distribution/turndelivery/devtmp',
+  //   children: [
+  //     {
+  //       path: '/distribution/turndelivery/devtmp',
+  //       name: '商配计划重构',
+  //       component: () => import('@/views/distribution/turndelivery/devtmp.vue'),
+  //     },
+  //   ],
+  // },
+  // {
+  //   path: '/distribution/signfor/devtmp',
+  //   component: Layout,
+  //   redirect: '/distribution/signfor/devtmp',
+  //   children: [
+  //     {
+  //       path: '/distribution/signfor/devtmp',
+  //       name: '签收明细重构',
+  //       component: () => import('@/views/distribution/signfor/devtmp.vue'),
+  //     },
+  //   ],
+  // },
+  // {
+  //   path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
+  //   component: Layout,
+  //   redirect: '/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView',
+  //   children: [
+  //     {
+  //       path: '/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView',
+  //       name: '',
+  //       component: () => import(/* webpackChunkName: "views" */ '@/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue'),
+  //     },
+  //   ],
+  // },
+  // {
+  //   path: '/distribution/inventory/distributionPrints',
+  //   component: Layout,
+  //   redirect: '/distribution/inventory',
+  //   children: [
+  //     {
+  //       path: '/distribution/inventory/distributionPrints',
+  //       name: '创建提货单',
+  //       meta: {
+  //         i18n: 'dict',
+  //       },
+  //       props: route => ({
+  //         name: route.query.name,
+  //         id: route.query.id
+  //       }),
+  //       component: () => import('@/views/distribution/inventory/distributionPrints.vue'),
+  //       children:[
+  //         {
+  //           path: '/distribution/inventory/distributionPrints',
+  //           name: '创建提货单',
+  //           meta: {
+  //             i18n: 'dict',
+  //           },
+  //           props: route => ({
+  //             name: route.query.name,
+  //             id: route.query.id
+  //           }),
+  //           component: () => import('@/views/distribution/inventory/distributionStockArticle.vue'),
 
-      //   ],
-      // }
-    ]
-  },
+  //         },
+  //       ]
+  //     },
+
+  //   ],
+  // }
 
 
 ];

From 02664fd953dcf0076025c3ac0f39672e34429db4 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Sun, 17 Dec 2023 16:58:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BF=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionDeliveryListmar.vue           | 129 +++++-------------
 vite.config.js                                |   5 +-
 2 files changed, 39 insertions(+), 95 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index 3ff0bda2..5af87830 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -102,95 +102,18 @@
                     </div>
                 </div>
                 <el-tab-pane label="全部列表" name="first">
-                    <el-row class="el-fy">
-                        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-                            <!-- 列表模块 -->
-                            <tablecmt :columnList="allColumnList" :tableData="data" :loading="loading" @inputTxt="inputsc"
-                                      @timeCheck="timesc"
-                                      @btnCheck="btnsc" @selectCheck="selectsc" @selection="selectionsc">
-                                <template #default="slotProps">
-                                    <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>
-                                    <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
-                                    <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
-                                    <el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' ||
-              slotProps.scope.row.deliveryStatus !== '3'
-              " @click="handleEdit(slotProps.scope)">编 辑
-                                    </el-text>
 
-                                    <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
-                                </template>
-                            </tablecmt>
-                            <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
-                            <!-- 分页模块 -->
-                            <el-pagination align="right" background @size-change="sizeChange"
-                                           @current-change="currentChange"
-                                           :current-page="page.currentPage" :page-sizes="[30, 50, 80, 120]"
-                                           :page-size="page.pageSize"
-                                           layout="total, sizes, prev, pager, next, jumper" :total="page.total">
-                            </el-pagination>
-                        </div>
-                    </el-row>
                 </el-tab-pane>
                 <el-tab-pane label="待配送" name="second">
-                    <el-row class="el-fy">
-                        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-                            <tablecmt :columnList="columnList" :tableData="data" :loading="loading" @inputTxt="inputsc"
-                                      @timeCheck="timesc"
-                                      @btnCheck="btnsc" @selectCheck="selectsc" @selection="selectionsc">
-                                <template #default="slotProps">
-                                    <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>
-                                    <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
-                                    <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
-                                    <el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' ||
-              slotProps.scope.row.deliveryStatus !== '3'
-              " @click="handleEdit(slotProps.scope)">编 辑
-                                    </el-text>
-
-                                    <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
-                                </template>
-                            </tablecmt>
-                            <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
-                            <!-- 分页模块 -->
-                            <el-pagination align="right" background @size-change="sizeChange"
-                                           @current-change="currentChange"
-                                           :current-page="page.currentPage" :page-sizes="[30, 50, 80, 120]"
-                                           :page-size="page.pageSize"
-                                           layout="total, sizes, prev, pager, next, jumper" :total="page.total">
-                            </el-pagination>
-                        </div>
-                    </el-row>
-                </el-tab-pane>
+                  </el-tab-pane>
                 <el-tab-pane label="配送中" name="third">
-                    <el-row class="el-fy">
-                        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-                            <tablecmt :columnList="columnList" :tableData="data" :loading="loading" @inputTxt="inputsc"
-                                      @timeCheck="timesc"
-                                      @btnCheck="btnsc" @selectCheck="selectsc" @selection="selectionsc">
-                                <template #default="slotProps">
-                                    <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>
-                                    <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
-                                    <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
-                                    <el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' ||
-              slotProps.scope.row.deliveryStatus !== '3'
-              " @click="handleEdit(slotProps.scope)">编 辑
-                                    </el-text>
 
-                                    <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
-                                </template>
-                            </tablecmt>
-                            <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
-                            <!-- 分页模块 -->
-                            <el-pagination align="right" background @size-change="sizeChange"
-                                           @current-change="currentChange"
-                                           :current-page="page.currentPage" :page-sizes="[30, 50, 80, 120]"
-                                           :page-size="page.pageSize"
-                                           layout="total, sizes, prev, pager, next, jumper" :total="page.total">
-                            </el-pagination>
-                        </div>
-                    </el-row>
                 </el-tab-pane>
                 <el-tab-pane label="已完成" name="fourth">
-                    <el-row class="el-fy">
+
+                </el-tab-pane>
+            </el-tabs>
+            <el-row class="el-fy">
                         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
                             <tablecmt :columnList="columnList" :tableData="data" :loading="loading" @inputTxt="inputsc"
                                       @timeCheck="timesc"
@@ -206,18 +129,21 @@
                                     <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
                                 </template>
                             </tablecmt>
-                            <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
-                            <!-- 分页模块 -->
-                            <el-pagination align="right" background @size-change="sizeChange"
-                                           @current-change="currentChange"
-                                           :current-page="page.currentPage" :page-sizes="[30, 50, 80, 120]"
-                                           :page-size="page.pageSize"
-                                           layout="total, sizes, prev, pager, next, jumper" :total="page.total">
-                            </el-pagination>
+
                         </div>
+                        <div class="el-fx-btn"> 
+
+                    
+<div class="el_fontsize" style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+<!-- 分页模块 -->
+<el-pagination align="right" background @size-change="sizeChange"
+               @current-change="currentChange"
+               :current-page="page.currentPage" :page-sizes="[30, 50, 80, 120]"
+               :page-size="page.pageSize"
+               layout="total, sizes, prev, pager, next, jumper" :total="page.total">
+</el-pagination>
+</div>
                     </el-row>
-                </el-tab-pane>
-            </el-tabs>
             <el-row>
 
                 <!--        <el-table ref="table" v-loading="loading"-->
@@ -1579,6 +1505,23 @@
     .el-fy {
         flex: 1;
         display: flex;
-        align-items: flex-end;
+        align-content: space-between;
+    }
+    .flex-c-sb{
+      flex-direction: column;
+      justify-content: space-between;
+  
+    }
+    .el-fx-btn{
+      display: flex;
+    justify-content: flex-end;
+    margin-right: 20px;
+    width: 100%;
+    }
+    .el_fontsize{
+      font-size: 14px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     }
 </style>
diff --git a/vite.config.js b/vite.config.js
index 8818229d..5f58ef50 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -22,7 +22,7 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.75:8777',
           // 新zyc
           // target: 'http://192.168.6.116:8777',
-          target: 'http://192.168.6.122:8777',
+          // target: 'http://192.168.6.122:8777',
           // target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.25:2888',
           // target: 'http://192.168.6.122:8777',
@@ -31,7 +31,8 @@ export default ({ mode, command }) => {
           // sst
           // target: 'http://192.168.10.94:8888',
           // target: 'http://192.168.10.29:13000',
-          // target: 'http://h5uapi.huitongys.com',
+          target: 'http://h5uapi.huitongys.com',
+          // target: 'http://test.api.huitongys.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },