diff --git a/src/api/distribution/createTask.js b/src/api/distribution/createTask.js
index 5b79b70e..cc41a6a7 100644
--- a/src/api/distribution/createTask.js
+++ b/src/api/distribution/createTask.js
@@ -74,7 +74,14 @@ export const $_getDetailInfo = params => {
   });
 };
 
-
+// 查询货位信息
+export const $_getList = ( params) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsAllocation/list',
+    method: 'get',
+    params
+  })
+}
 
 /**
  * 盘点状态修改
@@ -181,8 +188,15 @@ export const $_taskQuestSelectStrip = params => {
     params,
   });
 };
-
-
+// 盘点导出
+export const $_exportGetContrastInfo = params => {
+  return request({
+    url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/export-getContrastInfo',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });
+};
 
 
 // 盘点任务库存品
diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js
index 2cbb6b70..b4dd09ec 100644
--- a/src/api/distribution/distributionSignfor.js
+++ b/src/api/distribution/distributionSignfor.js
@@ -66,6 +66,7 @@ export const handlePicture = ids => {
     params: {
       ids
     },
+    responseType: 'blob',
   })
 };
 
diff --git a/src/option/basicdata/basicdataGoodsAllocation.js b/src/option/basicdata/basicdataGoodsAllocation.js
index 6833da4b..1a0a751d 100644
--- a/src/option/basicdata/basicdataGoodsAllocation.js
+++ b/src/option/basicdata/basicdataGoodsAllocation.js
@@ -200,8 +200,8 @@ export default {
       ],
     },
     {
-      label: '所在列',
-      prop: 'columnNum',
+      label: '所在层',
+      prop: 'layerNum',
       type: 'input',
       align: 'center',
       labelWidth: '100',
@@ -213,8 +213,8 @@ export default {
       width: 'fit-content',
     },
     {
-      label: '所在层',
-      prop: 'layerNum',
+      label: '所在列',
+      prop: 'columnNum',
       type: 'input',
       align: 'center',
       labelWidth: '100',
diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js
new file mode 100644
index 00000000..e4cd659b
--- /dev/null
+++ b/src/option/distribution/TripartiteTransfer.js
@@ -0,0 +1,872 @@
+/** 三方中转列表 */
+export const columnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'billladingCode',
+    label: '中转批次号',
+    type: 13,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'carNumber',
+    label: '承运商',
+    type: 2,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+  },
+  {
+    prop: 'driverName',
+    label: '承运日期',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+  },
+  {
+    prop: 'driverPhone',
+    label: '付款方式',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'warehouseName',
+    label: '运费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'lineNameTitle',
+    label: '代收贷款',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'nodeNub',
+    label: '承运单号',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'startTime',
+    label: '发站仓库',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'endTime',
+    label: '状态',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'planVolume',
+    label: '是否结算',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'billladingStatus',
+    label: '客户类型',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'chargeType',
+    label: '发车时间',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalFee',
+    label: '计划出库',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'remark',
+    label: '实际装车',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'carrierName',
+    label: '送货方式',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'waybillCount',
+    label: '经办人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalNum',
+    label: '创建时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalWeight',
+    label: '结算金额',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalVolume',
+    label: '结算人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'createUserName',
+    label: '签收时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'createUserName',
+    label: '操作',
+    type: 6,
+    values: '',
+    width: '300',
+    checkarr: [],
+    fixed: 'right',
+    sortable: false,
+  },
+];
+
+/** 装车详情列表 */
+export const detailsColumnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'orderCode',
+    label: '运单号',
+    type: 13,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'orderCode',
+    label: '合同号',
+    type: 13,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'orderPackageCode',
+    label: '包条码',
+    type: 13,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'driverName',
+    label: '计划目的地',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'driverPhone',
+    label: '目的地',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'warehouseName',
+    label: '装卸状态',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'lineNameTitle',
+    label: '订单来源',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'nodeNub',
+    label: '装车仓库',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'startTime',
+    label: '扫码时间',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'endTime',
+    label: '装卸仓库',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'planVolume',
+    label: '卸车时间',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'billladingStatus',
+    label: '装车类型',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'chargeType',
+    label: '是否补录',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalFee',
+    label: '是否齐套',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'remark',
+    label: '托盘码',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'carrierName',
+    label: '一级品类',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'waybillCount',
+    label: '二级品类',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalNum',
+    label: '三级品类',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalWeight',
+    label: '物料名称',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalVolume',
+    label: '装车扫描人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'createUserName',
+    label: '卸车人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalWeight',
+    label: '同步状态',
+    type: 3,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+];
+
+/** 运单池列表 */
+export const oldColumnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'orderCode',
+    label: '开单日期',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'orderCode',
+    label: '订单自编号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'orderPackageCode',
+    label: '运单号',
+    type: 2,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'driverName',
+    label: '到站',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'driverPhone',
+    label: '目的网点',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'warehouseName',
+    label: '发货单位',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'lineNameTitle',
+    label: '收货单位',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'nodeNub',
+    label: '收货人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'startTime',
+    label: '托盘码',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'endTime',
+    label: '品类名称',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'planVolume',
+    label: '件数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'billladingStatus',
+    label: '在库数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'chargeType',
+    label: '单价',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalFee',
+    label: '重量(kg)',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'remark',
+    label: '体积',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'carrierName',
+    label: '运费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'waybillCount',
+    label: '客户车次',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalNum',
+    label: '运单备注',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+];
+
+/** 调度池列表 */
+export const newColumnList = [
+  {
+    prop: '',
+    label: '复选框',
+    type: 0,
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: '',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: 55,
+    fixed: true,
+  },
+  {
+    prop: 'orderCode',
+    label: '开单日期',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'orderCode',
+    label: '订单自编号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'orderPackageCode',
+    label: '运单号',
+    type: 2,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'driverName',
+    label: '到站',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'driverPhone',
+    label: '目的网点',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'warehouseName',
+    label: '发货单位',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'lineNameTitle',
+    label: '收货单位',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'nodeNub',
+    label: '收货人',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'startTime',
+    label: '托盘码',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'endTime',
+    label: '品类名称',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'planVolume',
+    label: '件数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'billladingStatus',
+    label: '在库数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'chargeType',
+    label: '单价',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalFee',
+    label: '重量(kg)',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'remark',
+    label: '体积',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'carrierName',
+    label: '运费',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'waybillCount',
+    label: '客户车次',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'totalNum',
+    label: '运单备注',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+];
diff --git a/src/router/views/index.js b/src/router/views/index.js
index db2f111e..e834eca4 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1088,18 +1088,9 @@ export default [
       },
     ],
   },
-  {
-    path: '/aftersales/AbnormalworkOrder',
-    component: Layout,
-    redirect: '/aftersales/AbnormalworkOrder',
-    children: [
-      {
-        path: '/aftersales/AbnormalworkOrder',
-        name: '异常工单',
-        component: () => import('@/views/aftersales/abnormalworkOrder.vue'),
-      },
-    ],
-  },
+
+
+
   // 下面的代码为 商场客户端的页面
 
   {
@@ -1115,30 +1106,18 @@ export default [
     ],
   },
 
-  // {
-  //   path: '/distribution/checkInventoryTask/createTaskTemp',
-  //   component: Layout,
-  //   redirect: '/distribution/checkInventoryTask/createTaskTemp',
-  //   children: [
-  //     {
-  //       path: '/distribution/checkInventoryTask/createTaskTemp',
-  //       name: '盘点重构',
-  //       component: () => import('@/views/distribution/checkInventoryTask/createTaskTemp.vue'),
-  //     },
-  //   ],
-  // },
-// {
-//   path: '/distribution/checkInventoryTask/createTaskTemp',
-//   component: Layout,
-//   redirect: '/distribution/checkInventoryTask/createTaskTemp',
-//   children: [
-//     {
-//       path: '/distribution/checkInventoryTask/createTaskTemp',
-//       name: '盘点重构',
-//       component: () => import('@/views/distribution/checkInventoryTask/createTaskTemp.vue'),
-//     },
-//   ],
-// },
+{
+  path: '/aftersales/VueTemp',
+  component: Layout,
+  redirect: '/aftersales/VueTemp',
+  children: [
+    {
+      path: '/aftersales/VueTemp',
+      name: '工单',
+      component: () => import('@/views/aftersales/VueTemp.vue'),
+    },
+  ],
+},
 
   // {
   //   path: '/distribution/turndelivery/devtmp',
diff --git a/src/styles/common.scss b/src/styles/common.scss
index ffbdfa16..3260ddc5 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -152,6 +152,10 @@ a {
   margin-top: 10px;
 }
 
+.pointer {
+  cursor: pointer;
+}
+
 // ele样式覆盖
 @import './element-ui.scss';
 // 顶部右侧显示
diff --git a/src/utils/util.js b/src/utils/util.js
index 6aa7f33e..4df593cf 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -277,13 +277,13 @@ export const openWindow = (url, title, w, h) => {
   const width = window.innerWidth
     ? window.innerWidth
     : document.documentElement.clientWidth
-      ? document.documentElement.clientWidth
-      : screen.width;
+    ? document.documentElement.clientWidth
+    : screen.width;
   const height = window.innerHeight
     ? window.innerHeight
     : document.documentElement.clientHeight
-      ? document.documentElement.clientHeight
-      : screen.height;
+    ? document.documentElement.clientHeight
+    : screen.height;
 
   const left = width / 2 - w / 2 + dualScreenLeft;
   const top = height / 2 - h / 2 + dualScreenTop;
@@ -291,13 +291,13 @@ export const openWindow = (url, title, w, h) => {
     url,
     title,
     'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=yes, copyhistory=no, width=' +
-    w +
-    ', height=' +
-    h +
-    ', top=' +
-    top +
-    ', left=' +
-    left
+      w +
+      ', height=' +
+      h +
+      ', top=' +
+      top +
+      ', left=' +
+      left
   );
 
   // Puts focus on the newWindow
@@ -315,18 +315,18 @@ export const getScreen = isCollapse => {
 };
 
 export const getHtmls = (arrs, htmldemo) => {
-  let html = ''
+  let html = '';
   arrs.map(item => {
     let strhtml = JSON.parse(JSON.stringify(htmldemo));
     for (let key in item) {
       let str = '\\$\\{' + key + '\\}';
-      let reg=new RegExp(str,"g")
+      let reg = new RegExp(str, 'g');
       strhtml = strhtml.replace(reg, item[key]);
     }
     html += strhtml;
   });
-  return html
-}
+  return html;
+};
 /**
  * 获取顶部地址栏地址
  */
