diff --git a/src/api/aftersales/aftersalesWorkOrder.js b/src/api/aftersales/aftersalesWorkOrder.js
index 7e45a83a..9c8e5aad 100644
--- a/src/api/aftersales/aftersalesWorkOrder.js
+++ b/src/api/aftersales/aftersalesWorkOrder.js
@@ -313,4 +313,24 @@ export const $_arbitrateEnd = (data) => {
     method: 'post',
     data
   })
+}
+
+// 查询处理记录
+export const $_getTrackRecord = (params) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/getTrackRecord',
+    method: 'get',
+    params
+  })
+}
+
+
+
+// 修改工单数据
+export const $_modifyData = (data) => {
+  return request({
+    url: '/api/logpm-aftersales/aftersalesWorkOrder/submit',
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file
diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js
index 8cd484c3..a702d328 100644
--- a/src/option/aftersales/vueTvemp.js
+++ b/src/option/aftersales/vueTvemp.js
@@ -306,7 +306,7 @@ export const columnList = [
  
 export const recordList = [
   {
-    prop: 'entryTime',
+    prop: 'createTime',
     label: '跟进时间',
     type: 1,
     values: '',
@@ -317,7 +317,7 @@ export const recordList = [
     head: false,
   },
   {
-    prop: 'entryTime',
+    prop: 'followWarehouseName',
     label: '跟进仓库',
     type: 1,
     values: '',
@@ -328,7 +328,7 @@ export const recordList = [
     head: false,
   },
   {
-    prop: 'entryTime',
+    prop: 'addDepartment',
     label: '跟进人',
     type: 1,
     values: '',
@@ -339,7 +339,7 @@ export const recordList = [
     head: false,
   },
   {
-    prop: 'entryTime',
+    prop: 'processingResults',
     label: '处理结果',
     type: 1,
     values: '',
@@ -350,7 +350,7 @@ export const recordList = [
     head: false,
   },
   {
-    prop: 'entryTime',
+    prop: 'remark',
     label: '备注',
     type: 1,
     values: '',
@@ -361,7 +361,7 @@ export const recordList = [
     head: false,
   },
   {
-    prop: 'entryTime',
+    prop: 'pictureUrl',
     label: '图片',
     type: 1,
     values: '',
@@ -371,17 +371,6 @@ export const recordList = [
     sortable: false,
     head: false,
   },
-  {
-    prop: 'entryTime',
-    label: '更新日志',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: false,
-    head: false,
-  },
 ]  
 
 
diff --git a/src/page/index/layout.vue b/src/page/index/layout.vue
index 0439730f..ef13a581 100644
--- a/src/page/index/layout.vue
+++ b/src/page/index/layout.vue
@@ -1,5 +1,6 @@
 <template>
   <router-view #="{ Component }">
+    <!-- {{ $store.getters.tagsKeep }} -->
     <keep-alive :include="$store.getters.tagsKeep">
       <component :is="Component" />
     </keep-alive>
diff --git a/src/router/avue-router.js b/src/router/avue-router.js
index dad12da4..5774525f 100644
--- a/src/router/avue-router.js
+++ b/src/router/avue-router.js
@@ -42,6 +42,7 @@ RouterPlugin.install = function (option = {}) {
     },
     //动态路由
     formatRoutes: function (aMenu = [], first) {
+
       const aRouter = [];
       const propsDefault = website.menu;
       if (aMenu && aMenu.length === 0) return;
@@ -55,9 +56,6 @@ RouterPlugin.install = function (option = {}) {
           query = oMenu[propsDefault.query],
           meta = oMenu[propsDefault.meta];
 
-        if (option.keepAlive) {
-          meta.keepAlive = option.keepAlive;
-        }
         const isChild = !!(children && children.length !== 0);
         const oRouter = {
           path: path,
@@ -131,7 +129,7 @@ export const formatPath = (ele, first) => {
   const propsDefault = website.menu;
   const icon = ele[propsDefault.icon];
   ele[propsDefault.icon] = !icon ? propsDefault.iconDefault : icon;
-  ele.meta = { keepAlive:  ele.isOpen == 2 };
+  ele.meta = { keepAlive: ele.isOpen == 2 };
   const iframeComponent = 'components/iframe/main';
   const iframeSrc = href => {
     return href.replace(/&/g, '#');
diff --git a/src/router/index.js b/src/router/index.js
index 7fab1ed4..8257099d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,7 +14,6 @@ AvueRouter.install({
   store: Store,
   router: Router,
   i18n: i18n,
-  keepAlive: true
 });
 
 Router.$avueRouter.formatRoutes(Store.getters.menuAll, true);
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 3b05b17c..aca52120 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1,1376 +1,1366 @@
-import Layout from '@/page/index/index.vue';
+import Layout from '@/page/index/layout.vue';
 import Store from '@/store/';
 
 export default [
   {
-    path: '/wel',
+    path: '/',
     component: () =>
       Store.getters.isMacOs ? import('@/mac/index.vue') : import('@/page/index/index.vue'),
-    redirect: '/wel/index',
-    children: [
-      {
-        path: 'index',
-        name: '首页',
-        meta: {
-          i18n: 'dashboard',
-        },
-        component: () => import(/* webpackChunkName: "views" */ '@/views/wel/index.vue'),
-      },
-      {
-        path: 'dashboard',
-        name: '控制台',
+    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: '统计页面',
         meta: {
           i18n: 'dashboard',
           menu: false,
         },
-        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(
-            /* webpackChunkName: "views" */ '@/views/distribution/artery/AddVehicleStowage.vue'
-          ),
-      },
-      {
-        path: 'truckLoadingDetails',
-        name: '装车明细',
-        meta: {
-          i18n: 'data',
-        },
-        component: () =>
-          import(
-            /* webpackChunkName: "views" */ '@/views/distribution/artery/truckLoadingDetails.vue'
-          ),
-      },
-      {
-        path: 'addTripartiteTransfer',
-        name: '新增中转',
-        meta: {
-          i18n: 'data',
-        },
-        component: () =>
-          import(
-            /* webpackChunkName: "views" */ '@/views/distribution/artery/addTripartiteTransfer.vue'
-          ),
-      },
-      {
-        path: 'TripartiteTransferDetails',
-        name: '中转详情',
-        meta: {
-          i18n: 'data',
-        },
-        component: () =>
-          import(
-            /* webpackChunkName: "views" */ '@/views/distribution/artery/TripartiteTransferDetails.vue'
-          ),
-      },
-      {
-        path: 'VehicleStowageDetails',
-        name: '配载详情',
-        meta: {
-          i18n: 'data',
-        },
-        component: () =>
-          import(
-            /* webpackChunkName: "views" */ '@/views/distribution/artery/VehicleStowageDetails.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: [
+        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(
+                /* webpackChunkName: "views" */ '@/views/distribution/artery/AddVehicleStowage.vue'
+              ),
+          },
+          {
+            path: 'truckLoadingDetails',
+            name: '装车明细',
+            meta: {
+              i18n: 'data',
+            },
+            component: () =>
+              import(
+                /* webpackChunkName: "views" */ '@/views/distribution/artery/truckLoadingDetails.vue'
+              ),
+          },
+          {
+            path: 'addTripartiteTransfer',
+            name: '新增中转',
+            meta: {
+              i18n: 'data',
+            },
+            component: () =>
+              import(
+                /* webpackChunkName: "views" */ '@/views/distribution/artery/addTripartiteTransfer.vue'
+              ),
+          },
+          {
+            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: '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'),
+        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(
+                /* 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: '/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',
-        name: '维修总记录',
-        meta: {
-          data: 'data',
-        },
-        component: () =>
-          import(
-            /* webpackChunkName: "views" */ '@/views/basic/pdarecords/basicPdarecordslist.vue'
-          ),
+        component: Layout,
+        key: 'fullPath',
+        redirect: '/basic/pdarecords',
+        children: [
+          {
+            path: '/basic/pdarecords/basicPdarecordslist',
+            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',
-        name: '提货线路节点',
-        meta: {
-          data: 'data',
-        },
-        component: () => import('@/views/basic/delinenode/basicDelineNode.vue'),
+        component: Layout,
+        redirect: '/basic/delinenode',
+        children: [
+          {
+            path: '/basic/delinenode/basicDelineNode',
+            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',
-        name: '运单包件信息',
-        meta: {
-          data: 'data',
-        },
-        component: () => import('@/views/factory/snm/staorderPackages.vue'),
+        component: Layout,
+        redirect: '/factory/snm',
+        children: [
+          {
+            path: '/factory/snm/staorderPackages',
+            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',
-        name: '历史记录',
-        meta: {
-          i18n: 'dict',
-        },
-        props: route => ({ name: route.query.name, id: route.query.id }),
-        component: () =>
-          import(
-            /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicHistoricalContract.vue'
-          ),
+        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(
+                /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicHistoricalContract.vue'
+              ),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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(
-            /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicStorageServices.vue'
-          ),
+        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(
+                /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicStorageServices.vue'
+              ),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
-      },
-    ],
-  },
-  {
-    path: '/basicdata/brand/basicdataFreightFrom',
-    component: Layout,
-    redirect: '/brand/basicdataFreightFrom',
-    children: [
+        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'),
+          },
+        ],
+      },
       {
         path: '/basicdata/brand/basicdataFreightFrom',
-        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: [
+        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(
+                /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataFreightFrom.vue'
+              ),
+          },
+        ],
+      },
       {
         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'),
-      },
-    ],
-  },
-  {
-    path: '/basicdata/brand/basicdataCustomerBase',
-    component: Layout,
-    redirect: '/brand/basicdataCustomerBase',
-    children: [
+        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'),
+          },
+        ],
+      },
       {
         path: '/basicdata/brand/basicdataCustomerBase',
-        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: [
+        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(
+                /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataCustomerBase.vue'
+              ),
+          },
+        ],
+      },
       {
         path: '/basicdata/brand/basicdataCustomerStore',
-        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: [
+        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(
+                /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataCustomerStore.vue'
+              ),
+          },
+        ],
+      },
       {
         path: '/basic/printTemplate/basicPrintTemplateFrom',
-        name: 'name',
-        meta: {
-          data: 'data',
-        },
-        component: () => import('@/views/basic/printTemplate/basicPrintTemplateFrom.vue'),
+        component: Layout,
+        redirect: '/basic/printTemplate',
+        children: [
+          {
+            path: '/basic/printTemplate/basicPrintTemplateFrom',
+            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',
-        name: 'pad信息',
-        meta: {},
-        component: () => import('@/views/basic/pda/basicPdaform.vue'),
-      },
-    ],
-  },
-  // 测试页面
-  {
-    path: '/basic/pda/basicPdatt',
-    component: Layout,
-    redirect: '/basic/pda',
-    children: [
+        component: Layout,
+        redirect: '/basic/pda',
+        children: [
+          {
+            path: '/basic/pda/basicPdaform',
+            name: 'pad信息',
+            meta: {},
+            component: () => import('@/views/basic/pda/basicPdaform.vue'),
+          },
+        ],
+      },
+      // 测试页面
       {
         path: '/basic/pda/basicPdatt',
-        name: 'pad信息',
-        meta: {},
-        component: () => import('@/views/basic/pda/basicPdatt.vue'),
+        component: Layout,
+        redirect: '/basic/pda',
+        children: [
+          {
+            path: '/basic/pda/basicPdatt',
+            name: 'pad信息',
+            meta: {},
+            component: () => import('@/views/basic/pda/basicPdatt.vue'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        component: Layout,
+        redirect: '/basic/property',
+        children: [
+          {
+            path: '/basic/property/basicPropertyform',
+            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',
-        name: '转预约单',
-        component: () => import('@/views/distribution/reservation/reservationSubmitFrom.vue'),
+        component: Layout,
+        redirect: '/distribution/reservation/reservationSubmitFrom',
+        children: [
+          {
+            path: '/distribution/reservation/reservationSubmitFrom',
+            name: '转预约单',
+            component: () => import('@/views/distribution/reservation/reservationSubmitFrom.vue'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    path: '/distribution/reservation/reservationAddFrom',
-    component: Layout,
-    redirect: '/distribution/reservation/reservationAddFrom',
-    children: [
       {
         path: '/distribution/reservation/reservationAddFrom',
-        name: '新增预约单',
-        component: () => import('@/views/distribution/reservation/reservationAddFrom.vue'),
+        component: Layout,
+        redirect: '/distribution/reservation/reservationAddFrom',
+        children: [
+          {
+            path: '/distribution/reservation/reservationAddFrom',
+            name: '新增预约单',
+            component: () => import('@/views/distribution/reservation/reservationAddFrom.vue'),
+          },
+        ],
       },
-    ],
-  },
 
-  {
-    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'),
+        component: Layout,
+        redirect: '/distribution/reservation/atlas',
+        children: [
+          {
+            path: '/distribution/reservation/atlas',
+            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',
-        name: '配送地图展示',
-        id: 'id',
-        component: () => import('@/views/distribution/reservation/atlas1.vue'),
+        component: Layout,
+        redirect: '/distribution/reservation/atlas1',
+        children: [
+          {
+            path: '/distribution/reservation/atlas1',
+            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',
-        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: [
+        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'),
+      //     },
+      //   ],
+      // },
       {
         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'),
-  //     },
-  //   ],
-  // },
-  {
-    path: '/distribution/turndelivery/deliveryDiscuss',
-    component: Layout,
-    redirect: '/distribution/turndelivery/deliveryDiscuss',
-    children: [
+        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'),
+      //     },
+      //   ],
+      // },
       {
         path: '/distribution/turndelivery/deliveryDiscuss',
-        name: '商配计划',
-        component: () => import('@/views/distribution/turndelivery/deliveryDiscuss.vue'),
+        component: Layout,
+        redirect: '/distribution/turndelivery/deliveryDiscuss',
+        children: [
+          {
+            path: '/distribution/turndelivery/deliveryDiscuss',
+            name: '商配计划',
+            component: () => import('@/views/distribution/turndelivery/deliveryDiscuss.vue'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    path: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
-    component: Layout,
-    redirect: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
-    children: [
       {
         path: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
-        name: '滞留明细' + 'name',
-        component: () =>
-          import('@/views/warehouse/warehouseRetentionRecord/warehouseRetentionDetails.vue'),
+        component: Layout,
+        redirect: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
+        children: [
+          {
+            path: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
+            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',
-        name: '维修总记录',
-        meta: {
-          data: 'data',
-        },
-        component: () =>
-          import(/* webpackChunkName: "views" */ '@/views/basic/property/basicrecordslist.vue'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    path: '/basic/material/basicTripartiteMaterial',
-    component: Layout,
-    redirect: '/basic/material',
-    children: [
       {
         path: '/basic/material/basicTripartiteMaterial',
-        name: '三方物料',
-        meta: {
-          data: 'data',
-        },
-        component: () =>
-          import(
-            /* webpackChunkName: "views" */ '@/views/basic/material/basicTripartiteMaterial.vue'
-          ),
+        component: Layout,
+        redirect: '/basic/material',
+        children: [
+          {
+            path: '/basic/material/basicTripartiteMaterial',
+            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',
-        name: '创建提货单',
-        meta: {
-          i18n: 'dict',
-        },
-        props: route => ({
-          name: route.query.name,
-          id: route.query.id,
-        }),
-        component: () => import('@/views/distribution/inventory/distrilbutionBillLading.vue'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
 
-  {
-    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'),
-  //     },
-  //   ],
-  // },
-  {
-    path: '/basicdata/brand/basicdataTripartiteMall',
-    component: Layout,
-    redirect: '/brand/basicdataTripartiteMall',
-    children: [
+        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'),
+      //     },
+      //   ],
+      // },
       {
         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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        component: Layout,
+        redirect: '/brand/basicClientDetail',
+        children: [
+          {
+            path: '/basicdata/brand/basicClientDetail',
+            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',
-        name: '转库存品',
-        meta: {
-          i18n: 'dict',
-        },
-        props: route => ({
-          name: route.query.name,
-          id: route.query.id,
-        }),
-        component: () => import('@/views/distribution/inventory/distributionStockArticleFrom.vue'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
-      },
-    ],
-  },
-  {
-    path: '/distribution/inventory/distributionStockListDetails',
-    component: Layout,
-    redirect: '/inventory/distributionStockListDetails',
-    children: [
+        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'),
+          },
+        ],
+      },
       {
         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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        component: Layout,
+        redirect: '/distribution/signdetail',
+        children: [
+          {
+            path: '/distribution/signdetail/distributionSigndetaledt',
+            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',
-        name: '备货明细',
-        meta: {
-          i18n: 'dict',
-        },
-        props: route => ({
-          name: route.query.name,
-          id: route.query.id,
-        }),
-        component: () => import('@/views/distribution/stockup/distributionStockupDetails.vue'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
 
-  {
-    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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
 
-  {
-    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'),
+        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'),
+          },
+        ],
       },
-    ],
-  },
 
-  {
-    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'),
+        component: Layout,
+        redirect: '/basicdata/warehouse/warehouse',
+        children: [
+          {
+            path: '/basicdata/warehouse/warehouse/basicdataWarehouse1',
+            name: '仓库资料管理',
+            component: () => import('@/views/basicdata/warehouse/warehouse/basicdataWarehouse1.vue'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    path: '/distribution/checkInventoryTask/createTaskfrom',
-    component: Layout,
-    redirect: '/distribution/checkInventoryTask/createTaskfrom',
-    children: [
       {
         path: '/distribution/checkInventoryTask/createTaskfrom',
-        name: '盘点任务明细',
-        component: () => import('@/views/distribution/checkInventoryTask/createTaskfrom.vue'),
+        component: Layout,
+        redirect: '/distribution/checkInventoryTask/createTaskfrom',
+        children: [
+          {
+            path: '/distribution/checkInventoryTask/createTaskfrom',
+            name: '盘点任务明细',
+            component: () => import('@/views/distribution/checkInventoryTask/createTaskfrom.vue'),
+          },
+        ],
       },
-    ],
-  },
 
-  // 下面的代码为 商场客户端的页面
+      // 下面的代码为 商场客户端的页面
 
-  {
-    path: '/mail/order/add',
-    component: Layout,
-    redirect: '/mail/order/add',
-    children: [
       {
         path: '/mail/order/add',
-        name: '新建商场预约单',
-        component: () => import('@/views/mail/order/add.vue'),
+        component: Layout,
+        redirect: '/mail/order/add',
+        children: [
+          {
+            path: '/mail/order/add',
+            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/aftersalesWorkOrderAdd',
-    component: Layout,
-    redirect: '/aftersales/aftersalesWorkOrderAdd',
-    children: [
+      // {
+      //   path: '/aftersales/VueTemp',
+      //   component: Layout,
+      //   redirect: '/aftersales/VueTemp',
+      //   children: [
+      //     {
+      //       path: '/aftersales/VueTemp',
+      //       name: '工单',
+      //       component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'),
+      //     },
+      //   ],
+      // },
       {
         path: '/aftersales/aftersalesWorkOrderAdd',
-        name: '工单新增',
-        component: () => import('@/views/aftersales/aftersalesWorkOrderAdd.vue'),
+        component: Layout,
+        redirect: '/aftersales/aftersalesWorkOrderAdd',
+        children: [
+          {
+            path: '/aftersales/aftersalesWorkOrderAdd',
+            name: '工单新增',
+            component: () => import('@/views/aftersales/aftersalesWorkOrderAdd.vue'),
+          },
+        ],
       },
-    ],
-  },
 
-  {
-    path: '/aftersales/aftersalesWorkOrderInfo',
-    component: Layout,
-    redirect: '/aftersales/aftersalesWorkOrderInfo',
-    children: [
       {
         path: '/aftersales/aftersalesWorkOrderInfo',
-        name: '工单详情查看',
-        component: () => import('@/views/aftersales/aftersalesWorkOrderInfo.vue'),
+        component: Layout,
+        redirect: '/aftersales/aftersalesWorkOrderInfo',
+        children: [
+          {
+            path: '/aftersales/aftersalesWorkOrderInfo',
+            name: '工单详情查看',
+            component: () => import('@/views/aftersales/aftersalesWorkOrderInfo.vue'),
+          },
+        ],
       },
-    ],
-  },
 
-  {
-    path: '/aftersales/aftersalesWorkOrderend',
-    component: Layout,
-    redirect: '/aftersales/aftersalesWorkOrderend',
-    children: [
+
       {
         path: '/aftersales/aftersalesWorkOrderend',
-        name: '工单完结',
-        component: () => import('@/views/aftersales/aftersalesWorkOrderend.vue'),
+        component: Layout,
+        redirect: '/aftersales/aftersalesWorkOrderend',
+        children: [
+          {
+            path: '/aftersales/aftersalesWorkOrderend',
+            name: '工单完结',
+            component: () => import('@/views/aftersales/aftersalesWorkOrderend.vue'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    path: '/aftersales/WorkorderTimeout',
-    component: Layout,
-    redirect: '/aftersales/WorkorderTimeout',
-    children: [
       {
         path: '/aftersales/WorkorderTimeout',
-        name: '工单超时罚款',
-        component: () => import('@/views/aftersales/WorkorderTimeout.vue'),
+        component: Layout,
+        redirect: '/aftersales/WorkorderTimeout',
+        children: [
+          {
+            path: '/aftersales/WorkorderTimeout',
+            name: '工单超时罚款',
+            component: () => import('@/views/aftersales/WorkorderTimeout.vue'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    path: '/aftersales/customerService',
-    component: Layout,
-    redirect: '/aftersales/customerService',
-    children: [
       {
         path: '/aftersales/customerService',
-        name: '客服回复',
-        component: () => import('@/views/aftersales/customerService.vue'),
+        component: Layout,
+        redirect: '/aftersales/customerService',
+        children: [
+          {
+            path: '/aftersales/customerService',
+            name: '客服回复',
+            component: () => import('@/views/aftersales/customerService.vue'),
+          },
+        ],
       },
-    ],
-  },
-  {
-    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'),
+        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'),
+
+      //         },
+      //       ]
+      //     },
+
+      //   ],
+      // }
+    ]
+  },
+
 
-  //   ],
-  // }
 ];
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 1f95b6e6..e3b5152f 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -158,16 +158,16 @@
                     <div class="ElBtnClass">
                       <div v-if="!TimeoutStatus">
                         <!-- <el-button @click="addingRecord(slotProps.scope)">新增记录</el-button> -->
-                        <el-button v-if="!ClaimStatus" @click="view(slotProps.scope)"
+                        <el-button  @click="view(slotProps.scope)"
                           >查看</el-button
                         >
                         <!-- <el-button @click="ViewEvent(slotProps.scope)">编辑</el-button> -->
                         <!-- <el-button @click="reply(slotProps.scope)">回复</el-button> -->
                         <!-- <el-button @click="ViewDelete(slotProps.scope)">删除</el-button> -->
                         <!-- <el-button @click="CompletionButton(slotProps.scope)">完结</el-button> -->
-                        <el-button v-if="ClaimStatus" @click="appeal(slotProps.scope)"
+                        <!-- <el-button v-if="ClaimStatus" @click="appeal(slotProps.scope)"
                           >申诉</el-button
-                        >
+                        > -->
                       </div>
                       <el-button v-if="TimeoutStatus" @click="BtnModifyAmount(slotProps.scope)"
                         >修改金额</el-button
@@ -1103,6 +1103,9 @@ const scrollContainer = ref(null); //客服实例
 const workOrderStatus = ref(null); //侧边栏参数
 const BatchFrom = ref({}); //批量打回
 const currentPage = ref(1); // 默认页码
+const TransportlossList = ref([
+  //运损发现节点
+]);
 const pageSize = ref(30); // 默认每一页几条
 const total = ref(0); //页码总页数
 const KFinput = ref(''); //客服发送消息
@@ -1558,6 +1561,7 @@ const IndexTable = val => {
     page.value.total = res.data.data.total; //总页数
     if (res.data.data.records.length) {
       res.data.data.records.forEach(item => {
+        console.log(item,'item');
         // 对为null的数据进行处理
         for (const property in item) {
           if (item[property] == null) {
diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index 77dc32d1..d592a902 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -44,7 +44,7 @@
             </div>
           </div>
           <div class="NumTotal">
-            <span>总件数:{{ Indexform.number }}</span>
+            <span>总件数:{{ PackageInfo.length }}</span>
           </div>
         </div>
       </el-tab-pane>
@@ -269,6 +269,11 @@
       <el-form-item label="异常问题描述">
         <el-input v-model="Indexform.problemDescription" placeholder="请输入异常问题" clearable />
       </el-form-item>
+
+      <el-form-item >
+      </el-form-item>
+      <el-form-item >
+      </el-form-item>
     </el-form>
 
     <!-- 必填 -->
@@ -1119,6 +1124,7 @@ const ViewPackageDetails = val => {
     margin-left: 20px;
     font-size: 14px;
     width: 100px !important;
+    justify-content: flex-start;
   }
   .el-form-item {
     margin: 0;
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index 18ce73b9..6282e06c 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -1,17 +1,8 @@
 <template>
   <el-card class="box-card">
-    <el-tabs type="border-card" class="topClass" @tab-change="TopChange">
-      <el-tab-pane label="订单"></el-tab-pane>
-      <el-tab-pane label="零担"></el-tab-pane>
-    </el-tabs>
-
-    <!-- <el-divider content-position="left">
-      <span> {{ routerState ? '信息查看' : '工单新增' }}</span>
-    </el-divider> -->
     <el-tabs type="border-card" class="PackageInformation">
       <el-tab-pane label="包件信息">
         <div class="ResponsibilityBoxS">
-          <!-- <div><el-button type="primary" @click="AddPackage"> 添加信息 </el-button></div> -->
           <div class="el_btbox" v-for="(item, index) in PackageInfo" :key="index">
             <div class="leftbox">
               <div class="maxBox">
@@ -46,13 +37,6 @@
                 />
               </div>
             </div>
-
-            <!-- <div class="el-btn">
-              <el-button v-if="item.state" type="primary" @click="historicalPackages(index)">
-                查看历史包件
-              </el-button>
-              <el-button type="primary" @click="PackagRemoval(index)"> 移除 </el-button> 
-            </div> -->
           </div>
           <div class="NumTotal">
             <span>总件数:{{ PackageInfo.length }}</span>
@@ -96,50 +80,6 @@
       <el-form-item label="异常工单号">
         <el-input v-model="Indexform.workOrderNumber" disabled placeholder="异常工单号" clearable />
       </el-form-item>
-      <!-- 必填(提货环节可以不填写运单号) -->
-      <!-- <el-form-item label="运单号" v-if="groundlineType != 1">
-      <el-input v-model="Indexform.waybillNumber" placeholder="请输入运单号" clearable />
-    </el-form-item> -->
-
-      <!-- <el-form-item label="少货件数" v-if="StateType || SelectType == 2">
-      <div class="moneyNum">
-        <el-input
-          @change="ShortageTtems"
-          v-model="Indexform.number"
-          placeholder="请输入少货件数"
-          clearable
-        />
-        <div class="el_btn" @click="moneyBtnA"><span>编辑</span></div>
-      </div>
-    </el-form-item> -->
-
-      <!-- <el-form-item label="窜货件数" v-if="StateType || SelectType == 3">
-      <div class="moneyNum">
-        <el-input
-          @change="fleeingTtems"
-          v-model="Indexform.number"
-          placeholder="请输入窜货件数"
-          clearable
-        />
-        <div class="el_btn" @click="moneyBtnB"><span>编辑</span></div>
-      </div>
-    </el-form-item> -->
-
-      <!-- <el-form-item
-      label="包条码"
-      v-if="SelectType == 1 || SelectType == 2 || SelectType == 3 || StateType"
-    >
-      <el-input
-        v-model="Indexform.packageCode"
-        placeholder="请输入包条码,多个用逗号隔开"
-        clearable
-      />
-    </el-form-item> -->
-
-      <!-- 必填 -->
-      <!-- <el-form-item label="订单自编号">
-      <el-input v-model="Indexform.orderCode" placeholder="请输入订单自编号" clearable />
-    </el-form-item> -->
 
       <el-form-item
         label="车次号"
@@ -280,11 +220,10 @@
       <el-form-item label="异常问题描述">
         <el-input v-model="Indexform.problemDescription" placeholder="请输入异常问题" clearable />
       </el-form-item>
-    </el-form>
 
-    <!-- 必填 -->
-    <div class="el_clzr">
-      <el-form-item class="investigate" label="调查经过">
+      <!-- 必填 -->
+
+      <el-form-item label="调查经过">
         <el-input
           disabled
           v-model="Indexform.investigationPocess"
@@ -312,12 +251,78 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="处理结果">
+        <el-select
+          v-model="Indexform.result"
+          multiple
+          filterable
+          default-first-option
+          :reserve-keyword="false"
+          placeholder="请选择处理结果"
+          @change="changeProcessingResults"
+          disabled
+        >
+          <el-option
+            v-for="item in ProcessingResults"
+            :key="item.dictKey"
+            :label="item.dictValue"
+            :value="item.dictKey"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+
+    <div class="ProcessingResults" v-if="ProcessingList.length">
+      <div class="title">处理结果-理赔金额</div>
+      <div class="Listadmiration">
+        <div class="name" v-for="(item, index) in ProcessingList" :key="index">
+          <span>{{ item.name }}:</span>
+          <el-input-number
+            v-model="item.input"
+            :min="item.min"
+            :max="item.max"
+            @change="TotalChange"
+            disabled
+          />
+          <div class="Paymentname">
+            {{ item.payment ? item.text : '支付方式' }}
+          </div>
+        </div>
+      </div>
+
+      <div class="el_tool">
+        <span>总金额:{{ TotalClaimAmount }}</span>
+      </div>
+
+      <el-divider>
+        <span class="ZFname">理赔支付时间</span>
+      </el-divider>
+      <div class="lptime">
+        <el-date-picker
+          disabled
+          v-model="Indexform.compensationTime"
+          type="datetime"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择运理赔支付时间"
+        />
+      </div>
     </div>
+    <!-- 处理结果说明  -->
+    <el-form-item label="处理结果说明" class="el_resj">
+      <el-input
+        v-model="Indexform.resultDescription"
+        placeholder="请输入处理结果说明"
+        clearable
+        :autosize="{ minRows: 3, maxRows: 4 }"
+        type="textarea"
+        disabled
+      />
+    </el-form-item>
 
     <el-tabs type="border-card">
-      <el-tab-pane label="责任方选择">
+      <el-tab-pane label="责任方信息">
         <div class="ResponsibilityBox">
-          <!-- <div><el-button type="primary" @click="responsibleParty"> 添加信息 </el-button></div> -->
           <div class="el_btbox" v-for="(item, index) in FangAddList" :key="index">
             <div class="leftbox">
               <div class="maxBox">
@@ -396,9 +401,6 @@
                 />
               </div>
             </div>
-            <div class="el-btn">
-              <!-- <el-button type="primary" @click="ResponsibilityRemoval(index)"> 移除 </el-button> -->
-            </div>
           </div>
           <div class="Proportion">
             <span class="title">公司占比:{{ companyProportion }}</span>
@@ -432,90 +434,50 @@
       </el-dialog> -->
     </div>
 
-    <!-- <div class="dialog-footer">
-      <el-button @click="Indexdialog = false">取消</el-button>
-      <el-button type="primary" @click="ConfirmForm"> 提交 </el-button>
-    </div> -->
-
     <div class="foot_btn">
       <el-button type="primary" @click="addireply">回复</el-button>
       <el-button type="primary" @click="addingRecord">处理完结</el-button>
       <el-button type="primary" @click="EndJump">完结 </el-button>
-      <el-button type="primary" @click="ConfirmForm">打回 </el-button>
+      <el-button type="primary" @click="BatchReturn">打回 </el-button>
       <el-button type="primary" @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
+      <el-button type="primary" @click="EditInformation">信息编辑</el-button>
     </div>
   </el-card>
+  <!-- 批量打回弹窗 -->
+  <el-dialog v-model="dialogReturn" title="批量打回" width="40%" draggable class="plAllret">
+    <el-form
+      v-loading="repulse"
+      element-loading-text="正在打回中..."
+      label-position="top"
+      label-width="100px"
+      :model="BatchFrom"
+    >
+      <el-form-item label="打回原因">
+        <el-input v-model="BatchFrom.txt" type="textarea" :rows="4" />
+      </el-form-item>
 
-  <!-- <div v-if="routerState" class="foot_btn">
-    <el-button type="primary" @click="ConfirmForm">新增记录</el-button>
-    <el-button type="primary" @click="ConfirmForm">完结 </el-button>
-    <el-button type="primary" @click="ConfirmForm">打回 </el-button>
-  </div> -->
-
-  <!-- 少货件数大于3 -->
-  <el-dialog
-    :show-close="false"
-    v-model="ShortageState"
-    title="少货件数"
-    width="40%"
-    @close="ShortageStateFun"
-    lock-scroll
-    draggable
-  >
-    <div class="ShortageStatenum" v-for="item in ShortageList">
-      <span class="title">件数{{ item.number }}</span
-      ><el-input v-model="item.packageCode" placeholder="请输入包条码" />
-    </div>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="ShortageCancellation">取消</el-button>
-        <el-button type="primary" @click="ShortageState = false"> 确认信息 </el-button>
-      </span>
-    </template>
-  </el-dialog>
-
-  <!-- 窜货件数大于3 -->
-  <el-dialog
-    :show-close="false"
-    v-model="fleeingState"
-    title="窜货件数"
-    width="40%"
-    @close="fleeingFun"
-    lock-scroll
-    draggable
-  >
-    <div class="ShortageStatenum" v-for="item in fleeingList">
-      <span class="title">件数{{ item.number }}</span
-      ><el-input v-model="item.packageCode" placeholder="请输入包条码" />
-    </div>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="fleeingCancellation">取消</el-button>
-        <el-button type="primary" @click="ShortageState = false"> 确认信息 </el-button>
-      </span>
-    </template>
-  </el-dialog>
-
-  <el-dialog v-model="dialogHistoricalPackage" title="查看历史包件" width="30%">
-    <el-form-item label="历史包件选择">
-      <el-select v-model="HistoricalPackageinput" clearable filterable placeholder="请选择包件">
-        <el-option
-          v-for="item in HistoricalPackageList"
-          :key="item.value"
-          :label="item.workOrderNumber"
-          :value="item.workOrderId"
-        />
-      </el-select>
-      <el-button @click="ViewPackageDetails(HistoricalPackageinput)">查看详情</el-button>
-    </el-form-item>
+      <el-form-item label="流转营业部">
+        <el-select
+          v-model="BatchFrom.businessDepartment"
+          multiple
+          filterable
+          default-first-option
+          :reserve-keyword="false"
+          placeholder="请选择活动区域"
+        >
+          <el-option
+            v-for="item in warehouseData"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
     <template #footer>
       <span class="dialog-footer">
-        <el-button @click="dialogHistoricalPackage = false">取消</el-button>
-        <el-button type="primary" @click="HistoricalPackage(HistoricalPackageinput)">
-          确定选择
-        </el-button>
+        <el-button @click="dialogReturn = false">取消</el-button>
+        <el-button type="primary" @click="ConfirmReturn" :disabled="repulse"> 确定 </el-button>
       </span>
     </template>
   </el-dialog>
@@ -535,6 +497,7 @@ import {
   $_getBusinessDepartmentUser,
   $_getAbnormalPackage,
   $_getInfo,
+  $_batchReturn,
 } from '@/api/aftersales/aftersalesWorkOrder';
 import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
 import { getToken } from '@/utils/auth';
@@ -546,12 +509,15 @@ const Indexform = ref({
 }); //首页新增表单
 const IndexException = ref([]); //异常类型下拉选择
 const DiscoveringNodes = ref([]); //发现节点下拉选择
+const ProcessingResults = ref([]); //处理结果列表选项
 const warehouseData = ref([]); //处理方
 const SelectType = ref(null); //类型
+const BatchFrom = ref({}); //打回内容
 const StateType = ref(true); //类型
 const HistoricalPackageinput = ref(''); //历史包件选择
 const dialogImageUrl = ref(null); //图片
 const dialogVisible = ref(null); //图片
+const ProcessingList = ref([]); //处理结果已经选择的列表
 const groundlineSet = ref(true); //干线条件都满足
 const groundlineType = ref(null); //干线状态
 const ShortageState = ref(false); //少货件数弹窗状态
@@ -567,6 +533,9 @@ const identifying = ref(1); //订单，零担状态
 const dialogHistoricalPackage = ref(false); //历史包件弹窗
 const HistoricalPackageList = ref([]); //历史包件数组
 const HistorIndex = ref(0); //历史包件索引
+const TotalClaimAmount = ref(0); //总金额
+const dialogReturn = ref(false); //打回弹窗
+const repulse = ref(false); //加载效果
 const PackageInfo = ref([
   //包件信息
   { packageCode: '', orderCode: '', waybillNumber: '' },
@@ -671,7 +640,47 @@ const handle = () => {
     });
   });
 };
+const changeProcessingResults = val => {
+  // 首先删除取消的项目
+  ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state - 1));
+
+  // 然后添加或保持新的项目
+  val.forEach(num => {
+    let newItem = { input: 0, min: 0, max: 9999999999999, state: num + 1, payment: '', text: '' };
+    // 根据num为newItem的name字段赋值
+    switch (num) {
+      case '1':
+        newItem.name = '下补单';
+        break;
+      case '2':
+        newItem.name = '维修/补漆';
+        break;
+      case '3':
+        newItem.name = '客户未要求理赔';
+        break;
+      case '4':
+        newItem.name = '用库存';
+        break;
+      case '5':
+        newItem.name = '赔商家';
+        break;
+      case '6':
+        newItem.name = '赔付运费';
+        break;
+      case '7':
+        newItem.name = '工厂考核';
+        break;
+      default:
+        return;
+    }
 
+    // 如果列表中不存在则加入新项目
+    if (!ProcessingList.value.some(item => item.state === newItem.state)) {
+      ProcessingList.value.push(newItem);
+      console.log(`添加：${newItem.name}`);
+    }
+  });
+};
 // 获取当前责任方的责任人
 const ResponsiblePartychange = (val, index) => {
   FangAddList.value[index].personResponsibleName = null; //清空当前选择的责任人
@@ -687,6 +696,7 @@ const onLoad = () => {
   routerState.value = $route.query.routerState;
   updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
   updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节
+  updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节
   handle(); //处理方和责任方信息
 
   $_getInfo({ id: $route.query.id }).then(res => {
@@ -738,10 +748,6 @@ const onLoad = () => {
         Indexform.value.processor.push(item.businessId);
       }
     });
- 
-
-
-
 
     // 公司占比回显计算
     let sum = 0;
@@ -752,20 +758,29 @@ const onLoad = () => {
 
     // updateDictionary(columnList[2].checkarr, 'pc_work_order'); //异常类型
     // updateDictionary(columnList[3].checkarr, 'pc_discovery_node'); //发现环节
-
+    getDictionaryBiz('result_handling').then(res => {
+      console.log(res, '发现环节');
+      ProcessingResults.value = res.data.data;
+    });
     // 处理结果回显
-    // res.data.data.processingResultsVO.processingMoneyEntityList.forEach(item => {
-    //   ProcessingList.value.push({
-    //     input: item.money,
-    //     min: 0,
-    //     max: 9999999999999,
-    //     state: item.resultType,
-    //     payment: item.compensationMethod,
-    //     name: item.resultTypeName,
-    //     text: '',
-    //   });
-    //   Indexform.value.result.push(item.resultType);
-    // });
+    res.data.data.processingResultsVO.processingMoneyEntityList.forEach(item => {
+      ProcessingList.value.push({
+        input: item.money,
+        min: 0,
+        max: 9999999999999999999999999999,
+        state: item.resultType,
+        payment: item.compensationMethod,
+        name: item.resultTypeName,
+        text: item.compensationMethodName,
+      });
+      Indexform.value.result.push(item.resultType);
+    });
+    // 总金额回显
+    TotalClaimAmount.value = res.data.data.processingResultsVO.money;
+    // 理赔支付时间
+    Indexform.value.compensationTime = res.data.data.processingResultsVO.compensationTime;
+    // 处理结果说明回显
+    Indexform.value.resultDescription = res.data.data.processingResultsVO.resultDescription;
   });
 };
 onLoad(); //初始化程序
@@ -825,6 +840,7 @@ const responsibleParty = () => {
     description: '',
   });
 };
+
 // 责任移除
 const ResponsibilityRemoval = val => {
   FangAddList.value.splice(val, 1); //移除当前点击的按钮
@@ -1006,6 +1022,51 @@ const ConfirmForm = () => {
   });
 };
 
+// 批量打回
+const BatchReturn = () => {
+  BatchFrom.value.businessDepartment = [];
+  BatchFrom.value.txt = null;
+  dialogReturn.value = true;
+};
+
+// 打回按钮
+
+const ConfirmReturn = () => {
+  repulse.value = true; //开启加载并关闭按钮
+  let data = {
+    processorList: [],
+  };
+  // 过滤满足条件的对象
+  let foundObjs = warehouseData.value.filter(obj =>
+    BatchFrom.value.businessDepartment.includes(obj.value)
+  );
+  data['businessId'] = foundObjs.map(item => item.value).join(',');
+  data['businessName'] = foundObjs.map(item => item.label).join(',');
+  // 营业部处理
+  foundObjs.forEach(item => {
+    data['processorList'].push({ id: item.value, name: item.label });
+  });
+  data.reasonReturn = BatchFrom.value.txt; //打回原因
+  data.workOrderIds = [$route.query.id]; //异常工单ID
+  console.log(data, '处理好的值');
+  $_batchReturn(data)
+    .then(res => {
+      repulse.value = false; //关闭加载并关闭按钮
+      dialogReturn.value = false; //关闭打回弹窗
+      if (res.data.code == 200) {
+        ElMessage({
+          message: res.data.msg,
+          type: 'success',
+        });
+        $router.push('/aftersales/aftersalesWorkOrder'); //打回成功跳转到列表
+      }
+    })
+    .catch(error => {
+      repulse.value = false; //关闭加载并关闭按钮
+      dialogReturn.value = false; //关闭打回弹窗
+    });
+};
+
 // 少货件数对应事件
 const ShortageTtems = val => {
   ShortageList.value = []; //进入之前重置参数
@@ -1185,6 +1246,34 @@ const addingRecord = () => {
     },
   });
 };
+// 客服仲裁完结
+const CustomerServiceCompleted = () => {
+  $router.push({
+    path: '/aftersales/aftersalesWorkOrdermodify',
+    query: {
+      id: $route.query.id,
+      name: $route.query.workOrderNumber + '-客服仲裁完结',
+      businessId: $route.query.businessId,
+      warehouseId: $route.query.warehouseId,
+      workOrderNumber: $route.query.workOrderNumber,
+      RouterState: false,
+    },
+  });
+};
+// 编辑信息
+const EditInformation = () => {
+  $router.push({
+    path: '/aftersales/aftersalesWorkOrdermodify',
+    query: {
+      id: $route.query.id,
+      name: $route.query.workOrderNumber + '-信息编辑',
+      businessId: $route.query.businessId,
+      warehouseId: $route.query.warehouseId,
+      workOrderNumber: $route.query.workOrderNumber,
+      RouterState: true,
+    },
+  });
+};
 const EndJump = () => {
   $router.push({
     path: '/aftersales/aftersalesWorkOrderend',
@@ -1255,7 +1344,7 @@ const EndJump = () => {
     margin-left: 20px;
     font-size: 14px;
     width: 100px !important;
-justify-content: flex-start;
+    justify-content: flex-start;
   }
   .el-form-item {
     margin: 0;
@@ -1439,4 +1528,93 @@ justify-content: flex-start;
 :deep(.el-card__body) {
   margin-bottom: 50px;
 }
+.ProcessingResults {
+  width: 100%;
+  min-height: 260px;
+  border: 1px solid #ccc;
+  position: relative;
+  padding: 26px;
+  box-sizing: border-box;
+  margin-top: 20px;
+  color: #606266;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin-bottom: 16px;
+  .title {
+    position: absolute;
+    top: -20px;
+    left: 20px;
+    font-size: 26px;
+    background-color: #fff;
+  }
+  .Listadmiration {
+    display: flex;
+    flex-wrap: wrap;
+    margin-top: 26px;
+    justify-content: space-between;
+    .name {
+      display: flex;
+      margin-bottom: 20px;
+      height: 30px;
+      width: 30%;
+      span {
+        display: block;
+        width: 30%;
+        color: #606266;
+        font-size: 16px;
+      }
+    }
+  }
+
+  .lptime,
+  .ZFlptime {
+    display: flex;
+    .name {
+      width: 10%;
+      color: #606266;
+    }
+    .el-input {
+      width: auto;
+    }
+    :deep(.el-input--prefix) {
+      width: 200px;
+    }
+  }
+  .ZFlptime {
+    margin: 10px 0;
+  }
+}
+.Paymentname {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border: 1px solid #bfbfbf;
+  margin-left: 2px;
+  border-radius: 4px;
+  width: 100px;
+  font-size: 14px;
+  padding: 10px;
+  cursor: pointer;
+  width: 100px;
+  margin-left: 14px;
+}
+.Paymentname:hover {
+  border: 1px solid #172e60;
+}
+.el_resj {
+  margin-top: 20px !important;
+  :deep(.el-form-item__label) {
+    justify-content: flex-start;
+    margin-left: 20px;
+    font-size: 14px;
+    width: 100px !important;
+  }
+}
+.lptime {
+  height: 30px !important;
+  :deep(.el-input) {
+    height: 30px !important;
+  }
+}
 </style>
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index 964fa9a6..ea1ddf7a 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -2,7 +2,9 @@
   <el-card class="box-card">
     <template #header>
       <div class="card-header">
-        <span>{{$route.query.index=='0'?'回复': $route.query.index=='1'?'新增记录':'完结' }}</span>
+        <span>{{
+          $route.query.index == '0' ? '回复' : $route.query.index == '1' ? '新增记录' : '完结'
+        }}</span>
         <!-- <el-button class="button" v-if="$route.query.index=='1' || $route.query.index=='2'" @click="submit">提交</el-button> -->
       </div>
     </template>
@@ -27,7 +29,7 @@
           </el-form-item> -->
 
           <!-- <div class="selector"> -->
-          <div class="el-form-item el_lab" >
+          <div class="el-form-item el_lab">
             <span class="el-form-item__label">运损节点</span>
             <el-select
               v-model="endFrom.discoveryNode"
@@ -105,7 +107,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item> </el-form-item>
+          <el-form-item label="" class="el_lab"> </el-form-item>
           <div class="el_dcl">
             <!-- <div class="selector">
               <div class="el-form-item">
@@ -211,7 +213,7 @@
                   </div>
                 </div>
                 <div class="NumTotal">
-                  <span>总件数:{{ endFrom.number }}</span>
+                  <span>总件数:{{ PackageInfo.length }}</span>
                 </div>
               </div>
             </el-tab-pane>
@@ -333,40 +335,45 @@
                 </div>
 
                 <div class="payanindemnity" v-for="(item, index) in CompensationParty" :key="index">
-                  <div class="el_pklab">  
-                  <span class="title" :style="{ color: item.state != 0 ? '#000' : '#F56C6C' }"
-                    >{{ item.state == 0 ? '赔款方' : '收款方' }}{{ item.cld }}</span
-                  >
-                </div>
-                
-                <div class="el_pkLi">  
-                  <div class="sk_input">
-                    <el-input
-                      v-model="item.name"
-                      :placeholder="item.state == 0 ? '请填写赔款方' : '请填写收款方'"
-                    />
-                  </div>
-                  <div class="sk_input">
-                    <el-input v-model="item.reason" placeholder="请填写原因" />
-                  </div>
-                  <div class="sk_input">
-                    <el-input @input="amountMoney" :min="0" v-model="item.num" placeholder="金额" />
+                  <div class="el_pklab">
+                    <span class="title" :style="{ color: item.state != 0 ? '#000' : '#F56C6C' }"
+                      >{{ item.state == 0 ? '赔款方' : '收款方' }}{{ item.cld }}</span
+                    >
                   </div>
 
-                  <div class="sk_input" v-if="item.state == 0">
-                    <el-input v-model="item.explain" placeholder="请填写说明" />
-                  </div>
-                  <div class="sk_input" v-if="item.state == 1">
-                    <!-- <el-input v-model="item.explain" placeholder="请填写说明" /> -->
-                  </div>
-                  <div class="el_cwBtn">
-                    <el-button type="primary" v-if="item.state == 0"> 财务处理 </el-button>
-                    <el-button type="primary" @click="payremove(item.state, index)">
-                      移除
-                    </el-button>
+                  <div class="el_pkLi">
+                    <div class="sk_input">
+                      <el-input
+                        v-model="item.name"
+                        :placeholder="item.state == 0 ? '请填写赔款方' : '请填写收款方'"
+                      />
+                    </div>
+                    <div class="sk_input">
+                      <el-input v-model="item.reason" placeholder="请填写原因" />
+                    </div>
+                    <div class="sk_input">
+                      <el-input
+                        @input="amountMoney"
+                        :min="0"
+                        v-model="item.num"
+                        placeholder="金额"
+                      />
+                    </div>
+
+                    <div class="sk_input" v-if="item.state == 0">
+                      <el-input v-model="item.explains" placeholder="请填写说明" />
+                    </div>
+                    <div class="sk_input" v-if="item.state == 1">
+                      <!-- <el-input v-model="item.explain" placeholder="请填写说明" /> -->
+                    </div>
+                    <div class="el_cwBtn">
+                      <el-button type="primary" v-if="item.state == 0"> 财务处理 </el-button>
+                      <el-button type="primary" @click="payremove(item.state, index)">
+                        移除
+                      </el-button>
+                    </div>
                   </div>
                 </div>
-              </div>
                 <div class="paySum">
                   <span>
                     <el-icon><Coin /></el-icon>赔款金额总和:<b>{{
@@ -391,7 +398,7 @@
                   :reserve-keyword="false"
                   placeholder="请选择处理结果"
                   @change="changeProcessingResults"
-                  :disabled="$route.query.index=='0' || $route.query.index=='2'"
+                  :disabled="$route.query.index == '0' || $route.query.index == '2'"
                 >
                   <el-option
                     v-for="item in ProcessingResults"
@@ -413,6 +420,7 @@
                     :min="item.min"
                     :max="item.max"
                     @change="TotalChange"
+                    :disabled="$route.query.index == '0' || $route.query.index == '2'"
                   />
                   <div class="Paymentname" @click="PaymentSelection(item)">
                     {{ item.payment ? item.text : '支付方式' }}
@@ -452,31 +460,32 @@
                   type="datetime"
                   format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD HH:mm:ss"
+                  :disabled="$route.query.index == '0' || $route.query.index == '2'"
                   placeholder="请选择运理赔支付时间"
                 />
               </div>
             </div>
             <!-- 处理结果说明  -->
-            <el-form-item label="处理结果说明" v-if="routerState != 'end'" class="el_resj">
+            <el-form-item label="处理结果说明" class="el_resj">
               <el-input
                 v-model="endFrom.resultDescription"
                 placeholder="请输入处理结果说明"
                 clearable
                 :autosize="{ minRows: 3, maxRows: 4 }"
                 type="textarea"
-                :disabled="$route.query.index=='0' || $route.query.index=='2'"
+                :disabled="$route.query.index == '0' || $route.query.index == '2'"
               />
             </el-form-item>
 
             <!-- 备注信息 -->
-            <div class="notes" v-if="routerState != 'end'">
+            <div class="notes">
               <el-form-item label="异常问题描述">
                 <el-input
                   v-model="endFrom.problemDescription"
                   type="textarea"
                   :autosize="{ minRows: 3, maxRows: 4 }"
                   placeholder="请输入异常问题描述"
-                  :disabled="$route.query.index =='0' "
+                  :disabled="$route.query.index == '0'"
                 />
               </el-form-item>
             </div>
@@ -485,7 +494,7 @@
             <div class="Transport_damage_photos">
               <span class="title">图片</span>
               <el-upload
-              :disabled="$route.query.index =='0' "
+                disabled
                 v-model:file-list="endFrom.packageImage"
                 list-type="picture-card"
                 :on-preview="pictureList"
@@ -506,7 +515,7 @@
             </div>
 
             <!-- 视频  -->
-            <div class="Transport_damage_photos void">
+            <!-- <div class="Transport_damage_photos void">
               <span class="title">视频</span>
               <el-upload
                 class="upload-demo"
@@ -514,7 +523,7 @@
                 :action="doubledCount"
                 :headers="headers"
                 :on-success="ViodSuccess"
-                :disabled="$route.query.index =='0' "
+                :disabled="$route.query.index == '0'"
               >
                 <el-icon class="el-icon--upload"><upload-filled /></el-icon>
                 <div class="el-upload__text">
@@ -522,10 +531,8 @@
                   <span v-if="videoUrl" class="PreviewVoid" @click.stop="Clickviod">点击预览</span>
                 </div>
               </el-upload>
-            </div>
-            <div class="el_sub" v-if="$route.query.index !='0'">
-              <el-button type="primary" class="button" @click="submit">提交</el-button>
-            </div>
+            </div> -->
+
             <!-- 视频预览弹窗 -->
             <el-dialog v-model="VideoPreviewStatus" title="视频预览" width="40%">
               <video height="360" controls class="video-player">
@@ -582,9 +589,13 @@
               </el-tab-pane>
             </el-tabs>
           </div>
+          <div class="el_sub" v-if="$route.query.index != '0'">
+            <el-button type="primary" class="button" @click="submit">提交</el-button>
+          </div>
         </el-form>
       </div>
-      <el-affix :offset="msgTop" >
+
+      <el-affix :offset="msgTop">
         <div class="right">
           <el-tabs type="border-card">
             <div class="content">
@@ -635,9 +646,17 @@
                           <p>{{ item.time }}</p>
                         </div>
 
-                        <div class="tag">
+                        <div class="tag" v-if="msgState == 1 || msgState == 2 || msgState == 3">
                           <el-tag class="mx-1" effect="dark"
-                            >{{ msgState == 1 ? ' 待回复' : msgState == 2 ? '已回复' : '已超时' }}
+                            >{{
+                              msgState == 1
+                                ? ' 待回复'
+                                : msgState == 2
+                                ? '已回复'
+                                : msgState == 3
+                                ? '已超时'
+                                : ''
+                            }}
                           </el-tag>
                         </div>
                       </el-card>
@@ -758,6 +777,7 @@ import {
   $_addProcessingResults,
   $_getSurveyRecord,
   $_getAbnormalPackage,
+  $_getTrackRecord,
 } from '@/api/aftersales/aftersalesWorkOrder';
 import { columnList, recordList } from '@/option/aftersales/vueTvemp.js';
 import { getToken } from '@/utils/auth';
@@ -788,6 +808,7 @@ const companyProportion = ref(0); //公司占比
 const HistoricalPackageList = ref([]); //历史包件数组
 const dialogHistoricalPackage = ref(false); //包件弹窗
 const HistoricalPackageinput = ref(''); //历史包件选择
+const UserPermissions = ref(''); //操作权限
 const PackageInfo = ref([
   //包件信息
   { packageCode: '', orderCode: '', waybillNumber: '' },
@@ -818,24 +839,10 @@ const viodUrl = ref({});
 const videoUrl = ref(null); //视频预览
 const VideoPreviewStatus = ref(false); //视频预览状态
 const warehouseData = ref([]); //处理方
-const MessageContent = ref([
-  // {
-  //   time: '2021-08-03 16:00:00',
-  //   content: '内容1',
-  //   name: '营业部名称',
-  //   username: '张三',
-  //   img: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
-  //   file: 'http://192.168.10.100:9000/627683-logpm/upload/20231211/19d4e462c3ebe3026cb9b27868659554.docx',
-  //   mp4: 'http://192.168.10.100:9000/627683-logpm/upload/20231211/d4619612ebca02ca1318935b31bc6940.mp4',
-  //   imgList: [
-  //     'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
-  //     'https://fuss10.elemecdn.com/2/11/6535bcfb26e4c79b48ddde44f4b6fjpeg.jpeg',
-  //   ],
-  // },
-]);
+const MessageContent = ref([]);
 const CompensationParty = ref([
-  { name: '', state: 0, num: null, reason: '', cld: 1, explain: '' }, //赔款方
-  { name: '', state: 1, num: null, reason: '', cld: 1, explain: '' }, //收款方
+  { name: '', state: 0, num: null, reason: '', cld: 1, explains: '' }, //赔款方
+  { name: '', state: 1, num: null, reason: '', cld: 1, explains: '' }, //收款方
 ]); //收/赔
 const ProcessingList = ref([]); //处理结果已经选择的列表
 // 责任方列表
@@ -888,25 +895,12 @@ const details = reactive({
   columnList,
 
   /** 列表数据 */
-  data: [{}],
+  data: [],
   // 处理记录
   recordList,
   // 处理记录数据
   recorddata: [
-    { entryTime: '测试' },
-    { entryTime: '测试' },
-    { entryTime: '测试' },
-    { entryTime: '测试' },
-    { entryTime: '测试' },
-    { entryTime: '测试' },
-    { entryTime: '测试' },
-    { entryTime: '测试' },
-    { entryTime: '测试' },
-    { entryTime: '测试' },
-    { entryTime: '测试' },
-    { entryTime: '测试' },
-    { entryTime: '测试' },
-    { entryTime: '测试' },
+
   ],
   /** 页面loading */
   loadingObj: {
@@ -965,6 +959,21 @@ const TransportChange = val => {
 
 // 页面初始化数据
 const onLoad = () => {
+  
+  // 获取角色权限
+  getDictionaryBiz('after_sales_visits').then(res => {
+    console.log(res, '角色字典');
+    const matchingItem = res.data.data.find(
+      item => item.dictValue == JSON.parse(localStorage.getItem('TWMS-userInfo')).content.role_name
+    );
+    if (matchingItem) {
+      UserPermissions.value = matchingItem.dictValue;
+    } else {
+      UserPermissions.value = '仓库客服';
+    }
+    console.log(UserPermissions.value, '当前角色权限');
+  });
+
   // 获取页面参数
   if ($route.query.id) {
     console.log($route.query);
@@ -1014,6 +1023,7 @@ const onLoad = () => {
           description: res.description, //说明
         };
       });
+
       res.data.data.processorVOList.forEach(item => {
         if (item.typesOf == 2) {
           // 处理方
@@ -1048,24 +1058,69 @@ const onLoad = () => {
         sum = Number(item.responsibilityRatio) + sum;
       });
       companyProportion.value = 100 - sum;
-
-      // updateDictionary(columnList[2].checkarr, 'pc_work_order'); //异常类型
-      // updateDictionary(columnList[3].checkarr, 'pc_discovery_node'); //发现环节
-
-      // 处理结果回显
-      // res.data.data.processingResultsVO.processingMoneyEntityList.forEach(item => {
-      //   ProcessingList.value.push({
-      //     input: item.money,
-      //     min: 0,
-      //     max: 9999999999999,
-      //     state: item.resultType,
-      //     payment: item.compensationMethod,
-      //     name: item.resultTypeName,
-      //     text: '',
-      //   });
-      //   endFrom.value.result.push(item.resultType);
-      // });
+      ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map(
+        item => {
+          endFrom.value.result.push(item.resultType);
+          return {
+            input: item.money,
+            min: 0,
+            max: 9999999999999999999999999999,
+            state: item.resultType,
+            payment: item.compensationMethod,
+            name: item.resultTypeName,
+            text: item.compensationMethodName,
+          };
+        }
+      );
+
+      // 总金额回显
+      TotalClaimAmount.value = res.data.data.processingResultsVO.money;
+      // 理赔支付时间
+      endFrom.value.compensationTime = res.data.data.processingResultsVO.compensationTime;
+      // 处理结果说明回显
+      endFrom.value.resultDescription = res.data.data.processingResultsVO.resultDescription;
+
+      // 完结信息回显
+      // 收款方
+      CompensationParty.value = [];
+      if (res.data.data.completionRecipientEntityList.length > 0) {
+        res.data.data.completionRecipientEntityList.forEach((item, index) => {
+          TotalamountReceived.value += Number(item.money);
+          CompensationParty.value.push({
+            state: 1, //状态
+            num: item.money, //金额
+            name: item.recipient, //收款方名字
+            reason: item.reasonReceivingPayment, //收款方原因
+            explains: item.explains, //收款方说明
+            cld: index + 1,
+          });
+        });
+      }
+      // 赔款方
+      if (res.data.data.completionRecordEntities.length > 0) {
+        res.data.data.completionRecordEntities.forEach((item, index) => {
+          TotalamountCompensation.value += Number(item.money);
+          CompensationParty.value.push({
+            state: 0, //状态
+            num: item.money, //金额
+            name: item.indemnitor, //收款方名字
+            reason: item.reason, //收款方原因
+            explains: item.explains, //收款方说明
+            cld: index + 1,
+          });
+        });
+      }
+      endFrom.value.arbitrate= res.data.data.reasonArbitration; //仲裁原因
+    
     });
+
+  // 查询处理记录
+  $_getTrackRecord({
+  id:$route.query.id
+  }).then(res=>{
+  console.log(res,'处理记录返回值');
+  details.recorddata=res.data.data.surveyRecordEntities
+  })
   }
 
   // 异常类型业务字典
@@ -1293,7 +1348,7 @@ const AddCompensation = () => {
       som++;
     }
   });
-  CompensationParty.value.push({ name: '', state: 0, num: 0, reason: '', cld: som, explain: '' });
+  CompensationParty.value.push({ name: '', state: 0, num: 0, reason: '', cld: som, explains: '' });
 };
 // 添加收款方
 const AddPayee = () => {
@@ -1303,7 +1358,7 @@ const AddPayee = () => {
       som++;
     }
   });
-  CompensationParty.value.push({ name: '', state: 1, num: 0, reason: '', cld: som, explain: '' });
+  CompensationParty.value.push({ name: '', state: 1, num: 0, reason: '', cld: som, explains: '' });
 };
 // 理赔总金额计算
 const TotalChange = () => {
@@ -1455,6 +1510,9 @@ const personResponsiblechange = (val, index) => {
 };
 // 支付方式选择
 const PaymentSelection = val => {
+  if ($route.query.index == '0' || $route.query.index == '2') {
+    return;
+  }
   console.log(val, '支付');
   console.log(Paymentmethod.value);
   if (val.payment) {
@@ -1484,30 +1542,9 @@ const PaymentConfirmation = val => {
 
 // 提交信息
 const submit = () => {
-  // console.log(FangAddList.value,'赔款方businessName');
-  // console.log(warehouseData.value,'选择');
-  //  let a= [
-  //     {
-  //         "businessName": "1711993021509234689",
-  //         "personResponsibleName": "1712365249019097089",
-  //         "responsibilityRatio": ""
-  //     },
-  //     {
-  //         "businessName": "1713372843170975745",
-  //         "personResponsibleName": "1712376790741266433",
-  //         "responsibilityRatio": ""
-  //     }
-  // ]
-  // let b=[
-  // {value: '1711993021509234689', label: '荆门仓'},
-
-  // {value: '1713372842906734594', label: '龙泉仓'},
-
-  // {value: '1713372842990620674', label: '双流欧派仓'},
-  // ]
-
-  // const result = FangAddList.value.map(aItem => warehouseData.value.filter(bItem => bItem.value === aItem.businessName).map(match => match.label).join(',')).join(',');
-  // console.log(result,'处理好的');
+  console.log(UserPermissions.value, '当前角色');
+  // if (UserPermissions.value == '职能客服' || UserPermissions.value == '客服经理' ) {
+
   // 完结的逻辑
   // 异常问题描述非必填
   if (routerState.value == 'end') {
@@ -1535,7 +1572,8 @@ const submit = () => {
     let data = [
       {
         completionRecipientEntities: [], //收款方
-        completionRecordEntities: [],
+        completionRecordEntities: [], //赔款方
+        reasonArbitration: endFrom.value.arbitrate, //仲裁原因
         ...info,
       },
     ];
@@ -1550,7 +1588,7 @@ const submit = () => {
           indemnitor: item.name, //赔款方
           reason: item.reason, //原因
           money: Number(item.num), //金额
-          reasonArbitration: endFrom.value.arbitrate, //仲裁原因
+          reasonArbitration: item.reason, //说明
           workOrderId: info.id, //异常工单
           warehouseId: info.warehouseId, //仓库ID
         });
@@ -1578,19 +1616,35 @@ const submit = () => {
     // 赔款方
 
     console.log(data, '处理好的值');
-    $_addCompletionEnd(data).then(res => {
-      $router.push('/aftersales/aftersalesWorkOrder');
-      console.log(res, '完结成功返回值');
-      if (res.data.code == 200) {
-        ElMessage({
-          showClose: true,
-          message: res.data.msg,
-          type: 'success',
-        });
-      }
-    });
+    // $_addCompletionEnd(data).then(res => {
+    //   $router.push('/aftersales/aftersalesWorkOrder');
+    //   console.log(res, '完结成功返回值');
+    //   if (res.data.code == 200) {
+    //     ElMessage({
+    //       showClose: true,
+    //       message: res.data.msg,
+    //       type: 'success',
+    //     });
+    //   }
+    // });
+    // }else{
+    //   ElMessage({
+    //     message: '权限不足',
+    //     type: 'warning',
+    //   });
+    //   console.log(UserPermissions.value);
+    //   return;
+    // }
   } else {
-    // 新增记录
+    if (UserPermissions.value != '仓库客服') {
+      ElMessage({
+        message: '权限不足',
+        type: 'warning',
+      });
+      console.log(UserPermissions.value);
+      return;
+    }
+    // 新增记录处理结果
     console.log($route.query.id, '异常ID');
     console.log(ProcessingList.value, 'ProcessingList12312');
     let info = JSON.parse(JSON.stringify(endFrom.value)); //拷贝要提交的数据
@@ -1858,7 +1912,7 @@ const ViewPackageDetails = val => {
 }
 .notes {
   width: 100%;
-  margin-top:40px;
+  margin-top: 40px;
 }
 .Transport_damage_photos {
   width: 100%;
@@ -1926,11 +1980,11 @@ const ViewPackageDetails = val => {
     display: flex;
     align-items: center;
   }
-  .el_pklab{
+  .el_pklab {
     width: 50px;
   }
-  
-  .el_pkLi{
+
+  .el_pkLi {
     width: 100%;
     display: flex;
     justify-content: space-between;
@@ -2182,7 +2236,7 @@ const ViewPackageDetails = val => {
   flex-direction: column;
   margin-bottom: 10px;
   .leftbox {
-    width: 80%;
+    width: 100%;
     display: flex;
     justify-content: space-between;
   }
@@ -2225,10 +2279,10 @@ const ViewPackageDetails = val => {
   justify-content: flex-end;
   margin: 4px 0;
 }
-.el_resj{
-  margin-top:20px !important;
+.el_resj {
+  margin-top: 20px !important;
 }
-.el_lab{
+.el_lab {
   margin-right: 10px !important;
 }
 </style>
diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue
index 7f053f88..3a5dde9c 100644
--- a/src/views/aftersales/aftersalesWorkOrdermodify.vue
+++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue
@@ -1,1307 +1,1770 @@
 <template>
-    <el-card class="box-card">
-      <el-tabs type="border-card" class="topClass" @tab-change="TopChange">
+  <el-card class="box-card">
+    <!-- <el-tabs type="border-card" class="topClass" @tab-change="TopChange">
         <el-tab-pane label="订单"></el-tab-pane>
         <el-tab-pane label="零担"></el-tab-pane>
-      </el-tabs>
-  
-      <!-- <el-divider content-position="left">
+      </el-tabs> -->
+
+    <!-- <el-divider content-position="left">
         <span> {{ routerState ? '信息查看' : '工单新增' }}</span>
       </el-divider> -->
-      <el-tabs type="border-card" class="PackageInformation">
-        <el-tab-pane label="包件信息">
-          <div class="ResponsibilityBoxS">
-            <div><el-button type="primary" @click="AddPackage"> 添加信息 </el-button></div>
-            <div class="el_btbox" v-for="(item, index) in PackageInfo" :key="index">
-              <div class="leftbox">
-                <div class="maxBox">
-                  <span class="title">包条码:</span>
-                  <el-input
-                    v-model="item.packageCode"
-                    placeholder="请输入包条码"
-                    clearable
-                    :rows="2"
-                    @change="ChangePackageInfo(item.packageCode, index)"
-                  />
-                </div>
-  
-                <div class="maxBox">
-                  <span class="title">订单自编码:</span>
-                  <el-input v-model="item.orderCode" placeholder="请输入订单自编号" clearable />
-                </div>
-  
-                <div class="maxBox">
-                  <span class="title">运单号:</span>
-                  <el-input v-model="item.waybillNumber" placeholder="请输入运单号" clearable />
-                </div>
+    <el-tabs type="border-card" class="PackageInformation">
+      <el-tab-pane label="包件信息">
+        <div class="ResponsibilityBoxS">
+          <div><el-button type="primary" @click="AddPackage"> 添加信息 </el-button></div>
+          <div class="el_btbox" v-for="(item, index) in PackageInfo" :key="index">
+            <div class="leftbox">
+              <div class="maxBox">
+                <span class="title">包条码:</span>
+                <el-input
+                  v-model="item.packageCode"
+                  placeholder="请输入包条码"
+                  clearable
+                  :rows="2"
+                  @change="ChangePackageInfo(item.packageCode, index)"
+                />
+              </div>
+
+              <div class="maxBox">
+                <span class="title">订单自编码:</span>
+                <el-input v-model="item.orderCode" placeholder="请输入订单自编号" clearable />
               </div>
-  
-              <div class="el-btn">
-                <el-button v-if="item.state" type="primary" @click="historicalPackages(index)">
-                  查看历史包件
-                </el-button>
-                <el-button type="primary" @click="PackagRemoval(index)"> 移除 </el-button>
+
+              <div class="maxBox">
+                <span class="title">运单号:</span>
+                <el-input v-model="item.waybillNumber" placeholder="请输入运单号" clearable />
               </div>
             </div>
-            <div class="NumTotal">
-              <span>总件数:{{ Indexform.number }}</span>
+
+            <div class="el-btn">
+              <el-button v-if="item.state" type="primary" @click="historicalPackages(index)">
+                查看历史包件
+              </el-button>
+              <el-button type="primary" @click="PackagRemoval(index)"> 移除 </el-button>
             </div>
           </div>
-        </el-tab-pane>
-      </el-tabs>
-      <el-form :model="Indexform" label-width="100px" class="IndexFrom" ref="IndexForm">
-        <el-form-item label="异常类型">
-          <el-select
-            v-model="Indexform.workOrderType"
-            clearable
-            placeholder="选择工单异常类型"
-            @change="abnormalChange"
-          >
-            <el-option
-              v-for="item in IndexException"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-  
-        <el-form-item label="发现节点">
-          <el-select
-            v-model="Indexform.discoveryNode"
-            clearable
-            placeholder="选择发现节点"
-            @change="DiscoveringNodesChange"
-          >
-            <el-option
-              v-for="item in DiscoveringNodes"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-  
-        <el-form-item label="异常工单号">
-          <el-input v-model="Indexform.workOrderNumber" disabled placeholder="异常工单号" clearable />
-        </el-form-item>
-        <!-- 必填(提货环节可以不填写运单号) -->
-        <!-- <el-form-item label="运单号" v-if="groundlineType != 1">
-        <el-input v-model="Indexform.waybillNumber" placeholder="请输入运单号" clearable />
-      </el-form-item> -->
-  
-        <!-- <el-form-item label="少货件数" v-if="StateType || SelectType == 2">
-        <div class="moneyNum">
-          <el-input
-            @change="ShortageTtems"
-            v-model="Indexform.number"
-            placeholder="请输入少货件数"
-            clearable
-          />
-          <div class="el_btn" @click="moneyBtnA"><span>编辑</span></div>
-        </div>
-      </el-form-item> -->
-  
-        <!-- <el-form-item label="窜货件数" v-if="StateType || SelectType == 3">
-        <div class="moneyNum">
-          <el-input
-            @change="fleeingTtems"
-            v-model="Indexform.number"
-            placeholder="请输入窜货件数"
-            clearable
-          />
-          <div class="el_btn" @click="moneyBtnB"><span>编辑</span></div>
+          <div class="NumTotal">
+            <span>总件数:{{ Indexform.number }}</span>
+          </div>
         </div>
-      </el-form-item> -->
-  
-        <!-- <el-form-item
-        label="包条码"
-        v-if="SelectType == 1 || SelectType == 2 || SelectType == 3 || StateType"
-      >
-        <el-input
-          v-model="Indexform.packageCode"
-          placeholder="请输入包条码,多个用逗号隔开"
+      </el-tab-pane>
+    </el-tabs>
+    <el-form :disabled="RouterState=='false'" :model="Indexform" label-width="100px" class="IndexFrom" ref="IndexForm">
+      <el-form-item label="异常类型">
+        <el-select
+          v-model="Indexform.workOrderType"
           clearable
-        />
-      </el-form-item> -->
-  
-        <!-- 必填 -->
-        <!-- <el-form-item label="订单自编号">
-        <el-input v-model="Indexform.orderCode" placeholder="请输入订单自编号" clearable />
-      </el-form-item> -->
-  
-        <el-form-item
-          label="车次号"
-          v-if="
-            groundlineSet ||
-            groundlineType == 1 ||
-            groundlineType == 3 ||
-            groundlineType == 4 ||
-            groundlineType == 8 ||
-            groundlineType == 5 ||
-            groundlineType == 7 ||
-            groundlineType == 8
-          "
-        >
-          <el-input
-            v-model="Indexform.trainNumber"
-            placeholder="请输入车次号(干线卸车环节)"
-            clearable
-          />
-        </el-form-item>
-        <!-- 必填 -->
-        <el-form-item label="一级品">
-          <el-input v-model="Indexform.first" placeholder="请输入一级品类" clearable />
-        </el-form-item>
-        <!-- 必填 -->
-        <el-form-item label="二级品">
-          <el-input v-model="Indexform.secondary" placeholder="请输入二级品类" clearable />
-        </el-form-item>
-  
-        <el-form-item label="车辆路线" v-if="groundlineSet || groundlineType == 3">
-          <el-input
-            v-model="Indexform.vehicleRoute"
-            placeholder="请输入车辆路线车次号(通过车次号自动带出车辆路线)"
-            clearable
-          />
-        </el-form-item>
-  
-        <el-form-item label="发货时间">
-          <el-date-picker
-            v-model="Indexform.deliverGoodsTime"
-            type="datetime"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择发货时间"
-          />
-        </el-form-item>
-  
-        <el-form-item
-          label="发现时间"
-          v-if="
-            groundlineSet ||
-            groundlineType == 2 ||
-            groundlineType == 3 ||
-            groundlineType == 4 ||
-            groundlineType == 8 ||
-            groundlineType == 5 ||
-            groundlineType == 7 ||
-            groundlineType == 8
-          "
+          placeholder="选择工单异常类型"
+          @change="abnormalChange"
         >
-          <el-date-picker
-            v-model="Indexform.discoveryTime"
-            type="datetime"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择发现时间"
+          <el-option
+            v-for="item in IndexException"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
           />
-        </el-form-item>
-  
-        <el-form-item
-          label="配送时间"
-          v-if="
-            groundlineSet ||
-            groundlineType == 3 ||
-            groundlineType == 4 ||
-            groundlineType == 8 ||
-            groundlineType == 5 ||
-            groundlineType == 7 ||
-            groundlineType == 8
-          "
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="发现节点">
+        <el-select
+          v-model="Indexform.discoveryNode"
+          clearable
+          placeholder="选择发现节点"
+          @change="DiscoveringNodesChange"
         >
-          <el-date-picker
-            v-model="Indexform.deliveryTime"
-            type="datetime"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择配送时间"
+          <el-option
+            v-for="item in DiscoveringNodes"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
           />
-        </el-form-item>
-  
-        <el-form-item
-          label="入库时间"
-          v-if="groundlineSet || groundlineType == 2 || groundlineType == 4"
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="异常工单号">
+        <el-input v-model="Indexform.workOrderNumber" disabled placeholder="异常工单号" clearable />
+      </el-form-item>
+
+      <el-form-item label="车次号">
+        <el-input
+          v-model="Indexform.trainNumber"
+          placeholder="请输入车次号(干线卸车环节)"
+          clearable
+        />
+      </el-form-item>
+      <!-- 必填 -->
+      <el-form-item label="一级品">
+        <el-input v-model="Indexform.first" placeholder="请输入一级品类" clearable />
+      </el-form-item>
+      <!-- 必填 -->
+      <el-form-item label="二级品">
+        <el-input v-model="Indexform.secondary" placeholder="请输入二级品类" clearable />
+      </el-form-item>
+
+      <el-form-item label="车辆路线">
+        <el-input
+          v-model="Indexform.vehicleRoute"
+          placeholder="请输入车辆路线车次号(通过车次号自动带出车辆路线)"
+          clearable
+        />
+      </el-form-item>
+
+      <el-form-item label="发货时间">
+        <el-date-picker
+          v-model="Indexform.deliverGoodsTime"
+          type="datetime"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发货时间"
+        />
+      </el-form-item>
+
+      <el-form-item
+        label="发现时间"
+      >
+        <el-date-picker
+          v-model="Indexform.discoveryTime"
+          type="datetime"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择发现时间"
+        />
+      </el-form-item>
+
+      <el-form-item
+        label="配送时间">
+        <el-date-picker
+          v-model="Indexform.deliveryTime"
+          type="datetime"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择配送时间"
+        />
+      </el-form-item>
+
+      <el-form-item
+        label="入库时间">
+        <el-date-picker
+          v-model="Indexform.warehousingTime"
+          type="datetime"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择入库"
+        />
+      </el-form-item>
+      <!-- 必填 -->
+      <el-form-item label="运单商场">
+        <el-input v-model="Indexform.waybillMall" placeholder="请输入运单商场" clearable />
+      </el-form-item>
+      <el-form-item label="钉钉流程号">
+        <el-input v-model="Indexform.processNumber" placeholder="请输入钉钉流程号" />
+      </el-form-item>
+      <el-form-item
+        label="配送司机"
+        v-if="
+          groundlineSet ||
+          groundlineType == 3 ||
+          groundlineType == 4 ||
+          groundlineType == 8 ||
+          groundlineType == 5 ||
+          groundlineType == 7 ||
+          groundlineType == 8
+        "
+      >
+        <el-select
+          v-model="Indexform.deliveryDriver"
+          filterable
+          default-first-option
+          :reserve-keyword="false"
+          placeholder="请输入配送司机"
         >
-          <el-date-picker
-            v-model="Indexform.warehousingTime"
-            type="datetime"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择入库"
+          <el-option
+            v-for="item in DeliveryDriver"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
           />
-        </el-form-item>
-        <!-- 必填 -->
-        <el-form-item label="运单商场">
-          <el-input v-model="Indexform.waybillMall" placeholder="请输入运单商场" clearable />
-        </el-form-item>
-        <el-form-item label="钉钉流程号">
-          <el-input v-model="Indexform.processNumber" placeholder="请输入钉钉流程号" />
-        </el-form-item>
-        <el-form-item
-          label="配送司机"
-          v-if="
-            groundlineSet ||
-            groundlineType == 3 ||
-            groundlineType == 4 ||
-            groundlineType == 8 ||
-            groundlineType == 5 ||
-            groundlineType == 7 ||
-            groundlineType == 8
-          "
-        >
-          <el-select
-            v-model="Indexform.deliveryDriver"
-            filterable
-            default-first-option
-            :reserve-keyword="false"
-            placeholder="请输入配送司机"
-          >
-            <el-option
-              v-for="item in DeliveryDriver"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <!-- 必填 -->
-        <el-form-item label="异常问题描述">
-          <el-input v-model="Indexform.problemDescription" placeholder="请输入异常问题" clearable />
-        </el-form-item>
-      </el-form>
-  
+        </el-select>
+      </el-form-item>
       <!-- 必填 -->
-      <div class="el_clzr">
-        <el-form-item class="investigate" label="调查经过">
-          <el-input
-            v-model="Indexform.investigationPocess"
-            placeholder="请输入调查经过"
-            clearable
-            :rows="2"
-            type="textarea"
+      <el-form-item label="异常问题描述">
+        <el-input v-model="Indexform.problemDescription" placeholder="请输入异常问题" clearable />
+      </el-form-item>
+    </el-form>
+
+    <!-- 必填 -->
+    <div class="el_clzr">
+      <el-form-item class="investigate" label="调查经过">
+        <el-input
+          v-model="Indexform.investigationPocess"
+          placeholder="请输入调查经过"
+          clearable
+          :rows="2"
+          type="textarea"
+        />
+      </el-form-item>
+
+      <el-form-item label="处理方">
+        <el-select
+          v-model="Indexform.processor"
+          clearable
+          filterable
+          multiple
+          placeholder="请选择处理方"
+        >
+          <el-option
+            v-for="item in warehouseData"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
           />
-        </el-form-item>
-  
-        <el-form-item label="处理方">
-          <el-select
-            v-model="Indexform.processor"
-            clearable
-            filterable
-            multiple
-            placeholder="请选择处理方"
-          >
-            <el-option
-              v-for="item in warehouseData"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-      </div>
-  
-      <el-tabs type="border-card">
-        <el-tab-pane label="责任方选择">
-          <div class="ResponsibilityBox">
-            <div><el-button type="primary" @click="responsibleParty"> 添加信息 </el-button></div>
-            <div class="el_btbox" v-for="(item, index) in FangAddList" :key="index">
-              <div class="leftbox">
-                <div class="maxBox">
-                  <span class="title">责任方:</span>
-  
-                  <!-- 提货环节  -->
-  
-                  <el-select
-                    v-model="item.businessName"
-                    clearable
-                    placeholder="请选提货择责任方"
-                    v-if="groundlineType == 1"
-                  >
-                    <el-option
-                      v-for="item in responsible"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-  
-                  <el-select
-                    v-else
-                    v-model="item.businessName"
-                    filterable  
-                    placeholder="请选择责任方"
-                    @change="ResponsiblePartychange(item.businessName, index)"
-                  >
-                    <el-option
-                      v-for="item in warehouseData"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </div>
-  
-                <div class="maxBox">
-                  <span class="title">责任人：</span>
-                  <el-select
-                    v-model="item.personResponsibleName"
-                    clearable
-                    filterable
-                    placeholder="请选责任人"
-                  >
-                    <el-option
-                      v-for="item in personResponsibleList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
-                    />
-                  </el-select>
-                </div>
-                <div class="maxBox">
-                  <span class="title">占比:</span>
-                  <el-input
-                    v-model="item.responsibilityRatio"
-                    placeholder="请输入占比 "
-                    clearable
-                    :rows="2"
+        </el-select>
+      </el-form-item>
+    </div>
+
+    <el-tabs type="border-card">
+      <el-tab-pane label="责任方选择">
+        <div class="ResponsibilityBox">
+          <div><el-button type="primary" @click="responsibleParty"> 添加信息 </el-button></div>
+          <div class="el_btbox" v-for="(item, index) in FangAddList" :key="index">
+            <div class="leftbox">
+              <div class="maxBox">
+                <span class="title">责任方:</span>
+
+                <!-- 提货环节  -->
+
+                <el-select
+                  v-model="item.businessName"
+                  clearable
+                  placeholder="请选提货择责任方"
+                  v-if="groundlineType == 1"
+                >
+                  <el-option
+                    v-for="item in responsible"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
                   />
-                </div>
-  
-                <div class="maxBox">
-                  <span class="title">说明:</span>
-                  <el-input
-                    v-model="item.description"
-                    placeholder="请输入说明 "
-                    clearable
-                    :rows="2"
+                </el-select>
+
+                <el-select
+                  v-else
+                  v-model="item.businessName"
+                  filterable
+                  placeholder="请选择责任方"
+                  @change="ResponsiblePartychange(item.businessName, index)"
+                >
+                  <el-option
+                    v-for="item in warehouseData"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
                   />
-                </div>
+                </el-select>
+              </div>
+
+              <div class="maxBox">
+                <span class="title">责任人：</span>
+                <el-select
+                  v-model="item.personResponsibleName"
+                  clearable
+                  filterable
+                  placeholder="请选责任人"
+                >
+                  <el-option
+                    v-for="item in personResponsibleList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </div>
+              <div class="maxBox">
+                <span class="title">占比:</span>
+                <el-input
+                  v-model="item.responsibilityRatio"
+                  placeholder="请输入占比 "
+                  clearable
+                  :rows="2"
+                  @input="ProportionInput"
+                />
               </div>
-              <div class="el-btn">
-                <el-button type="primary" @click="ResponsibilityRemoval(index)"> 移除 </el-button>
+
+              <div class="maxBox">
+                <span class="title">说明:</span>
+                <el-input
+                  v-model="item.description"
+                  placeholder="请输入说明 "
+                  clearable
+                  :rows="2"
+                />
               </div>
             </div>
-            <div class="Proportion">
-              <span class="title">公司占比:{{ companyProportion }}</span>
+            <div class="el-btn">
+              <el-button type="primary" @click="ResponsibilityRemoval(index)"> 移除 </el-button>
             </div>
           </div>
-        </el-tab-pane>
-      </el-tabs>
-  
-      <div class="Transport_damage_photos" v-if="SelectType == 1 || SelectType == 3 || StateType">
-        <span class="title">{{
-          SelectType == 1 ? '运损照片' : SelectType == 3 ? '窜货照片' : '照片'
-        }}</span>
-        <el-upload
-          v-model:file-list="Indexform.packList"
-          list-type="picture-card"
-          :on-preview="pictureList"
-          :on-remove="ImgListRemove"
-          :action="doubledCount"
-          :on-success="ImgSuccess"
-          :before-upload="beforeAvatarUpload"
-          :headers="headers"
-          multiple
-          drag
-        >
-          <el-icon><Plus /></el-icon>
-        </el-upload>
-  
-        <el-dialog v-model="dialogVisible">
-          <img w-full :src="dialogImageUrl" alt="图片" />
-        </el-dialog>
-      </div>
-  
-      <div class="dialog-footer">
-        <el-button @click="Indexdialog = false">取消</el-button>
-        <el-button type="primary" @click="ConfirmForm"> 提交 </el-button>
+          <div class="Proportion">
+            <span class="title">公司占比:{{ companyProportion }}</span>
+          </div>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+
+    <el-form-item label="处理结果" class="el_handle">
+      <el-select
+        v-model="Indexform.result"
+        multiple
+        filterable
+        default-first-option
+        :reserve-keyword="false"
+        placeholder="请选择处理结果"
+        @change="changeProcessingResults"
+      >
+        <el-option
+          v-for="item in ProcessingResults"
+          :key="item.dictKey"
+          :label="item.dictValue"
+          :value="item.dictKey"
+        />
+      </el-select>
+    </el-form-item>
+
+    <div class="ProcessingResults" v-if="ProcessingList.length">
+      <div class="title">处理结果-理赔金额</div>
+      <div class="Listadmiration">
+        <div class="name" v-for="(item, index) in ProcessingList" :key="index">
+          <span>{{ item.name }}:</span>
+          <el-input-number
+            v-model="item.input"
+            :min="item.min"
+            :max="item.max"
+            @change="TotalChange"
+          />
+          <div class="Paymentname" @click="PaymentSelection(item)">
+            {{ item.payment ? item.text : '支付方式' }}
+          </div>
+        </div>
       </div>
-    </el-card>
-  
-    <!-- <div v-if="routerState" class="foot_btn">
-      <el-button type="primary" @click="ConfirmForm">新增记录</el-button>
-      <el-button type="primary" @click="ConfirmForm">完结 </el-button>
-      <el-button type="primary" @click="ConfirmForm">打回 </el-button>
-    </div> -->
-  
-    <!-- 少货件数大于3 -->
-    <el-dialog
-      :show-close="false"
-      v-model="ShortageState"
-      title="少货件数"
-      width="40%"
-      @close="ShortageStateFun"
-      lock-scroll
-      draggable
-    >
-      <div class="ShortageStatenum" v-for="item in ShortageList">
-        <span class="title">件数{{ item.number }}</span
-        ><el-input v-model="item.packageCode" placeholder="请输入包条码" />
+
+      <div class="el_tool">
+        <span>总金额:{{ TotalClaimAmount }}</span>
       </div>
-  
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="ShortageCancellation">取消</el-button>
-          <el-button type="primary" @click="ShortageState = false"> 确认信息 </el-button>
-        </span>
-      </template>
-    </el-dialog>
-  
-    <!-- 窜货件数大于3 -->
-    <el-dialog
-      :show-close="false"
-      v-model="fleeingState"
-      title="窜货件数"
-      width="40%"
-      @close="fleeingFun"
-      lock-scroll
-      draggable
-    >
-      <div class="ShortageStatenum" v-for="item in fleeingList">
-        <span class="title">件数{{ item.number }}</span
-        ><el-input v-model="item.packageCode" placeholder="请输入包条码" />
+
+      <el-divider>
+        <span class="ZFname">理赔支付时间</span>
+      </el-divider>
+      <div class="lptime">
+        <!-- <span class="name">理赔支付时间</span> -->
+        <el-date-picker
+          v-model="Indexform.compensationTime"
+          type="datetime"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择运理赔支付时间"
+        />
       </div>
-  
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="fleeingCancellation">取消</el-button>
-          <el-button type="primary" @click="ShortageState = false"> 确认信息 </el-button>
-        </span>
-      </template>
-    </el-dialog>
-  
-    <el-dialog v-model="dialogHistoricalPackage" title="查看历史包件" width="30%">
-      <el-form-item label="历史包件选择">
-        <el-select v-model="HistoricalPackageinput" clearable filterable placeholder="请选择包件">
-          <el-option
-            v-for="item in HistoricalPackageList"
-            :key="item.value"
-            :label="item.workOrderNumber"
-            :value="item.workOrderId"
+    </div>
+
+    <el-tabs type="border-card" class="demo-tabs">
+      <el-tab-pane>
+        <template #label>
+          <span class="custom-tabs-label">
+            <el-icon><calendar /></el-icon>
+            <span>完结信息</span>
+          </span>
+        </template>
+
+        <div class="el-ckbtn">
+          <el-button type="primary" @click="AddCompensation">添加赔款方</el-button>
+          <el-button type="primary" @click="AddPayee">添加收款方</el-button>
+        </div>
+
+        <div class="payanindemnity" v-for="(item, index) in CompensationParty" :key="index">
+          <div class="el_pklab">
+            <span class="title" :style="{ color: item.state != 0 ? '#000' : '#F56C6C' }"
+              >{{ item.state == 0 ? '赔款方' : '收款方' }}{{ item.cld }}</span
+            >
+          </div>
+
+          <div class="el_pkLi">
+            <div class="sk_input">
+              <el-input
+                v-model="item.name"
+                :placeholder="item.state == 0 ? '请填写赔款方' : '请填写收款方'"
+              />
+            </div>
+            <div class="sk_input">
+              <el-input v-model="item.reason" placeholder="请填写原因" />
+            </div>
+            <div class="sk_input">
+              <el-input @input="amountMoney" :min="0" v-model="item.num" placeholder="金额" />
+            </div>
+
+            <div class="sk_input" v-if="item.state == 0">
+              <el-input v-model="item.explains" placeholder="请填写说明" />
+            </div>
+            <div class="sk_input" v-if="item.state == 1">
+              <!-- <el-input v-model="item.explain" placeholder="请填写说明" /> -->
+            </div>
+            <div class="el_cwBtn">
+              <el-button type="primary" v-if="item.state == 0"> 财务处理 </el-button>
+              <el-button type="primary" @click="payremove(item.state, index)"> 移除 </el-button>
+            </div>
+          </div>
+        </div>
+        <div class="paySum">
+          <span>
+            <el-icon><Coin /></el-icon>赔款金额总和:<b>{{ TotalamountCompensation }}</b></span
+          >
+          <span>
+            <el-icon><Coin /></el-icon>收款金额总和:<b>{{ TotalamountReceived }}</b></span
+          >
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+
+    <!-- 仲裁原因 -->
+    <div class="arbitrate">
+      <el-tabs type="border-card" class="demo-tabs">
+        <el-tab-pane>
+          <template #label>
+            <span class="custom-tabs-label">
+              <el-icon><calendar /></el-icon>
+              <span>仲裁原因</span>
+            </span>
+          </template>
+
+          <el-input
+            v-model="Indexform.arbitrate"
+            type="textarea"
+            :autosize="{ minRows: 5, maxRows: 4 }"
+            placeholder="请输入仲裁原因"
           />
-        </el-select>
-        <el-button @click="ViewPackageDetails(HistoricalPackageinput)">查看详情</el-button>
-      </el-form-item>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogHistoricalPackage = false">取消</el-button>
-          <el-button type="primary" @click="HistoricalPackage(HistoricalPackageinput)">
-            确定选择
-          </el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </template>
-  
-  <script setup>
-  import { ElMessage } from 'element-plus';
-  import { ElMessageBox } from 'element-plus';
-  import { useRouter, useRoute } from 'vue-router';
-  import { getDictionaryBiz } from '@/api/system/dict'; //字典
-  import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方
-  import {
-    $_getList,
-    $_submit,
-    $_getDetail,
-    $_remove,
-    $_getBusinessDepartmentUser,
-    $_getAbnormalPackage,
-  } from '@/api/aftersales/aftersalesWorkOrder';
-  import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
-  import { getToken } from '@/utils/auth';
-  const $router = useRouter();
-  const $route = useRoute();
-  const Indexform = ref({
-    packList: [
-      {
-        name: 'food.jpeg',
-        url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
-      },
-      {
-        name: 'food.jpeg',
-        url: 'https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100',
-      },
-    ],
-    decreaseImageEntityList: [], //处理好的图片数据
-  }); //首页新增表单
-  const IndexException = ref([]); //异常类型下拉选择
-  const DiscoveringNodes = ref([]); //发现节点下拉选择
-  const warehouseData = ref([]); //处理方
-  const SelectType = ref(null); //类型
-  const StateType = ref(true); //类型
-  const HistoricalPackageinput = ref(''); //历史包件选择
-  const dialogImageUrl = ref(null); //图片
-  const dialogVisible = ref(null); //图片
-  const groundlineSet = ref(true); //干线条件都满足
-  const groundlineType = ref(null); //干线状态
-  const ShortageState = ref(false); //少货件数弹窗状态
-  const fleeingState = ref(false); //窜货件数弹窗
-  const ShortageList = ref([]); //少货件数
-  const fleeingList = ref([]); //窜货件数
-  const valueStrictly = ref();
-  const routerID = ref(null); //路由参数ID
-  const routerState = ref(''); //路由状态
-  const personResponsibleList = ref([]); //责任人列表
-  const companyProportion = ref(0); //公司占比
-  const identifying = ref(1); //订单，零担状态
-  const dialogHistoricalPackage = ref(false); //历史包件弹窗
-  const HistoricalPackageList = ref([]); //历史包件数组
-  const HistorIndex = ref(0); //历史包件索引
-  const PackageInfo = ref([
-    //包件信息
-    { packageCode: '', orderCode: '', waybillNumber: '' },
-  ]);
-  // 责任方列表
-  const FangAddList = ref([
-    { businessName: '', personResponsibleName: '', responsibilityRatio: '', description: '' },
-  ]);
-  // 提货责任方
-  const responsible = ref([
-    {
-      value: '1',
-      label: '工厂',
-    },
-    {
-      value: '2',
-      label: '外包搬运',
-    },
-    {
-      value: '3',
-      label: '物流',
-    },
-  ]);
-  
-  const DeliveryDriver = ref([
-    {
-      value: '0',
-      label: '兰溪',
-    },
-    {
-      value: '1',
-      label: '李华',
-    },
-    {
-      value: '2',
-      label: '唐飞',
-    },
-  ]);
-  // 图片列表
-  const fileList = ref([]);
-  // 字典公共函数
-  function updateDictionary(targetArray, dictionaryType) {
-    getDictionaryBiz(dictionaryType).then(res => {
-      console.log(res, '字典');
-      res.data.data.forEach(item => {
-        targetArray.push({
-          value: item.dictKey,
-          label: item.dictValue,
-        });
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div class="Transport_damage_photos">
+
+      <el-upload
+        v-model:file-list="Indexform.packageImage"
+        list-type="picture-card"
+        :on-preview="pictureList"
+        :on-remove="ImgListRemove"
+        :action="doubledCount"
+        :on-success="ImgSuccess"
+        :before-upload="beforeAvatarUpload"
+        :headers="headers"
+        multiple
+        drag
+      >
+        <el-icon><Plus /></el-icon>
+      </el-upload>
+
+      <el-dialog v-model="dialogVisible">
+        <img w-full :src="dialogImageUrl" alt="图片" />
+      </el-dialog>
+    </div>
+
+    <div class="dialog-footer">
+      <el-button @click="Indexdialog = false">取消</el-button>
+      <el-button type="primary" @click="ConfirmForm"> 提交 </el-button>
+      <el-button type="primary" @click="Arbitrationcompleted"> 客服仲裁完结 </el-button>
+    </div>
+  </el-card>
+
+  <!-- 少货件数大于3 -->
+  <el-dialog
+    :show-close="false"
+    v-model="ShortageState"
+    title="少货件数"
+    width="40%"
+    @close="ShortageStateFun"
+    lock-scroll
+    draggable
+  >
+    <div class="ShortageStatenum" v-for="item in ShortageList">
+      <span class="title">件数{{ item.number }}</span
+      ><el-input v-model="item.packageCode" placeholder="请输入包条码" />
+    </div>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="ShortageCancellation">取消</el-button>
+        <el-button type="primary" @click="ShortageState = false"> 确认信息 </el-button>
+      </span>
+    </template>
+  </el-dialog>
+
+  <!-- 窜货件数大于3 -->
+  <el-dialog
+    :show-close="false"
+    v-model="fleeingState"
+    title="窜货件数"
+    width="40%"
+    @close="fleeingFun"
+    lock-scroll
+    draggable
+  >
+    <div class="ShortageStatenum" v-for="item in fleeingList">
+      <span class="title">件数{{ item.number }}</span
+      ><el-input v-model="item.packageCode" placeholder="请输入包条码" />
+    </div>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="fleeingCancellation">取消</el-button>
+        <el-button type="primary" @click="ShortageState = false"> 确认信息 </el-button>
+      </span>
+    </template>
+  </el-dialog>
+
+  <el-dialog v-model="dialogHistoricalPackage" title="查看历史包件" width="30%">
+    <el-form-item label="历史包件选择">
+      <el-select v-model="HistoricalPackageinput" clearable filterable placeholder="请选择包件">
+        <el-option
+          v-for="item in HistoricalPackageList"
+          :key="item.value"
+          :label="item.workOrderNumber"
+          :value="item.workOrderId"
+        />
+      </el-select>
+      <el-button @click="ViewPackageDetails(HistoricalPackageinput)">查看详情</el-button>
+    </el-form-item>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogHistoricalPackage = false">取消</el-button>
+        <el-button type="primary" @click="HistoricalPackage(HistoricalPackageinput)">
+          确定选择
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+
+  <!-- 支付方式选择 -->
+  <el-dialog v-model="ZFdialog" title="支付方式选择" width="45%" class="ZFfsLoad">
+    <el-radio-group v-model="Indexform.compensationMethod">
+      <el-radio
+        :label="item.dictKey"
+        v-for="item in Paymentmethod"
+        :key="item.dictKey"
+        size="large"
+        border
+        >{{ item.dictValue }}</el-radio
+      >
+    </el-radio-group>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="ZFdialog = false">取消</el-button>
+        <el-button type="primary" @click="PaymentConfirmation(Indexform.compensationMethod)">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ElMessage } from 'element-plus';
+import { ElMessageBox } from 'element-plus';
+import { useRouter, useRoute } from 'vue-router';
+import { getDictionaryBiz } from '@/api/system/dict'; //字典
+import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方
+import {
+  $_getList,
+  $_submit,
+  $_getDetail,
+  $_remove,
+  $_getBusinessDepartmentUser,
+  $_getAbnormalPackage,
+  $_getInfo,
+  $_arbitrateEnd,
+  $_modifyData,
+} from '@/api/aftersales/aftersalesWorkOrder';
+import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
+import { getToken } from '@/utils/auth';
+import { computeNumber, isNumer } from '@/utils/util';
+const $router = useRouter();
+const $route = useRoute();
+const TotalamountCompensation = ref(0); //赔款金额合计
+const TotalamountReceived = ref(0); //收款金额合计
+const Indexform = ref({
+  packList: [],
+  decreaseImageEntityList: [], //处理好的图片数据
+}); //首页新增表单
+const IndexException = ref([]); //异常类型下拉选择
+const ProcessingList = ref([]); //处理结果已经选择的列表
+const DiscoveringNodes = ref([]); //发现节点下拉选择
+const warehouseData = ref([]); //处理方
+const SelectType = ref(null); //类型
+const StateType = ref(true); //类型
+const HistoricalPackageinput = ref(''); //历史包件选择
+const dialogImageUrl = ref(null); //图片
+const dialogVisible = ref(null); //图片
+const groundlineSet = ref(true); //干线条件都满足
+const groundlineType = ref(null); //干线状态
+const ShortageState = ref(false); //少货件数弹窗状态
+const fleeingState = ref(false); //窜货件数弹窗
+const ShortageList = ref([]); //少货件数
+const fleeingList = ref([]); //窜货件数
+const valueStrictly = ref();
+const routerID = ref(null); //路由参数ID
+const routerState = ref(''); //路由状态
+const personResponsibleList = ref([]); //责任人列表
+const companyProportion = ref(0); //公司占比
+const identifying = ref(1); //订单，零担状态
+const dialogHistoricalPackage = ref(false); //历史包件弹窗
+const HistoricalPackageList = ref([]); //历史包件数组
+const Paymentmethod = ref([]); //支付方式
+const ZFdialog = ref(false); //支付弹窗
+const ZFname = ref(''); //支付方式弹窗
+const HistorIndex = ref(0); //历史包件索引
+const ProcessingResults = ref([]); //处理结果列表选项
+const TotalClaimAmount = ref(0); //理赔总金额
+const TransportlossList = ref([]);
+const RouterState = ref(null); //编辑信息
+const CompensationParty = ref([
+  { name: '', state: 0, num: null, reason: '', cld: 1, explains: '' }, //赔款方
+  { name: '', state: 1, num: null, reason: '', cld: 1, explains: '' }, //收款方
+]); //收/赔
+const PackageInfo = ref([
+  //包件信息
+  { packageCode: '', orderCode: '', waybillNumber: '' },
+]);
+// 责任方列表
+const FangAddList = ref([
+  { businessName: '', personResponsibleName: '', responsibilityRatio: '', description: '' },
+]);
+// 提货责任方
+const responsible = ref([
+  {
+    value: '1',
+    label: '工厂',
+  },
+  {
+    value: '2',
+    label: '外包搬运',
+  },
+  {
+    value: '3',
+    label: '物流',
+  },
+]);
+
+const DeliveryDriver = ref([
+  {
+    value: '0',
+    label: '兰溪',
+  },
+  {
+    value: '1',
+    label: '李华',
+  },
+  {
+    value: '2',
+    label: '唐飞',
+  },
+]);
+// 图片列表
+const fileList = ref([]);
+// 字典公共函数
+function updateDictionary(targetArray, dictionaryType) {
+  getDictionaryBiz(dictionaryType).then(res => {
+    console.log(res, '字典');
+    res.data.data.forEach(item => {
+      targetArray.push({
+        value: item.dictKey,
+        label: item.dictValue,
       });
     });
+  });
+}
+// 图片上传必须携带TOKEN
+const headers = computed(() => {
+  return { 'Blade-Auth': 'Bearer ' + getToken() };
+});
+// 图片上传接口
+const doubledCount = computed(() => {
+  return '/api/blade-resource/oss/endpoint/put-file';
+});
+// 图片上传接口
+
+// 图片上传成功回调函数
+const ImgSuccess = (response, uploadFile) => {
+  if (response.success === true) {
+    console.log(response);
+    Indexform.value['packList'].push({
+      name: response.data.originalName,
+      url: response.data.link,
+    });
+    console.log(Indexform.value['packList'], '图片列表');
+  }
+};
+
+// 上传图片规则
+const beforeAvatarUpload = rawFile => {
+  if (rawFile.type !== 'image/png') {
+    ElMessage.error('图片格式只能为image/png!');
+    return false;
+  } else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('图片大小不能大于2MB!');
+    return false;
   }
-  // 图片上传必须携带TOKEN
-  const headers = computed(() => {
-    return { 'Blade-Auth': 'Bearer ' + getToken() };
+  return true;
+};
+// 点击图片列表回调
+const pictureList = val => {
+  console.log(val, '图片列表');
+};
+// 点击图片移除
+const ImgListRemove = val => {
+  console.log(val, '移除图片');
+};
+// 处理方和责任方获取数据
+const handle = () => {
+  getDeptWarehouse().then(res => {
+    res.data.data.forEach(item => {
+      warehouseData.value.push({
+        value: item.id,
+        label: item.name,
+      });
+    });
+  });
+};
+
+// 获取当前责任方的责任人
+const ResponsiblePartychange = (val, index) => {
+  FangAddList.value[index].personResponsibleName = null; //清空当前选择的责任人
+  $_getBusinessDepartmentUser({
+    warehouseId: val,
+  }).then(res => {
+    console.log(res, '获取责任人列表');
+    personResponsibleList.value = res.data.data;
+  });
+};
+const onLoad = () => {
+  RouterState.value = $route.query.RouterState;
+  console.log(RouterState.value, '路由状态');
+  getDictionaryBiz('result_handling').then(res => {
+    console.log(res, '发现环节');
+    ProcessingResults.value = res.data.data;
+    console.log(ProcessingResults.value, '发现环节');
   });
-  // 图片上传接口
-  const doubledCount = computed(() => {
-    return '/api/blade-resource/oss/endpoint/put-file';
+
+  // 支付方式字典
+  getDictionaryBiz('payment_method').then(res => {
+    //处理结果字典
+    console.log(res);
+    Paymentmethod.value = res.data.data;
   });
-  // 图片上传接口
-  
-  // 图片上传成功回调函数
-  const ImgSuccess = (response, uploadFile) => {
-    if (response.success === true) {
-      console.log(response);
-      Indexform.value['packList'].push({
-        name: response.data.originalName,
-        url: response.data.link,
+
+  console.log($route.query.id, '页面初始化');
+  routerState.value = $route.query.routerState;
+  updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
+  updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节
+  handle(); //处理方和责任方信息
+
+  $_getInfo({ id: $route.query.id }).then(res => {
+    console.log(res, '回显返回值参数');
+    Indexform.value = res.data.data;
+    Indexform.value.result = [];
+    Indexform.value.processor = [];
+    Indexform.value.packageImage = [];
+    //图片处理回显
+    res.data.data.decreaseImageVOList.forEach(res => {
+      Indexform.value['packageImage'].push({
+        name: res.imageName,
+        url: res.imagePath,
       });
-      console.log(Indexform.value['packList'], '图片列表');
-    }
-  };
-  
-  // 上传图片规则
-  const beforeAvatarUpload = rawFile => {
-    if (rawFile.type !== 'image/png') {
-      ElMessage.error('图片格式只能为image/png!');
-      return false;
-    } else if (rawFile.size / 1024 / 1024 > 2) {
-      ElMessage.error('图片大小不能大于2MB!');
-      return false;
-    }
-    return true;
-  };
-  // 点击图片列表回调
-  const pictureList = val => {
-    console.log(val, '图片列表');
-  };
-  // 点击图片移除
-  const ImgListRemove = val => {
-    console.log(val, '移除图片');
-  };
-  // 处理方和责任方获取数据
-  const handle = () => {
-    getDeptWarehouse().then(res => {
-      res.data.data.forEach(item => {
-        warehouseData.value.push({
-          value: item.id,
-          label: item.name,
-        });
+    });
+    // 包件回显
+    PackageInfo.value = res.data.data.abnormalPackageVOList
+      .map(item => {
+        let orderCodes = item.orderCode.split(',');
+        let packageCodes = item.packageCode.split(',');
+        let waybillNumbers = item.waybillNumber.split(',');
+
+        return orderCodes.map((code, index) => ({
+          packageCode: packageCodes[index],
+          orderCode: code,
+          waybillNumber: waybillNumbers[index],
+        }));
+      })
+      .flat();
+    // 责任方回显
+    FangAddList.value = res.data.data.processorVOList
+      .filter(item => item.typesOf == '1')
+      .map(res => {
+        return {
+          businessName: res.businessId,
+        };
       });
+
+    FangAddList.value = res.data.data.personResponsibleVOS.map(res => {
+      return {
+        businessName: res.businessId, //责任人ID
+        personResponsibleName: res.personResponsibleName, //责任人名称
+        responsibilityRatio: res.responsibilityRatio, //占比
+        description: res.description, //说明
+      };
     });
-  };
-  
-  // 获取当前责任方的责任人
-  const ResponsiblePartychange = (val, index) => {
-    FangAddList.value[index].personResponsibleName = null; //清空当前选择的责任人
-    $_getBusinessDepartmentUser({
-      warehouseId: val,
-    }).then(res => {
-      console.log(res, '获取责任人列表');
-      personResponsibleList.value = res.data.data;
+
+    res.data.data.processorVOList.forEach(item => {
+      if (item.typesOf == 2) {
+        // 处理方
+        Indexform.value.processor.push(item.businessId);
+      }
     });
-  };
-  const onLoad = () => {
-    console.log($route.query.id, '页面初始化');
-    routerState.value = $route.query.routerState;
-    updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
-    updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节
-    handle(); //处理方和责任方信息
-  };
-  onLoad(); //初始化程序
-  // 异常类型事件
-  const abnormalChange = val => {
-    console.log(val, '异常事件类型');
-    console.log(StateType.value);
-    StateType.value = false;
-    if (val == 1 || val == 2 || val == 3) {
-      SelectType.value = val;
-    } else {
-      StateType.value = true;
-    }
-    // 运损无数据默认0
-    if (val == 1) {
-      Indexform.value.packageCode = 0;
-    } else {
-      Indexform.value.packageCode = null;
-    }
-  };
-  
-  // 发现节点事件
-  const DiscoveringNodesChange = val => {
-    groundlineSet.value = false; //干线条件都不满足
-    if (val == 1 || val == 2 || val == 3 || val == 4 || val == 5 || val == 8 || val == 7) {
-      groundlineType.value = val; //干线状态
-      console.log(val);
-    } else {
-      groundlineSet.value = true; //展示所有搜索框
-    }
-  };
-  
-  // 照片
-  const handleRemove = (uploadFile, uploadFiles) => {
-    console.log(uploadFile, uploadFiles);
-  };
-  
-  const handlePictureCardPreview = uploadFile => {
-    dialogImageUrl.value = uploadFile.url;
-    dialogVisible.value = true;
-  };
-  
-  // 添加包件
-  const AddPackage = () => {
-    PackageInfo.value.push({ packageCode: '', orderCode: '', waybillNumber: '' });
-  };
-  // 包件移除
-  const PackagRemoval = val => {
-    PackageInfo.value.splice(val, 1); //移除当前点击的按钮
-  };
-  // 责任方添加
-  const responsibleParty = () => {
-    FangAddList.value.push({
-      businessName: '',
-      personResponsibleName: '',
-      responsibilityRatio: '',
-      description: '',
+    console.log(Indexform.value.processor, ' Indexform.value.processor');
+    getDictionaryBiz('pc_work_order').then(res => {
+      //处理结果字典
+      console.log(res, '环节字典');
+      Indexform.value.workOrderType = res.data.data.find(
+        res => res.dictKey == Indexform.value.workOrderType
+      ).dictValue; //异常类型回显
     });
-  };
-  // 责任移除
-  const ResponsibilityRemoval = val => {
-    FangAddList.value.splice(val, 1); //移除当前点击的按钮
-  };
-  // 顶部标签切换
-  const TopChange = val => {
-    console.log(val);
-    if (val == 0) {
-      identifying.value = 1;
-    } else {
-      identifying.value = 2;
-    }
-  };
-  
-  //表单提交
-  const ConfirmForm = () => {
-    // 图片类型:10运损,20窜货
-    // decreaseImageEntityList:[
-    //   {imageType:10,imageName:'图片名称',imagePath:'图片路径'},
-    //   {imageType:10,imageName:'图片名称',imagePath:'图片路径'},
-    // ]
-    console.log(Indexform.value['packList'], '图片列表');
-    // 处理图片(当类型为货损或为窜货才执行下面的东西)
-    if (SelectType.value == 1 || SelectType.value == 3) {
-      if (Indexform.value['packList']) {
-        Indexform.value['packList'].forEach(item => {
-          Indexform.value['decreaseImageEntityList'].push({
-            imageType: SelectType.value == 1 ? 10 : SelectType.value == 3 ? 20 : '',
-            imageName: item.name,
-            imagePath: item.url,
-          });
-        });
-      }
-    }
-  
-    console.log(Indexform.value['decreaseImageEntityList'], '处理好的图片');
-    //司机信息处理
-    if (Indexform.value.deliveryDriver) {
-      Indexform.value.deliveryDriver = DeliveryDriver.value.find(
-        item => item.value == Indexform.value.deliveryDriver
-      ).label;
-    }
-  
-    console.log(Indexform.value.deliveryDriver); // 输出李华
-    let processorEntityList = [];
-  
-    //处理方信息处理
-    if (Indexform.value.processor.length) {
-      Indexform.value.processor.forEach(item => {
-        let found = warehouseData.value.find(element => element.value == item.toString());
-        processorEntityList.push({
-          businessName: found ? found.label : '',
-          businessId: item,
-          conditions: 1,
-          typesOf: 2,
-        });
-      });
-    }
-  
-    // 提货责任方
-    // if (Indexform.value.businessMame) {
-    //   const found = responsible.value.find(item => item.value === Indexform.value.businessMame);
-    //   if (found) {
-    //     processorEntityList.push({
-    //       businessName: found.label,
-    //       businessId: found.id,
-    //       conditions: 1,
-    //       typesOf: 1,
-    //     });
-    //   }
-    // }
-    //  提货责任方
-  
-    console.log(Indexform.value.businessMame, '提货责任方');
-    let DataSubmit = {
-      personResponsibleDTO: [],
-      packageEntityList: [], ////包件信息
-      ...Indexform.value,
-    }; //解构表单参数
-    DataSubmit.processorEntityList = processorEntityList;
-    DataSubmit.decreaseImageEntityList = JSON.parse(
-      JSON.stringify(Indexform.value['decreaseImageEntityList'])
-    );
-  
-    // 包件信息
-    // packageEntityList
-  
-    DataSubmit['packageEntityList'].push({
-      workOrderId: Indexform.workOrderNumber, //异常ID
-      number: PackageInfo.value.length, //数量
-      packageCode: PackageInfo.value.map(item => item.packageCode).join(','), //包件码
-      warehouseId: '', //仓库ID
-      packageImage: Indexform.value['packList'].map(item => item.url).join(','), //包件图片路径
-      waybillNumber: PackageInfo.value.map(item => item.waybillNumber).join(','), //运单号
-      orderCode: PackageInfo.value.map(item => item.orderCode).join(','), //订单自编码
+
+    //发现环节回显
+    getDictionaryBiz('pc_discovery_node').then(res => {
+      // ProcessingResults.value = res.data.data;
+      TransportlossList.value = res.data.data;
+      // Indexform.discoveryNode
+    });
+    getDictionaryBiz('result_handling').then(res => {
+      ProcessingResults.value = res.data.data;
     });
-    DataSubmit.orderCode = PackageInfo.value.map(item => item.orderCode).join(','); //订单自编码
-    // 总件数
-    Indexform.value.number = PackageInfo.value.length;
-    console.log(DataSubmit['packageEntityList'], '包件信息');
-    // 调查经过
-    DataSubmit.surveyRecordDTO = {
-      content: Indexform.value.investigationPocess,
-      workOrderId: Indexform.value.workOrderNumber,
-    };
-    console.log(DataSubmit.surveyRecordDTO, '调查经过');
-    // 新责任方处理
-    // FangAddList.value
-  
-    // 责任方信息
+
+    // 公司占比回显计算
+    let sum = 0;
     FangAddList.value.forEach(item => {
-      DataSubmit['personResponsibleDTO'].push({
-        businessName: warehouseData.value.find(obj => obj.value == item.businessName)?.label || null, //责任方名称  
-        businessId: warehouseData.value.find(obj => obj.value == item.businessName)?.value || null,
-        wordOrderId: Indexform.value.workOrderNumber, //异常工单ID
-        description: item.description,
-        personResponsibleId:
-          personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.id || null, //责任人ID   personResponsibleList
-        personResponsibleName:
-          personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name || null, //责任人名称
-        responsibilityRatio: item.responsibilityRatio, //责任比例
-      });
+      sum = Number(item.responsibilityRatio) + sum;
     });
-    let proportion = 0; //责任比例之和
-    DataSubmit['personResponsibleDTO'].forEach(item => {
-      proportion += Number(item.responsibilityRatio);
+    companyProportion.value = 100 - sum;
+
+    ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map(item => {
+      Indexform.value.result.push(item.resultType);
+      return {
+        input: item.money,
+        min: 0,
+        max: 9999999999999999999999999999,
+        state: item.resultType,
+        payment: item.compensationMethod,
+        name: item.resultTypeName,
+        text: item.compensationMethodName,
+      };
     });
-    console.log(proportion, '责任比例之和');
-    companyProportion.value = 100 - proportion;
-    DataSubmit.companyProportion = companyProportion.value; //公司占比
-    console.log(DataSubmit.companyProportion, '公司占比');
-    console.log(DataSubmit['personResponsibleDTO'], '新责任方处理的数据');
-    //console.log(Indexform.value.duty.length);
-    //责任方信息处理
-    if (FangAddList.value.length) {
-      console.log(warehouseData.value, 'warehouseData.value');
-      FangAddList.value.forEach(item => {
-        console.log(item, 'item');
-        processorEntityList.push({
-          businessName:
-            warehouseData.value.find(obj => obj.value == item.businessName)?.label || null,
-          businessId: item.businessName,
-          conditions: 1,
-          typesOf: 1,
+
+    // 总金额回显
+    TotalClaimAmount.value = res.data.data.processingResultsVO.money;
+    // 理赔支付时间
+    Indexform.value.compensationTime = res.data.data.processingResultsVO.compensationTime;
+    // 处理结果说明回显
+    Indexform.value.resultDescription = res.data.data.processingResultsVO.resultDescription;
+          // 收款方
+          CompensationParty.value = [];
+      if (res.data.data.completionRecipientEntityList.length > 0) {
+        res.data.data.completionRecipientEntityList.forEach((item, index) => {
+          TotalamountReceived.value += Number(item.money);
+          CompensationParty.value.push({
+            state: 1, //状态
+            num: item.money, //金额
+            name: item.recipient, //收款方名字
+            reason: item.reasonReceivingPayment, //收款方原因
+            explains: item.explains, //收款方说明
+            cld: index + 1,
+          });
         });
-      });
-    }
-    DataSubmit.identifying = identifying.value; //1订单2零担3库存品
-  
-    console.log(processorEntityList, '老责任方处理好的数据');
-  
-    // //责任方信息处理
-    // if (Indexform.value.duty.length) {
-    //   Indexform.value.forEach(item => {
-    //     let found = warehouseData.value.find(element => element.value == item.toString());
-    //     processorEntityList.push({
-    //       businessName: found ? found.label : '',
-    //       businessId: item,
-    //       conditions: 1,
-    //       typesOf: 1,
-    //     });
-    //   });
-    // }
-  
-    delete DataSubmit.duty, //移除多余字段
-      delete DataSubmit.packList; //移除图片原始字段
-    delete DataSubmit.processor; //移除多余字段
-    console.log(DataSubmit, '处理好的数据');
-    //提交表单信息stringify
-    $_submit(DataSubmit).then(res => {
-      if (res.data.code == 200) {
-        ElMessage({
-          message: res.data.msg,
-          type: 'success',
+      }
+      // 赔款方
+      if (res.data.data.completionRecordEntities.length > 0) {
+        res.data.data.completionRecordEntities.forEach((item, index) => {
+          TotalamountCompensation.value += Number(item.money);
+          CompensationParty.value.push({
+            state: 0, //状态
+            num: item.money, //金额
+            name: item.indemnitor, //收款方名字
+            reason: item.reason, //收款方原因
+            explains: item.explains, //收款方说明
+            cld: index + 1,
+          });
         });
-        Indexform.value = {}; //重置表单
-        $router.push('/aftersales/aftersalesWorkOrder'); //添加成功跳转到列表
       }
-    });
-  };
-  
-  // 少货件数对应事件
-  const ShortageTtems = val => {
-    ShortageList.value = []; //进入之前重置参数
-    const pattern = /\s+/g;
-    const result = val.replace(pattern, '');
-    console.log(result); // 输出 "33"
-    Indexform.value.number = result;
-    if (Indexform.value.number > 1) {
-      ShortageState.value = true; //数量大于1，开启弹窗输入
+  });
+};
+onLoad(); //初始化程序
+// 异常类型事件
+const abnormalChange = val => {
+  console.log(val, '异常事件类型');
+  console.log(StateType.value);
+  StateType.value = false;
+  if (val == 1 || val == 2 || val == 3) {
+    SelectType.value = val;
+  } else {
+    StateType.value = true;
+  }
+  // 运损无数据默认0
+  if (val == 1) {
+    Indexform.value.packageCode = 0;
+  } else {
+    Indexform.value.packageCode = null;
+  }
+};
+// 公司占比计算
+const ProportionInput = () => {
+  console.log(FangAddList.value, '公司占比');
+  let sum = 0;
+  FangAddList.value.forEach(item => {
+    sum = Number(item.responsibilityRatio) + sum;
+  });
+  sum = 100 - sum;
+  companyProportion.value = sum;
+  console.log(sum, '公司占比');
+};
+// 发现节点事件
+const DiscoveringNodesChange = val => {
+  groundlineSet.value = false; //干线条件都不满足
+  if (val == 1 || val == 2 || val == 3 || val == 4 || val == 5 || val == 8 || val == 7) {
+    groundlineType.value = val; //干线状态
+    console.log(val);
+  } else {
+    groundlineSet.value = true; //展示所有搜索框
+  }
+};
+
+// 照片
+const handleRemove = (uploadFile, uploadFiles) => {
+  console.log(uploadFile, uploadFiles);
+};
+
+const handlePictureCardPreview = uploadFile => {
+  dialogImageUrl.value = uploadFile.url;
+  dialogVisible.value = true;
+};
+
+// 添加包件
+const AddPackage = () => {
+  PackageInfo.value.push({ packageCode: '', orderCode: '', waybillNumber: '' });
+};
+// 包件移除
+const PackagRemoval = val => {
+  PackageInfo.value.splice(val, 1); //移除当前点击的按钮
+};
+// 责任方添加
+const responsibleParty = () => {
+  FangAddList.value.push({
+    businessName: '',
+    personResponsibleName: '',
+    responsibilityRatio: '',
+    description: '',
+  });
+};
+// 责任移除
+const ResponsibilityRemoval = val => {
+  FangAddList.value.splice(val, 1); //移除当前点击的按钮
+};
+// 顶部标签切换
+const TopChange = val => {
+  console.log(val);
+  if (val == 0) {
+    identifying.value = 1;
+  } else {
+    identifying.value = 2;
+  }
+};
+
+const changeProcessingResults = val => {
+  // 首先删除取消的项目
+  ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state - 1));
+
+  // 然后添加或保持新的项目
+  val.forEach(num => {
+    let newItem = { input: 0, min: 0, max: 9999999999999, state: num + 1, payment: '', text: '' };
+    // 根据num为newItem的name字段赋值
+    switch (num) {
+      case '1':
+        newItem.name = '下补单';
+        break;
+      case '2':
+        newItem.name = '维修/补漆';
+        break;
+      case '3':
+        newItem.name = '客户未要求理赔';
+        break;
+      case '4':
+        newItem.name = '用库存';
+        break;
+      case '5':
+        newItem.name = '赔商家';
+        break;
+      case '6':
+        newItem.name = '赔付运费';
+        break;
+      case '7':
+        newItem.name = '工厂考核';
+        break;
+      default:
+        return;
     }
-    for (let i = 0; i < val; i++) {
-      ShortageList.value.push({
-        number: i + 1, //件数
-        packageCode: null, //输入框
-      });
+
+    // 如果列表中不存在则加入新项目
+    if (!ProcessingList.value.some(item => item.state === newItem.state)) {
+      ProcessingList.value.push(newItem);
+      console.log(`添加：${newItem.name}`);
     }
-  };
-  // 少货关闭回调
-  const ShortageStateFun = () => {
-    ShortageList.value.forEach(item => {
-      if (item.packageCode == null) {
-        Indexform.value.number = null;
-      }
-    });
-  };
-  // 少货按钮取消
-  const ShortageCancellation = () => {
-    Indexform.value.number = null; //少货件数
-    ShortageList.value = []; //进入之前重置参数
-    ShortageState.value = false; //关闭弹窗
-  };
-  // 窜货关闭回调
-  const fleeingFun = () => {
-    fleeingList.value.forEach(item => {
-      if (item.packageCode == null) {
-        Indexform.value.number = null;
-      }
-    });
-  };
-  // 窜货取消事件
-  const fleeingCancellation = () => {
-    Indexform.value.number = null; //少货件数
-    fleeingList.value = []; //进入之前重置参数
-    fleeingState.value = false; //关闭弹窗
-  };
-  // 窜货输入框
-  const fleeingTtems = val => {
-    fleeingList.value = []; //进入之前重置参数
-    const pattern = /\s+/g;
-    const result = val.replace(pattern, '');
-    console.log(result); // 输出 "33"
-    Indexform.value.number = result;
-    if (Indexform.value.number > 1) {
-      fleeingState.value = true; //数量大于1，开启弹窗输入
+  });
+};
+
+// 支付方式选择
+const PaymentSelection = val => {
+  console.log(val, '支付');
+  console.log(Paymentmethod.value);
+  if (val.payment) {
+    //支付方式回显
+    let data = Paymentmethod.value.find(item => item.dictKey == val.payment);
+    Indexform.value.compensationMethod = data.dictKey;
+  } else {
+    Indexform.value.compensationMethod = null; //清空上一次选择
+  }
+  ZFdialog.value = true; //展开支付方式选择弹窗
+  ZFname.value = val.name; //存放的当前点击的名字
+};
+
+// 理赔总金额计算
+const TotalChange = () => {
+  TotalClaimAmount.value = 0;
+  ProcessingList.value.forEach(item => {
+    console.log(item);
+    TotalClaimAmount.value += item.input;
+  });
+};
+
+// 支付方式选择确定
+const PaymentConfirmation = val => {
+  console.log(val, '支付方式选择确定');
+  let data = ProcessingList.value.find(item => item.name == ZFname.value);
+  console.log(data, '处理好的');
+  data.text = Paymentmethod.value.find(item => item.dictKey == val).dictValue;
+  data.payment = val;
+  ZFdialog.value = false; //关闭支付方式选择弹窗
+  ElMessage({
+    message: '支付方式选择成功',
+    type: 'success',
+  });
+  console.log(ProcessingList.value, '选择好的支付列表');
+};
+
+// 添加赔款方
+const AddCompensation = () => {
+  console.log('添加赔款方');
+  let som = 1;
+  CompensationParty.value.forEach(item => {
+    if (item.state == 0) {
+      som++;
     }
-    for (let i = 0; i < val; i++) {
-      fleeingList.value.push({
-        number: i + 1, //件数
-        packageCode: null, //输入框
-      });
+  });
+  CompensationParty.value.push({ name: '', state: 0, num: 0, reason: '', cld: som, explains: '' });
+};
+// 添加收款方
+const AddPayee = () => {
+  let som = 1;
+  CompensationParty.value.forEach(item => {
+    if (item.state == 1) {
+      som++;
     }
-  };
-  // 少货编辑
-  const moneyBtnA = () => {
-    if (!Indexform.value.number) {
-      ElMessage({
-        message: '请输入少货数量',
-        type: 'warning',
-      });
-      return;
+  });
+  CompensationParty.value.push({ name: '', state: 1, num: 0, reason: '', cld: som, explains: '' });
+};
+// 金额输入汇总
+const amountMoney = () => {
+  // 计算赔款金额总数
+  TotalamountCompensation.value = 0;
+  TotalamountReceived.value = 0;
+  CompensationParty.value.forEach(item => {
+    const _num = isNumer(item.num) ? item.num : 0;
+    // 统计赔款方【0】
+    if (item.state == 0) {
+      TotalamountCompensation.value = computeNumber(
+        TotalamountCompensation.value,
+        '+',
+        _num
+      ).result;
     }
-    ShortageState.value = true; //开启弹窗输入
-  };
-  // 窜货编辑
-  const moneyBtnB = () => {
-    if (!Indexform.value.number) {
-      ElMessage({
-        message: '请输入窜货数量',
-        type: 'warning',
-      });
-      return;
+    // 统计收款方金额【1】
+    if (item.state == 1) {
+      TotalamountReceived.value = computeNumber(TotalamountReceived.value, '+', _num).result;
     }
-    fleeingState.value = true; //开启弹窗输入
-  };
-  // 查询包件信息自动回显
-  const ChangePackageInfo = (val, index) => {
-    let data = {
-      packageCode: val,
-    };
-    $_getAbnormalPackage(data).then(res => {
-      console.log(res, '包件信息');
-      console.log(res.data.data, '包件信息');
-      if (res.data.data.length) {
-        const packageData = res.data.data[0];
-        PackageInfo.value[index].orderCode = packageData.orderCode; //订单自编码
-        PackageInfo.value[index].waybillNumber = packageData.waybillNumber; //运单号
-        PackageInfo.value[index].orderId = packageData.orderId; //运单号
-        PackageInfo.value[index].state = false; //状态
-  
-        if (res.data.data.length > 1) {
-          HistoricalPackageList.value = res.data.data;
-          PackageInfo.value[index].state = true; //状态
-        }
+  });
+  console.log('赔款总计金额', TotalamountCompensation.value);
+  console.log('收款总计金额', TotalamountReceived.value);
+};
+// 移除按钮
+const payremove = (state, val) => {
+  // 判断赔付方，至少保留一条数据
+  let som = 0;
+  if (state == 0) {
+    CompensationParty.value.forEach(item => {
+      if (item.state == 0) {
+        som++;
       }
-      // packageCode; //包件码
-      // //订单自编码
-      // orderCode: orderId; //运单号
-      // workOrderId; //工单id
-      // workOrderNumber; //工单名称
-      console.log(PackageInfo.value, '处理好的参数');
     });
-  };
-  
-  // 查看历史包件
-  const historicalPackages = val => {
-    dialogHistoricalPackage.value = true; //打开历史包件弹窗
-    HistorIndex.value = val;
-    console.log(val);
-  };
-  // 历史包件确定选择
-  const HistoricalPackage = val => {
-    let info = HistoricalPackageList.value.find(obj => obj.workOrderId == val);
-    PackageInfo.value[HistorIndex.value].orderCode = info.orderCode; //订单自编码
-    PackageInfo.value[HistorIndex.value].waybillNumber = info.waybillNumber; //运单号
-    PackageInfo.value[HistorIndex.value].orderId = info.orderId; //运单号
-    dialogHistoricalPackage.value = false; //关闭历史包件弹窗
-  
-    PackageInfo.value[HistorIndex.value].relatedWorkOrdersId = info.workOrderId;
-    console.log(PackageInfo.value, '处理好的参数');
-  };
-  // 历史包件里面的查看
-  const ViewPackageDetails = val => {
-    if (!val) {
+    if (som == 1) {
       ElMessage({
-        message: '请选择要查看的数据',
+        message: '赔款必填最少一条',
         type: 'warning',
       });
       return;
     }
-    console.log(val);
-    let info = HistoricalPackageList.value.find(obj => obj.workOrderId == val);
-    console.log(info, '筛选的值');
-    $router.push({
-      path: '/aftersales/aftersalesWorkOrderInfo',
-      query: {
-        id: info.workOrderId,
-        name: info.workOrderId + '-信息查看',
-        routerState: 'view',
-      },
-    });
-    dialogHistoricalPackage.value = false; //打开历史包件弹窗
+  }
+  CompensationParty.value.splice(val, 1);
+  console.log('CompensationParty :>> ', CompensationParty);
+  amountMoney();
+};
+//表单提交
+const ConfirmForm = () => {
+  let DataSubmit={
+    packageEntityList:[],//新增的包件信息
+    unPpackageEntityList:[],//取消的包件ID
+    processorEntityList:[],//新增的责任方和处理方
+    unProcessorEntityList:[],//取消的责任方和处理方
+    decreaseImageEntityList:[],//损货图片
+    unDecreaseImageEntityList:[],//取消的损货图片
+    completionRecipientEntities:[],//异常工单完结收款方
+    completionRecordEntities:[],//异常工单完结赔款方
+    aftersalesProcessingResultsDTO:{
+
+    },//处理结果
+    personResponsibleDTO:[],//添加预计责任人
+    unPersonResponsibleDTO:[],//取消预计责任人
+    surveyRecordDTO:{
+
+    },//调查经过
+    ...Indexform.value
+  }
+  console.log(DataSubmit, '处理好的数据');
+
+  $_modifyData(DataSubmit).then(res=>{
+    console.log(res,'编辑成功返回值');
+  })
+};
+
+// 客服仲裁完结
+const Arbitrationcompleted = () => {
+  let data = {
+    id: $route.query.id,
+    completionRecipientEntities: [], //处理结果收款方
+    completionRecordEntities: [], //处理结果赔款方
+    reasonArbitration:Indexform.value.arbitrate, //仲裁原因
+    aftersalesProcessingResultsDTO: {
+      workOrderId: '', //异常工单ID
+    },
   };
-  </script>
-  
-  <style scoped lang="scss">
-  .IndexFrom {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-  
-    .el-form-item {
-      height: 46px;
-      display: flex;
-      align-items: center;
-      margin: 0;
-      margin-bottom: 18px;
-      flex: 1 0 30%;
-      :deep(.el-form-item__label) {
-        width: 100px !important;
-        justify-content: flex-start;
-      }
+  data.aftersalesProcessingResultsDTO.workOrderId = $route.query.id; //异常工单ID
+  CompensationParty.value.forEach(item => {
+    if (item.state == 0) {
+      // 赔款
+      data['completionRecordEntities'].push({
+        indemnitor: item.name, //赔款方
+        reason: item.reason, //原因
+        money: Number(item.num), //金额
+        reasonArbitration:item.reason,//说明
+        workOrderId: $route.query.id, //异常工单
+        warehouseId: $route.query.warehouseId, //仓库ID
+      });
+    } else {
+      // 收款方
+      data['completionRecipientEntities'].push({
+        recipient: item.name, //收款方
+        reasonReceivingPayment: item.reason, //收款原因
+        money: Number(item.num), //金额
+        responsibleParty: FangAddList.value
+          .map(aItem =>
+            warehouseData.value
+              .filter(bItem => bItem.value === aItem.businessName)
+              .map(match => match.label)
+              .join(',')
+          )
+          .join(','),
+        workOrderNumber: $route.query.workOrderNumber, //工单号
+        workOrderId: $route.query.id, //异常工单
+        warehouseId: $route.query.warehouseId, //仓库ID
+      });
     }
-    :deep(.el-form-item__content) {
-      height: 100%;
-      width: 70% !important;
-      flex: none;
-      .el-input {
-        height: 100% !important;
-        display: flex;
-        align-items: center;
+  });
+
+  // 处理结果
+
+  data.aftersalesProcessingResultsDTO['processingMoneyEntityList'] = ProcessingList.value
+    .map(item => {
+      console.log(item);
+      let match = ProcessingResults.value.find(element => element.dictValue == item.name);
+      if (match) {
+        let paymentMethodMatch = Paymentmethod.value.find(
+          paymentMethod => paymentMethod.dictKey == item.payment
+        );
+        return {
+          resultType: match.dictKey, //赔方式的key
+          money: item.input, //金额
+          typesOf: 1, //固定参数
+          compensationMethod: paymentMethodMatch ? paymentMethodMatch.dictKey : '未知支付方式',
+          compensationMethodName: paymentMethodMatch
+            ? paymentMethodMatch.dictValue
+            : '未知支付方式',
+          resultName: item.name, //处理结果名字
+        };
+      } else {
+        return null;
       }
+    })
+    .filter(item => item !== null);
+
+  // 总金额
+  let sum = 0; //金额总计
+  for (let i = 0; i < ProcessingList.value.length; i++) {
+    sum = computeNumber(sum, '+', ProcessingList.value[i].input).result;
+  }
+  data.aftersalesProcessingResultsDTO.money = sum; //金额汇总
+  console.log(data, '处理好的值');
+};
+
+// 少货件数对应事件
+const ShortageTtems = val => {
+  ShortageList.value = []; //进入之前重置参数
+  const pattern = /\s+/g;
+  const result = val.replace(pattern, '');
+  console.log(result); // 输出 "33"
+  Indexform.value.number = result;
+  if (Indexform.value.number > 1) {
+    ShortageState.value = true; //数量大于1，开启弹窗输入
+  }
+  for (let i = 0; i < val; i++) {
+    ShortageList.value.push({
+      number: i + 1, //件数
+      packageCode: null, //输入框
+    });
+  }
+};
+// 少货关闭回调
+const ShortageStateFun = () => {
+  ShortageList.value.forEach(item => {
+    if (item.packageCode == null) {
+      Indexform.value.number = null;
     }
-    .el-input__wrapper {
-      height: 32px !important;
-    }
-    :deep(.el-input) {
-      width: 100% !important;
-    }
-    :deep(.el-input__wrapper) {
-      height: 30px !important;
-    }
-    :deep(.el-select) {
-      width: 100%;
-    }
-    :deep(.el-form-item__label) {
-      margin-left: 20px;
+  });
+};
+// 少货按钮取消
+const ShortageCancellation = () => {
+  Indexform.value.number = null; //少货件数
+  ShortageList.value = []; //进入之前重置参数
+  ShortageState.value = false; //关闭弹窗
+};
+// 窜货关闭回调
+const fleeingFun = () => {
+  fleeingList.value.forEach(item => {
+    if (item.packageCode == null) {
+      Indexform.value.number = null;
     }
+  });
+};
+// 窜货取消事件
+const fleeingCancellation = () => {
+  Indexform.value.number = null; //少货件数
+  fleeingList.value = []; //进入之前重置参数
+  fleeingState.value = false; //关闭弹窗
+};
+// 窜货输入框
+const fleeingTtems = val => {
+  fleeingList.value = []; //进入之前重置参数
+  const pattern = /\s+/g;
+  const result = val.replace(pattern, '');
+  console.log(result); // 输出 "33"
+  Indexform.value.number = result;
+  if (Indexform.value.number > 1) {
+    fleeingState.value = true; //数量大于1，开启弹窗输入
   }
-  .el_clzr {
-    margin-top: 40px;
-  
-    :deep(.el-select) {
-      width: 100%;
-    }
-    :deep(.el-input) {
-      height: 38px;
+  for (let i = 0; i < val; i++) {
+    fleeingList.value.push({
+      number: i + 1, //件数
+      packageCode: null, //输入框
+    });
+  }
+};
+// 少货编辑
+const moneyBtnA = () => {
+  if (!Indexform.value.number) {
+    ElMessage({
+      message: '请输入少货数量',
+      type: 'warning',
+    });
+    return;
+  }
+  ShortageState.value = true; //开启弹窗输入
+};
+// 窜货编辑
+const moneyBtnB = () => {
+  if (!Indexform.value.number) {
+    ElMessage({
+      message: '请输入窜货数量',
+      type: 'warning',
+    });
+    return;
+  }
+  fleeingState.value = true; //开启弹窗输入
+};
+// 查询包件信息自动回显
+const ChangePackageInfo = (val, index) => {
+  let data = {
+    packageCode: val,
+  };
+  $_getAbnormalPackage(data).then(res => {
+    console.log(res, '包件信息');
+    console.log(res.data.data, '包件信息');
+    if (res.data.data.length) {
+      const packageData = res.data.data[0];
+      PackageInfo.value[index].orderCode = packageData.orderCode; //订单自编码
+      PackageInfo.value[index].waybillNumber = packageData.waybillNumber; //运单号
+      PackageInfo.value[index].orderId = packageData.orderId; //运单号
+      PackageInfo.value[index].state = false; //状态
+
+      if (res.data.data.length > 1) {
+        HistoricalPackageList.value = res.data.data;
+        PackageInfo.value[index].state = true; //状态
+      }
     }
+    // packageCode; //包件码
+    // //订单自编码
+    // orderCode: orderId; //运单号
+    // workOrderId; //工单id
+    // workOrderNumber; //工单名称
+    console.log(PackageInfo.value, '处理好的参数');
+  });
+};
+
+// 查看历史包件
+const historicalPackages = val => {
+  dialogHistoricalPackage.value = true; //打开历史包件弹窗
+  HistorIndex.value = val;
+};
+// 历史包件确定选择
+const HistoricalPackage = val => {
+  let info = HistoricalPackageList.value.find(obj => obj.workOrderId == val);
+  PackageInfo.value[HistorIndex.value].orderCode = info.orderCode; //订单自编码
+  PackageInfo.value[HistorIndex.value].waybillNumber = info.waybillNumber; //运单号
+  PackageInfo.value[HistorIndex.value].orderId = info.orderId; //运单号
+  dialogHistoricalPackage.value = false; //关闭历史包件弹窗
+
+  PackageInfo.value[HistorIndex.value].relatedWorkOrdersId = info.workOrderId;
+  console.log(PackageInfo.value, '处理好的参数');
+};
+// 历史包件里面的查看
+const ViewPackageDetails = val => {
+  if (!val) {
+    ElMessage({
+      message: '请选择要查看的数据',
+      type: 'warning',
+    });
+    return;
+  }
+  console.log(val);
+  let info = HistoricalPackageList.value.find(obj => obj.workOrderId == val);
+  console.log(info, '筛选的值');
+  $router.push({
+    path: '/aftersales/aftersalesWorkOrderInfo',
+    query: {
+      id: info.workOrderId,
+      name: info.workOrderId + '-信息查看',
+      routerState: 'view',
+    },
+  });
+  dialogHistoricalPackage.value = false; //打开历史包件弹窗
+};
+</script>
+
+<style scoped lang="scss">
+.IndexFrom {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+
+  .el-form-item {
+    height: 46px;
+    display: flex;
+    align-items: center;
+    margin: 0;
+    margin-bottom: 18px;
+    flex: 1 0 30%;
     :deep(.el-form-item__label) {
-      margin-left: 20px;
-      font-size: 14px;
       width: 100px !important;
+      justify-content: flex-start;
     }
-    .el-form-item {
-      margin: 0;
-      margin-bottom: 34px;
-    }
-    :deep(.el-input__wrapper) {
-      height: 35px !important;
+  }
+  :deep(.el-form-item__content) {
+    height: 100%;
+    width: 70% !important;
+    flex: none;
+    .el-input {
+      height: 100% !important;
+      display: flex;
+      align-items: center;
     }
-    :deep(.el-form-item__content) {
-      height: 100%;
-      width: 90% !important;
-      flex: none;
-      .el-input {
-        height: 100% !important;
-        display: flex;
-        align-items: center;
-      }
+  }
+  .el-input__wrapper {
+    height: 32px !important;
+  }
+  :deep(.el-input) {
+    width: 100% !important;
+  }
+  :deep(.el-input__wrapper) {
+    height: 30px !important;
+  }
+  :deep(.el-select) {
+    width: 100%;
+  }
+  :deep(.el-form-item__label) {
+    margin-left: 20px;
+  }
+}
+.el_clzr {
+  margin-top: 40px;
+
+  :deep(.el-select) {
+    width: 100%;
+  }
+  :deep(.el-input) {
+    height: 38px;
+  }
+  :deep(.el-form-item__label) {
+    margin-left: 20px;
+    font-size: 14px;
+    width: 100px !important;
+    justify-content: flex-start;
+  }
+  .el-form-item {
+    margin: 0;
+    margin-bottom: 34px;
+  }
+  :deep(.el-input__wrapper) {
+    height: 35px !important;
+  }
+  :deep(.el-form-item__content) {
+    height: 100%;
+    width: 90% !important;
+    flex: none;
+    .el-input {
+      height: 100% !important;
+      display: flex;
+      align-items: center;
     }
   }
-  .Transport_damage_photos {
+}
+.Transport_damage_photos {
+  display: flex;
+  padding: 0 15px;
+  margin-top: 20px;
+  .title {
+    width: 100px;
+    display: block;
+    margin-bottom: 10px;
+    font-size: 14px;
+  }
+}
+.dialog-footer {
+  width: 100%;
+  display: flex;
+  justify-content: flex-end;
+  padding: 0 10px;
+  box-sizing: border-box;
+  padding-right: 36px;
+}
+.investigate {
+  :deep(.el-form-item__content) {
+    width: 90% !important;
+    box-sizing: border-box;
+  }
+}
+.ShortageStatenum {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+  .title {
+    width: 80px;
+  }
+  .remove {
+    width: 47px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    color: #ff0000;
+  }
+}
+.moneyNum {
+  display: flex;
+  flex: 1;
+  .el_btn {
+    width: 50px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 1px solid #ccc;
+    margin-left: 3px;
+    border-radius: 4px;
+    cursor: pointer;
+  }
+}
+.ResponsibilityBox {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  .leftbox {
+    width: 80%;
+    display: flex;
+    justify-content: space-between;
+  }
+  .maxBox {
     display: flex;
-    padding: 0 15px;
-    margin-top: 20px;
+    align-items: center;
+    width: 30%;
+    margin-right: 16px;
     .title {
-      width: 100px;
-      display: block;
-      margin-bottom: 10px;
+      width: 80px;
       font-size: 14px;
+      color: #606266;
+    }
+    .el-select {
+      width: 100%;
     }
   }
-  .dialog-footer {
-    width: 100%;
+  .el-btn {
+    margin-left: 5%;
+    border: none;
+  }
+  .el_btbox {
     display: flex;
-    justify-content: flex-end;
-    padding: 0 10px;
-    box-sizing: border-box;
-    padding-right: 36px;
+    margin-top: 10px;
   }
-  .investigate {
-    :deep(.el-form-item__content) {
-      width: 90% !important;
-      box-sizing: border-box;
-    }
+}
+.ResponsibilityBoxS {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 10px;
+  .leftbox {
+    width: 80%;
+    display: flex;
+    justify-content: space-between;
   }
-  .ShortageStatenum {
+  .maxBox {
     display: flex;
     align-items: center;
-    margin-bottom: 10px;
+    width: 30%;
     .title {
-      width: 80px;
+      width: 140px;
+      color: #606266;
+      font-size: 14px;
     }
-    .remove {
-      width: 47px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      cursor: pointer;
-      color: #ff0000;
+    .el-select {
+      width: 100%;
     }
   }
-  .moneyNum {
+  .el-btn {
+    margin-left: 5%;
+    border: none;
+  }
+  .el_btbox {
     display: flex;
-    flex: 1;
-    .el_btn {
-      width: 50px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      border: 1px solid #ccc;
-      margin-left: 3px;
-      border-radius: 4px;
-      cursor: pointer;
-    }
+    margin-top: 10px;
   }
-  .ResponsibilityBox {
-    width: 100%;
+}
+.PackageInformation {
+  margin-bottom: 10px;
+}
+.NumTotal {
+  width: 30%;
+  margin-top: 16px;
+  display: flex;
+  align-items: center;
+  span {
+    width: 120px;
+    font-size: 14px;
+  }
+}
+.Proportion {
+  margin-top: 16px;
+  .title {
+    font-size: 14px;
+    color: #606266;
+  }
+}
+
+:deep(.is-active) {
+  border-bottom: 1px solid #e4e7ed !important;
+}
+.topClass {
+  :deep(.el-tabs__content) {
+    padding: 0;
+  }
+}
+.foot_btn {
+  position: fixed;
+  bottom: 0;
+  left: 50%;
+  transform: translate(0, -50%);
+  width: 100%;
+  height: 40px;
+  background-color: #ffffff;
+  border-top: 1px solid #fff;
+  box-shadow: 3px -1px 1px #ccc;
+  display: flex;
+  align-items: center;
+  padding-left: 10px;
+}
+:deep(.el-card__body) {
+  margin-bottom: 50px;
+}
+.ProcessingResults {
+  width: 100%;
+  min-height: 260px;
+  border: 1px solid #ccc;
+  position: relative;
+  padding: 26px;
+  box-sizing: border-box;
+  margin-top: 35px;
+  color: #606266;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin-bottom: 16px;
+  .title {
+    position: absolute;
+    top: -20px;
+    left: 20px;
+    font-size: 26px;
+    background-color: #fff;
+  }
+  .Listadmiration {
     display: flex;
-    flex-direction: column;
-    .leftbox {
-      width: 80%;
-      display: flex;
-      justify-content: space-between;
-    }
-    .maxBox {
+    flex-wrap: wrap;
+    margin-top: 26px;
+    justify-content: space-between;
+    .name {
       display: flex;
-      align-items: center;
-      width: 30%;
-      margin-right: 16px;
-      .title {
-        width: 80px;
-        font-size: 14px;
+      margin-bottom: 20px;
+      height: 30px;
+      width: 33%;
+      span {
+        display: block;
+        width: 30%;
         color: #606266;
+        font-size: 16px;
       }
-      .el-select {
-        width: 100%;
-      }
-    }
-    .el-btn {
-      margin-left: 5%;
-      border: none;
-    }
-    .el_btbox {
-      display: flex;
-      margin-top: 10px;
     }
   }
-  .ResponsibilityBoxS {
-    width: 100%;
+
+  .lptime,
+  .ZFlptime {
     display: flex;
-    flex-direction: column;
-    margin-bottom: 10px;
-    .leftbox {
-      width: 80%;
-      display: flex;
-      justify-content: space-between;
-    }
-    .maxBox {
-      display: flex;
-      align-items: center;
-      width: 30%;
-      .title {
-        width: 140px;
-        color: #606266;
-        font-size: 14px;
-      }
-      .el-select {
-        width: 100%;
-      }
+    .name {
+      width: 10%;
+      color: #606266;
     }
-    .el-btn {
-      margin-left: 5%;
-      border: none;
+    .el-input {
+      width: auto;
     }
-    .el_btbox {
-      display: flex;
-      margin-top: 10px;
+    :deep(.el-input--prefix) {
+      width: 200px;
     }
   }
-  .PackageInformation {
-    margin-bottom: 10px;
+  .ZFlptime {
+    margin: 10px 0;
   }
-  .NumTotal {
-    width: 30%;
-    margin-top: 16px;
+  .Paymentname {
+    margin-left: 30px;
+  }
+}
+.el_handle {
+  margin-top: 16px;
+  :deep(.el-select) {
+    width: 100%;
+  }
+}
+.lptime {
+  height: 30px;
+  :deep(.el-input) {
+    height: 30px;
+  }
+}
+.Paymentname {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border: 1px solid #bfbfbf;
+  margin-left: 2px;
+  border-radius: 4px;
+  width: 100px;
+  font-size: 14px;
+  padding: 10px;
+  cursor: pointer;
+  width: 100px;
+}
+
+.payanindemnity {
+  display: flex;
+  align-items: center;
+  margin-top: 20px;
+  .title {
+    width: 126px;
+    height: 100%;
     display: flex;
+    display: block;
     align-items: center;
-    span {
-      width: 120px;
-      font-size: 14px;
-    }
   }
-  .Proportion {
-    margin-top: 16px;
-    .title {
-      font-size: 14px;
-      color: #606266;
-    }
-  }
-  
-  :deep(.is-active) {
-    border-bottom: 1px solid #e4e7ed !important;
+  .sk_input {
+    margin: 0 5px;
+    margin-left: 20px;
+    width: 20%;
   }
-  .topClass {
-    :deep(.el-tabs__content) {
-      padding: 0;
-    }
+  .el-button {
+    border: none;
   }
-  .foot_btn {
-    position: fixed;
-    bottom: 0;
-    left: 50%;
-    transform: translate(0, -50%);
-    width: 100%;
-    height: 40px;
-    background-color: #ffffff;
-    border-top: 1px solid #fff;
-    box-shadow: 3px -1px 1px #ccc;
+}
+.payanindemnity {
+  display: flex;
+  align-items: center;
+  margin-top: 20px;
+  .title {
+    width: 126px;
+    height: 100%;
     display: flex;
+    display: block;
     align-items: center;
-    padding-left: 10px;
   }
-  :deep(.el-card__body) {
-    margin-bottom: 50px;
+  .sk_input {
+    margin: 0 5px;
+    margin-left: 20px;
+    width: 20%;
+  }
+  .el-button {
+    border: none;
+  }
+}
+.el_pkLi {
+  width: 100%;
+  display: flex;
+}
+.paySum {
+  margin-top: 36px;
+  font-size: 14px;
+  display: flex;
+  span {
+    margin-right: 30px;
+    display: flex;
+    align-items: center;
   }
-  </style>
-  
\ No newline at end of file
+}
+:deep(.el-upload-dragger) {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index faea482c..17c3b419 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -624,8 +624,8 @@ export default {
   },
   watch: {
     handler(newVal, oldVal) {
-      this.fetchData();
-      this.onLoad(this.page);
+      // this.fetchData();
+      // this.onLoad(this.page);
     },
     deep: false,
     immediate: true,
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 91a4d0f1..334e4713 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -99,56 +99,147 @@
         </ul>
       </div>
 
-      <el-row>
-        <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
-          <div class="avue-crud__left" style="margin-top: 20px">
-            <!--            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添 加 配 送</el-button>-->
-            <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
-            <!--                        <el-button type="primary" icon="el-icon-delete" @click="handleDelete" plain>新 增</el-button>-->
-            <el-button type="primary" @click="toDeliveryPlan">新增商配</el-button>
 
-            <el-button type="primary" @click="printBatchOrder">批量打印</el-button>
-            <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
-              >导出
-            </el-button>
-          </div>
-          <!-- 头部右侧按钮模块 -->
-          <div class="avue-crud__right">
-            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
-          </div>
-        </div>
-      </el-row>
-      <el-row>
-        <!-- 列表模块 -->
-        <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="
+      <el-row >
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+            <div class="avue-crud__header">
+              <!-- 头部左侧按钮模块 -->
+              <div class="avue-crud__left" style="margin-top: 20px">
+                <!--            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添 加 配 送</el-button>-->
+                <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
+                <!--                        <el-button type="primary" icon="el-icon-delete" @click="handleDelete" plain>新 增</el-button>-->
+                <el-button type="primary" @click="toDeliveryPlan">新增商配</el-button>
+
+                <el-button type="primary" @click="printBatchOrder">批量打印</el-button>
+                <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
+                >导出
+                </el-button>
+              </div>
+              <!-- 头部右侧按钮模块 -->
+              <div class="avue-crud__right">
+                <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+                <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+                <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+              </div>
+            </div>
+          <el-tab-pane label="全部列表" name="first">
+            <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>
+          </el-tab-pane>
+          <el-tab-pane label="待配送" name="second">
+            <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
+                        @click="handleEdit(slotProps.scope)"
+                >编 辑</el-text
+                >
+                <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
+              </template>
+            </tablecmt>
+          </el-tab-pane>
+          <el-tab-pane label="配送中" name="third">
+            <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>
+          </el-tab-pane>
+          <el-tab-pane label="已完成" name="fourth">
+            <tablecmt
+                    :columnList="columnList"
+                    :tableData="data"
+                    :loading="loading"
+                    @inputTxt="inputsc"
+                    @timeCheck="timesc"
+                    @btnCheck="btnsc"
+                    @selectCheck="selectsc"
+                    @selection="selectionsc"
             >
-            <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
-          </template>
-        </tablecmt>
+              <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>
+          </el-tab-pane>
+        </el-tabs>
+
+
+
+        <!-- 列表模块 -->
+
         <!--        <el-table ref="table" v-loading="loading"-->
         <!--                  @selection-change="selectionChange"-->
         <!--                  :data="data"-->
@@ -375,6 +466,7 @@ export default {
       form: {},
       // 选择行
       selectionList: [],
+      activeName:'first',
       columnList: [
         {
           prop: 'serialNumber',
@@ -736,6 +828,33 @@ export default {
     },
   },
   methods: {
+    //tabs切换
+    handleClick(tab, event) {
+      console.log('tab------------------>', tab.props.name);
+      this.query = {};
+      switch (tab.props.name) {
+
+        case 'first':
+          break;
+        case 'second':
+          //待配送
+          this.query.deliveryStatus = '1';
+          break;
+        case 'third':
+          //配送中
+          this.query.deliveryStatus = '2';
+          break;
+        case 'fourth':
+          //已完成
+          this.query.deliveryStatus = '3';
+          break;
+      }
+      this.onLoad(this.page);
+
+      console.log('tab------------------>', tab);
+      console.log('event--------------->', event);
+    },
+
     /**
      * 导出
      * */
@@ -1243,6 +1362,10 @@ export default {
   :deep(.el-dialog) {
     width: fit-content;
   }
+  :deep(.el-row){
+    flex-direction: column;
+    flex-wrap: nowrap;
+  }
 }
 .order-info {
   ul {
@@ -1336,4 +1459,5 @@ export default {
   display: flex;
 align-items: flex-end;
 }
+
 </style>
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index b4e14a93..3ff0bda2 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -1,1222 +1,1584 @@
 <template>
-  <basic-container>
-    <div class="avue-crud">
-      <el-row v-if="!search">
-        <!-- 查询模块 -->
-        <el-form :inline="true" :model="query" class="fr-fo">
-          <el-form-item label="配送车次:">
-            <el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
-          </el-form-item>
-          <el-form-item label="客户名称:">
-            <el-input v-model="query.clineName" placeholder="请客户名称"></el-input>
-          </el-form-item>
-          <el-form-item label="配送日期:" class="el-times">
-            <el-date-picker v-model="query.taskTime" type="date" placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
-          <!--          <el-form-item label="配送类型:">-->
-          <!--            <el-select v-model="query.businessType" placeholder="请选择业务类型">-->
-          <!--              <el-option-->
-          <!--                      :key="'1'"-->
-          <!--                      :value="'商配'">商配-->
-          <!--              </el-option>-->
-          <!--              <el-option-->
-          <!--                      :key="'2'"-->
-          <!--                      :value="'市配'">市配-->
-          <!--              </el-option>-->
-          <!--            </el-select>-->
-          <!--          </el-form-item>-->
-          <el-form-item label="配送种类:">
-            <el-select v-model="query.deliveryKind" placeholder="请选择业务类型">
-              <el-option :key="'1'" :value="'自主配送'">自主配送 </el-option>
-              <el-option :key="'2'" :value="'外协配送'">外协配送 </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="配送司机:">
-            <el-select v-model="query.driverName" filterable placeholder="请输入司机名称" :loading="loading">
-              <el-option v-for="item in driverData" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="配送车辆:">
-            <el-select v-model="query.vehicleName" filterable placeholder="请输入司机名称" :loading="loading">
-              <el-option v-for="item in vehicleData" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <!-- 查询按钮 -->
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <!--        <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
-        <!--          <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>-->
-        <!--        </el-col>-->
-        <div class="order-info">
-          <ul>
-            <li>
-              <img src="../../../../public/img/bg/Delivery.png" /> 市配总车次{{
-                statistics.vehiclesNub
-              }}
-            </li>
-            <li>
-              <img src="../../../../public/img/bg/package.png" />总包件数{{
-                statistics.marketTotal
-              }}
-            </li>
-            <li>
-              <img src="../../../../public/img/bg/inventory.png" />总库存品数{{
-                statistics.minventoryTotal
-              }}
-            </li>
-            <li>
-              <img src="../../../../public/img/bg/distribution.png" />市配订单总数{{
-                statistics.marketNub
-              }}
-            </li>
-          </ul>
-        </div>
-      </el-row>
-      <el-row>
-        <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
-          <div class="avue-crud__left" style="margin-top: 20px">
-            <el-button type="primary" icon="el-icon-plus" @click="printBatchOrder">批量打印</el-button>
-            <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
-            <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain>导出
-            </el-button>
-          </div>
-          <!-- 头部右侧按钮模块 -->
-          <div class="avue-crud__right">
-            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
-          </div>
-        </div>
-      </el-row>
-      <el-row>
-        <!-- 列表模块 -->
-        <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 !== '已完成' ||
+    <basic-container>
+        <div class="avue-crud">
+            <el-row v-if="!search">
+                <!-- 查询模块 -->
+                <el-form :inline="true" :model="query" class="fr-fo">
+                    <el-form-item label="配送车次:">
+                        <el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
+                    </el-form-item>
+                    <el-form-item label="客户名称:">
+                        <el-input v-model="query.clineName" placeholder="请客户名称"></el-input>
+                    </el-form-item>
+                    <el-form-item label="配送日期:" class="el-times">
+                        <el-date-picker v-model="query.taskTime" type="date" placeholder="选择日期">
+                        </el-date-picker>
+                    </el-form-item>
+                    <!--          <el-form-item label="配送类型:">-->
+                    <!--            <el-select v-model="query.businessType" placeholder="请选择业务类型">-->
+                    <!--              <el-option-->
+                    <!--                      :key="'1'"-->
+                    <!--                      :value="'商配'">商配-->
+                    <!--              </el-option>-->
+                    <!--              <el-option-->
+                    <!--                      :key="'2'"-->
+                    <!--                      :value="'市配'">市配-->
+                    <!--              </el-option>-->
+                    <!--            </el-select>-->
+                    <!--          </el-form-item>-->
+                    <el-form-item label="配送种类:">
+                        <el-select v-model="query.deliveryKind" placeholder="请选择业务类型">
+                            <el-option :key="'1'" :value="'自主配送'">自主配送</el-option>
+                            <el-option :key="'2'" :value="'外协配送'">外协配送</el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="配送司机:">
+                        <el-select v-model="query.driverName" filterable placeholder="请输入司机名称" :loading="loading">
+                            <el-option v-for="item in driverData" :key="item.dictKey" :label="item.dictValue"
+                                       :value="item.dictValue">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="配送车辆:">
+                        <el-select v-model="query.vehicleName" filterable placeholder="请输入司机名称" :loading="loading">
+                            <el-option v-for="item in vehicleData" :key="item.dictKey" :label="item.dictValue"
+                                       :value="item.dictValue">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <!-- 查询按钮 -->
+                    <el-form-item class="el-btn">
+                        <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+                        <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-row>
+            <el-row>
+                <!--        <el-col :xl="14" :lg="7" :md="8" :sm="24" >-->
+                <!--          <span style="padding-left: 10%" >配送总车次：{{statistics.vehiclesNub}}/总包件数：{{statistics.deliveriesTotal}}/总库存品数：{{statistics.dinventoryTotal}} </span>-->
+                <!--        </el-col>-->
+                <div class="order-info">
+                    <ul>
+                        <li>
+                            <img src="../../../../public/img/bg/Delivery.png"/> 市配总车次{{
+                            statistics.vehiclesNub
+                            }}
+                        </li>
+                        <li>
+                            <img src="../../../../public/img/bg/package.png"/>总包件数{{
+                            statistics.marketTotal
+                            }}
+                        </li>
+                        <li>
+                            <img src="../../../../public/img/bg/inventory.png"/>总库存品数{{
+                            statistics.minventoryTotal
+                            }}
+                        </li>
+                        <li>
+                            <img src="../../../../public/img/bg/distribution.png"/>市配订单总数{{
+                            statistics.marketNub
+                            }}
+                        </li>
+                    </ul>
+                </div>
+            </el-row>
+            <el-row>
+
+            </el-row>
+            <el-tabs v-model="activeName" @tab-click="handleClick">
+                <div class="avue-crud__header">
+                    <!-- 头部左侧按钮模块 -->
+                    <div class="avue-crud__left" style="margin-top: 20px">
+                        <el-button type="primary" icon="el-icon-plus" @click="printBatchOrder">批量打印</el-button>
+                        <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
+                        <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain>导出
+                        </el-button>
+                    </div>
+                    <!-- 头部右侧按钮模块 -->
+                    <div class="avue-crud__right">
+                        <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+                        <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+                        <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+                    </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>
+              " @click="handleEdit(slotProps.scope)">编 辑
+                                    </el-text>
 
-            <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
-          </template>
-        </tablecmt>
-        <!--        <el-table ref="table" v-loading="loading"-->
-        <!--                  @selection-change="selectionChange"-->
-        <!--                  :data="data"-->
-        <!--                  :height="height"-->
-        <!--                  style="width: 100%"-->
-        <!--                  :border="option.border">-->
-        <!--&lt;!&ndash;          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>&ndash;&gt;-->
-        <!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
-        <!--&lt;!&ndash;          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">&ndash;&gt;-->
-        <!--&lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-        <!--          <template v-for="(item,index) in option.column">-->
-        <!--            &lt;!&ndash; table字段 &ndash;&gt;-->
-        <!--            <el-table-column v-if="item.hide!==true"-->
-        <!--                             :prop="item.prop"-->
-        <!--                             :label="item.label"-->
-        <!--                             :width="item.width"-->
-        <!--                             :key="index">-->
-        <!--            </el-table-column>-->
-        <!--          </template>-->
-        <!--          &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
-        <!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
-        <!--            <template #="{row}">-->
-        <!--&lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
-        <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看</el-button>-->
-        <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button>-->
-        <!--            </template>-->
-        <!--          </el-table-column>-->
-        <!--        </el-table>-->
-      </el-row>
-      <el-row class="el-fy">
-        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-          <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-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 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-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
-        <div>
-          <div v-html="html"></div>
+                                    <!--            <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">
+                        <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>-->
 
-          <!-- <div v-for="(item,index) in qrCodeObj">
+                                    <!--            <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-tabs>
             <el-row>
-              <el-col :span="24" >
-                <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
-              </el-col>
+
+                <!--        <el-table ref="table" v-loading="loading"-->
+                <!--                  @selection-change="selectionChange"-->
+                <!--                  :data="data"-->
+                <!--                  :height="height"-->
+                <!--                  style="width: 100%"-->
+                <!--                  :border="option.border">-->
+                <!--&lt;!&ndash;          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>&ndash;&gt;-->
+                <!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
+                <!--&lt;!&ndash;          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">&ndash;&gt;-->
+                <!--&lt;!&ndash;          </el-table-column>&ndash;&gt;-->
+                <!--          <template v-for="(item,index) in option.column">-->
+                <!--            &lt;!&ndash; table字段 &ndash;&gt;-->
+                <!--            <el-table-column v-if="item.hide!==true"-->
+                <!--                             :prop="item.prop"-->
+                <!--                             :label="item.label"-->
+                <!--                             :width="item.width"-->
+                <!--                             :key="index">-->
+                <!--            </el-table-column>-->
+                <!--          </template>-->
+                <!--          &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
+                <!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
+                <!--            <template #="{row}">-->
+                <!--&lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
+                <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看</el-button>-->
+                <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button>-->
+                <!--            </template>-->
+                <!--          </el-table-column>-->
+                <!--        </el-table>-->
             </el-row>
-          </div> -->
-        </div>
-        <span slot="footer" class="dialog-footer">
+
+
+            <!-- 打印模块 -->
+            <el-dialog title="二维码" :visible.sync="isShow" width="780px" v-model="isShow">
+                <div>
+                    <div v-html="html"></div>
+
+                    <!-- <div v-for="(item,index) in qrCodeObj">
+                      <el-row>
+                        <el-col :span="24" >
+                          <el-image  width="10" height="10" w-full  :key="index" :src="item " alt="Preview Image"/>
+                        </el-col>
+                      </el-row>
+                    </div> -->
+                </div>
+                <span slot="footer" class="dialog-footer">
           <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
           <el-button type="primary" @click="printTemplate">打 印</el-button>
           <el-button type="primary" @click="isShow = false">确 定</el-button>
           <el-button @click="isShow = false">取 消</el-button>
         </span>
-      </el-dialog>
-    </div>
+            </el-dialog>
+        </div>
 
-    <el-dialog v-model="dialogVisible" title="增值服务" width="30%" :model="addvalue" :before-close="handleClose">
-      <el-form-item label="增值服务" prop="freightMark">
-        <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
-          <el-checkbox style="width: 100%; margin-bottom: 3%" v-for="(item, index) in addvalueServeTypeData"
-            :key="item.dictKey" :label="item.dictKey">{{ item.dictValue }}
-            <span v-if="index === 0 || index === 6 || index === 2 || index === 4">&nbsp;件数:
-              <el-input type="number" v-model="item.f" :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                @change="textbox($event, index, 1)" style="width: 20%; border: none; border-bottom: 2px solid #eee" />
-            </span>
-            <span v-if="index === 1">公里:
-              <el-input type="primary" v-model="item.a" :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                @change="textbox($event, index, 2)" style="width: 20%; border: none; border-bottom: 2px solid #eee" />
-            </span>
-            <span v-if="index === 3">距离:
-              <el-input type="number" v-model="item.b" :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                @change="textbox($event, index, 3)" style="width: 20%; border: none; border-bottom: 2px solid #eee" />
-            </span>
-            <span v-if="index === 5">人数:
-              <el-input type="number" v-model="item.c" :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                @change="textbox($event, index, 4)" style="width: 20%; border: none; border-bottom: 2px solid #eee" />
-            </span>
-            <span v-if="index === 0">楼层:
-              <el-input type="number" v-model="item.d" :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                @change="textbox($event, index, 5)" style="width: 20%; border: none; border-bottom: 2px solid #eee" />
-            </span>
-            <span v-if="item">预计费用:
-              <el-input type="number" v-model="item.e" :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
-                @change="textbox($event, index, 6)" style="width: 20%; border: none; border-bottom: 2px solid #eee" />
-            </span>
-          </el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="dialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="aaa"> 确定(增值服务) </el-button>
-        </span>
-      </template>
-    </el-dialog>
-  </basic-container>
-  <edittablehead @setcolum="setnewcolum" @closce="showdrawer" :drawerShow="drawerShow" :columnList="columnList">
-  </edittablehead>
+        <!--    <el-dialog v-model="dialogVisible" title="增值服务" width="30%" :model="addvalue" :before-close="handleClose">-->
+        <!--      <el-form-item label="增值服务" prop="freightMark">-->
+        <!--        <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">-->
+        <!--          <el-checkbox style="width: 100%; margin-bottom: 3%" v-for="(item, index) in addvalueServeTypeData"-->
+        <!--            :key="item.dictKey" :label="item.dictKey">{{ item.dictValue }}-->
+        <!--            <span v-if="index === 0 || index === 6 || index === 2 || index === 4">&nbsp;件数:-->
+        <!--              <el-input type="number" v-model="item.f" :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"-->
+        <!--                @change="textbox($event, index, 1)" style="width: 20%; border: none; border-bottom: 2px solid #eee" />-->
+        <!--            </span>-->
+        <!--            <span v-if="index === 1">公里:-->
+        <!--              <el-input type="primary" v-model="item.a" :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"-->
+        <!--                @change="textbox($event, index, 2)" style="width: 20%; border: none; border-bottom: 2px solid #eee" />-->
+        <!--            </span>-->
+        <!--            <span v-if="index === 3">距离:-->
+        <!--              <el-input type="number" v-model="item.b" :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"-->
+        <!--                @change="textbox($event, index, 3)" style="width: 20%; border: none; border-bottom: 2px solid #eee" />-->
+        <!--            </span>-->
+        <!--            <span v-if="index === 5">人数:-->
+        <!--              <el-input type="number" v-model="item.c" :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"-->
+        <!--                @change="textbox($event, index, 4)" style="width: 20%; border: none; border-bottom: 2px solid #eee" />-->
+        <!--            </span>-->
+        <!--            <span v-if="index === 0">楼层:-->
+        <!--              <el-input type="number" v-model="item.d" :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"-->
+        <!--                @change="textbox($event, index, 5)" style="width: 20%; border: none; border-bottom: 2px solid #eee" />-->
+        <!--            </span>-->
+        <!--            <span v-if="item">预计费用:-->
+        <!--              <el-input type="number" v-model="item.e" :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"-->
+        <!--                @change="textbox($event, index, 6)" style="width: 20%; border: none; border-bottom: 2px solid #eee" />-->
+        <!--            </span>-->
+        <!--          </el-checkbox>-->
+        <!--        </el-checkbox-group>-->
+        <!--      </el-form-item>-->
+        <!--      <template #footer>-->
+        <!--        <span class="dialog-footer">-->
+        <!--          <el-button @click="dialogVisible = false">取消</el-button>-->
+        <!--          <el-button type="primary" @click="aaa"> 确定(增值服务) </el-button>-->
+        <!--        </span>-->
+        <!--      </template>-->
+        <!--    </el-dialog>-->
+    </basic-container>
+    <edittablehead @setcolum="setnewcolum" @closce="showdrawer" :drawerShow="drawerShow" :columnList="columnList">
+    </edittablehead>
 </template>
 
 <script>
-import {
-  getList,
-  getDetail,
-  add,
-  update,
-  remove,
-  getPage,
-  getstatistics,
-  printBatch,
-  getDeliveryListExport,
-} from '@/api/distribution/distributionDeliveryList';
-import option from '@/option/distribution/distributionDeliveryList';
-import { mapGetters } from 'vuex';
-import { getDictionaryBiz } from '@/api/system/dict';
-import { addIncrement } from '@/api/distribution/distributionStockArticle';
-import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
-import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
-import print from '@/utils/print';
-import { getBillLadingExport } from '@/api/distribution/distrilbutionBillLading';
-import { downloadXls } from '@/utils/util';
+  import {
+    getList,
+    getDetail,
+    add,
+    update,
+    remove,
+    getPage,
+    getstatistics,
+    printBatch,
+    getDeliveryListExport
+  } from '@/api/distribution/distributionDeliveryList';
+  import option from '@/option/distribution/distributionDeliveryList';
+  import { mapGetters } from 'vuex';
+  import { getDictionaryBiz } from '@/api/system/dict';
+  import { addIncrement } from '@/api/distribution/distributionStockArticle';
+  import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
+  import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
+  import print from '@/utils/print';
+  import { getBillLadingExport } from '@/api/distribution/distrilbutionBillLading';
+  import { downloadXls } from '@/utils/util';
 
-export default {
-  data() {
-    return {
-      height: 0,
-      // 弹框标题
-      title: '',
-      // 是否展示弹框
-      box: false,
-      // 是否显示查询
-      search: true,
-      // 加载中
-      loading: true,
-      // 是否为查看模式
-      view: false,
-      // 打印模版
-      html: '',
-      // 是否显示打印模版
-      isShow: false,
-      // 查询信息
-      query: {},
-      //数据统计
-      statistics: {},
-      drawerShow: false,
-      // 分页信息
-      page: {
-        currentPage: 1,
-        pageSize: 30,
-        total: 40,
-      },
-      //配送类型
-      deliverytypeData: [],
-      //配送种类
-      deliverykindData: [],
-      //配送状态
-      deliveryliststateData: [],
-      // 表单数据
-      form: {},
-      // 选择行
-      selectionList: [],
-      columnList: [
-        {
-          prop: '',
-          label: '序号',
-          type: 0,
-          values: '',
-          width: 55,
-          checkarr: [],
-          fixed: true,
-        },
-        {
-          prop: 'trainNumber',
-          label: '车次',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          // head: true,
-        },
-        {
-          prop: 'taskTime',
-          label: '配送日期',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: true,
-          sortable: true,
-          // head: true,
-        },
-        {
-          prop: 'warehouseName',
-          label: '仓库',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'clineName',
-          label: '客户名称',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'kindName',
-          label: '配送种类',
-          type: 3,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'typeName',
-          label: '配送类型',
-          type: 1,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'vehicleName',
-          label: '配送车辆',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'driverName',
-          label: '配送司机',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'distributionCompany',
-          label: '配送公司',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
+  export default {
+    data() {
+      return {
+        height: 0,
+        // 弹框标题
+        title: '',
+        // 是否展示弹框
+        box: false,
+        // 是否显示查询
+        search: true,
+        // 加载中
+        loading: true,
+        // 是否为查看模式
+        view: false,
+        // 打印模版
+        html: '',
+        // 是否显示打印模版
+        isShow: false,
+        // 查询信息
+        query: {},
+        //数据统计
+        statistics: {},
+        drawerShow: false,
+        // 分页信息
+        page: {
+          currentPage: 1,
+          pageSize: 30,
+          total: 40
         },
+        //配送类型
+        deliverytypeData: [],
+        //配送种类
+        deliverykindData: [],
+        //配送状态
+        deliveryliststateData: [],
+        // 表单数据
+        form: {},
+        // 选择行
+        selectionList: [],
+        activeName: 'first',
+        allColumnList: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: 55,
+            checkarr: [],
+            fixed: true
+          },
+          {
+            prop: 'trainNumber',
+            label: '车次',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: true,
+            sortable: true
+            // head: true,
+          },
+          {
+            prop: 'taskTime',
+            label: '配送日期',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: true,
+            sortable: true
+            // head: true,
+          },
+          {
+            prop: 'warehouseName',
+            label: '仓库',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'clineName',
+            label: '客户名称',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'kindName',
+            label: '配送种类',
+            type: 3,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'typeName',
+            label: '配送类型',
+            type: 1,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'vehicleName',
+            label: '配送车辆',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'driverName',
+            label: '配送司机',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'distributionCompany',
+            label: '配送公司',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
 
-        {
-          prop: 'deliveryStatusName',
-          label: '配送状态',
-          type: 3,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        // {
-        //   prop: 'deliveryListLoadingStatusName',
-        //   label: '装车状态',
-        //   type: 3,
-        //   values: '',
-        //   width: '140',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true
-        // },
-        {
-          prop: 'customersNumber',
-          label: '配送客户数',
-          type: 1,
-          values: '',
-          width: '160',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'price',
-          label: '配送费',
-          type: 1,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'fee',
-          label: '增值服务',
-          type: 1,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'orderNumber',
-          label: '订单总数',
-          type: 1,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'deliveryNumber',
-          label: '配送件数',
-          type: 1,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'inventoryNub',
-          label: '配送库存品件数',
-          type: 1,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'scannedNumber',
-          label: '装车件数',
-          type: 1,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'loadingTeamName',
-          label: '装车班组',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'signingNumber',
-          label: '签收件数',
-          type: 1,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: 'loadingTeamName',
-          label: '装车班组',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: '',
-          label: '操作',
-          type: 6,
-          values: '',
-          width: '200',
-          checkarr: [],
-          fixed: 'right',
-          sortable: false,
-        },
-        // 更多列的配置...
-      ],
-      // 表单配置
-      option: option,
-      //增值服务弹窗
-      dialogVisible: false,
-      //增值服务字典列表
-      addvalueServeTypeData: [],
-      //增值服务列表
-      addvalueServeType: [],
-      //配送方式字典列表
-      deliveryWayData: [],
-      //增值服务对象
-      addvalueObj: {},
-      //订单行数据
-      orderInfo: {},
-      deliverId: null,
-      //费用列表
-      feeList: [],
-      //楼层
-      floorList: [],
-      // 表单列表
-      data: [],
-      driverData: [],
-      vehicleData: [],
-    };
-  },
-  mounted() {
-    this.getvehicleData();
-    this.getDriverData();
-    this.queryDictionary();
-    this.init();
-    /**
-     * 初始化获取本地缓存的编辑隐藏的列表
-     *  固定搭配，不能更改
-     */
-    let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
-    let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
-    let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
-    if (checkListnewarr) {
-      this.columnList.map(item => {
-        item.head = false;
-      });
-      checkListnewarr.map(ite => {
+          {
+            prop: 'deliveryStatusName',
+            label: '配送状态',
+            type: 3,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          // {
+          //   prop: 'deliveryListLoadingStatusName',
+          //   label: '装车状态',
+          //   type: 3,
+          //   values: '',
+          //   width: '140',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true
+          // },
+          {
+            prop: 'customersNumber',
+            label: '配送客户数',
+            type: 1,
+            values: '',
+            width: '160',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'price',
+            label: '配送费',
+            type: 1,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'fee',
+            label: '增值服务',
+            type: 1,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'orderNumber',
+            label: '订单总数',
+            type: 1,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'deliveryNumber',
+            label: '配送件数',
+            type: 1,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'inventoryNub',
+            label: '配送库存品件数',
+            type: 1,
+            values: '',
+            width: '180',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'scannedNumber',
+            label: '装车件数',
+            type: 1,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'loadingTeamName',
+            label: '装车班组',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'signingNumber',
+            label: '签收件数',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'loadingTeamName',
+            label: '装车班组',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: 'right',
+            sortable: false
+          }
+          // 更多列的配置...
+        ],
+        columnList: [
+          {
+            prop: '',
+            label: '序号',
+            type: 0,
+            values: '',
+            width: 55,
+            checkarr: [],
+            fixed: true
+          },
+          {
+            prop: 'trainNumber',
+            label: '车次',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: true,
+            sortable: true
+            // head: true,
+          },
+          {
+            prop: 'taskTime',
+            label: '配送日期',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: true,
+            sortable: true
+            // head: true,
+          },
+          {
+            prop: 'warehouseName',
+            label: '仓库',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'clineName',
+            label: '客户名称',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'kindName',
+            label: '配送种类',
+            type: 3,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'typeName',
+            label: '配送类型',
+            type: 1,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'vehicleName',
+            label: '配送车辆',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'driverName',
+            label: '配送司机',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'distributionCompany',
+            label: '配送公司',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+
+          // {
+          //   prop: 'deliveryStatusName',
+          //   label: '配送状态',
+          //   type: 3,
+          //   values: '',
+          //   width: '140',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true
+          // },
+          // {
+          //   prop: 'deliveryListLoadingStatusName',
+          //   label: '装车状态',
+          //   type: 3,
+          //   values: '',
+          //   width: '140',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true
+          // },
+          {
+            prop: 'customersNumber',
+            label: '配送客户数',
+            type: 1,
+            values: '',
+            width: '160',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'price',
+            label: '配送费',
+            type: 1,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'fee',
+            label: '增值服务',
+            type: 1,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'orderNumber',
+            label: '订单总数',
+            type: 1,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'deliveryNumber',
+            label: '配送件数',
+            type: 1,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'inventoryNub',
+            label: '配送库存品件数',
+            type: 1,
+            values: '',
+            width: '180',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'scannedNumber',
+            label: '装车件数',
+            type: 1,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'loadingTeamName',
+            label: '装车班组',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'signingNumber',
+            label: '签收件数',
+            type: 1,
+            values: '',
+            width: '130',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: 'loadingTeamName',
+            label: '装车班组',
+            type: 2,
+            values: '',
+            width: '140',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: 'right',
+            sortable: false
+          }
+          // 更多列的配置...
+        ],
+        // 表单配置
+        option: option,
+        //增值服务弹窗
+        dialogVisible: false,
+        //增值服务字典列表
+        addvalueServeTypeData: [],
+        //增值服务列表
+        addvalueServeType: [],
+        //配送方式字典列表
+        deliveryWayData: [],
+        //增值服务对象
+        addvalueObj: {},
+        //订单行数据
+        orderInfo: {},
+        deliverId: null,
+        //费用列表
+        feeList: [],
+        //楼层
+        floorList: [],
+        // 表单列表
+        data: [],
+        driverData: [],
+        vehicleData: []
+      };
+    },
+    mounted() {
+      this.getvehicleData();
+      this.getDriverData();
+      this.queryDictionary();
+      this.init();
+      /**
+       * 初始化获取本地缓存的编辑隐藏的列表
+       *  固定搭配，不能更改
+       */
+      let checkListnewarr = this.$functions.getStorage(window.location.pathname + 'checkList');
+      let flexListnewarr = this.$functions.getStorage(window.location.pathname + 'flexList');
+      let sortlistnewarr = this.$functions.getStorage(window.location.pathname + 'sortlist');
+      if (checkListnewarr) {
+        this.columnList.map(item => {
+          item.head = false;
+        });
+        checkListnewarr.map(ite => {
+          this.columnList.map(item => {
+            if (ite == item.label) {
+              item.head = true;
+            }
+          });
+        });
+      } else {
+        let arr = [];
         this.columnList.map(item => {
-          if (ite == item.label) {
-            item.head = true;
+          if (item.head) {
+            arr.push(item.label);
           }
         });
-      });
-    } else {
-      let arr = [];
-      this.columnList.map(item => {
-        if (item.head) {
-          arr.push(item.label);
-        }
-      });
-      this.$functions.setStorage(window.location.pathname + 'checkList', arr);
-    }
-    if (flexListnewarr) {
-      this.columnList.map(item => {
-        item.fixed = false;
-      });
-      flexListnewarr.map(ite => {
+        this.$functions.setStorage(window.location.pathname + 'checkList', arr);
+      }
+      if (flexListnewarr) {
         this.columnList.map(item => {
-          if (ite == item.label) {
-            if (item.type == 6) {
-              item.fixed = 'right';
-            } else {
-              item.fixed = true;
+          item.fixed = false;
+        });
+        flexListnewarr.map(ite => {
+          this.columnList.map(item => {
+            if (ite == item.label) {
+              if (item.type == 6) {
+                item.fixed = 'right';
+              } else {
+                item.fixed = true;
+              }
             }
-          }
+          });
         });
-      });
-    } else {
-      let arr = [];
-      this.columnList.map(item => {
-        if (item.fixed) {
-          arr.push(item.label);
-        }
-      });
-      this.$functions.setStorage(window.location.pathname + 'flexList', arr);
-    }
-    if (sortlistnewarr) {
-      this.columnList.map(item => {
-        item.sortable = false;
-      });
-      sortlistnewarr.map(ite => {
+      } else {
+        let arr = [];
         this.columnList.map(item => {
-          if (ite == item.label) {
-            item.sortable = true;
+          if (item.fixed) {
+            arr.push(item.label);
           }
         });
-      });
-    } else {
-      let arr = [];
-      this.columnList.map(item => {
-        if (item.sortable) {
-          arr.push(item.label);
-        }
-      });
-      this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
-    }
-  },
-  computed: {
-    ...mapGetters(['permission']),
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(',');
-    },
-  },
-  methods: {
-    /**
-     * 导出
-     * */
-    handleExportInfo() {
-      let row = {};
-      const ids = this.selectionList.join(',');
-      row.ids = ids;
-      row.type = '2';
-      row = { ...row, ...this.query };
-      delete row.deliveryStatusName;
-      delete row.kindName;
-      getDeliveryListExport(row).then(res => {
-        console.log(res.data);
-        downloadXls(res.data, '市配配送计划数据.xlsx');
-      });
-    },
-    getvehicleData() {
-      return new Promise((rv, rev) => {
-        getVehicleList().then(res => {
-          const data = res.data.data;
-          if (!data) return
-          let po = [];
-          data.forEach(item => {
-            let a = {
-              dictKey: item.id,
-              dictValue: item.vehicleNub,
-            };
-            po.push(a);
-          });
-          this.vehicleData = po;
-          console.log('^^^^^^^^^^^^^^^^', res.data.data);
-          rv(res.data.data);
+        this.$functions.setStorage(window.location.pathname + 'flexList', arr);
+      }
+      if (sortlistnewarr) {
+        this.columnList.map(item => {
+          item.sortable = false;
         });
-      });
-    },
-    getDriverData() {
-      return new Promise((rv, rev) => {
-        getDriverList().then(res => {
-          const data = res.data.data;
-          let po = [];
-          data.forEach(item => {
-            let a = {
-              dictKey: item.id,
-              dictValue: item.name,
-            };
-            po.push(a);
+        sortlistnewarr.map(ite => {
+          this.columnList.map(item => {
+            if (ite == item.label) {
+              item.sortable = true;
+            }
           });
-          this.driverData = po;
-          console.log('===============>', res.data.data);
-          rv(res.data.data);
         });
-      });
-    },
-    showdrawer(value) {
-      this.drawerShow = value;
-    },
-    /**
-     * 弹窗的勾选回调，用于更改头部数组
-     * 固定搭配，只需要更换   columnList
-     */
-    setnewcolum(newarr, headarr, type) {
-      // console.log(newarr,'+++++++++++')
-      if (type == 1) {
-        this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
-      } else if (type == 2) {
-        this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
-      } else if (type == 3) {
-        this.columnList = newarr;
-        this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
+      } else {
+        let arr = [];
+        this.columnList.map(item => {
+          if (item.sortable) {
+            arr.push(item.label);
+          }
+        });
+        this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
       }
     },
-    handleCheckedCitiesChange(value) {
-      if (value) {
-        this.form.addvalueType = value;
-      }
-      console.log('>>>>>', this.form);
-      if (value.length < 1) {
-        this.costList = [];
-        this.costListName = [];
+    computed: {
+      ...mapGetters(['permission']),
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(',');
       }
-      this.deliveryWayData.forEach(i => {
-        if (value.includes(i.dictKey)) {
-          console.log(i);
-          i.pitch = true;
-          this.costListName = value;
-        }
-      });
-    },
-    editmap(scope) {
-      const { row } = scope;
-      console.log('row>>>>>>xxxx', row);
-      this.$router.push({
-        path: '/distribution/reservation/atlas1',
-        query: {
-          item: JSON.stringify(row),
-          type: '2',
-        },
-      });
     },
-    textbox(e, index, a) {
-      if (a === 6) {
-        this.feeList[index + 1] = e;
-        return;
-      }
-      if (a === 5)
-        if (index === 0 && a === 5) {
-          this.floorList[index + 1] = e;
-          return;
-        }
-      this.costList[index + 1] = e;
+    methods: {
+      //tabs切换
+      handleClick(tab, event) {
+        console.log('tab------------------>', tab.props.name);
+        this.query = {};
+        switch (tab.props.name) {
 
-      //费用列表
-    },
-    aaa() {
-      let addvalueInfos = [];
-      this.form.addvalueType.forEach((item, index) => {
-        let addvalueInfo = {};
-        addvalueInfo.addvalueId = item;
-        if (item == 1 || item == 3 || item == 5 || item == 7) {
-          addvalueInfo.number = this.costList[item];
-        }
-        if (item == 2) {
-          addvalueInfo.kilometer = this.costList[item];
+          case 'first':
+            break;
+          case 'second':
+            //待配送
+            this.query.deliveryStatus = '1';
+            break;
+          case 'third':
+            //配送中
+            this.query.deliveryStatus = '2';
+            break;
+          case 'fourth':
+            //已完成
+            this.query.deliveryStatus = '3';
+            break;
         }
-        if (item == 4) {
-          addvalueInfo.distance = this.costList[item];
+        this.onLoad(this.page);
+
+        console.log('tab------------------>', tab);
+        console.log('event--------------->', event);
+      },
+      /**
+       * 导出
+       * */
+      handleExportInfo() {
+        let row = {};
+        const ids = this.selectionList.join(',');
+        row.ids = ids;
+        row.type = '2';
+        row = { ...row, ...this.query };
+        delete row.deliveryStatusName;
+        delete row.kindName;
+        getDeliveryListExport(row).then(res => {
+          console.log(res.data);
+          downloadXls(res.data, '市配配送计划数据.xlsx');
+        });
+      },
+      getvehicleData() {
+        return new Promise((rv, rev) => {
+          getVehicleList().then(res => {
+            const data = res.data.data;
+            if (!data) return;
+            let po = [];
+            data.forEach(item => {
+              let a = {
+                dictKey: item.id,
+                dictValue: item.vehicleNub
+              };
+              po.push(a);
+            });
+            this.vehicleData = po;
+            console.log('^^^^^^^^^^^^^^^^', res.data.data);
+            rv(res.data.data);
+          });
+        });
+      },
+      getDriverData() {
+        return new Promise((rv, rev) => {
+          getDriverList().then(res => {
+            const data = res.data.data;
+            let po = [];
+            data.forEach(item => {
+              let a = {
+                dictKey: item.id,
+                dictValue: item.name
+              };
+              po.push(a);
+            });
+            this.driverData = po;
+            console.log('===============>', res.data.data);
+            rv(res.data.data);
+          });
+        });
+      },
+      showdrawer(value) {
+        this.drawerShow = value;
+      },
+      /**
+       * 弹窗的勾选回调，用于更改头部数组
+       * 固定搭配，只需要更换   columnList
+       */
+      setnewcolum(newarr, headarr, type) {
+        // console.log(newarr,'+++++++++++')
+        if (type == 1) {
+          this.columnList = newarr;
+          this.$functions.setStorage(window.location.pathname + 'checkList', headarr);
+        } else if (type == 2) {
+          this.columnList = newarr;
+          this.$functions.setStorage(window.location.pathname + 'flexList', headarr);
+        } else if (type == 3) {
+          this.columnList = newarr;
+          this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
         }
-        if (item == 6) {
-          addvalueInfo.peopleNum = this.costList[item];
+      },
+      handleCheckedCitiesChange(value) {
+        if (value) {
+          this.form.addvalueType = value;
         }
-        if (this.floorList.length > 1) {
-          addvalueInfo.floor = this.floorList[1];
-          this.floorList = [];
+        console.log('>>>>>', this.form);
+        if (value.length < 1) {
+          this.costList = [];
+          this.costListName = [];
         }
-        addvalueInfo.fee = this.feeList[item];
-        addvalueInfos.push(addvalueInfo);
-      });
-      let params = {};
-      params.id = this.deliverId;
-      params.addvalue = addvalueInfos;
-      params.relatedId = 2;
-      console.log('params>>>>>>>>>>>>>>>>>>', params);
-      addIncrement(params).then(res => {
-        this.dialogVisible = false;
-        this.$message({
-          type: 'success',
-          message: '操作成功!',
+        this.deliveryWayData.forEach(i => {
+          if (value.includes(i.dictKey)) {
+            console.log(i);
+            i.pitch = true;
+            this.costListName = value;
+          }
         });
-      });
-      this.onLoad(this.page);
-    },
-    selectionsc(value) {
-      // 筛选出所有被选中项的id
-      this.selectionList = value.map(item => item.id);
-    },
-    delectsolt(scope) {
-      const { row } = scope;
-      console.log(row);
-    },
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => { });
-    },
-    editsolt(scope) {
-      const { row } = scope;
-      console.log(row);
-      this.$router.push({
-        path: '/distribution/deliverylist/distributionDeliveryListedt',
-        query: {
-          data: encodeURIComponent(JSON.stringify(row)),
-          name: row.trainNumber + '-查看配送',
-        },
-      });
-    },
-    costadd(scope) {
-      const { row } = scope;
-      console.log('row>>>>>>>>>>', row);
-      this.deliverId = row.id;
-      //查询订单的增值服务，
-      this.addvalueServeType = [];
-      this.addvalue = {};
-      this.dialogVisible = true;
-      this.costList = [];
-      this.feeList = [];
-      this.floorList = [];
-      // this.orderInfo = row;
-    },
-    btnsc(index, row) {
-      console.log(index, row);
-    },
-    selectsc(index, row) {
-      console.log('index :>> ', index);
-      console.log('row :>> ', row);
-      this.query[row.prop] = index;
-      if (!index) {
-        delete this.query[row.prop];
-      }
-      if (row.prop === 'deliveryStatusName') {
-        this.query['deliveryStatus'] = index;
-      } else if (row.prop === 'kindName') {
-        this.query['kind'] = index;
-      }
-
-      this.onLoad(this.page);
-    },
-    timesc(index, row) {
-      console.log(index, row);
-    },
-    inputsc(index, row) {
-      this.query[row.prop] = index;
-      if (!index) {
-        delete this.query[row.prop];
-      }
-      this.onLoad(this.page);
-    },
-    queryDictionary() {
-      // getDictionaryBiz('delivery_type').then(res => {
-      //   this.deliverytypeData = res.data.data;
-      // });
-      getDictionaryBiz('addvalue_serve_type').then(res => {
-        this.addvalueServeTypeData = res.data.data;
-      });
-      getDictionaryBiz('delivery_way').then(res => {
-        this.deliveryWayData = res.data.data;
-      });
+      },
+      editmap(scope) {
+        const { row } = scope;
+        console.log('row>>>>>>xxxx', row);
+        this.$router.push({
+          path: '/distribution/reservation/atlas1',
+          query: {
+            item: JSON.stringify(row),
+            type: '2'
+          }
+        });
+      },
+      textbox(e, index, a) {
+        if (a === 6) {
+          this.feeList[index + 1] = e;
+          return;
+        }
+        if (a === 5)
+          if (index === 0 && a === 5) {
+            this.floorList[index + 1] = e;
+            return;
+          }
+        this.costList[index + 1] = e;
 
-      //配送状态
-      getDictionaryBiz('distribution_delivery_status').then(res => {
-        this.$functions.checkcColumnList('deliveryStatusName', this.columnList).checkarr =
-          res.data.data.map(item => {
-            item.value = item.dictKey;
-            item.label = item.dictValue;
-            return item;
+        //费用列表
+      },
+      aaa() {
+        let addvalueInfos = [];
+        this.form.addvalueType.forEach((item, index) => {
+          let addvalueInfo = {};
+          addvalueInfo.addvalueId = item;
+          if (item == 1 || item == 3 || item == 5 || item == 7) {
+            addvalueInfo.number = this.costList[item];
+          }
+          if (item == 2) {
+            addvalueInfo.kilometer = this.costList[item];
+          }
+          if (item == 4) {
+            addvalueInfo.distance = this.costList[item];
+          }
+          if (item == 6) {
+            addvalueInfo.peopleNum = this.costList[item];
+          }
+          if (this.floorList.length > 1) {
+            addvalueInfo.floor = this.floorList[1];
+            this.floorList = [];
+          }
+          addvalueInfo.fee = this.feeList[item];
+          addvalueInfos.push(addvalueInfo);
+        });
+        let params = {};
+        params.id = this.deliverId;
+        params.addvalue = addvalueInfos;
+        params.relatedId = 2;
+        console.log('params>>>>>>>>>>>>>>>>>>', params);
+        addIncrement(params).then(res => {
+          this.dialogVisible = false;
+          this.$message({
+            type: 'success',
+            message: '操作成功!'
           });
-      });
-      //配送种类
-      getDictionaryBiz('distribution_deliverylist_kind').then(res => {
-        this.$functions.checkcColumnList('kindName', this.columnList).checkarr = res.data.data.map(
-          item => {
-            item.value = item.dictKey;
-            item.label = item.dictValue;
-            return item;
+        });
+        this.onLoad(this.page);
+      },
+      selectionsc(value) {
+        // 筛选出所有被选中项的id
+        this.selectionList = value.map(item => item.id);
+      },
+      delectsolt(scope) {
+        const { row } = scope;
+        console.log(row);
+      },
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {
+          });
+      },
+      editsolt(scope) {
+        const { row } = scope;
+        console.log(row);
+        this.$router.push({
+          path: '/distribution/deliverylist/distributionDeliveryListedt',
+          query: {
+            data: encodeURIComponent(JSON.stringify(row)),
+            name: row.trainNumber + '-查看配送'
           }
-        );
-      });
+        });
+      },
+      costadd(scope) {
+        const { row } = scope;
+        console.log('row>>>>>>>>>>', row);
+        this.deliverId = row.id;
+        //查询订单的增值服务，
+        this.addvalueServeType = [];
+        this.addvalue = {};
+        this.dialogVisible = true;
+        this.costList = [];
+        this.feeList = [];
+        this.floorList = [];
+        // this.orderInfo = row;
+      },
+      btnsc(index, row) {
+        console.log(index, row);
+      },
+      selectsc(index, row) {
+        console.log('index :>> ', index);
+        console.log('row :>> ', row);
+        this.query[row.prop] = index;
+        if (!index) {
+          delete this.query[row.prop];
+        }
+        if (row.prop === 'deliveryStatusName') {
+          this.query['deliveryStatus'] = index;
+        } else if (row.prop === 'kindName') {
+          this.query['kind'] = index;
+        }
 
-      this.onLoad(this.page);
-    },
+        this.onLoad(this.page);
+      },
+      timesc(index, row) {
+        console.log(index, row);
+      },
+      inputsc(index, row) {
+        this.query[row.prop] = index;
+        if (!index) {
+          delete this.query[row.prop];
+        }
+        this.onLoad(this.page);
+      },
+      queryDictionary() {
+        // getDictionaryBiz('delivery_type').then(res => {
+        //   this.deliverytypeData = res.data.data;
+        // });
+        getDictionaryBiz('addvalue_serve_type').then(res => {
+          this.addvalueServeTypeData = res.data.data;
+        });
+        getDictionaryBiz('delivery_way').then(res => {
+          this.deliveryWayData = res.data.data;
+        });
 
-    init() {
-      this.height = this.setPx(document.body.clientHeight - 340);
-    },
-    searchHide() {
-      this.search = !this.search;
-    },
-    searchChange() {
-      if (this.query.deliveryKind) {
-        let deliveryKind = this.query.deliveryKind;
-        switch (deliveryKind) {
-          case '自主配送':
-            this.query.kind = '1';
-            break;
-          case '外协配送':
-            this.query.kind = '2';
-            break;
+        //配送状态
+        getDictionaryBiz('distribution_delivery_status').then(res => {
+          this.$functions.checkcColumnList('deliveryStatusName', this.allColumnList).checkarr =
+            res.data.data.map(item => {
+              item.value = item.dictKey;
+              item.label = item.dictValue;
+              return item;
+            });
+        });
+        //配送种类
+        getDictionaryBiz('distribution_deliverylist_kind').then(res => {
+          this.$functions.checkcColumnList('kindName', this.columnList).checkarr = res.data.data.map(
+            item => {
+              item.value = item.dictKey;
+              item.label = item.dictValue;
+              return item;
+            }
+          );
+        });
+
+        this.onLoad(this.page);
+      },
+
+      init() {
+        this.height = this.setPx(document.body.clientHeight - 340);
+      },
+      searchHide() {
+        this.search = !this.search;
+      },
+      searchChange() {
+        if (this.query.deliveryKind) {
+          let deliveryKind = this.query.deliveryKind;
+          switch (deliveryKind) {
+            case '自主配送':
+              this.query.kind = '1';
+              break;
+            case '外协配送':
+              this.query.kind = '2';
+              break;
+          }
         }
-      }
-      this.onLoad(this.page);
-    },
-    searchReset() {
-      this.query = {};
-      this.page.currentPage = 1;
-      this.onLoad(this.page);
-    },
-    handleSubmit() {
-      if (!this.form.id) {
-        add(this.form).then(() => {
-          this.box = false;
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
+        this.onLoad(this.page);
+      },
+      searchReset() {
+        this.query = {};
+        this.page.currentPage = 1;
+        this.onLoad(this.page);
+      },
+      handleSubmit() {
+        if (!this.form.id) {
+          add(this.form).then(() => {
+            this.box = false;
+            this.onLoad(this.page);
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
           });
-        });
-      } else {
-        update(this.form).then(() => {
-          this.box = false;
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
+        } else {
+          update(this.form).then(() => {
+            this.box = false;
+            this.onLoad(this.page);
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
           });
+        }
+      },
+      handleAdd() {
+        this.title = '新增';
+        this.form = {};
+        this.box = true;
+      },
+      handleEdit(scope) {
+        const { row } = scope;
+        this.$router.push({
+          path: '/distribution/turndelivery/deliveryMarket',
+          query: {
+            deliveryId: row.id,
+            name: row.trainNumber + '-编辑配送'
+          }
         });
-      }
-    },
-    handleAdd() {
-      this.title = '新增';
-      this.form = {};
-      this.box = true;
-    },
-    handleEdit(scope) {
-      const { row } = scope;
-      this.$router.push({
-        path: '/distribution/turndelivery/deliveryMarket',
-        query: {
-          deliveryId: row.id,
-          name: row.trainNumber + '-编辑配送',
-        },
-      });
-    },
-    handleView(row) {
-      this.title = '查看';
-      this.view = true;
-      this.box = true;
-      getDetail(row.id).then(res => {
-        this.form = res.data.data;
-      });
-    },
-    // handleViewBlank (row) {
-    //   this.$router.push({
-    //     path: '/distribution/deliverylist/distributionDeliveryListedt',
-    //     query: {
-    //       id: row.id,
-    //       name: row.trainNumber +'-查看配送'
-    //     }
-    //   });
-    // },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(this.ids);
+      },
+      handleView(row) {
+        this.title = '查看';
+        this.view = true;
+        this.box = true;
+        getDetail(row.id).then(res => {
+          this.form = res.data.data;
+        });
+      },
+      // handleViewBlank (row) {
+      //   this.$router.push({
+      //     path: '/distribution/deliverylist/distributionDeliveryListedt',
+      //     query: {
+      //       id: row.id,
+      //       name: row.trainNumber +'-查看配送'
+      //     }
+      //   });
+      // },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
+        this.$confirm('确定将选择数据删除?', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
-        .then(() => {
-          this.selectionClear();
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.selectionClear();
+            this.onLoad(this.page);
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
           });
-        });
-    },
-    rowDel(row) {
-      this.$confirm('确定将选择数据删除?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          return remove(row.id);
+      },
+      rowDel(row) {
+        this.$confirm('确定将选择数据删除?', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: 'success',
-            message: '操作成功!',
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
           });
+      },
+      beforeClose(done) {
+        done();
+        this.form = {};
+        this.view = false;
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        // this.$refs.table.clearSelection();
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage;
+        this.onLoad(this.page);
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize;
+        this.onLoad(this.page);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        this.query.type = '2';
+        getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          // eslint-disable-next-line no-empty
+          // for (let i = 0; i < data.records.length; i++) {
+          // eslint-disable-next-line no-empty
+          // for (let j = 0; j < this.deliverytypeData.length; j++) {
+          //   // eslint-disable-next-line no-empty
+          //   if (data.records[i].type == this.deliverytypeData[j].dictKey) {
+          //     data.records[i].type = this.deliverytypeData[j].dictValue;
+          //   }
+          // }
+          // for (let j = 0; j < this.deliverykindData.length; j++) {
+          //   // eslint-disable-next-line no-empty
+          //   if (data.records[i].kind == this.deliverykindData[j].dictKey) {
+          //     data.records[i].kind = this.deliverykindData[j].dictValue;
+          //   }
+          // }
+          // for (let j = 0; j < this.deliveryliststateData.length; j++) {
+          //   // eslint-disable-next-line no-empty
+          //   if (data.records[i].state == this.deliveryliststateData[j].dictKey) {
+          //     data.records[i].state = this.deliveryliststateData[j].dictValue;
+          //   }
+          // }
+          // }
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
         });
-    },
-    beforeClose(done) {
-      done();
-      this.form = {};
-      this.view = false;
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      // this.$refs.table.clearSelection();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-      this.onLoad(this.page);
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-      this.onLoad(this.page);
-    },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      this.query.type = '2';
-      getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        // eslint-disable-next-line no-empty
-        // for (let i = 0; i < data.records.length; i++) {
-        // eslint-disable-next-line no-empty
-        // for (let j = 0; j < this.deliverytypeData.length; j++) {
-        //   // eslint-disable-next-line no-empty
-        //   if (data.records[i].type == this.deliverytypeData[j].dictKey) {
-        //     data.records[i].type = this.deliverytypeData[j].dictValue;
-        //   }
-        // }
-        // for (let j = 0; j < this.deliverykindData.length; j++) {
-        //   // eslint-disable-next-line no-empty
-        //   if (data.records[i].kind == this.deliverykindData[j].dictKey) {
-        //     data.records[i].kind = this.deliverykindData[j].dictValue;
-        //   }
-        // }
-        // for (let j = 0; j < this.deliveryliststateData.length; j++) {
-        //   // eslint-disable-next-line no-empty
-        //   if (data.records[i].state == this.deliveryliststateData[j].dictKey) {
-        //     data.records[i].state = this.deliveryliststateData[j].dictValue;
-        //   }
-        // }
-        // }
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-      getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
-        res => {
-          this.statistics = res.data.data;
-          console.log('this.statistics :>> ', this.statistics);
+        getstatistics(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+          res => {
+            this.statistics = res.data.data;
+            console.log('this.statistics :>> ', this.statistics);
+          }
+        );
+        // getDetail(row.id).then(res => {
+        //   this.form = res.data.data;
+        // });
+      },
+
+      /**
+       * 批量打印
+       */
+      async printBatchOrder() {
+        console.log(11);
+        if (this.selectionList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
         }
-      );
-      // getDetail(row.id).then(res => {
-      //   this.form = res.data.data;
-      // });
-    },
+        this.isShow = true;
+        this.html = '';
+        const res = await printBatch({ ids: Array.from(this.selectionList).join(','), type: 2 });
+        console.log('res :>> ', res);
+        const {
+          data: { code, data }
+        } = res;
+        if (code === 200) {
+          // 初始化打印页面
+          data.forEach(item => {
+            this.html += item.templateHtml;
+          });
+        }
+      },
 
-    /**
-     * 批量打印
-     */
-    async printBatchOrder() {
-      console.log(11);
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.isShow = true;
-      this.html = '';
-      const res = await printBatch({ ids: Array.from(this.selectionList).join(','), type: 2 });
-      console.log('res :>> ', res);
-      const {
-        data: { code, data },
-      } = res;
-      if (code === 200) {
-        // 初始化打印页面
-        data.forEach(item => {
-          this.html += item.templateHtml;
-        });
-      }
-    },
+      /**
+       * 获取单个打印页面
+       */
+      async printOrder(row) {
+        console.log('row :>> ', row);
+        this.html = '';
+        const res = await printBatch({ ids: row.id, type: 2 });
+        console.log('res :>> ', res);
+        const {
+          data: { code, data }
+        } = res;
+        if (code === 200) {
+          // 初始化打印页面
+          data.forEach(item => {
+            this.html += item.templateHtml;
+          });
+          this.isShow = true;
+        }
+      },
 
-    /**
-     * 获取单个打印页面
-     */
-    async printOrder(row) {
-      console.log('row :>> ', row);
-      this.html = '';
-      const res = await printBatch({ ids: row.id, type: 2 });
-      console.log('res :>> ', res);
-      const {
-        data: { code, data },
-      } = res;
-      if (code === 200) {
-        // 初始化打印页面
-        data.forEach(item => {
-          this.html += item.templateHtml;
-        });
-        this.isShow = true;
+      /**
+       * 打印
+       */
+      printTemplate() {
+        print();
       }
-    },
-
-    /**
-     * 打印
-     */
-    printTemplate() {
-      print();
-    },
-  },
-};
+    }
+  };
 </script>
 
 <style scoped lang="scss">
-.avue-crud {
-  :deep(.el-dialog) {
-    width: fit-content;
-  }
-}
+    .avue-crud {
+        :deep(.el-dialog) {
+            width: fit-content;
+        }
+    }
 
-.order-info {
-  ul {
-    list-style: none;
-    display: flex;
-    padding: 0;
+    .order-info {
+        ul {
+            list-style: none;
+            display: flex;
+            padding: 0;
 
-    li {
-      color: #172e60;
-      position: relative;
-      padding: 0 20px;
-      display: flex;
-      align-items: center;
-      font-weight: 500;
+            li {
+                color: #172e60;
+                position: relative;
+                padding: 0 20px;
+                display: flex;
+                align-items: center;
+                font-weight: 500;
 
-      img {
-        margin-right: 4px;
-      }
-    }
+                img {
+                    margin-right: 4px;
+                }
+            }
 
-    li::after {
-      content: '';
-      display: block;
-      width: 0.10417vw;
-      height: 18px;
-      background-color: #dddbdb;
-      position: absolute;
-      top: 2px;
-      left: 0px;
-    }
-  }
+            li::after {
+                content: '';
+                display: block;
+                width: 0.10417vw;
+                height: 18px;
+                background-color: #dddbdb;
+                position: absolute;
+                top: 2px;
+                left: 0px;
+            }
+        }
 
-  li:first-child::after {
-    content: none;
-  }
+        li:first-child::after {
+            content: none;
+        }
 
-  li:first-child {
-    padding-left: 0;
-  }
-}
+        li:first-child {
+            padding-left: 0;
+        }
+    }
 
-.avue-crud__header {
-  // align-items: flex-end !important;
-}
+    .avue-crud__header {
+        // align-items: flex-end !important;
+    }
 
-// 日期选择框
-.el-times {
-  :deep(.el-tooltip__trigger) {
-    height: 30px !important;
-  }
-}
+    // 日期选择框
+    .el-times {
+        :deep(.el-tooltip__trigger) {
+            height: 30px !important;
+        }
+    }
 
-.el-btn {
-  min-width: 200px;
-  margin-right: 0 !important;
+    .el-btn {
+        min-width: 200px;
+        margin-right: 0 !important;
 
-  :deep(.el-form-item__content) {
-    width: 180px;
-    justify-content: flex-end;
-  }
-}
+        :deep(.el-form-item__content) {
+            width: 180px;
+            justify-content: flex-end;
+        }
+    }
 
-.avue-crud__right {
-  display: flex;
-  align-items: center;
-}
+    .avue-crud__right {
+        display: flex;
+        align-items: center;
+    }
 
-.fr-fo {
-  display: flex;
-}
+    .fr-fo {
+        display: flex;
+    }
 
-:deep(.avue-crud__header) {
-  .avue-crud__left {
-    margin-top: 0 !important;
-  }
-}
+    :deep(.avue-crud__header) {
+        .avue-crud__left {
+            margin-top: 0 !important;
+        }
+    }
 
-:deep(.avue-crud) {
-  display: flex;
-  height: 100%;
-  flex-direction: column;
-}
+    :deep(.avue-crud) {
+        display: flex;
+        height: 100%;
+        flex-direction: column;
+    }
 
-:deep(.el-card__body) {
-  height: 100%;
-}
+    :deep(.el-card__body) {
+        height: 100%;
+    }
 
-:deep(.el-card) {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-}
+    :deep(.el-card) {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+    }
 
-.el-fy {
-  flex: 1;
-  display: flex;
-  align-items: flex-end;
-}
+    .el-fy {
+        flex: 1;
+        display: flex;
+        align-items: flex-end;
+    }
 </style>
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index 3dd72e6c..41a367a2 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -1084,7 +1084,7 @@ export default {
       ],
     };
   },
-  mounted() {
+  created() {
     this.init();
     this.onLoad(this.page);
     /**
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 5f17aa09..5780f175 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -1813,22 +1813,22 @@ export default {
       this.$functions.setStorage(window.location.pathname + 'sortlist', arr);
     }
   },
-  watch: {
-    '$route.query.id': {
-      handler(newVal, oldVal) {
-        if (this.$route.query.type == '2') {
-          //查询提货编辑数据
-          this.getDetailOen();
-        } else if (this.$route.query.type == '1') {
-          this.onLoad(this.page);
-        } else if (this.$route.query.type == '3') {
-          this.onLoadCj();
-        }
-      },
-      deep: true,
-      immediate: true,
-    },
-  },
+  // watch: {
+  //   '$route.query.id': {
+  //     handler(newVal, oldVal) {
+  //       if (this.$route.query.type == '2') {
+  //         //查询提货编辑数据
+  //         this.getDetailOen();
+  //       } else if (this.$route.query.type == '1') {
+  //         this.onLoad(this.page);
+  //       } else if (this.$route.query.type == '3') {
+  //         this.onLoadCj();
+  //       }
+  //     },
+  //     deep: true,
+  //     immediate: true,
+  //   },
+  // },
   computed: {
     ...mapGetters(['permission', 'tagWel', 'tagList', 'tag']),
     ids() {