1.加入包条字段

src/views/basicdata/warehouse/tray/basicdataTray.vue

@@ -292,7 +292,7 @@
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(() => {
+        }) .then(() => {
             console.log("this.selectionList>>>>>>>>>>>>>>>>>>",this.selectionList);
             const newList = this.selectionList.map(item => item.palletCode);
             return vacants(newList);

src/views/basicdata/warehouse/tray/basicdataTrayedt.vue

@@ -279,6 +279,18 @@ export default {
         border: true,
         selection: true,
         column: [
+          {
+            label: "服务号",
+            prop: "serviceNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "运单号",
+            prop: "waybillNumber",
+            search: true,
+            width:"100px"
+          },
           {
             label: "包条码",
             prop: "orderPackageCode",
@@ -328,11 +340,42 @@ export default {
             width:"100px"
           },
           {
-            label: "运单号",
-            prop: "waybillNumber",
+            label: "包件状态",
+            prop: "orderPackageStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件冻结状态",
+            prop: "orderPackageFreezeStatusName",
             search: true,
             width:"100px"
           },
+          {
+            label: "包件上架状态",
+            prop: "orderPackageGroundingStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件备货状态",
+            prop: "orderPackageStockupStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件预约状态",
+            prop: "orderPackageReservationStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件装车状态",
+            prop: "orderPackageLoadingStatusName",
+            search: true,
+            width:"100px"
+          },
+
           // {
           //   label: "托盘码",
           //   prop: "pallet",

src/views/basicdata/warehouse/tray/basicdataTrayhistory.vue

@@ -299,6 +299,18 @@ export default {
         border: true,
         selection: true,
         column: [
+          {
+            label: "服务号",
+            prop: "serviceNumber",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "运单号",
+            prop: "waybillNumber",
+            search: true,
+            width:"100px"
+          },
           {
             label: "包条码",
             prop: "orderPackageCode",
@@ -348,8 +360,38 @@ export default {
             width:"100px"
           },
           {
-            label: "运单号",
-            prop: "waybillNumber",
+            label: "包件状态",
+            prop: "orderPackageStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件冻结状态",
+            prop: "orderPackageFreezeStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件上架状态",
+            prop: "orderPackageGroundingStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件备货状态",
+            prop: "orderPackageStockupStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件预约状态",
+            prop: "orderPackageReservationStatusName",
+            search: true,
+            width:"100px"
+          },
+          {
+            label: "包件装车状态",
+            prop: "orderPackageLoadingStatusName",
             search: true,
             width:"100px"
           },

src/views/warehouse/warehouseStock/warehouseStock.vue

@@ -79,6 +79,26 @@ export default {
           sortable: false,
           head: false,
         },
+        {
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'waybillNumber',
+          label: '运单号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'orderCode',
           label: '订单自编码',
@@ -170,18 +190,44 @@ export default {
           sortable: true,
         },
         {
-          prop: 'warehouseEntryTimeEnd',
-          label: '入库时间',
-          type: 2,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
+          label: "包件状态",
+          prop: "orderPackageStatusName",
+          search: true,
+          width:"100px"
         },
         {
-          prop: 'waybillNumber',
-          label: '运单号',
+          label: "包件冻结状态",
+          prop: "orderPackageFreezeStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          label: "包件上架状态",
+          prop: "orderPackageGroundingStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          label: "包件备货状态",
+          prop: "orderPackageStockupStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          label: "包件预约状态",
+          prop: "orderPackageReservationStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          label: "包件装车状态",
+          prop: "orderPackageLoadingStatusName",
+          search: true,
+          width:"100px"
+        },
+        {
+          prop: 'warehouseEntryTimeEnd',
+          label: '入库时间',
           type: 2,
           values: '',
           width: '180',
@@ -189,6 +235,7 @@ export default {
           fixed: false,
           sortable: true,
         },
+
         {
           prop: 'operatorName',
           label: '操作员',