@@ -424,3 +424,24 @@ export const downloadXls = (fileArrayBuffer, filename) => {
     window.open(URL.createObjectURL(file));
   }
 };
+
+/**
+ * 设置元素节点高度
+ * @param {node} node 元素 type: element || array
+ * @param {string} height 高度 (非必填) type: string
+ */
+export const setNodeHeight = (_node, _height) => {
+  // 判断是否传入的是数组
+  const _type = Object.prototype.toString.call(_node);
+  console.log('_type :>> ', _type);
+  // 传入数组时
+  if (_type === '[object Array]') {
+    console.log('333 :>> ', 333);
+  }
+  // 传入单一节点时
+  else if (_type === '[object HTMLDivElement]') {
+    console.log('222 :>> ', 222);
+    if (_height) _node.style.height = _height;
+    console.log('_node :>> ', _node);
+  }
+};
diff --git a/src/views/aftersales/VueTemp.vue b/src/views/aftersales/VueTemp.vue
new file mode 100644
index 00000000..7ee43309
--- /dev/null
+++ b/src/views/aftersales/VueTemp.vue
@@ -0,0 +1,249 @@
+<template>
+  <el-card class="box-card">
+    <el-table
+        v-loading="loading"
+        element-loading-text="数据正在更新中..."
+        :data="ElData"
+        border
+        style="width: 100%"
+        ref="tableRef"
+        @select-all="selectAll"
+        @select="selectChange"
+      >
+        <el-table-column type="selection" width="55" fixed />
+        <el-table-column type="index" fixed width="50" height="100" label="#" align="center" />
+
+        <!-- 
+            Type ===1 普通文本
+            Type ===2 图片显示
+            Type ===3 操作功能
+            label:    标题
+            width:    宽度
+            prop:     数据字段
+           -->
+
+        <el-table-column
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          :fixed="item.fixed"
+          align="center"
+          v-for="(item, index) in ElmenuData"
+          :key="item.label"
+        >
+          <el-table-column
+            :prop="item.prop"
+            :label="item.label"
+            :width="item.width"
+            :fixed="item.fixed"
+            align="center"
+          >
+          <!-- 头部搜索 -->
+            <template #header>
+              <el-input
+                clearable
+                v-if="item.type == 4"
+                v-model="item.values"
+                :placeholder="`请输入${item.label}`"
+              />
+            </template>
+            <!-- 内容主体 -->
+            <template #default="props">
+              <span v-if="4">{{ props.row[item.prop] ? props.row[item.prop] : '/' }}</span>
+              <div :class="ElBtnClass" v-if="item.type == 3">
+                <el-button
+                  :link="ElButtonS[0].link"
+                  :class="ElButtonS[0].class"
+                  :auto-insert-space="ElButtonS[0].space"
+                  :size="ElButtonS[0].size"
+                  :icon="ElButtonS[0].icon"
+                  @click="ViewEvent(props.row)"
+                  >明细</el-button
+                >
+              </div>     
+            
+            </template>
+          </el-table-column>
+        </el-table-column>
+
+      </el-table>
+  </el-card>
+</template>
+
+<script setup>
+// 按钮配置
+const ElButtonS = ref([
+  // 1.link    切换按钮样式(文本模式-false ,按钮模式-tre)
+  // 2.class   按钮样式名(用于切换按钮样式)
+  // 3.space   是否开启按钮文子直接间距(true开启 ,false关闭)
+  // 4.size    按钮尺寸默认小尺寸('large'| 'default'| 'small')
+  // 5.icon    按钮图标
+  // 6.table   按钮名称
+  {
+    link: false,
+    class: 'el-btn-view',
+    space: true,
+    size: 'small',
+    icon: 'el-icon-view',
+    table: '详情',
+  },
+  {
+    link: false,
+    class: 'el-btn-view',
+    space: true,
+    size: 'small',
+    icon: 'el-icon-view',
+    table: '延期',
+  },
+  {
+    link: false,
+    class: 'el-btn-view',
+    space: true,
+    size: 'small',
+    icon: 'el-icon-view',
+    table: '编辑',
+  },
+  {
+    link: false,
+    class: 'el-btn-view',
+    space: true,
+    size: 'small',
+    icon: 'el-icon-view',
+    table: '对比数据',
+  },
+]);
+
+
+
+
+
+const ElData=ref([
+    {
+        name:'产品名称1',
+        currentUsageWarehouse:'北京仓库1'
+    },
+    {
+        name:'产品名称2',
+        currentUsageWarehouse:'北京仓库2'
+    }
+])
+const ElmenuData = ref([
+  {
+    prop: 'name',
+    label: '异常类型',
+    type: 4,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'currentUsageWarehouse',
+    label: '发现节点',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'model',
+    label: '异常工单',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'purchaseAmount',
+    label: '运单号',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'state',
+    label: '订单自编号',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'user',
+    label: '车次号',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'deviceSerialNumber',
+    label: '一级品',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'userPosition',
+    label: '二级品',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: 'isDeposit',
+    label: '车辆线路',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+  {
+    prop: '',
+    label: '操作',
+    type: 10,
+    values: '',
+    width: '280',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    header: true,
+  },
+]);
+
+
+
+</script>
+
+<style scoped lang='scss'>
+
+</style>
\ No newline at end of file
diff --git a/src/views/aftersales/abnormalworkOrder.vue b/src/views/aftersales/abnormalworkOrder.vue
deleted file mode 100644
index 4f3123dd..00000000
--- a/src/views/aftersales/abnormalworkOrder.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-  <el-tabs type="border-card" class="demo-tabs">
-    <el-tab-pane v-for="item in Tabs" :key="item.name">
-      <template #label>
-        <span class="custom-tabs-label">
-          <el-icon><component :is="item.icon" /></el-icon>
-          <span>{{ item.label }}</span>
-        </span>
-      </template>
-      <!-- 顶部搜索框 -->
-      <el-form :inline="true" :model="formInput" class="demo-form-inline">
-        <el-form-item label="Approved by">
-          <el-input v-model="formInput.user" placeholder="Approved by" clearable />
-        </el-form-item>
-        <el-form-item label="Activity zone">
-          <el-select v-model="formInput.region" placeholder="Activity zone" clearable>
-            <el-option label="Zone one" value="shanghai" />
-            <el-option label="Zone two" value="beijing" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="Activity time">
-          <el-date-picker
-            v-model="formInput.date"
-            type="date"
-            placeholder="Pick a date"
-            clearable
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="onSubmit">Query</el-button>
-        </el-form-item>
-      </el-form>
-    </el-tab-pane>
-  </el-tabs>
-</template>
-
-<script setup>
-import { ref, reactive, onMounted, computed, watch } from 'vue';
-// 标题栏
-const Tabs = ref([
-  { label: '处理中', name: 0, icon: 'Monitor' },
-  { label: '理赔金额未出', name: 1, icon: 'Coin' },
-  { label: '处理完毕', name: 2, icon: 'Check' },
-  { label: '完结', name: 3, icon: 'Reading' },
-  { label: '仲裁中', name: 4, icon: 'List' },
-  { label: '全部', name: 5, icon: 'Notification' },
-]);
-// 搜索框
-const formInput = ref({}); //搜索框
-</script>
-
-<style lang="scss" scoped>
-.custom-tabs-label {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  i {
-    margin-right: 6px;
-  }
-}
-</style>
diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
index 02ddb149..f82c04df 100644
--- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
+++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue
@@ -586,4 +586,10 @@ export default {
     margin-right: 0;
   }
 }
+:deep(.el-card){
+height: 100%;
+.el-card__body{
+  height: 100%;
+}
+}
 </style>
diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index a5792d6f..cc4c7cee 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -78,7 +78,9 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" icon="Plus" @click="searchChange">新增中转 </el-button>
+            <el-button type="primary" icon="Plus" @click="handleShowTransfer('add')"
+              >新增中转
+            </el-button>
             <el-button type="primary" icon="Printer" @click="searchReset()">装载清单</el-button>
             <el-button type="primary" icon="Printer" @click="searchReset()"
               >装载卸车清单(财务)</el-button
@@ -173,7 +175,7 @@
   >
     <el-form :inline="true" :model="query" class="el-fr-d">
       <div class="fo-fl">
-        <el-form-item label="预计发车:" class="el-times">
+        <el-form-item label="扫码时间:" class="el-times">
           <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
           <el-date-picker
             v-model="stockupDate"
@@ -186,7 +188,7 @@
             clearable
           />
         </el-form-item>
-        <el-form-item label="实际发车:" class="el-times">
+        <el-form-item label="卸车时间:" class="el-times">
           <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
           <el-date-picker
             v-model="stockupDate"
@@ -200,9 +202,14 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-van" @click="searchChange">批量卸车</el-button>
+          <el-button type="primary" icon="Edit" @click="searchChange">中转批量签收</el-button>
           <el-button type="primary" icon="el-icon-search" @click="searchReset()">搜 索</el-button>
           <el-button icon="el-icon-printer" @click="searchReset()">二维码</el-button>
+          <el-button
+            icon="Operation"
+            @click="showdrawer(true, 'truckLoadingDetail')"
+            circle
+          ></el-button>
         </el-form-item>
       </div>
     </el-form>
@@ -232,16 +239,195 @@
       :total="trickleLoadingPage.total"
     >
     </el-pagination>
