diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 4ead8b4e..1d576f98 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -1936,16 +1936,15 @@ export default {
           this.page.total = inventoryList.total;
           console.log('res :>> ', res);
 
-
           // 过滤掉已选择的数量
 
           const _inventoryInfo = inventoryList.records;
-          this.inventoryInfo = _inventoryInfo
+          this.inventoryInfo = _inventoryInfo;
           if (this.inventoryData.length !== 0) {
             // 获取ids的映射数组
             const ids = this.inventoryData.map(val => val.id);
             // 赋值给回显勾选的数组
-           this.inventoryInfo = _inventoryInfo.filter(val => {
+            this.inventoryInfo = _inventoryInfo.filter(val => {
               // 循环获取符合条件的库存品组成数组
               return !ids.includes(val.id);
             });
@@ -2630,7 +2629,7 @@ export default {
       }
       this.marketName = _marketName;
       console.log('this.inventoryList :>> ', this.inventoryList);
-      this.inventoryData = [...this.inventoryData,...this.inventoryList];
+      this.inventoryData = [...this.inventoryData, ...this.inventoryList];
 
       this.stockListShow = false;
     },
@@ -2797,14 +2796,9 @@ export default {
       this.query.typeService = 2;
       this.query.genre = '1';
       this.query.marketName = this.marketName;
-      // const page = this.page;
-      let a = [];
-      if (this.orderData) {
-        this.orderData.forEach(item => {
-          a.push(item.id);
-        });
+      if (this.orderData.length !== 0) {
+        this.query.orderIds = this.orderData.map(val => val.id).join(',');
       }
-      this.query.orderIds = a.join(',');
       console.log('--------------query>', this.query);
       const res = await selectStockArticleInfoList(
         page.currentPage,
@@ -2812,27 +2806,18 @@ export default {
         Object.assign(params, this.query)
       );
       const { records, total } = res.data.data;
-      this.stockArticleInfo = records;
+      const _filterArr = records
+      
+      // this.stockArticleInfo = records;
       console.log('this.stockArticleInfo :>> ', this.stockArticleInfo);
       this.stockArticleInfo.forEach((item, index) => {
         //检查订单是否冻结
         this.checkOrder(item, index);
-        // if (this.orderData) {
-        //   this.orderData.forEach(o => {
-        //     if (o.id === item.id) {
-        //       this.$nextTick(() => {
-        //         this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
-        //       });
-        //     }
-        //   });
-        // }else {
-        //   this.orderList = [];
-        // }
         this.page.total = total;
       });
       if (this.orderData.length !== 0) {
         const ids = this.orderData.map(val => val.id);
-        const _orderData = this.stockArticleInfo.filter(val => !ids.includes(val.id))
+        const _orderData = this.stockArticleInfo.filter(val => !ids.includes(val.id));
         // this.orderSelectList = this.stockArticleInfo.filter(val => ids.includes(val.id));
         console.log('orderSelectList :>> ', this.orderSelectList);
       }
diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue
index 18f9c227..450b9a89 100644
--- a/src/views/warehouse/parcelList/distributionParcelList.vue
+++ b/src/views/warehouse/parcelList/distributionParcelList.vue
@@ -154,6 +154,27 @@ export default {
           sortable: false,
           head: false,
         },
+        {
+          prop: '',
+          label: '序号',
+          type: 12,
+          values: '',
+          width: '55',
+          checkarr: [],
+          fixed: true,
+          sortable: false,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'warehouse',
           label: '仓库',
@@ -165,6 +186,26 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'conditionsType',
+          label: '包件明细状态',
+          type: 3,
+          values: '',
+          width: '130',
+          checkarr: [
+            {
+              label: '定制品',
+              value: '1',
+            },
+            {
+              label: '库存品',
+              value: '2',
+            },
+          ],
+          fixed: false,
+          sortable: false,
+          head: false,
+        },
         {
           prop: 'orderPackageCode',
           label: '包条码',
@@ -269,16 +310,6 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'orderCode',
-          label: '订单自编号',
-          type: 2,
-          values: '',
-          width: '180',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
       ],
       drawerShow: false,
       height: 0,
@@ -420,6 +451,12 @@ export default {
       console.log(this.query);
       this.onLoad(this.page);
     },
+    timesc() {},
+    btnsc() {},
+    selectsc(value, row) {
+      console.log('value :>> ', value);
+      console.log('row :>> ', row);
+    },
     showdrawer(value) {
       this.drawerShow = value;
     },
@@ -558,7 +595,10 @@ export default {
       getpage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
-        this.data = data.records;
+        this.data = data.records.map(val => {
+          val.conditionsType = val.conditions === 1 ? '定制品' : '库存品';
+          return val;
+        });
         this.loading = false;
         this.selectionClear();
       });
@@ -583,6 +623,6 @@ export default {
 .el-fy {
   flex: 1;
   display: flex;
- align-items: flex-end;
+  align-items: flex-end;
 }
 </style>