diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js
index 68ff4330..ed80601c 100644
--- a/src/option/aftersales/vueTvemp.js
+++ b/src/option/aftersales/vueTvemp.js
@@ -50,17 +50,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
-  // {
-  //   prop: 'packageCode',
-  //   label: '包条码',
-  //   type: 2,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  //   head: false,
-  // },
+  {
+    prop: 'packageCode',
+    label: '包条码',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'waybillNumber',
     label: '运单号',
@@ -416,17 +416,17 @@ export const columnList8 = [
     sortable: true,
     head: false,
   },
-  // {
-  //   prop: 'packageCode',
-  //   label: '包条码',
-  //   type: 2,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  //   head: false,
-  // },
+  {
+    prop: 'packageCode',
+    label: '包条码',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'waybillNumber',
     label: '运单号',
@@ -782,17 +782,17 @@ export const columnList3 = [
     sortable: true,
     head: false,
   },
-  // {
-  //   prop: 'packageCode',
-  //   label: '包条码',
-  //   type: 2,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  //   head: false,
-  // },
+  {
+    prop: 'packageCode',
+    label: '包条码',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'waybillNumber',
     label: '运单号',
@@ -851,7 +851,7 @@ export const columnList3 = [
   {
     prop: 'workOrderStatusNameS', //workOrderStatus
     label: '工单状态',
-    type: 3,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -881,39 +881,39 @@ export const columnList3 = [
     sortable: true,
     head: false,
   },
-  {
-    prop: 'totalAmount',
-    label: '赔款金额',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'entryTime',
-    label: '财务入账时间',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'operator',
-    label: '操作人',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
+  // {
+  //   prop: 'totalAmount',
+  //   label: '赔款金额',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'entryTime',
+  //   label: '财务入账时间',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'operator',
+  //   label: '操作人',
+  //   type: 2,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
   {
     prop: 'deliverGoodsTime',
     label: '送货时间',
@@ -995,17 +995,17 @@ export const columnList3 = [
     head: false,
   },
 
-  {
-    prop: 'overTime',
-    label: '完结时间',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
+  // {
+  //   prop: 'overTime',
+  //   label: '完结时间',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
   {
     prop: 'investigationProcess',
     label: '调查经过',
@@ -1028,39 +1028,39 @@ export const columnList3 = [
   //   sortable: true,
   //   head: false,
   // },
-  {
-    prop: 'processNumber',
-    label: '钉钉流程号',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'reviewedBy',
-    label: '审核人',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'auditTime',
-    label: '审核时间',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
+  // {
+  //   prop: 'processNumber',
+  //   label: '钉钉流程号',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'reviewedBy',
+  //   label: '审核人',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'auditTime',
+  //   label: '审核时间',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
   {
     prop: 'createTime',
     label: '录入时间',
@@ -1148,17 +1148,17 @@ export const columnList1 = [
     sortable: true,
     head: false,
   },
-  // {
-  //   prop: 'packageCode',
-  //   label: '包条码',
-  //   type: 2,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  //   head: false,
-  // },
+  {
+    prop: 'packageCode',
+    label: '包条码',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'waybillNumber',
     label: '运单号',
@@ -1217,7 +1217,7 @@ export const columnList1 = [
   {
     prop: 'workOrderStatusNameS', //workOrderStatus
     label: '工单状态',
-    type: 3,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -1247,39 +1247,39 @@ export const columnList1 = [
     sortable: true,
     head: false,
   },
-  {
-    prop: 'totalAmount',
-    label: '赔款金额',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'entryTime',
-    label: '财务入账时间',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'operator',
-    label: '操作人',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
+  // {
+  //   prop: 'totalAmount',
+  //   label: '赔款金额',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'entryTime',
+  //   label: '财务入账时间',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'operator',
+  //   label: '操作人',
+  //   type: 2,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
   {
     prop: 'deliverGoodsTime',
     label: '送货时间',
@@ -1361,64 +1361,20 @@ export const columnList1 = [
     head: false,
   },
 
-  {
-    prop: 'overTime',
-    label: '完结时间',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'investigationProcess',
-    label: '调查经过',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
   // {
-  //   prop: 'personResponsible',
-  //   label: '责任人(库内作业环节)',
-  //   type: 2,
+  //   prop: 'overTime',
+  //   label: '完结时间',
+  //   type: 1,
   //   values: '',
-  //   width: '170',
+  //   width: '150',
   //   checkarr: [],
   //   fixed: false,
   //   sortable: true,
   //   head: false,
   // },
   {
-    prop: 'processNumber',
-    label: '钉钉流程号',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'reviewedBy',
-    label: '审核人',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'auditTime',
-    label: '审核时间',
+    prop: 'investigationProcess',
+    label: '调查经过',
     type: 1,
     values: '',
     width: '150',
@@ -1427,6 +1383,50 @@ export const columnList1 = [
     sortable: true,
     head: false,
   },
+  // {
+  //   prop: 'personResponsible',
+  //   label: '责任人(库内作业环节)',
+  //   type: 2,
+  //   values: '',
+  //   width: '170',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'processNumber',
+  //   label: '钉钉流程号',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'reviewedBy',
+  //   label: '审核人',
+  //   type: 2,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'auditTime',
+  //   label: '审核时间',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
   {
     prop: 'createTime',
     label: '录入时间',
@@ -1492,12 +1492,23 @@ export const columnList4 = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'workOrderStatusName',
+    label: '工单状态',
+    type: 1,
+    values: '',
+    width: '120',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'businessName',
     label: '营业部',
-    type: 3,
+    type: 2,
     values: '',
-    width: '100',
+    width: '130',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1520,7 +1531,7 @@ export const columnList4 = [
     label: '商场名称',
     type: 2,
     values: '',
-    width: '110',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1531,7 +1542,7 @@ export const columnList4 = [
     label: '运单号',
     type: 2,
     values: '',
-    width: '100',
+    width: '120',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1540,10 +1551,10 @@ export const columnList4 = [
 
   {
     prop: 'workOrderTypeName',
-    label: '异常类型名称',
+    label: '异常类型',
     type: 3,
     values: '',
-    width: '130',
+    width: '140',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1554,9 +1565,9 @@ export const columnList4 = [
   {
     prop: 'resultTypeName',
     label: '处理结果名称',
-    type: 3,
+    type: 1,
     values: '',
-    width: '130',
+    width: '140',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1568,7 +1579,7 @@ export const columnList4 = [
     label: '发现环节',
     type: 3,
     values: '',
-    width: '120',
+    width: '140',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1590,7 +1601,7 @@ export const columnList4 = [
     label: '车辆路线',
     type: 2,
     values: '',
-    width: '110',
+    width: '180',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1599,9 +1610,9 @@ export const columnList4 = [
   {
     prop: 'indemnitor',
     label: '赔款方',
-    type: 3,
+    type: 1,
     values: '',
-    width: '100',
+    width: '130',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1610,9 +1621,9 @@ export const columnList4 = [
   {
     prop: 'reason',
     label: '判责原因',
-    type: 2,
+    type: 1,
     values: '',
-    width: '110',
+    width: '130',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1621,7 +1632,7 @@ export const columnList4 = [
   {
     prop: 'money',
     label: '金额',
-    type: 2,
+    type: 1,
     values: '',
     width: '100',
     checkarr: [],
@@ -1630,29 +1641,19 @@ export const columnList4 = [
     head: false,
   },
 
-  {
-    prop: 'processNumber',
-    label: '钉钉流程号',
-    type: 2,
-    values: '',
-    width: '120',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
+  // {
+  //   prop: 'processNumber',
+  //   label: '钉钉流程号',
+  //   type: 2,
+  //   values: '',
+  //   width: '120',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+
 
-  {
-    prop: 'workOrderStatusName',
-    label: '工单状态',
-    type: 1,
-    values: '',
-    width: '120',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
   {
     prop: 'createUserName',
     label: '操作',
@@ -1785,7 +1786,7 @@ export const columnList2 = [
   {
     prop: 'workOrderStatusNameS', //workOrderStatus
     label: '工单状态',
-    type: 3,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -1826,17 +1827,17 @@ export const columnList2 = [
     sortable: true,
     head: false,
   },
-  {
-    prop: 'entryTime',
-    label: '财务入账时间',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
+  // {
+  //   prop: 'entryTime',
+  //   label: '财务入账时间',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
   {
     prop: 'operator',
     label: '操作人',
@@ -1920,18 +1921,6 @@ export const columnList2 = [
   {
     prop: 'vehicleRoute',
     label: '车辆线路',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-
-  {
-    prop: 'overTime',
-    label: '完结时间',
     type: 1,
     values: '',
     width: '150',
@@ -1940,6 +1929,18 @@ export const columnList2 = [
     sortable: true,
     head: false,
   },
+
+  // {
+  //   prop: 'overTime',
+  //   label: '完结时间',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
   {
     prop: 'investigationProcess',
     label: '调查经过',
@@ -1962,39 +1963,39 @@ export const columnList2 = [
   //   sortable: true,
   //   head: false,
   // },
-  {
-    prop: 'processNumber',
-    label: '钉钉流程号',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'reviewedBy',
-    label: '审核人',
-    type: 2,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
-  {
-    prop: 'auditTime',
-    label: '审核时间',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
+  // {
+  //   prop: 'processNumber',
+  //   label: '钉钉流程号',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'reviewedBy',
+  //   label: '审核人',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
+  // {
+  //   prop: 'auditTime',
+  //   label: '审核时间',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  //   head: false,
+  // },
   {
     prop: 'createTime',
     label: '录入时间',
@@ -2151,7 +2152,7 @@ export const columnList5 = [
   {
     prop: 'workOrderStatusNameS', //workOrderStatus
     label: '工单状态',
-    type: 3,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -2814,17 +2815,28 @@ export const columnList6 = [
     sortable: true,
     head: false,
   },
-  // {
-  //   prop: 'packageCode',
-  //   label: '包条码',
-  //   type: 2,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  //   head: false,
-  // },
+  {
+    prop: 'workOrderStatusNameS', //workOrderStatus
+    label: '工单状态',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'packageCode',
+    label: '包条码',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'waybillNumber',
     label: '运单号',
@@ -2880,17 +2892,7 @@ export const columnList6 = [
     sortable: true,
     head: false,
   },
-  {
-    prop: 'workOrderStatusNameS', //workOrderStatus
-    label: '工单状态',
-    type: 3,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
+
   {
     prop: 'brandName',
     label: '品牌',
diff --git a/src/option/distribution/Unstoreddetails.js b/src/option/distribution/Unstoreddetails.js
index ebf4df37..a9c1ca49 100644
--- a/src/option/distribution/Unstoreddetails.js
+++ b/src/option/distribution/Unstoreddetails.js
@@ -12,7 +12,7 @@ export const columnList = [
   {
     prop: 'waybillNumber',
     label: '运单号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -23,7 +23,7 @@ export const columnList = [
   {
     prop: 'orderCode',
     label: '订单自编号',
-    type: 1,
+    type:2,
     values: '',
     width: '150',
     checkarr: [],
@@ -34,7 +34,7 @@ export const columnList = [
   {
     prop: 'warehouse',
     label: '仓库',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -56,7 +56,7 @@ export const columnList = [
   {
     prop: 'orderPackageCode',
     label: '包条码',
-    type: 1,
+    type: 2,
     values: '',
     width: '180',
     checkarr: [],
@@ -66,7 +66,7 @@ export const columnList = [
   {
     prop: 'goodsAllocation',
     label: '货位信息',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -76,7 +76,7 @@ export const columnList = [
   {
     prop: 'pallet',
     label: '所在托盘',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -86,7 +86,7 @@ export const columnList = [
   {
     prop: 'firsts',
     label: '一级品',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -96,7 +96,7 @@ export const columnList = [
   {
     prop: 'second',
     label: '二级品',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -106,7 +106,7 @@ export const columnList = [
   {
     prop: 'thirdProduct',
     label: '三级品',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -116,7 +116,7 @@ export const columnList = [
   {
     prop: 'materialName',
     label: '物料名称',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -126,7 +126,7 @@ export const columnList = [
   {
     prop: 'materialCode',
     label: '物料编码',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -143,6 +143,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,//开启统计
   },
   {
     prop: 'warehouseEntryTimeEnd',
@@ -157,7 +158,7 @@ export const columnList = [
   {
     prop: 'trainNumber',
     label: '客户车次号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -167,7 +168,7 @@ export const columnList = [
   {
     prop: 'sendWarehouseName',
     label: '发站仓',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 7b0a6070..16a8f085 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -98,13 +98,13 @@
                     <el-icon><Plus /></el-icon>新 增</el-button
                   >
 
-                  <el-button
+                  <!-- <el-button
                     v-if="ButtonPermissions.export_Report"
                     type="primary"
                     @click="exportReport"
                   >
                     <el-icon><Download /></el-icon>EXCEL导出</el-button
-                  >
+                  > -->
 
                   <el-button
                     v-if="ButtonPermissions.Timed_outexport"
diff --git a/src/views/distribution/inventory/delivery/Unstoreddetails.vue b/src/views/distribution/inventory/delivery/Unstoreddetails.vue
index 13265043..0f852193 100644
--- a/src/views/distribution/inventory/delivery/Unstoreddetails.vue
+++ b/src/views/distribution/inventory/delivery/Unstoreddetails.vue
@@ -82,8 +82,8 @@
         </el-form>
       </div>
       <el-tabs type="border-card" class="el_tabs" @click="tabclaick" v-model="activeName">
-        <el-tab-pane label="已入库" name="1"></el-tab-pane>
         <el-tab-pane label="未入库" name="2"></el-tab-pane>
+        <el-tab-pane label="已入库" name="1"></el-tab-pane>
       </el-tabs>
       <!-- 控件模块 -->
       <el-row>
@@ -166,7 +166,7 @@
 <script setup>
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { columnList } from '@/option/distribution/Unstoreddetails.js';
-import { processRowPropertyName, setNodeHeight, getObjType } from '@/utils/util';
+import { processRowPropertyName, setNodeHeight, getObjType, deepClone } from '@/utils/util';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls, handleClearTableQuery } from '@/utils/util';
 import { getShowAdvancePackgeCode } from '@/api/waybill/orderPackageListDetails';
@@ -181,7 +181,8 @@ import {
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
-const activeName = ref('1');
+const activeName = ref('2');
+const dataCopy = ref([]); //拷贝数据
 const dialogVisible = ref(false);
 const from = ref({
   unWarehouse: [],
@@ -193,8 +194,6 @@ const details = reactive({
   search: false,
   /** 表格搜索条件 */
   query: {
-    inputQuery: {},
-    selectQuery: {},
   },
   defaultTime2: [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)], // '12:00:00', '08:00:00'
   /** 时间快捷选择设置 */
@@ -292,9 +291,32 @@ const {
 const showdrawer = _flag => {
   details.drawerShow = _flag;
 };
+const filterAst = (ast, data) => {
+  // 检查 `data` 中是否所有的 `values` 都为空
+  const allValuesEmpty = data.every(item => !item.values);
+
+  // 如果所有 `values` 都为空，直接返回 `ast`
+  if (allValuesEmpty) {
+    // tabclaick();
+    return dataCopy.value;
+  }
+
+  // 否则筛选出 `values` 不为空的对象
+  const filteredData = data.filter(item => item.values);
+
+  // 根据筛选出的条件过滤 `ast`
+  return ast.filter(item => {
+    return filteredData.every(sub => {
+      const prop = sub.prop;
+      const value = sub.values;
+      return item[prop] === value;
+    });
+  });
+};
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
-    
+  let _query = filterAst(dataCopy.value, columnList);
+  details.data = _query;
 };
 
 /** 表格表头时间选择 */
@@ -375,10 +397,12 @@ const onLoad = async () => {
   if (code !== 200 || !data) {
     return;
   }
+
   console.log(_res, '基础信息');
   from.value.warehouse = data.warehouse; //已入库
   from.value.unWarehouse = data.unWarehouse; //未入库
-  details.data = data.warehouse;
+  details.data = data.unWarehouse;
+  dataCopy.value = deepClone(from.value.warehouse);
   details.loadingObj.list = false;
 };
 
@@ -402,8 +426,10 @@ initPage();
 const tabclaick = () => {
   if (activeName.value == 1) {
     details.data = from.value.warehouse; //已入库
+    dataCopy.value = deepClone(from.value.warehouse);
   } else {
-    details.data = from.value.unWarehouse; //已入库
+    details.data = from.value.unWarehouse; //未入库
+    dataCopy.value = deepClone(from.value.unWarehouse);
   }
 };
 
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 0602bc89..c87f5c38 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -143,7 +143,7 @@
           <template v-if="slotProps.scope.column.label === '未入库数量'">
             <el-text class="el_textBtn" @click="InformationViewing(slotProps.scope.row)">
               {{
-                slotProps.scope.column.label === '未入库数量' ? slotProps.scope.row.notReceived : ''
+                slotProps.scope.row.notReceived
               }}
             </el-text>
           </template>
@@ -934,6 +934,9 @@ export default {
   methods: {
     // 未入库数量跳转
     InformationViewing(row) {
+      if(!row.notReceived || Number(row.isZero)) {
+        return
+      }
       this.$router.push({
         path: '/distribution/inventory/delivery/Unstoreddetails',
         query: {
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index 7d770eb5..83444bac 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -96,6 +96,13 @@
         @selection="selectionChange"
       >
         <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '未入库数量'">
+            <el-text class="el_textBtn" @click="InformationViewing(slotProps.scope.row)">
+              {{
+               slotProps.scope.row.notReceived
+              }}
+            </el-text>
+          </template>
           <template v-if="slotProps.scope.column.label === '货位信息'">
             <div style="width: 100%">
               <el-tag
@@ -1042,6 +1049,20 @@ export default {
       handleClearTableQuery(this.columnList);
       this.onLoad(this.page);
     },
+    InformationViewing(row) {
+      if(!row.notReceived || Number(row.isZero)) {
+        return
+      }
+      this.$router.push({
+        path: '/distribution/inventory/delivery/Unstoreddetails',
+        query: {
+          id: row.id,
+          orderCode: row.orderCode,
+          name: '未入库订单详情 - ' + row.orderCode,
+          isZero: row.isZero,
+        },
+      });
+    },
     handleSubmit() {
       if (!this.form.id) {
         add(this.form).then(() => {
@@ -1439,4 +1460,7 @@ export default {
     color: #009688;
   }
 }
+.el_textBtn {
+  font-weight: bold;
+}
 </style>
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index 4397904c..3ba7403a 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -125,6 +125,13 @@
         @selection="selectionChange"
       >
         <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '未入库数量'">
+            <el-text class="el_textBtn" @click="InformationViewing(slotProps.scope.row)">
+              {{
+               slotProps.scope.row.notReceived
+              }}
+            </el-text>
+          </template>
           <template v-if="slotProps.scope.column.label === '货位信息'">
             <div style="width: 100%">
               <el-tag
@@ -914,6 +921,20 @@ export default {
       this.dialogFormCustomer = true;
       this.dialogFormCustomerOwn = true;
     },
+    InformationViewing(row) {
+      if(!row.notReceived || Number(row.isZero)) {
+        return
+      }
+      this.$router.push({
+        path: '/distribution/inventory/delivery/Unstoreddetails',
+        query: {
+          id: row.id,
+          orderCode: row.orderCode,
+          name: '未入库订单详情 - ' + row.orderCode,
+          isZero: row.isZero,
+        },
+      });
+    },
     //通知提货
     handleCallDelivery(ind) {
       if (this.selectionList.length === 0) {
@@ -1402,4 +1423,7 @@ export default {
     color: #009688;
   }
 }
+.el_textBtn {
+  font-weight: bold;
+}
 </style>
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index edd104ae..72ba3287 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -108,6 +108,13 @@
         @selection="selectionChange"
       >
         <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '未入库数量'">
+            <el-text class="el_textBtn" @click="InformationViewing(slotProps.scope.row)">
+              {{
+               slotProps.scope.row.notReceived
+              }}
+            </el-text>
+          </template>
           <template v-if="slotProps.scope.column.label === '货位信息'">
             <div style="width: 100%">
               <el-tag
@@ -901,6 +908,20 @@ export default {
       this.query[row.prop] = index;
       this.onLoad(this.page);
     },
+    InformationViewing(row) {
+      if(!row.notReceived || Number(row.isZero)) {
+        return
+      }
+      this.$router.push({
+        path: '/distribution/inventory/delivery/Unstoreddetails',
+        query: {
+          id: row.id,
+          orderCode: row.orderCode,
+          name: '未入库订单详情 - ' + row.orderCode,
+          isZero: row.isZero,
+        },
+      });
+    },
     handleMoke() {
       if (this.selectionList.length === 0) {
         this.$message.warning('请选择至少一条数据');
@@ -1765,4 +1786,7 @@ export default {
     margin-right: 4px;
   }
 }
+.el_textBtn {
+  font-weight: bold;
+}
 </style>