+  </el-dialog>
+
+  <!-- 创建 && 编辑 中转 -->
+  <el-dialog
+    title="新增中转"
+    v-model="details.popUpShow.transferVisited"
+    width="80%"
+    :before-close="beforeClose"
+    append-to-body
+    class="transferPopUp"
+  >
+    <el-form :inline="true" label-width="100px" :model="query" class="el-fr-d">
+      <div class="fo-fl">
+        <el-form-item label="中转承运商"> <el-input /></el-form-item>
+        <el-form-item label="经办人"> <el-input /></el-form-item>
+        <el-form-item label="送货方式"> <el-input /></el-form-item>
+        <el-form-item label="付款方式"> <el-input /></el-form-item>
+        <el-form-item label="运费分摊方式"> <el-input /></el-form-item>
+        <el-form-item label="送货司机"> <el-input /></el-form-item>
+        <el-form-item label="客户类型"> <el-input /></el-form-item>
+        <el-form-item label="是否结算"> <el-input /></el-form-item>
+        <el-form-item label="代收贷款"> <el-input /></el-form-item>
+        <el-form-item label="承运单号"> <el-input /></el-form-item>
+        <el-form-item label="承运时间"> <el-input /></el-form-item>
+        <el-form-item label="客户收货时间"> <el-input /></el-form-item>
+        <el-form-item label="运费"> <el-input /></el-form-item>
+        <el-form-item label="司机结算费"> <el-input /></el-form-item>
+      </div>
+      <div style="width: 100%">
+        <el-form-item label="备注"> <el-input type="textarea" /></el-form-item>
+      </div>
+    </el-form>
+
+    <div class="add_row">
+      <!-- 列表模块 -->
+      <div style="width: 47%">
+        <div class="add_row_title">运单池</div>
+        <div v-if="!search">
+          <el-form :inline="true" label-width="80px" :model="details.oldQuery" class="el-fr-d">
+            <div class="fo-fl">
+              <el-form-item label="备注" class="el-times">
+                <el-input></el-input>
+              </el-form-item>
+
+              <el-form-item label="托盘码" class="el-times">
+                <el-input></el-input>
+              </el-form-item>
+
+              <el-form-item class="el-times">
+                <el-date-picker
+                  v-model="stockupDate"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="-"
+                  start-placeholder="开单日期"
+                  end-placeholder="开单日期"
+                  :shortcuts="shortcuts"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="searchReset()"
+                  >搜 索</el-button
+                >
+                <el-button icon="el-icon-delete" @click="searchReset()">重置</el-button>
+              </el-form-item>
+            </div>
+          </el-form>
+        </div>
+
+        <div style="margin-bottom: 10px" class="flex-c-sb">
+          <!-- 控件 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true, 1)" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
+
+          <el-button type="text" style="cursor: pointer" @click="handleAddWaybill">
+            加入调度池
+            <el-icon><CaretRight /></el-icon>
+          </el-button>
+        </div>
+        <tablecmt
+          :columnList="details.oldColumnList"
+          :tableData="details.oldData"
+          :loading="loadingObj.oldListLoading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+        </tablecmt>
+        <!-- 统计行 -->
+        <div class="statistics_row">
+          <!--           <div>合计: 选择数: {{ addInfo.oldSelectionList.length }}，</div>
+          <div>件数: {{ selectionList.length }}，</div>
+          <div>重量: {{ selectionList.length }}，</div>
+          <div>体积: {{ selectionList.length }}</div> -->
+        </div>
 
-    <!-- 表单按钮 -->
-    <!--     <template #footer>
-      <div v-if="!view" class="dialog-footer">
-        <el-button type="primary" icon="el-icon-circle-check" @click="handleEditSubmit"
-          >提 交</el-button
+        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+          <!-- 分页模块 -->
+          <el-pagination
+            style="zoom: 0.9"
+            align="right"
+            background
+            @size-change="sizeChange"
+            @current-change="currentChange"
+            :current-page="zeroAdditionalRecordingInfo.oldPage.currentPage"
+            :page-sizes="[30, 50, 80, 120]"
+            :page-size="zeroAdditionalRecordingInfo.oldPage.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="zeroAdditionalRecordingInfo.oldPage.total"
+          >
+          </el-pagination>
+        </div>
+      </div>
+
+      <!-- 列表模块 -->
+      <div style="width: 47%">
+        <div class="add_row_title">调度池</div>
+        <div v-if="!search">
+          <el-form :inline="true" label-width="80px" :model="details.newQuery" class="el-fr-d">
+            <div class="fo-fl">
+              <el-form-item label="备注" class="el-times">
+                <el-input></el-input>
+              </el-form-item>
+
+              <el-form-item label="托盘码" class="el-times">
+                <el-input></el-input>
+              </el-form-item>
+              <el-form-item class="el-times">
+                <el-date-picker
+                  v-model="stockupDate"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="-"
+                  start-placeholder="开单日期"
+                  end-placeholder="开单日期"
+                  :shortcuts="shortcuts"
+                  clearable
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="searchReset()"
+                  >搜 索</el-button
+                >
+                <el-button icon="el-icon-delete" @click="searchReset()">重置</el-button>
+              </el-form-item>
+            </div>
+          </el-form>
+        </div>
+
+        <div style="margin-bottom: 10px" class="flex-c-sb">
+          <el-button type="text" class="pointer" @click="handleRemoveWaybill">
+            <el-icon><CaretLeft /></el-icon>
+            移除调度池
+          </el-button>
+
+          <!-- 控件 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="Operation" @click="showdrawer(true, 2)" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+        <tablecmt
+          :columnList="details.newColumnList"
+          :tableData="details.newData"
+          :loading="loadingObj.newListLoading"
+          @inputTxt="newInputsc"
+          @timeCheck="newTimesc"
+          @btnCheck="newBtnsc"
+          @selectCheck="newSelectsc"
+          @selection="newSelectionChange"
         >
-        <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+        </tablecmt>
+        <div class="statistics_row">
+          <!--           <div>合计: 选择数: {{ addInfo.oldSelectionList.length }}，</div>
+          <div>件数: {{ selectionList.length }}，</div>
+          <div>重量: {{ selectionList.length }}，</div>
+          <div>体积: {{ selectionList.length }}</div> -->
+        </div>
       </div>
-    </template> -->
+
+      <el-button></el-button>
+    </div>
   </el-dialog>
 
   <!-- 列表配置显示 -->
@@ -249,7 +435,7 @@
     @setcolum="setnewcolum"
     @closce="showdrawer"
     :drawerShow="drawerShow"
-    :columnList="columnList"
+    :columnList="details.editColumnList"
   ></edittablehead>
 </template>
 
@@ -261,7 +447,12 @@ import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
 import { downloadXls } from '@/utils/util';
-import { columnList, detailsColumnList } from '@/option/distribution/VehicleStowage';
+import {
+  columnList,
+  detailsColumnList,
+  oldColumnList,
+  newColumnList,
+} from '@/option/distribution/TripartiteTransfer';
 import { useRouter } from 'vue-router';
 
 // 获取路由实例
@@ -306,9 +497,18 @@ const details = reactive<any>({
   stockupDate: [],
   /** 列表 */
   columnList,
+  /** 装车明细表头信息 */
   detailsColumnList,
+  /** 修改的列表信息 */
+  editColumnList: [],
+  /** 运单池 */
+  oldColumnList,
+  /** 调度池 */
+  newColumnList,
   /** 列表数据 */
   data: [{}],
+  newData: [],
+  oldData: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -336,7 +536,7 @@ const details = reactive<any>({
     /** 装车详情 */
     truckLoadingDetailVisited: false,
     /** 零担补录 */
-    zeroAdditionalRecordingVisited: false,
+    transferVisited: false,
   },
   /** 列表Dom节点 */
   listNode: '',
@@ -396,7 +596,18 @@ const searchReset = () => {
 };
 
 /** 展开列表控件 */
-const showdrawer = (_flag?: boolean) => {
+const showdrawer = (_flag?: boolean, _type?: string) => {
+  switch (_type) {
+    case 'truckLoadingDetail':
+      details.editColumnList = details.detailsColumnList;
+      break;
+
+    default:
+      console.log('123 :>> ', 123);
+      details.editColumnList = details.columnList;
+      break;
+    // details.
+  }
   details.drawerShow = _flag;
 };
 
@@ -459,6 +670,44 @@ const selectionChange = (list: any) => {
   details.selectionList = list;
 };
 
+/** 表格表头输入框搜索 */
+const newInputsc = (index, row) => {
+  details.newQuery[row.prop] = index;
+  onLoad(details.page);
+};
+
+/** 表格表头时间选择 */
+const newTimesc = (index, row) => {
+  console.log(index, row);
+  if (!!index) {
+    index = dayjs(index).format('YYYY-MM-DD');
+  }
+  details.newQuery[row.prop] = index;
+  if (!index) {
+    delete details.newQuery[row.prop];
+  }
+  onLoad(details.page);
+};
+
+/** 表格表头输入框搜索 */
+const newBtnsc = () => {};
+
+/** 表格表头下拉框选择 */
+const newSelectsc = (index, row) => {
+  details.newQuery[row.prop] = index;
+  if (!index) delete details.newQuery[row.prop];
+  if (row.prop === 'certificateTypeName') {
+    details.newQuery['certificateType'] = index;
+    if (!index) delete details.newQuery['certificateType'];
+  }
+  onLoad(details.page);
+};
+
+/** 表格表头复选框选择 */
+const newSelectionChange = (list: any) => {
+  details.newSelectionList = list;
+};
+
 /** 每页数量改变执行的回调 */
 const sizeChange = (pageSize: number) => {
   details.page.pageSize = pageSize;
@@ -475,13 +724,13 @@ const currentChange = () => {};
  *  */
 const setnewcolum = (newarr, headarr, type) => {
   if (type == 1) {
-    details.columnList = newarr;
+    details.editColumnList = newarr;
     functions.setStorage(window.location.pathname + 'checkList', headarr);
   } else if (type == 2) {
-    details.columnList = newarr;
+    details.editColumnList = newarr;
     functions.setStorage(window.location.pathname + 'flexList', headarr);
   } else if (type == 3) {
-    details.columnList = newarr;
+    details.editColumnList = newarr;
     functions.setStorage(window.location.pathname + 'sortlist', headarr);
   }
 };
@@ -505,11 +754,59 @@ const handleShowTruckLoadingDetails = ({ row }) => {
   });
 };
 
-/** 显示零担补录 */
+/** 跳转零担补录 */
 const handleShowzeroAdditionalRecording = ({ row }) => {
   // 跳转到零担补录页面
   $router.push('/distribution/artery/zeroAdditionalRecording');
 };
+
+/** 新增中转 */
+const addTransfer = async () => {
+  return null;
+};
+
+/** 修改中转 */
+const editTransfer = async () => {
+  return null;
+};
+
+/** 显示新增或修改中转弹窗 */
+const handleShowTransfer = async (_type: string) => {
+  switch (_type) {
+    // 新增
+    case 'add':
+      await addTransfer();
+      break;
+
+    // 修改
+    case 'edit':
+      await editTransfer();
+      break;
+
+    default:
+      break;
+  }
+  details.popUpShow.transferVisited = true;
+
+  nextTick(() => {
+    // 获取弹窗内表格元素节点, 并设置高度
+    const _nodeList = document.querySelectorAll('.transferPopUp .maboxhi');
+    _nodeList.forEach(val => (val.style.height = '300px'));
+  });
+};
+
+/** 添加运单 */
+const handleAddWaybill = () => {
+  //   if (this.addInfo.oldSelectionList.length === 0) return this.$message.warning('最少选择一条运单');
+  //   this.addInfo.newData = [...this.addInfo.newData, ...this.addInfo.oldSelectionList];
+  //   this.addInfo.haveIds = this.addInfo.map(val => val.id);
+};
+/** 移除运单 */
+const handleRemoveWaybill = () => {
+  //   if (this.addInfo.newSelectionList.length === 0) return this.$message.warning('最少选择一条运单');
+  //   this.addInfo.newData = [...this.addInfo.newData, ...this.addInfo.oldSelectionList];
+  //   this.addInfo.haveIds = this.addInfo.map(val => val.id);
+};
 </script>
 
 <style scoped lang="scss">
@@ -585,4 +882,8 @@ const handleShowzeroAdditionalRecording = ({ row }) => {
 .pointer {
   cursor: pointer;
 }
+
+.transferPopUp :deep(.el-textarea) {
+  width: 500px;
+}
 </style>
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue
index fe58f3b2..5105d357 100644
--- a/src/views/distribution/artery/VehicleStowage.vue
+++ b/src/views/distribution/artery/VehicleStowage.vue
@@ -169,8 +169,33 @@
     width="80%"
     :before-close="beforeClose"
     append-to-body
+    :fullscreen="details.fullscreenObj.truckLoadingDetailPopUp"
+    :show-close="false"
     class="truckLoadingDetailPopUp"
   >
+    <template #header="{ close, titleId, titleClass }">
+      <div class="my-header flex-c-sb">
+        <h4 :id="titleId" :class="titleClass">装车明细</h4>
+        <div class="flex-c-c">
+          <!-- 全屏显示按钮 -->
+          <el-button type="text" v-if="!details.fullscreenObj.truckLoadingDetailPopUp">
+            <el-icon class="" @click="handleFullScrean('open', 'truckLoadingDetailPopUp')"
+              ><FullScreen
+            /></el-icon>
+          </el-button>
+          <el-button type="text" v-else>
+            <el-icon class="" @click="handleFullScrean('close', 'truckLoadingDetailPopUp')"
+              ><CopyDocument
+            /></el-icon>
+          </el-button>
+
+          <!-- 弹窗关闭按钮 -->
+          <el-button type="text">
+            <el-icon class="" @click="close"><Close /></el-icon>
+          </el-button>
+        </div>
+      </div>
+    </template>
     <el-form :inline="true" :model="query" class="el-fr-d">
       <div class="fo-fl">
         <el-form-item label="预计发车:" class="el-times">
@@ -260,7 +285,7 @@ import dayjs from 'dayjs';
 import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
-import { downloadXls } from '@/utils/util';
+import { downloadXls, setNodeHeight } from '@/utils/util';
 import { columnList, detailsColumnList } from '@/option/distribution/VehicleStowage';
 import { useRouter } from 'vue-router';
 
@@ -349,6 +374,11 @@ const details = reactive<any>({
       total: 0,
     },
   },
+  /** 全屏 */
+  fullscreenObj: {
+    /** 装车明细 */
+    truckLoadingDetailPopUp: false,
+  },
 });
 
 const {
@@ -510,6 +540,31 @@ const handleShowzeroAdditionalRecording = ({ row }) => {
   // 跳转到零担补录页面
   $router.push('/distribution/artery/zeroAdditionalRecording');
 };
+
+/**
+ * 是否开启床车明细全屏
+ * @params(_type) 开启或关闭
+ */
+const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
+  const _node = document.querySelector('.truckLoadingDetailPopUp .maboxhi');
+
+  switch (_name) {
+    case 'truckLoadingDetailPopUp':
+      details.fullscreenObj.truckLoadingDetailPopUp =
+        !details.fullscreenObj.truckLoadingDetailPopUp;
+
+      const _node = document.querySelector('.truckLoadingDetailPopUp .maboxhi');
+      if (_type === 'close') {
+        setNodeHeight(_node, '500px');
+      } else {
+        setNodeHeight(_node, '1000px');
+      }
+      break;
+
+    default:
+      break;
+  }
+};
 </script>
 
 <style scoped lang="scss">
@@ -581,8 +636,4 @@ const handleShowzeroAdditionalRecording = ({ row }) => {
     }
   }
 }
-
-.pointer {
-  cursor: pointer;
-}
 </style>
diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue
index 390b0af5..6a827776 100644
--- a/src/views/distribution/checkInventoryTask/createTask.vue
+++ b/src/views/distribution/checkInventoryTask/createTask.vue
@@ -128,6 +128,13 @@
                   >对比数据</el-button
                 >
               </div>
+              <div v-if="item.type == 5 && item.prop == 'questNum'">
+                {{
+                props.row[item.prop] ? props.row[item.prop] : '/'
+              }}
+                <span class="el-exDc" @click="ExportDC(props.row)">导出</span>
+                
+              </div>
               <span v-if="item.type == 7">{{
                 props.row[item.prop] == 1 ? '全部' : props.row[item.prop] == 2 ? '全仓' : '/'
               }}</span>
@@ -166,7 +173,7 @@
     </div>
     <!-- 弹窗详情 -->
 
-    <el-dialog v-model="PopupDetails" title="盘点数据" width="70%" :before-close="handleClose">
+    <el-dialog v-model="PopupDetails" :title="!InventoryState?'盘点数据':'未盘点数据'" width="80%" :before-close="handleClose" :fullscreen="fullScreen">
       <div style="margin-bottom: 10px">
         <div style="display: flex">
           <!-- v-if="TcMInventoryStatus" -->
@@ -181,6 +188,11 @@
             <!-- v-if="NotCounted" -->
             <el-button type="primary" @click="NotInventoried">盘点</el-button>
           </div>
+
+          <div class="fullScreen" @click="BtnfullScreen"> 
+            <el-icon><FullScreen /></el-icon>
+          </div>
+
         </div>
       </div>
       <!-- 表格开始 -->
@@ -250,7 +262,7 @@
               </el-select>
             </template>
             <template #default="props">
-              <span v-if="item.type == 6 && item.prop == 'questStatus'">
+           <span v-if="item.type == 6 && item.prop == 'questStatus'">
                 {{
                   props.row[item.prop] == 0
                     ? '待盘点'
@@ -278,7 +290,6 @@
 
               <span v-if="item.type == 10">
                 <el-input
-                  @change="InputSo(item)"
                   clearable
                   :disabled="props.row.Checkbox"
                   v-model="props.row[item.prop]"
@@ -423,8 +434,19 @@
             </el-checkbox-group>
           </el-form-item>
 
-          <el-form-item label="新的货位:">
-            <el-input v-model="WrapBarEditing.groundingPositionCode" placeholder="请输入" />
+       
+
+          <el-form-item label="新的货位">
+            <el-select-v2
+            v-model="WrapBarEditing.groundingPositionCode"
+            style="width:240px"
+            filterable
+            remote
+            :remote-method="remoteMethod"
+            clearable
+            :options="optionss"
+            placeholder="请输入货位"
+          />
           </el-form-item>
         </el-form>
 
@@ -492,7 +514,6 @@
       v-model="InventoryPopup"
       title="创建盘点任务"
       width="30%"
-      :before-close="InventoryPopupClose"
     >
       <el-form :model="formInventory" label-width="120px">
         <el-form-item label="商场名称">
@@ -532,7 +553,7 @@
         </el-form-item>
       </el-form>
       <template #footer>
-        <span class="dialog-footer">
+        <span class="dialog-footer">  
           <el-button @click="InventoryPopup = false">取消</el-button>
           <el-button type="primary" @click="InventorySubmit"> 提交 </el-button>
         </span>
@@ -557,7 +578,7 @@
     <!-- 对比信息弹窗 -->
     <el-dialog v-model="dialogcontrast" title="对比信息" width="70%">
       <div class="dbExPo">
-        <!-- <el-button type="primary" @click="MXexport">导出</el-button> -->
+        <el-button type="primary" @click="MXexport">导出</el-button>
       </div>
       <!-- 表格开始 -->
       <el-table
@@ -641,6 +662,8 @@ import {
   $_materialList,
   $_submit,
   $_questDetailIds,
+  $_exportGetContrastInfo,
+  $_getList,
 } from '@/api/distribution/createTask';
 import { ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
@@ -682,7 +705,7 @@ const NotCounted = ref(false); //为盘点信息
 const UncheckedRow = ref({}); //未盘点当前行存储数据
 const InventoryStatus = ref(false); //盘点中的状态修改
 const InventoryInput = ref(null); //用来存储盘点状态定制品选怎的第几个input
-// const InventoryData=ref([]);//盘带状态修改保存的数据
+const InventoryState=ref(false);//盘带状态修改保存的数据
 const TcMInventoryStatus = ref(true); //盘点弹窗按钮权限控制
 const TcStatusModification = ref(false); //表示当前在修改状态
 const TcStateSwitching = ref(false); //默认表示定制品状态
@@ -692,6 +715,8 @@ const TcReaJoin = ref([]); //零担库存品状态10，20，30...
 const TcDataaddition = ref(false); //数据新增弹唱
 const Fromnewlyadded = ref({}); //数据新增
 const Statusjudgment = ref(false); //新增按钮
+const DbEx=ref(null);//对比明细导出
+const fullScreen=ref(false);//是否全屏
 const radioList = ref([
   { label: 0, txt: '在库', input: 'stockNum', disabled: true },
   { label: 1, txt: '破损', input: 'wornNum', disabled: true },
@@ -752,6 +777,17 @@ const menuData = ref([
     search: true,
     head: true,
   },
+  {
+    prop: 'marketName',
+    label: '收货单位',
+    type: 4,
+    values: '',
+    width: '250',
+    checkarr: [],
+    fixed: false,
+    search: true,
+    head: true,
+  },
   {
     prop: 'brandName',
     label: '品牌名称',
@@ -822,28 +858,29 @@ const menuData = ref([
 
 // 弹窗盘点
 const InventoryDetails = ref([
-  {
-    prop: 'orderPackageCode',
-    label: '包条',
+{
+    prop: 'orderCode',
+    label: '订单自编号',
     type: 5,
     values: '',
     width: '260',
     checkarr: [],
-    fixed: false,
+    fixed: true,
     search: true,
     head: true,
   },
   {
-    prop: 'orderCode',
-    label: '订单自编号',
+    prop: 'orderPackageCode',
+    label: '包条',
     type: 5,
     values: '',
     width: '260',
     checkarr: [],
-    fixed: false,
+    fixed: true,
     search: true,
     head: true,
   },
+
   {
     prop: 'questTarget',
     label: '品类',
@@ -899,6 +936,17 @@ const InventoryDetails = ref([
   {
     prop: 'positionCode',
     label: '货位',
+    type: 5,
+    values: '',
+    width: '260',
+    checkarr: [],
+    fixed: false,
+    search: true,
+    head: true,
+  },
+  {
+    prop: 'materialName',
+    label: '物料名称',
     type: 4,
     values: '',
     width: '260',
@@ -918,7 +966,39 @@ const InventoryDetails = ref([
     search: true,
     head: true,
   },
-
+  {
+    prop: 'trayName',
+    label: '托盘名称',
+    type: 4,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
+  {
+    prop: 'updateUser',
+    label: '盘点人',
+    type: 4,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
+  {
+    prop: 'updateTime',
+    label: '盘点时间',
+    type: 4,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
   {
     prop: 'firsts',
     label: '一级品类',
@@ -952,7 +1032,17 @@ const InventoryDetails = ref([
     search: true,
     head: true,
   },
-
+  {
+    prop: 'brandName',
+    label: '品牌',
+    type: 4,
+    values: '',
+    width: '250',
+    checkarr: [],
+    fixed: false,
+    search: true,
+    head: true,
+  },
   {
     prop: 'categoryName',
     label: '产品名称',
@@ -996,7 +1086,18 @@ const contrast = ref([
     values: '',
     width: '260',
     checkarr: [],
-    fixed: false,
+    fixed: true,
+    search: true,
+    head: true,
+  },
+  {
+    prop: 'orderPackageCode',
+    label: '包条',
+    type: 5,
+    values: '',
+    width: '260',
+    checkarr: [],
+    fixed: true,
     search: true,
     head: true,
   },
@@ -1154,6 +1255,17 @@ const contrast = ref([
     search: false,
     head: true,
   },
+  {
+    prop: 'trayName',
+    label: '托盘名称',
+    type: 4,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    search: false,
+    head: true,
+  },
   {
     prop: 'groundingPositionCode',
     label: '新货位',
@@ -1243,7 +1355,10 @@ const IndexPd=(val)=>{
     }
   });
 }
-
+// 弹窗全屏
+const BtnfullScreen=()=>{
+  fullScreen.value=!fullScreen.value;
+}
 
 function onLoad() {
   getDictionaryBiz('logpm_unit').then(res => {
@@ -1327,6 +1442,7 @@ const InputSo = val => {
         });
       }
     });
+   
     return;
   }
   if (val.prop == 'materialCode') {
@@ -1378,14 +1494,29 @@ const InputSo = val => {
 const TcAddData = () => {
   TcDataaddition.value = true; //新增弹窗显示
 };
-// 对比明细导出
-const MXexport = () => {
+// 对比数据导出公共函数
+const DbExTc=(data)=>{
+  $_exportGetContrastInfo({
+    id:data.id,
+    questNum:data.questNum
+  }).then(res=>{
+    console.log(res,'导出');
+    downloadXls(res.data,  `${data.questNum}对比明细.xlsx`)
+  })
+}
+// 盘点对比导出
+const ExportDC = (val) => {
   // 触发下载函数
-  downloadXls(url, '滞留运单.xlsx');
-
-  // 释放临时 URL
-  // URL.revokeObjectURL(url);
+console.log(val);
+DbExTc(val)
 };
+// 对比数据导出
+const MXexport=()=>{
+  // 触发下载函数
+DbExTc(DbEx.value)
+}
+
+
 // 新增任务按钮(搜索不到出现此按钮)
 const TcDataadditionsubmit = () => {
   console.log(Fromnewlyadded.value);
@@ -1523,6 +1654,7 @@ const comparativeData = val => {
   dialogcontrast.value = true; //显示对比数据表格
   contrastloading.value = true; //开启表格加载
   console.log(val, '对比数据当前行');
+  DbEx.value=val;//存储当前行数据用于导出
   let data = {};
   data.questNum = val.questNum;
   data.questId = val.id;
@@ -1537,7 +1669,7 @@ const searchReset = () => {
   SoInfoData.value = {};
 };
 
-const TcViewEvent = val => {
+const TcViewEvent = (val,Inso) => {
   Statusjudgment.value = false; //关闭新增按钮
   TcPdloading.value = true;
   console.log(val, '要传递的对象');
@@ -1546,6 +1678,7 @@ const TcViewEvent = val => {
     questId: val.id,
     current: TccurrentPage.value, //页码
     size: TcpageSize.value, //条数
+    ...Inso
   };
   console.log(data, '要提交的数据');
 
@@ -1561,6 +1694,10 @@ const TcViewEvent = val => {
 };
 // 点击详情按钮
 const ViewEvent = val => {
+  InventoryDetails.value.forEach(item=>{
+    item.values=null
+  })
+  InventoryState.value=false;//修改标题（盘点数据）
   TccurrentPage.value = 1; //重置页码
   NotCounted.value = false; //关闭未盘点
   row.value = val;
@@ -1576,7 +1713,7 @@ const ViewEvent = val => {
 };
 
 // 未盘点数据请求
-const NotCountedFn = row => {
+const NotCountedFn = (row,Inso) => {
   TcPdloading.value = true;
   $_getDetailInfo({
     questStatus: 0,
@@ -1584,6 +1721,7 @@ const NotCountedFn = row => {
     questId: row.id,
     current: TccurrentPage.value, //页码
     size: TcpageSize.value, //条数
+    ...Inso
   }).then(res => {
     TcPdloading.value = false;
     console.log(res, '未盘点明细返回值');
@@ -1597,14 +1735,20 @@ const NotCountedFn = row => {
 
 // 未盘点明细
 const DetailsNotCounted = row => {
+  InventoryDetails.value.forEach(item=>{
+    item.values=null
+  })
+
+  InventoryState.value=true;//修改弹窗标题（未盘点数据），
+  TcFrom.value={};//重置搜索
   TccurrentPage.value = 1; //重置页码
   UncheckedRow.value = row; //存储当前点击行的数据
-  console.log(row.value, '点击盘点了');
-
+  console.log(row.value,'存储好的数据');
   NotCounted.value = true; //展开未盘点
   TcPdloading.value = true;
   PopupDetails.value = true;
-  NotCountedFn(UncheckedRow.value);
+  NotCountedFn(row);
+  row.value = row;
 };
 // 未盘点转已盘点按钮
 const NotInventoried = val => {
@@ -1623,7 +1767,7 @@ const NotInventoried = val => {
       id: item.id,
       questStatus: (item.questStatus = 1),
       questId: item.questId,
-      questNum: UncheckedRow.value.questNum,
+      questNum:UncheckedRow.value.questNum,
     });
   });
   console.log(data, '未盘点处理好的值');
@@ -1848,6 +1992,19 @@ const StatusDetermination = () => {
   }
 };
 
+
+const optionss = ref([])
+const loadings = ref(false)
+const list =  ref([])
+const remoteMethod = (query) => {
+  if (query !== '') {
+      optionss.value = list.value.filter((item) => {
+        return item.label.toLowerCase().includes(query.toLowerCase())
+      })
+  } else {
+    optionss.value = []
+  }
+}
 // 多选数据状态处理
 const Tclist = val => {
   console.log(val);
@@ -1865,6 +2022,22 @@ const Tclist = val => {
 };
 // 盘点详情编辑
 const InventoryEditing = val => {
+  $_getList({
+    current: 1, //页码
+    size: 10000, //条数
+    warehouseId:val.warehouseId,
+  }).then(res=>{
+    console.log(res);
+    
+    if(res.data.data.records){
+  list.value=   res.data.data.records.map((item) => {  
+  return { value:`${item.id}`, label: `${item.qrCode}` }
+})
+console.log(list.value);
+    }
+  })
+
+
   counting.value = {}; //重置数据值对象
   WrapBarEditing.value.radio = null;
   readList.value = [];
@@ -1898,10 +2071,11 @@ const InventoryEditing = val => {
 // 信息编辑弹窗提交
 const InformationEditing = () => {
   TcPdloading.value = true;
+  console.log(WrapBarEditing.value,'WrapBarEditing.value');
   let data = [
     {
       orderCode: WrapBarEditing.value.orderCode, //订单编号
-      groundingPositionCode: WrapBarEditing.value.positionCode, //新的货位
+      groundingPositionCode: WrapBarEditing.value.groundingPositionCode, //新的货位
       stockNum: counting.value.stockNum, //在库数量
       lossNum: counting.value.lossNum, //丢失数量
       deliveNum: counting.value.deliveNum, //配送数量
@@ -1914,6 +2088,12 @@ const InformationEditing = () => {
       id: Tcrow.value.id,
     },
   ];
+  if(WrapBarEditing.value.groundingPositionCode){
+   let val = list.value.find(obj => obj.value == WrapBarEditing.value.groundingPositionCode);
+   console.log(data,'货位处理好的数据');
+    data[0].groundingAllocationId=val.value;
+    data[0].groundingPositionCode=val.label
+  }
   if (!TcStateSwitching.value) {
     //为假表示当前走定制品规则
     let InputMax = counting.value[radioList.value[InventoryInput.value].input]; //存储当前输入框最大值
@@ -1967,13 +2147,18 @@ const InformationEditing = () => {
 const TcChenge = (event, val) => {
   console.log(event, val);
   TcPdloading.value = true;
+  console.log(row.value,'必须参数');
+  console.log(row.value.questNum,'questNum');
+  let quest=row.value.questNum
+  let qstId=row.value.id
   let data = {
-    questNum: row.value.questNum,
-    questId: row.value.id,
     current: TccurrentPage.value, //页码
     size: TcpageSize.value, //条数
     ...TcFrom.value,
+    questNum:quest,
+    questId:qstId,
   };
+
   console.log(data, '要提交的数据');
 
   $_getDetailInfo(data).then(res => {
@@ -1992,10 +2177,10 @@ const TcPageSizeChange = val => {
   TcpageSize.value = val;
   if (NotCounted.value) {
     //表示当前是未盘点翻页
-    NotCountedFn(UncheckedRow.value);
+    NotCountedFn(UncheckedRow.value,TcFrom.value);
   } else {
     console.log(val);
-    TcViewEvent(row.value);
+    TcViewEvent(row.value,TcFrom.value);
   }
 };
 
@@ -2006,10 +2191,10 @@ const TcSizeChange = val => {
   if (NotCounted.value) {
     //表示当前是未盘点翻页
 
-    NotCountedFn(UncheckedRow.value);
+    NotCountedFn(UncheckedRow.value,TcFrom.value);
   } else {
     console.log(val);
-    TcViewEvent(row.value);
+    TcViewEvent(row.value,TcFrom.value);
   }
 };
 // 弹窗翻页
@@ -2116,11 +2301,12 @@ const InventorySubmit = () => {
     //
     SubData.list = [];
     // 结束时间
-    SubData.endTime = formInventory.value.time[0];
+    SubData.endTime = formInventory.value.time[1];
     // 开始时间
-    SubData.startTime = formInventory.value.time[1];
+    SubData.startTime = formInventory.value.time[0];
     InventoryPopup.value = false; //关闭创建盘点任务弹窗
     loading.value = true; //开启表格加载
+    console.log(SubData,'处理好的数据');
     postAddtaskQuest(SubData).then(res => {
       onLoad(); //体积之后初始化页面
       if ((res.data.code = 200)) {
@@ -2149,15 +2335,15 @@ const InventorySubmit = () => {
   }
 
   // 结束时间
-  SubData.endTime = formInventory.value.time[0];
+  SubData.endTime = formInventory.value.time[1];
   // 开始时间
-  SubData.startTime = formInventory.value.time[1];
+  SubData.startTime = formInventory.value.time[0];
   console.log(SubData, '处理好要提交的数据');
   InventoryPopup.value = false; //关闭创建盘点任务弹窗
-  postAddtaskQuest(SubData).then(res => {
-    console.log(res, '盘点计划提交成功');
-    onLoad(); //体积之后初始化页面
-  });
+  // postAddtaskQuest(SubData).then(res => {
+  //   console.log(res, '盘点计划提交成功');
+  //   onLoad(); //体积之后初始化页面
+  // });
 };
 </script>
 
@@ -2201,9 +2387,7 @@ const InventorySubmit = () => {
   padding: 0 10px;
 }
 
-:deep(.cell) {
-  padding: 0;
-}
+
 
 .demo-pagination-block {
   flex: 1;
@@ -2242,6 +2426,7 @@ const InventorySubmit = () => {
   display: flex;
   justify-content: flex-end;
   margin-top: 80px;
+ 
 }
 
 .Tcstate {
@@ -2286,4 +2471,35 @@ const InventorySubmit = () => {
   justify-content: flex-end;
   margin-bottom: 10px;
 }
+.el-exDc{
+  margin-left: 20px;
+  color: #10d070;
+  cursor: pointer;
+}
+:deep(.el-dialog){
+  display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    .el-dialog__footer{
+      flex: 1;
+    }
+    .dialog-footer{
+    display: flex;
+    align-items: flex-end;
+  }
+}
+.fullScreen{
+  display: flex;
+    margin-left: auto;
+    align-items: center;
+    justify-content: center;
+    i{
+      width: 20px;
+    height: 20px;
+    svg{
+      height: 100%;
+    width: 100%;
+    }
+    }
+}
 </style>
diff --git a/src/views/distribution/checkInventoryTask/createTaskaaa.vue b/src/views/distribution/checkInventoryTask/createTaska.vue
similarity index 100%
rename from src/views/distribution/checkInventoryTask/createTaskaaa.vue
rename to src/views/distribution/checkInventoryTask/createTaska.vue
diff --git a/src/views/distribution/inventory/carry/distributionStockCarry.vue b/src/views/distribution/inventory/carry/distributionStockCarry.vue
index 55c4d39d..780a17a2 100644
--- a/src/views/distribution/inventory/carry/distributionStockCarry.vue
+++ b/src/views/distribution/inventory/carry/distributionStockCarry.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container>
     <div class="avue-crud">
-      <el-row   v-if="!search" style="padding:6px 18px">
+      <el-row v-if="!search" style="padding: 6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="商场名称:">
@@ -22,12 +22,12 @@
           <el-form-item label="服务类型:">
             <el-input v-model="query.typeService" placeholder="请输入服务类型"></el-input>
           </el-form-item>
-<!--          <el-form-item label="类型;1 预约单  2库存单:">-->
-<!--            <el-input v-model="query.genre" placeholder="请输入类型;1 预约单  2库存单"></el-input>-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="状态;1 配送 2 待配送:">-->
-<!--            <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></el-input>-->
-<!--          </el-form-item>-->
+          <!--          <el-form-item label="类型;1 预约单  2库存单:">-->
+          <!--            <el-input v-model="query.genre" placeholder="请输入类型;1 预约单  2库存单"></el-input>-->
+          <!--          </el-form-item>-->
+          <!--          <el-form-item label="状态;1 配送 2 待配送:">-->
+          <!--            <el-input v-model="query.state" placeholder="请输入状态;1 配送 2 待配送"></el-input>-->
+          <!--          </el-form-item>-->
           <!-- 查询按钮 -->
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
@@ -39,89 +39,123 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <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-plus" @click="handlePickUpStore" v-if="permission.stockArticle_add" >自提</el-button>
+            <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-plus"
+              @click="handlePickUpStore"
+              v-if="permission.stockArticle_add"
+              >自提</el-button
+            >
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete">全部</el-button>
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">未通知</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete">已通知</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
-<!--          <div class="avue-crud__right">-->
-<!--            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>-->
-<!--            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>-->
-<!--          </div>-->
+          <!--          <div class="avue-crud__right">-->
+          <!--            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>-->
+          <!--            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>-->
+          <!--          </div>-->
         </div>
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">创建异常</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" >转预约单</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="handleStockList">批量加配转库存品</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('3')" >修改客户信息</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('2')" >修改服务类型</el-button>
-
+            <el-button type="danger" icon="el-icon-delete" @click="handleDelete"
+              >转预约单</el-button
+            >
+            <el-button type="primary" icon="el-icon-plus" @click="handleStockList"
+              >批量加配转库存品</el-button
+            >
+            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('3')"
+              >修改客户信息</el-button
+            >
+            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('2')"
+              >修改服务类型</el-button
+            >
           </div>
           <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handlebill">创建提货单</el-button>
-            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1')" >再次通知</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1')">通知提货</el-button>
+            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1')"
+              >再次通知</el-button
+            >
+            <el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1')"
+              >通知提货</el-button
+            >
           </div>
           <!-- 头部右侧按钮模块 -->
-<!--          <div class="avue-crud__right">-->
-<!--            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>-->
-<!--            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>-->
-<!--          </div>-->
+          <!--          <div class="avue-crud__right">-->
+          <!--            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>-->
+          <!--            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>-->
+          <!--          </div>-->
         </div>
-
-
       </el-row>
       <el-row>
         <!-- 列表模块 -->
-        <el-table ref="table" v-loading="loading"
-                  @selection-change="selectionChange"
-                  :data="data"
-                  :height="height"
-                  style="width: 100%"
-                  :border="option.border">
-          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
+        <el-table
+          ref="table"
+          v-loading="loading"
+          @selection-change="selectionChange"
+          :data="data"
+          :height="height"
+          style="width: 100%"
+          :border="option.border"
+        >
+          <el-table-column
+            type="selection"
+            v-if="option.selection"
+            width="55"
+            align="center"
+          ></el-table-column>
           <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
           <el-table-column v-if="option.index" label="序号" type="index" width="60" align="center">
           </el-table-column>
-          <template v-for="(item,index) in option.column">
+          <template v-for="(item, index) in option.column">
             <!-- table字段 -->
-            <el-table-column v-if="item.hide!==true"
-                             :prop="item.prop"
-                             :label="item.label"
-                             :width="item.width"
-                             :key="index">
+            <el-table-column
+              v-if="item.hide !== true"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+              :key="index"
+            >
             </el-table-column>
           </template>
           <!-- 操作栏模块 -->
           <el-table-column prop="menu" label="操作" :width="220" align="center">
-            <template #="{row}">
-              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
-              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
-<!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
+            <template #="{ row }">
+              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)"
+                >查看</el-button
+              >
+              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)"
+                >编辑</el-button
+              >
+              <!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
             </template>
           </el-table-column>
         </el-table>
       </el-row>
       <el-row>
-        <div class="avue-crud__pagination" style="width:100%">
+        <div class="avue-crud__pagination" style="width: 100%">
           <!-- 分页模块 -->
-          <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
+            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-dialog v-model="dialogFormVisible" title="通知提货">
         <el-form :model="formCall">
           <el-form-item label="顾客姓名" :label-width="formLabelWidth">
@@ -141,29 +175,29 @@
               placeholder="请填写内容"
             />
           </el-form-item>
-          <el-form-item label="历史跟进" :label-width="formLabelWidth">
-
-
-          </el-form-item>
+          <el-form-item label="历史跟进" :label-width="formLabelWidth"> </el-form-item>
         </el-form>
         <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">取消</el-button>
-<!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-        <el-button type="primary" @click="callFordelivery('1')"> 确定 </el-button>
-      </span>
+          <span class="dialog-footer">
+            <el-button @click="dialogFormVisible = false">取消</el-button>
+            <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+            <el-button type="primary" @click="callFordelivery('1')"> 确定 </el-button>
+          </span>
         </template>
       </el-dialog>
+
+      <!-- 修改服务类型 -->
       <el-dialog v-model="dialogFormService" title="修改服务类型">
         <el-form :model="formService">
           <el-form-item label="服务类型" :label-width="formLabelWidth">
-<!--            <el-input v-model="formService.typeService" autocomplete="off" />-->
+            <!--            <el-input v-model="formService.typeService" autocomplete="off" />-->
             <el-select v-model="formService.typeService" clearable placeholder="请选择服务类型">
               <el-option
-                  v-for="item in distributionType"
-                  :key="item.dictKey"
-                  :label="item.dictValue"
-                  :value="item.dictKey">
+                v-for="item in distributionType"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -180,13 +214,15 @@
           </el-form-item>
         </el-form>
         <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogFormService = false">取消</el-button>
-<!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-        <el-button type="primary" @click="callFordelivery('2')"> 确定 </el-button>
-      </span>
+          <span class="dialog-footer">
+            <el-button @click="dialogFormService = false">取消</el-button>
+            <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+            <el-button type="primary" @click="callFordelivery('2')"> 确定 </el-button>
+          </span>
         </template>
       </el-dialog>
+
+      <!-- 修改客户信息 -->
       <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
         <el-form :model="formCustomer">
           <el-form-item label="姓名" :label-width="formLabelWidth">
@@ -205,38 +241,41 @@
           </el-form-item>
         </el-form>
         <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogFormCustomer = false">取消</el-button>
-<!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-        <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
-      </span>
+          <span class="dialog-footer">
+            <el-button @click="dialogFormCustomer = false">取消</el-button>
+            <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+            <el-button type="primary" @click="callFordelivery('3')"> 确定 </el-button>
+          </span>
         </template>
       </el-dialog>
+
       <!-- 表单模块 -->
-      <el-dialog :title="title"
-                 v-model="box"
-                 width="50%"
-                 :before-close="beforeClose"
-                 append-to-body>
+      <el-dialog
+        :title="title"
+        v-model="box"
+        width="50%"
+        :before-close="beforeClose"
+        append-to-body
+      >
         <el-form :disabled="view" ref="form" :model="form" label-width="80px">
           <!-- 表单字段 -->
           <el-form-item label="服务号" prop="serviceNumber">
-            <el-input v-model="form.serviceNumber" placeholder="请输入服务号"/>
+            <el-input v-model="form.serviceNumber" placeholder="请输入服务号" />
           </el-form-item>
           <el-form-item label="订单自编号" prop="orderCode">
-            <el-input v-model="form.orderCode" placeholder="请输入订单自编号"/>
+            <el-input v-model="form.orderCode" placeholder="请输入订单自编号" />
           </el-form-item>
           <el-form-item label="商场名称" prop="mallName">
-            <el-input v-model="form.mallName" placeholder="请输入商场名称"/>
+            <el-input v-model="form.mallName" placeholder="请输入商场名称" />
           </el-form-item>
           <el-form-item label="货物名称" prop="descriptionGoods">
-            <el-input v-model="form.descriptionGoods" placeholder="请输入货物名称"/>
+            <el-input v-model="form.descriptionGoods" placeholder="请输入货物名称" />
           </el-form-item>
           <el-form-item label="仓库" prop="warehouse">
-            <el-input v-model="form.warehouse" placeholder="请输入仓库"/>
+            <el-input v-model="form.warehouse" placeholder="请输入仓库" />
           </el-form-item>
           <el-form-item label="入库时间" prop="warehouseEntryTime">
-<!--            <el-input v-model="form.warehouseEntryTime" placeholder="请输入入库时间"/>-->
+            <!--            <el-input v-model="form.warehouseEntryTime" placeholder="请输入入库时间"/>-->
             <el-date-picker
               v-model="form.warehouseEntryTime"
               type="datetime"
@@ -246,71 +285,71 @@
             />
           </el-form-item>
           <el-form-item label="在库时长" prop="storeTime">
-            <el-input v-model="form.storeTime" placeholder="请输入在库时长"/>
+            <el-input v-model="form.storeTime" placeholder="请输入在库时长" />
           </el-form-item>
           <el-form-item label="订单总件数" prop="totalNumber">
-            <el-input v-model="form.totalNumber" placeholder="请输入订单总件数"/>
+            <el-input v-model="form.totalNumber" placeholder="请输入订单总件数" />
           </el-form-item>
           <el-form-item label="在库件数" prop="handQuantity">
-            <el-input v-model="form.handQuantity" placeholder="请输入在库件数"/>
+            <el-input v-model="form.handQuantity" placeholder="请输入在库件数" />
           </el-form-item>
           <el-form-item label="是否齐套" prop="completeSet">
             <el-select v-model="form.completeSet" clearable placeholder="请选择是否齐套">
-<!--              <el-option-->
-<!--                v-for="item in completeSetData"-->
-<!--                :key="item.dictKey"-->
-<!--                :label="item.dictValue"-->
-<!--                :value="item.dictKey">-->
-<!--              </el-option>-->
+              <!--              <el-option-->
+              <!--                v-for="item in completeSetData"-->
+              <!--                :key="item.dictKey"-->
+              <!--                :label="item.dictValue"-->
+              <!--                :value="item.dictKey">-->
+              <!--              </el-option>-->
               <el-option label="是" value="2">是</el-option>
               <el-option label="否" value="1">否</el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="品牌" prop="brand">
-            <el-input v-model="form.brand" placeholder="请输入品牌"/>
+            <el-input v-model="form.brand" placeholder="请输入品牌" />
           </el-form-item>
           <el-form-item label="服务类型" prop="typeService">
             <el-select v-model="form.typeService" clearable placeholder="请选择服务类型">
-<!--              <el-option-->
-<!--                v-for="item in typeServiceData"-->
-<!--                :key="item.dictKey"-->
-<!--                :label="item.dictValue"-->
-<!--                :value="item.dictKey">-->
-<!--              </el-option>-->
+              <!--              <el-option-->
+              <!--                v-for="item in typeServiceData"-->
+              <!--                :key="item.dictKey"-->
+              <!--                :label="item.dictValue"-->
+              <!--                :value="item.dictKey">-->
+              <!--              </el-option>-->
               <el-option label="干" value="1">干</el-option>
               <el-option label="仓" value="2">仓</el-option>
               <el-option label="配" value="3">配</el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="顾客名字" prop="customerName">
-            <el-input v-model="form.customerName" placeholder="请输入顾客名字"/>
+            <el-input v-model="form.customerName" placeholder="请输入顾客名字" />
           </el-form-item>
           <el-form-item label="顾客电话" prop="customerTelephone">
-            <el-input v-model="form.customerTelephone" placeholder="请输入顾客电话"/>
+            <el-input v-model="form.customerTelephone" placeholder="请输入顾客电话" />
           </el-form-item>
           <el-form-item label="顾客地址" prop="customerAddress">
-            <el-input v-model="form.customerAddress" placeholder="请输入顾客地址"/>
+            <el-input v-model="form.customerAddress" placeholder="请输入顾客地址" />
           </el-form-item>
           <el-form-item label="类型;1 预约单  2库存单" prop="genre">
             <el-select v-model="form.genre" clearable placeholder="请选择类型;1 预约单  2库存单">
-<!--              <el-option-->
-<!--                v-for="item in genreData"-->
-<!--                :key="item.dictKey"-->
-<!--                :label="item.dictValue"-->
-<!--                :value="item.dictKey">-->
-<!--              </el-option>-->
+              <!--              <el-option-->
+              <!--                v-for="item in genreData"-->
+              <!--                :key="item.dictKey"-->
+              <!--                :label="item.dictValue"-->
+              <!--                :value="item.dictKey">-->
+              <!--              </el-option>-->
               <el-option label="库存单" value="2">库存单</el-option>
               <el-option label="预约单" value="1">预约单</el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="状态;1 配送 2 待配送" prop="state">
             <el-select v-model="form.state" clearable placeholder="请选择状态;1 配送 2 待配送">
-<!--              <el-option-->
-<!--                v-for="item in stateData"-->
-<!--                :key="item.dictKey"-->
-<!--                :label="item.dictValue"-->
-<!--                :value="item.dictKey">-->
-<!--              </el-option>-->
+              <!--              <el-option-->
+              <!--                v-for="item in stateData"-->
+              <!--                :key="item.dictKey"-->
+              <!--                :label="item.dictValue"-->
+              <!--                :value="item.dictKey">-->
+              <!--              </el-option>-->
               <el-option label="待配送" value="2">待配送</el-option>
               <el-option label="配送" value="1">配送</el-option>
             </el-select>
@@ -319,7 +358,9 @@
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+              >提 交</el-button
+            >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
         </template>
@@ -329,16 +370,23 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,addStock } from "@/api/distribution/distributionStockArticle";
-import { addCallDelivery } from "@/api/distribution/distrilbutionCallDelivery";
-import { addClient } from "@/api/distribution/distributionClientMessage";
-import { addService } from "@/api/distribution/distributionServiceLog";
-import option from "@/option/distribution/distributionStockArticle";
-import { mapGetters } from "vuex";
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  addStock,
+} from '@/api/distribution/distributionStockArticle';
+import { addCallDelivery } from '@/api/distribution/distrilbutionCallDelivery';
+import { addClient } from '@/api/distribution/distributionClientMessage';
+import { addService } from '@/api/distribution/distributionServiceLog';
+import option from '@/option/distribution/distributionStockArticle';
+import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 
 export default {
-  data () {
+  data() {
     return {
       height: 0,
       // 弹框标题
@@ -357,11 +405,11 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 30,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
-      formCall: {},// 通知
+      formCall: {}, // 通知
       formService: {}, // 服务
       formCustomer: {}, // 客户
       // 选择行
@@ -375,41 +423,41 @@ export default {
       dialogFormVisible: false,
       dialogFormCustomer: false,
       dialogFormService: false,
-      formLabelWidth: '120px'
-    }
+      formLabelWidth: '120px',
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
     this.onLoad(this.page);
   },
   computed: {
-    ...mapGetters(["permission"]),
+    ...mapGetters(['permission']),
     permissionList() {
       return {
         addBtn: this.validData(this.permission.basicdataBrandCategory_add, false),
         viewBtn: this.validData(this.permission.basicdataBrandCategory_view, false),
         delBtn: this.validData(this.permission.basicdataBrandCategory_delete, false),
-        editBtn: this.validData(this.permission.basicdataBrandCategory_edit, false)
+        editBtn: this.validData(this.permission.basicdataBrandCategory_edit, false),
       };
     },
-    ids () {
+    ids() {
       let ids = [];
       this.selectionList.forEach(ele => {
         ids.push(ele.id);
       });
-      return ids.join(",");
-    }
+      return ids.join(',');
+    },
   },
   methods: {
-    handleStockList(){
+    handleStockList() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择的订单转为库存品吗？", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择的订单转为库存品吗？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return addStock(this.ids);
@@ -418,115 +466,109 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
     //确定通知提货按钮
-    callFordelivery(inde){
+    callFordelivery(inde) {
       switch (inde) {
         case '1':
           console.log(this.formCall);
-          this.formCall.waybillNumber  = this.ids;
+          this.formCall.waybillNumber = this.ids;
           addCallDelivery(this.formCall).then(() => {
             this.$message({
-              type: "success",
-              message: "操作成功!"
+              type: 'success',
+              message: '操作成功!',
             });
             this.dialogFormVisible = false;
-            this.formCall={}
+            this.formCall = {};
           });
           break;
         case '2':
           // console.log("服务类型",this.formService);
-          addService(this.formService).then(() =>{
+          addService(this.formService).then(() => {
             this.$message({
-              type: "success",
-              message: "操作成功!"
+              type: 'success',
+              message: '操作成功!',
             });
             this.dialogFormService = false;
-            this.formService={}
-          })
+            this.formService = {};
+          });
           break;
         case '3':
-          console.log("客户信息！！！",this.formCustomer);
+          console.log('客户信息！！！', this.formCustomer);
           this.formCustomer.stockArticleId = this.ids;
-          addClient(this.formCustomer).then(() =>{
+          addClient(this.formCustomer).then(() => {
             this.$message({
-              type: "success",
-              message: "操作成功!"
+              type: 'success',
+              message: '操作成功!',
             });
             this.dialogFormCustomer = false;
-            this.formCustomer={}
-          })
+            this.formCustomer = {};
+          });
           break;
       }
     },
     //提货跳转
-    handlebill(row){
-      console.log(">>>>",this.ids);
+    handlebill(row) {
+      console.log('>>>>', this.ids);
       this.$router.push({
         path: '/distribution/inventory/distrilbutionBillLading',
-        query:{
+        query: {
           id: this.ids,
-
-
-        }
+        },
       });
     },
     //通知提货
-    handleCallDelivery(ind){
+    handleCallDelivery(ind) {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
       switch (ind) {
-          case '1':
-            let ids = [];
-            this.selectionList.forEach(ele => {
-              ids.push(ele.orderCode);
-            });
-            this.formCall.waybill = ids;
-            this.dialogFormVisible = true;
-            break;
-            case '2':
-
-              this.dialogFormService = true;
-            break;
-            case '3':
-
-              this.dialogFormCustomer = true;
-            break;
+        case '1':
+          let ids = [];
+          this.selectionList.forEach(ele => {
+            ids.push(ele.orderCode);
+          });
+          this.formCall.waybill = ids;
+          this.dialogFormVisible = true;
+          break;
+        case '2':
+          this.dialogFormService = true;
+          break;
+        case '3':
+          this.dialogFormCustomer = true;
+          break;
       }
-
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
       });
-
     },
-    searchHide () {
+    searchHide() {
       this.search = !this.search;
     },
-    searchChange () {
+    searchChange() {
       this.onLoad(this.page);
     },
-    searchReset () {
+    searchReset() {
       this.query = {};
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
-    handleSubmit () {
+    handleSubmit() {
       if (!this.form.id) {
         add(this.form).then(() => {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
       } else {
@@ -534,55 +576,57 @@ export default {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
-        })
+        });
       }
     },
     //自提
-    handlePickUpStore(){
+    handlePickUpStore() {
       this.loading = true;
       // console.log("this.query",this.query);
       let params = {};
       this.query.typeService = '1';
-      getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
+      getList(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(
+        res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        }
+      );
     },
-    handleAdd () {
-      this.title = '新增'
-      this.form = {}
-      this.box = true
+    handleAdd() {
+      this.title = '新增';
+      this.form = {};
+      this.box = true;
     },
-    handleEdit (row) {
-      this.title = '编辑'
-      this.box = true
+    handleEdit(row) {
+      this.title = '编辑';
+      this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleView (row) {
-      this.title = '查看'
+    handleView(row) {
+      this.title = '查看';
       this.view = true;
       this.box = true;
       getDetail(row.id).then(res => {
         this.form = res.data.data;
       });
     },
-    handleDelete () {
+    handleDelete() {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(this.ids);
@@ -591,16 +635,16 @@ export default {
           this.selectionClear();
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    rowDel (row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
         .then(() => {
           return remove(row.id);
@@ -608,33 +652,33 @@ export default {
         .then(() => {
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
         });
     },
-    beforeClose (done) {
-      done()
+    beforeClose(done) {
+      done();
       this.form = {};
       this.view = false;
     },
-    selectionChange (list) {
+    selectionChange(list) {
       // console.log("添加阿斯顿发生",list);
       this.selectionList = list;
     },
-    selectionClear () {
+    selectionClear() {
       this.selectionList = [];
       // this.$refs.table.clearSelection();
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.currentPage = currentPage;
       this.onLoad(this.page);
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.pageSize = pageSize;
       this.onLoad(this.page);
     },
-    onLoad (page, params = {}) {
+    onLoad(page, params = {}) {
       this.loading = true;
       this.query.genre = 1;
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
@@ -644,8 +688,8 @@ export default {
         this.loading = false;
         this.selectionClear();
       });
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>
diff --git a/src/views/distribution/signfor/distributionSignfor.vue b/src/views/distribution/signfor/distributionSignfor.vue
index afa0d120..cd7dfd54 100644
--- a/src/views/distribution/signfor/distributionSignfor.vue
+++ b/src/views/distribution/signfor/distributionSignfor.vue
@@ -115,6 +115,7 @@
             <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
               >导出
             </el-button>
+<!--            v-loading.fullscreen.lock="fullscreenLoading"-->
             <el-button type="danger" icon="el-icon-picture" @click="handlePictureInfo" plain
             >导出图片
             </el-button>
@@ -215,9 +216,29 @@
           </span>
         </template>
       </el-dialog>
+
+
+      <el-dialog
+              title="提示"
+              v-model="dialogVisible"
+              width="15%"
+              :before-close="handleClose">
+        <div align="center">
+          <el-progress type="circle" :percentage="fileSize" status="success"></el-progress>
+
+        </div>
+        <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+  </span>
+      </el-dialog>
     </div>
+
+
   </basic-container>
 
+
+
   <edittablehead
     @setcolum="setnewcolum"
     @closce="showdrawer"
@@ -572,6 +593,7 @@ export default {
         // 更多列的配置...
       ],
       columnListedit: [],
+      dialogVisible: false,
       drawerShow: false,
       height: 0,
       // 弹框标题
@@ -592,6 +614,7 @@ export default {
       signingStatusData: [],
       //业务类型
       deliveryTypeData: [],
+      fullscreenLoading:false,
       //来源
       orderSourceData: [],
       // 分页信息
@@ -609,6 +632,7 @@ export default {
       // 表单列表
       data: [],
       driverData: [],
+      fileSize:0,
     };
   },
   mounted() {
@@ -722,6 +746,9 @@ export default {
       // if (!!this.ids) {
       //   row.ids = this.ids;
       // }
+      // const h = this.$createElement;
+
+
       console.log("this.selectionList>>>>>>>>>>",this.selectionList);
       if (this.selectionList.length < 1){
         this.$message({
@@ -729,16 +756,69 @@ export default {
           message: '请选择签收记录!',
         });
       }
-     const idList= this.selectionList.map(item=>{
-        return item.id
-      })
-      console.log(idList);
-      const ids = idList.join(',');
-      console.log("ids>>>>>>>>>>>>",ids);
-      handlePicture(ids).then(res=>{
-        console.log("res><>>>>>>>>>>>>>",res);
+
+      const idList= this.selectionList.map(item=>{
+        console.log('>>>>>>>>>',item);
+        return{id:item.id,reservationCode:item.reservationCode,client:item.consignee}
       })
 
+      const _arr = [];
+              console.log(idList);
+      if (idList.length > 0){
+        // this.fullscreenLoading = true;
+        // this.dialogVisible = true;
+
+        idList.forEach(item=>{
+         return  _arr.push(handlePicture(item.id));
+        })
+
+
+        console.log('arr>>>>>>>>>>>>>>>>>>>>',_arr);
+        function delayedTimer() {
+          console.log('Delayed timer executed!');
+        }
+        const timerId = setTimeout(delayedTimer, 500);
+        Promise.all(_arr).then((response)=>{
+
+           console.log('response>>>>>>>>>>>>>>>>>>>>>',response);
+          response.forEach((res, index) =>{
+            console.log('res>>>>>>>>>>>>>>>>>>>>>',res.data);
+            if (res.data.size > 0){
+              const _item = idList[index];
+              const blob = new Blob([res.data], {type: 'application/zip'});
+              let a = document.createElement("a");
+              a.href = window.URL.createObjectURL(blob);
+              // a.href = 'http://192.168.10.25:2888/D:/Test';
+              a.download = _item.client +'-'+_item.reservationCode  +".zip";
+              // a.download = 'aaa' + ".zip";
+              a.style.display = "none";
+              document.body.appendChild(a);
+              a.click(); // 模拟点击了a标签，会触发a标签的href的读取，浏览器就会自动下载了
+              a.remove();
+            }
+          })
+           for (let i = 0; i < 100; i++) {
+             this.fileSize = i;
+           }
+           // this.dialogVisible = false;
+          setTimeout(() => {
+            clearTimeout(timerId);
+            console.log('延迟执行完成');
+            this.fullscreenLoading = false;
+
+            this.$notify({
+              title: '提示',
+              message: ('i', { style: 'color: teal'}, '开始下载...')
+            });
+          }, 3000);
+         })
+
+
+        // 在 3 秒之后，自动清除定时器
+
+      }
+
+
 
       // row.signingStatus = '2';
       // row = { ...row, ...this.query };
@@ -748,6 +828,7 @@ export default {
       //   downloadXls(res.data, '签收数据.xlsx');
       // });
     },
+
     showdrawer(value) {
       this.drawerShow = value;
     },
diff --git a/vite.config.js b/vite.config.js
index d2453eba..ef8b29a2 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -20,9 +20,11 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.101:8888',
           // 老zyc
             // target: 'http://192.168.10.75:8777',
+             // 新zyc
             target: 'http://192.168.6.137:8777',
-          // 新zyc
-          //  target: 'http://192.168.10.200:13000',
+         
+          // tjj
+          //  target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.94:8888',
           // target: 'http://test.api.huitongys.com',
           // target: 'http://h5uapi.huitongys.com',