diff --git a/src/api/distribution/distributionParcelList.js b/src/api/distribution/distributionParcelList.js
index 1b238fe9..20922cfd 100644
--- a/src/api/distribution/distributionParcelList.js
+++ b/src/api/distribution/distributionParcelList.js
@@ -99,3 +99,4 @@ export const getPackageList = (params) => {
 }
 
 
+
diff --git a/src/api/distribution/distributionStockup.js b/src/api/distribution/distributionStockup.js
index 4ecdcfb3..ccbfaa59 100644
--- a/src/api/distribution/distributionStockup.js
+++ b/src/api/distribution/distributionStockup.js
@@ -28,9 +28,9 @@ export const getDetail = (id) => {
   })
 }
 
-export const getDetailStockupOwn = (id) => {
+export const getDetailStockupOwnSelf = (id) => {
   return request({
-    url: '/api/logpm-distribution/distributionStockup/detailOwn',
+    url: '/api/logpm-distribution/distributionStockup/detailOwnSelf',
     method: 'get',
     params: {
      id
@@ -106,3 +106,15 @@ export const update = (row) => {
   })
 }
 
+export const billStockList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockup/billStockList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
diff --git a/src/option/distribution/distributionStockup.js b/src/option/distribution/distributionStockup.js
index 009bb327..b6de107a 100644
--- a/src/option/distribution/distributionStockup.js
+++ b/src/option/distribution/distributionStockup.js
@@ -4,134 +4,269 @@ export default {
   border: true,
   selection: true,
   columnReservation: [ // 备货订单
-    {
-      label: "主键",
-      prop: "id",
-      display: false,
-      hide: true,
-    },
-    {
-      label: "租户号",
-      prop: "tenantId",
-      display: false,
-      hide: true,
-    },
-    {
-      label: "创建人",
-      prop: "createUser",
-      display: false,
-      hide: true,
-    },
-    {
-      label: "创建时间",
-      prop: "createTime",
-      display: false,
-      hide: true,
-    },
-    {
-      label: "更新人",
-      prop: "updateUser",
-      display: false,
-      hide: true,
-    },
-    {
-      label: "更新时间",
-      prop: "updateTime",
-      display: false,
-      hide: true,
-    },
-    {
-      label: "状态",
-      prop: "status",
-      display: false,
-      hide: true,
-    },
-    {
-      label: "是否已删除",
-      prop: "isDeleted",
-      display: false,
-      hide: true,
-    },
-    {
-      label: "创建部门",
-      prop: "createDept",
-      display: false,
-      hide: true,
-    },
-    // {
-    //   label: "备货时间",
-    //   prop: "stockupDate",
-    //   format: "YYYY-MM-DD hh:mm:ss",
-    //   valueFormat: "YYYY-MM-DD hh:mm:ss",
-    // },
-    // {
-    //   label: "配送单号",
-    //   prop: "stockupUser",
-    // },
-    {
-      label: "收货人",
-      prop: "consignee",
-      search: true,
-    },
-    {
-      label: "收货电话",
-      prop: "deliveryPhone",
-      search: true,
-    },
-    {
-      label: "收货地址",
-      prop: "deliveryAddress",
-      search: true,
-    },
-    {
-      label: "收货单位",
-      prop: "mallName",
-    },
-    {
-      label: "订单自编号",
-      prop: "stockArticleId",
-      display: false,
-    },
-    // {
-    //   label: "配送单号",
-    //   prop: "reserve2",
-    //   display: false,
-    // },
-    {
-      label: "备货状态",
-      prop: "stockupStatusName",
-      display: false,
-    },
-    // {
-    //   label: "配送状态",
-    //   prop: "reserve4",
-    //   display: false,
-    // },
-  /*  {
-      label: "装车件数",
-      prop: "reserve5",
-      display: false,
-    },
-    {
-      label: "签收件数",
-      prop: "reserve3",
-      display: false,
-    },
-    {
-      label: "回库件数",
-      prop: "reserve4",
-      display: false,
-    },
-    {
-      label: "是否加急",
-      prop: "reserve5",
-      display: false,
-    },
-    {
-      label: "状态",
-      prop: "reserve5",
-      display: false,
-    },*/
+
+  {
+    prop: 'pickupBatch',
+    label: '提货批次',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'serviceNumber',
+    label: '服务号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'waybillNumber ',
+    label: '运单号',
+    type: 2,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'consigneeUnit',
+    label: '收货单位',
+    type: 2,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'customerName',
+    label: '收货人',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'customerTelephone',
+    label: '联系电话',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'warehouse',
+    label: '仓库',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: true,
+  },
+  {
+    prop: 'warehouseEntryTime',
+    label: '入库时间',
+    type: 4,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'collectFee',
+    label: '到付运费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'transport',
+    label: '搬运费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'storageFee',
+    label: '仓储费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'forklift',
+    label: '叉车费',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'otherFee',
+    label: '其他增值费用',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  // {
+  //   prop: 'pickUpTime',
+  //   label: '总费用',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+  {
+    prop: 'totalNumber',
+    label: '应提件数',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'handQuantity',
+    label: '实提件数',
+    type: 1,
+    values: '',
+    width: '180',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'brand',
+    label: '品牌',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'productInformation',
+    label: '货品信息',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'customerTelephone',
+    label: '提货手机',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: false,
+  },
+  {
+    prop: 'consignee',
+    label: '提货人',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: false,
+  },
+  {
+    prop: 'pickUpPlate',
+    label: '提货车牌',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: false,
+  },
+  {
+    prop: 'deliveryDocument',
+    label: '提货证件',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: false,
+  },
+  {
+    prop: 'certificateTypeName',
+    label: '证件类型',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: false,
+  },
+  // {
+  //   prop: 'notificationStatusName',
+  //   label: '通知状态',
+  //   type: 3,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: false,
+  // },
+  {
+    prop: 'conditionName',
+    label: '提货状态',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: false,
+  },
+  {
+    prop: 'totalCost',
+    label: '费用合计',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: false,
+  },
 
   ],
   columnStockOrder: [ // 备货订单
@@ -531,7 +666,7 @@ export default {
     // },
     {
       label: "备货时间",
-      prop: "reservationDate",
+      prop: "stockupDate",
       search: true,
     },
     {
diff --git a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
index 87a901ab..d2eb20e9 100644
--- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
+++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
@@ -7,17 +7,17 @@
           <!-- 查询按钮 -->
           <el-form-item>
             <el-col>
-<!--              <el-form-item label="仓库:" prop="warehouse">-->
-<!--                &lt;!&ndash;            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>&ndash;&gt;-->
-<!--                <el-select v-model="query.warehouseId" filterable clearable  placeholder="请输入仓库关键词" style="width: 88%;">-->
-<!--                  <el-option-->
-<!--                          v-for="item in allWarehouse"-->
-<!--                          :key="item.id"-->
-<!--                          :label="item.name"-->
-<!--                          :value="item.id">-->
-<!--                  </el-option>-->
-<!--                </el-select>-->
-<!--              </el-form-item>-->
+             <!-- <el-form-item label="仓库:" prop="warehouse">
+                          <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>
+                <el-select v-model="query.warehouseId" filterable clearable  placeholder="请输入仓库关键词" style="width: 88%;">
+                  <el-option>
+                          v-for="item in allWarehouse"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                  </el-option>
+                </el-select>
+             </el-form-item> -->
               <el-form-item label="启用状态:" prop="areaStatus">
                 <!--            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>-->
                 <el-select v-model="query.enableStatus" clearable  placeholder="请选择启用状态" style="width: 88%;">
@@ -181,18 +181,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="12">-->
-<!--              <el-form-item label="仓库:" prop="warehouseId" v-if="isShow" label-width="110px">-->
-<!--                <el-select v-model="form.warehouseId" filterable  placeholder="请选择仓库" style="width: 70%" >-->
-<!--                  <el-option-->
-<!--                          v-for="item in allWarehouse"-->
-<!--                          :key="item.id"-->
-<!--                          :label="item.name"-->
-<!--                          :value="item.id">-->
-<!--                  </el-option>-->
-<!--                </el-select>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
+           <el-col :span="12">
+             <el-form-item label="仓库:" prop="warehouseId" v-if="isShow" label-width="110px">
+               <el-select v-model="form.warehouseId" filterable  placeholder="请选择仓库" style="width: 70%" >
+                 <el-option
+                         v-for="item in allWarehouse"
+                         :key="item.id"
+                         :label="item.name"
+                         :value="item.id">
+                 </el-option>
+               </el-select>
+             </el-form-item>
+           </el-col>
           </el-row>
         </el-form>
         <!-- 表单按钮 -->
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 8d5c2ad1..9f39bab1 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -134,7 +134,8 @@
                             <el-table-column v-if="item.hide!==true"
                                              :prop="item.prop"
                                              :label="item.label"
-                                             align="center"
+                                             :show-overflow-tooltip="true"
+                                             :align="center"
                                              :width="item.width"
                                              :key="index">
                             </el-table-column>
@@ -178,7 +179,8 @@
                             <el-table-column v-if="item.hide!==true"
                                              :prop="item.prop"
                                              :label="item.label"
-                                             align="center"
+                                             :show-overflow-tooltip="true"
+                                             :align="center"
                                              :width="item.width"
                                              :key="index">
                             </el-table-column>
@@ -201,7 +203,8 @@
                             <el-table-column v-if="item.hide!==true"
                                              :prop="item.prop"
                                              :label="item.label"
-                                             align="center"
+                                             :show-overflow-tooltip="true"
+                                             :align="center"
                                              :width="item.width"
                                              :key="index">
                             </el-table-column>
@@ -240,7 +243,8 @@
                             <el-table-column v-if="item.hide!==true"
                                              :prop="item.prop"
                                              :label="item.label"
-                                             align="center"
+                                             :show-overflow-tooltip="true"
+                                             :align="center"
                                              :width="item.width"
                                              :key="index">
                             </el-table-column>
@@ -309,13 +313,14 @@
                           :height="height"
                           style="width: 100%"
                           :border="option.border">
-                    <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+                    <el-table-column type="expand" v-if="option.expand" :align="center"></el-table-column>
                     <template v-for="(item,index) in wrapoption.column">
                         <!-- table字段 -->
                         <el-table-column v-if="item.hide!==true"
                                          :prop="item.prop"
                                          :label="item.label"
-                                         align="center"
+                                         :show-overflow-tooltip="true"
+                                         :align="center"
                                          :width="item.width"
                                          :key="index">
                         </el-table-column>
@@ -323,7 +328,7 @@
                 </el-table>
                 <div class="avue-crud__pagination" style="width:100%">
                     <!-- 分页模块 -->
-                    <el-pagination align="right"
+                    <el-pagination :align="center"
                                    background
                                    @size-change="wsizeChange"
                                    @current-change="wcurrentChange"
@@ -523,6 +528,18 @@
               prop: 'signingStatus',
               search: true,
               width: '100px'
+            }, 
+            {
+              label: '司机签收时间',
+              prop: 'signingStatus',
+              search: true,
+              width: '150px'
+            },
+            {
+              label: '文员复核时间',
+              prop: 'signingStatus',
+              search: true,
+              width: '140px'
             }
           ],
           columnTakeOver: [
@@ -727,6 +744,68 @@
               search: true,
               width: '100px'
             },
+
+            {
+              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: 'orderPackageDeliveryStatus',
+              search: true,
+              width: '130px'
+            },
+             {
+              label: '装车扫描时间',
+              prop: 'orderPackageReservationStatusName',
+              search: true,
+              width: '150px'
+            },
+            {
+              label: '装车扫描人员',
+              prop: 'orderPackageDeliveryStatus',
+              search: true,
+              width: '150px'
+            },
+              {
+              label: '签收扫描时间',
+              prop: 'orderPackageReservationStatusName',
+              search: true,
+              width: '150px'
+            },
+            {
+              label: '签收扫描人员',
+              prop: 'orderPackageDeliveryStatus',
+              search: true,
+              width: '150px'
+            },
+
             {
               label: '托盘码',
               prop: 'pallet',
@@ -784,6 +863,13 @@
               search: true,
               width: '100px'
             },
+            {
+              label: '签收数量',
+              prop: 'readyStock',
+              search: true,
+              width: '100px'
+            },
+       
             {
               label: '物料编号',
               prop: 'cargoNumber',
@@ -805,8 +891,18 @@
               label: '库位信息',
               prop: 'goodsAllocation',
               width: '100px'
-            }
-
+            },
+            {
+              label: '签收人',
+              prop: 'goodsAllocation',
+              width: '100px'
+            },
+            {
+              label: '签收时间',
+              prop: 'readyStock',
+              search: true,
+              width: '100px'
+            },
 
           ]
         },
@@ -847,6 +943,18 @@
               search: true,
               width: '100px'
             },
+            {
+              label: '装车数量',
+              prop: 'readyStock',
+              search: true,
+              width: '100px'
+            }, 
+             {
+              label: '签收数量',
+              prop: 'readyStock',
+              search: true,
+              width: '100px'
+            },
             {
               label: '备货状态',
               prop: 'stockArticleState',
@@ -888,6 +996,24 @@
               prop: 'consigneeMobile',
               search: true,
               width: '100px'
+            },
+            {
+              label: '终端收货人',
+              prop: 'consigneePerson',
+              search: true,
+              width: '100px'
+            },
+            {
+              label: '终端收货地址',
+              prop: 'consigneeAddress',
+              search: true,
+              width: '100px'
+            },
+            {
+              label: '终端收货电话',
+              prop: 'consigneeMobile',
+              search: true,
+              width: '100px'
             }
 
           ]
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 38f6f9a5..5ed84130 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -1618,19 +1618,7 @@ export default {
              up.stockArticleList = this.dataList;
 
 
-             console.log("修改提交数据》》》",up);
-             /*console.log(this.$route.matched) // 当前路由匹配的路由信息
-               console.log(tag,key);
-             let { tag, key } = this.findTag(this.$route.path);
-             this.$store.commit('DEL_TAG', tag);
-               if (tag.fullPath === this.tag.fullPath) {
-                 tag = this.tagList[key - 1];
-                 this.$router.push({
-                   path: tag.path,
-                   query: tag.query,
-                 });
-               }
-*/
+
              update(up).then(() => {
                // this.box = false;
                // this.onLoad(this.page);
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index b805d33a..c3800a92 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -105,7 +105,7 @@
           <template #default="slotProps">
 <!--            <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
             <el-button size="small" text @click="handleLike(slotProps.scope)">查看</el-button>
-            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope,1)" v-if="slotProps.scope.row.conditions < 7">签收</el-button>
+            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope,1)" v-if="slotProps.scope.row.conditions < 20">签收</el-button>
             <el-button type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)">编辑提货信息</el-button>
 <!--            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
 
@@ -966,11 +966,7 @@ export default {
       });
     },
     handleEdits (row) {
-      // this.title = '编辑'
-      // this.box = true
-      // getDetail(row.id).then(res => {
-      //   this.form = res.data.data;
-      // });
+    
       this.$router.push({
         path: '/distribution/inventory/distrilbutionBillLading',
         query:{
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index 0f434a6e..7fdde8e1 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -235,7 +235,8 @@
             <el-table-column v-if="item.hide!==true"
                              :prop="item.prop"
                              :label="item.label"
-                             align="center"
+                             :show-overflow-tooltip="true"
+                             :align="center"
                              :width="item.width"
                              :key="index">
             </el-table-column>
@@ -418,6 +419,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          
         },
         {
           label: "物料名称",
@@ -512,7 +514,7 @@ export default {
         column: [
           {
             label: "包条码",
-            prop: "packetBarCode",
+            prop: "orderPackageCode",
             search: true,
             width:"100px"
           },
@@ -542,15 +544,16 @@ export default {
           },
           {
             label: "物料编号",
-            prop: "encoded",
+            prop: "materialCode",
             search: true,
             width:"100px"
           },
           {
             label: "物料名称",
-            prop: "material",
+            prop: "materialName",
             search: true,
             width:"100px"
+            
           },
           {
             label: "托盘码",
diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
index bebf528d..f29221cd 100644
--- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue
@@ -3,13 +3,37 @@
     <div class="avue-crud">
       <el-row :hidden="!search" style="margin-bottom: 5%">
         <!-- 列表模块 -->
+        <el-table
+          ref="table"
+          v-loading="loading"
+          :data="data"
+          height="20%"
+          style="width: 100%"
+          :border="option.border"
+        >
+          <template v-for="(item, index) in option.columnBasic">
+            <!-- table字段 -->
+            <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>
+      </el-row>
+      <!--   <el-row style="margin-bottom: 5%">
+        &lt;!&ndash; 列表模块 &ndash;&gt;
         <el-table ref="table" v-loading="loading"
+                  @selection-change="selectionChange"
                   :data="data"
                   height="20%"
                   style="width: 100%"
                   :border="option.border">
-          <template v-for="(item,index) in option.columnBasic">
-            <!-- table字段 -->
+          <template v-for="(item,index) in option.columnTakeOver">
+            &lt;!&ndash; table字段 &ndash;&gt;
             <el-table-column v-if="item.hide!==true"
                              :prop="item.prop"
                              :label="item.label"
@@ -17,8 +41,29 @@
                              :key="index">
             </el-table-column>
           </template>
+
         </el-table>
+
+
       </el-row>
+      <el-row style="margin-bottom: 5%">
+        &lt;!&ndash; 列表模块 &ndash;&gt;
+        <el-table ref="table" v-loading="loading"
+                  @selection-change="selectionChange"
+                  :data="data"
+                  style="width: 100%"
+                  :border="option.border">
+          <template v-for="(item,index) in option.columnStockUp">
+            &lt;!&ndash; table字段 &ndash;&gt;
+            <el-table-column v-if="item.hide!==true"
+                             :prop="item.prop"
+                             :label="item.label"
+                             :width="item.width"
+                             :key="index">
+            </el-table-column>
+          </template>
+        </el-table>
+      </el-row>-->
       <el-row>
         <el-tabs
           type="card"
@@ -27,124 +72,230 @@
           v-model="activeName"
           @tab-click="handleClick"
         >
+          <el-tab-pane label="自提列表" name="reservation">
+            <el-table
+              ref="table"
+              v-loading="loading"
+              @selection-change="selectionChange"
+              :data="data3"
+              :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.columnReservation">
+                <!-- table字段 -->
+                <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}">-->
+              <!--                  &lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
+              <!--                  &lt;!&ndash;              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>&ndash;&gt;-->
+              <!--                  &lt;!&ndash;              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;-->
+              <!--                </template>-->
+              <!--              </el-table-column>-->
+            </el-table>
+            <div class="avue-crud__pagination" style="width: 100%">
+              <!-- 分页模块 -->
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange"
+                @current-change="currentChange"
+                :current-page="page3.currentPage"
+                :page-sizes="[10, 20, 30, 40, 50, 100]"
+                :page-size="page3.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page3.total"
+              >
+              </el-pagination>
+            </div>
+          </el-tab-pane>
           <el-tab-pane label="订单列表" name="library">
-            <el-table ref="table" v-loading="loading"
-                      @selection-change="selectionChange"
-                      :data="dataPare"
-                      :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="dataPare"
+              :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
+                v-if="option.index"
+                label="序号"
+                type="index"
+                width="60"
+                align="center"
+              >
               </el-table-column>
-              <template v-for="(item,index) in option.columnStockOrder">
+              <template v-for="(item, index) in option.columnStockOrder">
                 <!-- 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}">-->
+              <!--                  &lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
+              <!--                  &lt;!&ndash;              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>&ndash;&gt;-->
+              <!--                  &lt;!&ndash;              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;-->
+              <!--                </template>-->
+              <!--              </el-table-column>-->
             </el-table>
-            <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="[10, 20, 30, 40, 50, 100]"
-                             :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="[10, 20, 30, 40, 50, 100]"
+                :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page.total"
+              >
               </el-pagination>
             </div>
-
           </el-tab-pane>
           <el-tab-pane label="备货包件" name="outbound">
-            <el-table ref="table" v-loading="loading"
-                      @selection-change="selectionChange"
-                      :data="data1"
-                      :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="data1"
+              :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
+                v-if="option.index"
+                label="序号"
+                type="index"
+                width="60"
+                align="center"
+              >
               </el-table-column>
-              <template v-for="(item,index) in option.columnStockingBag">
+              <template v-for="(item, index) in option.columnStockingBag">
                 <!-- 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}">
-                  &lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;
-                  &lt;!&ndash;              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>&ndash;&gt;
-                  &lt;!&ndash;              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>&ndash;&gt;
+                <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-column>
             </el-table>
-            <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="page1.currentPage"
-                             :page-sizes="[10, 20, 30, 40, 50, 100]"
-                             :page-size="page1.pageSize"
-                             layout="total, sizes, prev, pager, next, jumper"
-                             :total="page1.total">
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange"
+                @current-change="currentChange"
+                :current-page="page1.currentPage"
+                :page-sizes="[10, 20, 30, 40, 50, 100]"
+                :page-size="page1.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page1.total"
+              >
               </el-pagination>
             </div>
           </el-tab-pane>
           <el-tab-pane label="库存品" name="enter">
-            <el-table ref="table" v-loading="loading"
-                      @selection-change="selectionChange"
-                      :data="data2"
-                      :height="height"
-                      style="width: 100%"
-                      :border="option.border">
+            <el-table
+              ref="table"
+              v-loading="loading"
+              @selection-change="selectionChange"
+              :data="data2"
+              :height="height"
+              style="width: 100%"
+              :border="option.border"
+            >
               <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="70" align="center">
+              <el-table-column
+                v-if="option.index"
+                label="序号"
+                type="index"
+                width="70"
+                align="center"
+              >
               </el-table-column>
-              <template v-for="(item,index) in option.columnInventory">
+              <template v-for="(item, index) in option.columnInventory">
                 <!-- 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>
-            <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="page2.currentPage"
-                             :page-sizes="[10, 20, 30, 40, 50, 100]"
-                             :page-size="page2.pageSize"
-                             layout="total, sizes, prev, pager, next, jumper"
-                             :total="page2.total">
+              <el-pagination
+                align="right"
+                background
+                @size-change="sizeChange"
+                @current-change="currentChange"
+                :current-page="page2.currentPage"
+                :page-sizes="[10, 20, 30, 40, 50, 100]"
+                :page-size="page2.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page2.total"
+              >
               </el-pagination>
             </div>
           </el-tab-pane>
         </el-tabs>
-
       </el-row>
-    <!--  <el-row>
+      <!--  <el-row>
         <div class="avue-crud__pagination" style="width:100%">
           &lt;!&ndash; 分页模块 &ndash;&gt;
           <el-pagination align="right"
@@ -159,7 +310,7 @@
           </el-pagination>
         </div>
       </el-row>-->
-     <!-- <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
+      <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
         <el-form :model="formCustomer">
           <el-form-item label="姓名" :label-width="formLabelWidth">
             <el-input v-model="formCustomer.name" autocomplete="off" />
@@ -177,13 +328,13 @@
           </el-form-item>
         </el-form>
         <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogFormCustomer = false">取消</el-button>
-        &lt;!&ndash;        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>&ndash;&gt;
-        <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>
     </div>
   </basic-container>
 </template>
@@ -195,19 +346,22 @@ import {
   add,
   update,
   remove,
-  getDetailStockupOwn,
-  getDetailReservationOwn, getDetailOrderOwn, getDetailInventoryOwn
-} from '@/api/distribution/distrilbutionBillLading';
-import option from "@/option/distribution/distrilbutionBillLading";
-import { mapGetters } from "vuex";
+  getDetailStockupOwnSelf,
+  getDetailReservationOwn,
+  getDetailOrderOwn,
+  getDetailInventoryOwn,
+  billStockList,
+} from '@/api/distribution/distributionStockup';
+import option from '@/option/distribution/distributionStockup';
+import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getParcelListOwn } from '@/api/distribution/distributionParcelList';
 
 export default {
-  data () {
+  data() {
     return {
       height: 0,
-      activeName: 'library',
+      activeName: 'reservation',
       // 弹框标题
       title: '',
       // 是否展示弹框
@@ -215,7 +369,7 @@ export default {
       // 是否显示查询
       search: true,
       // 加载中
-      loading: false,
+      loading: true,
       // 是否为查看模式
       view: false,
       // 查询信息
@@ -224,29 +378,29 @@ export default {
       page: {
         currentPage: 1,
         pageSize: 10,
-        total: 40
+        total: 40,
       },
       // 分页信息
       page1: {
         currentPage: 1,
         pageSize: 10,
-        total: 40
+        total: 40,
       },
       // 分页信息
       page2: {
         currentPage: 1,
         pageSize: 10,
-        total: 40
+        total: 40,
       },
       // 分页信息
       page3: {
         currentPage: 1,
         pageSize: 10,
-        total: 40
+        total: 40,
       },
       // 表单数据
       form: {},
-      formCall: {},// 通知
+      formCall: {}, // 通知
       formService: {}, // 服务
       formCustomer: {}, // 客户
       // 选择行
@@ -268,97 +422,100 @@ export default {
       dialogFormCustomer: false,
       dialogFormService: false,
       formLabelWidth: '120px',
-      handler:true, //首次
-      trade:false, // 商
-      municipal:true, // 市
-      taker:true, // 自提
-    }
+      handler: true, //首次
+      trade: false, // 商
+      municipal: true, // 市
+      taker: true, // 自提
+    };
   },
-  mounted () {
+  mounted() {
     this.init();
-
   },
-  watch:{
-    '$route.query.id':{
+  watch: {
+    '$route.query.id': {
       handler(newVal, oldVal) {
         // console.log(newVal, oldVal);
         this.init();
       },
       deep: true,
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   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: {
-    handleClick (tab, event)  {
-      console.log(tab, event)
+    handleClick(tab, event) {
+      console.log(tab, event);
       console.log(tab.props.name);
       this.leibiao = tab.props.name;
-      if( this.leibiao == 'library'){
+      if (this.leibiao == 'library') {
         //订单
         this.getOrderList(this.page);
-      }else if( this.leibiao == 'outbound'){
+      } else if (this.leibiao == 'outbound') {
         //包件
         this.getStockUpParcelsList(this.page1);
-      }else if( this.leibiao == 'enter'){
+      } else if (this.leibiao == 'enter') {
         //库存品
         this.getInventoryList(this.page2);
       }
-
     },
-    init () {
+    init() {
       this.height = this.setPx(document.body.clientHeight - 570);
-      getDictionaryBiz('distribution_type').then(res => { //配送类型
+      getDictionaryBiz('distribution_type').then(res => {
+        //配送类型
         this.distributionType = res.data.data;
       });
-      getDictionaryBiz('delivery_way').then(res => { //配送方式
+      // console.log("配送方式123", this.deliveryWayList);
+      getDictionaryBiz('delivery_way').then(res => {
+        //配送方式
         this.deliveryWayList = res.data.data;
+        console.log('配送方式123', this.deliveryWayList);
       });
-      getDictionaryBiz('stockup_status').then(res => { //配送方式
+      getDictionaryBiz('stockup_status').then(res => {
+        //配送方式
         this.stockupStatusList = res.data.data;
       });
-      getDictionaryBiz('addvalue_serve_type').then(res => { //服务类型
+      getDictionaryBiz('addvalue_serve_type').then(res => {
+        //服务类型
         this.serveTypeList = res.data.data;
       });
       this.onLoad(this.page);
-
     },
-    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 {
@@ -366,48 +523,48 @@ export default {
           this.box = false;
           this.onLoad(this.page);
           this.$message({
-            type: "success",
-            message: "操作成功!"
+            type: 'success',
+            message: '操作成功!',
           });
-        })
+        });
       }
     },
 
     //全部
-    handleEntire(){
+    handleEntire() {
       this.handler = true;
       this.taker = true;
       this.trade = false;
-
     },
     //商配
-    handleTrade(){
+    handleTrade() {
       // this.handler = true;
       this.trade = true;
     },
     //商配
-    handleMunicipal(){
+    handleMunicipal() {
       // this.handler = true;
       // this.taker = true;
     },
     //自提
-    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();
-        this.handler = false;
-        this.taker = false;
-      });
+      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();
+          this.handler = false;
+          this.taker = false;
+        }
+      );
     }, //自提的通知
-    handleInform(index){
-
+    handleInform(index) {
       this.loading = true;
       // console.log("this.query",this.query);
       let params = {};
@@ -421,45 +578,47 @@ export default {
           break;
       }
       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();
-        this.handler = false;
-        this.taker = false;
-      });
+      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();
+          this.handler = false;
+          this.taker = false;
+        }
+      );
     },
-    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);
@@ -468,16 +627,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);
@@ -485,131 +644,160 @@ 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) {
-      if(!!this.leibiao && this.leibiao == 'library'){
+    currentChange(currentPage) {
+      if (!!this.leibiao && this.leibiao == 'library') {
         this.page.currentPage = currentPage;
         this.getOrderList(this.page);
-
-      }else if(!!this.leibiao && this.leibiao == 'outbound'){
+      } else if (!!this.leibiao && this.leibiao == 'outbound') {
         this.page1.currentPage = currentPage;
         this.getStockUpParcelsList(this.page1);
-      }
-      else if(!!this.leibiao && this.leibiao == 'enter'){
+      } else if (!!this.leibiao && this.leibiao == 'enter') {
         this.page2.currentPage = currentPage;
         this.getInventoryList(this.page2);
-      }
-      else {
+      } else {
         this.page3.currentPage = currentPage;
         this.getReservationList(this.page3);
       }
     },
-    sizeChange (pageSize) {
-      if(!!this.leibiao && this.leibiao == 'library'){
+    sizeChange(pageSize) {
+      if (!!this.leibiao && this.leibiao == 'library') {
         this.page.pageSize = pageSize;
         this.getOrderList(this.page);
-
-      }else if(!!this.leibiao && this.leibiao == 'outbound'){
+      } else if (!!this.leibiao && this.leibiao == 'outbound') {
         this.page1.pageSize = pageSize;
         this.getStockUpParcelsList(this.page1);
-      }
-      else if(!!this.leibiao && this.leibiao == 'enter'){
+      } else if (!!this.leibiao && this.leibiao == 'enter') {
         this.page2.pageSize = pageSize;
         this.getInventoryList(this.page2);
-      }
-      else{
+      } else {
         this.page3.pageSize = pageSize;
         this.getReservationList(this.page3);
       }
-
     },
-    onLoad (page, params = {}) {
-      // this.loading = true;
+    onLoad(page, params = {}) {
+      this.loading = true;
       this.query.id = this.$route.query.id;
-      getDetailStockupOwn(this.$route.query.id).then(res => {
-        console.log("返回的值",res.data.data);
+      getDetailStockupOwnSelf(this.$route.query.id).then(res => {
         const data = res.data.data;
         this.data[0] = data;
+
         this.loading = false;
-        this.getOrderList(page);
-        // console.log(">>>>>",this.data[0],deliveryTypeName,deliveryWayName,serveTypeName);
-        this.selectionClear();
+        this.billStockListPage(page);
+   
       });
-    } ,
+    },
+
+
+    /**
+     * 查询备货任务关联的自提任务
+     * @param {*} page
+     */
+    async billStockListPage(page) {
+      let a = await billStockList(page.currentPage, page.pageSize, { id: this.$route.query.id });
+      this.data3 = a.data.data.records;
+      console.log("》》》》》》",this.data3);
+
+      // if (!!this.data3 && this.data3.length > 0) {
+      //   this.data3.forEach(i => {
+      //     let b = this.stockupStatusList.find(a => a.dictKey == i.stockupStatus);
+      //     if (!!b) {
+      //       i.stockupStatusName = b.dictValue;
+      //     }
+      //   });
+      // }
+
+      this.page3.total = a.data.data.total;
+      this.loading = false;
+      this.selectionClear();
+    },
+
     //查询包件列表
-   async getStockUpParcelsList(page){
-      let a = await getDetailReservationOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
-     console.log("包件...",a.data);
+    async getStockUpParcelsList(page) {
+      let a = await getParcelListOwn(page.currentPage, page.pageSize, { id: this.$route.query.id });
+      console.log('包件...', a.data);
       const data = a.data.data;
       this.data1 = data.records;
-      this.data1.forEach(i =>{
-        let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
-        if(!!b){
+      this.data1.forEach(i => {
+        let b = this.stockupStatusList.find(a => a.dictKey == i.stockupStatus);
+        if (!!b) {
           i.stockupStatusName = b.dictValue;
         }
-      })
-     this.page1.total = a.data.data.total;
-     this.loading = false;
-     this.selectionClear();
+      });
+      this.page1.total = a.data.data.total;
+      this.loading = false;
+      this.selectionClear();
     },
     //查询订单列表
-   async getOrderList(page){
-      let a =await getDetailOrderOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
-     console.log("订单...",a.data);
+    async getOrderList(page) {
+      let a = await getDetailOrderOwn(page.currentPage, page.pageSize, {
+        id: this.$route.query.id,
+      });
+      // console.log("订单...",a.data);
       const data = a.data.data;
       this.dataPare = data.records;
-      this.dataPare.forEach(i =>{
-        let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
-        if(!!b){
+      this.dataPare.forEach(i => {
+        let b = this.stockupStatusList.find(a => a.dictKey == i.stockupStatus);
+        if (!!b) {
           i.stockupStatusName = b.dictValue;
         }
-      })
-     this.page.total = a.data.data.total;
-     this.loading = false;
-     this.selectionClear();
+      });
+      this.page.total = a.data.data.total;
+      this.loading = false;
+      this.selectionClear();
     },
     //查询库存品列表
-   async getInventoryList(page){
-      let a =await getDetailInventoryOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
-     console.log("库存品...",a.data);
+    async getInventoryList(page) {
+      let a = await getDetailInventoryOwn(page.currentPage, page.pageSize, {
+        id: this.$route.query.id,
+      });
+      // console.log("库存品...",a.data);
       const data = a.data.data;
       this.data2 = data.records;
-      this.data2.forEach(i =>{
-        let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
-        if(!!b){
+      this.data2.forEach(i => {
+        let b = this.stockupStatusList.find(a => a.dictKey == i.stockupStatus);
+        if (!!b) {
           i.stockupStatusName = b.dictValue;
         }
-      })
-     this.page2.total = a.data.data.total;
-     this.loading = false;
-     this.selectionClear();
+      });
+      this.page2.total = a.data.data.total;
+      this.loading = false;
+      this.selectionClear();
     },
     //转换类型
-    getOwnServer(row,name,list){
-      row.forEach( i =>{
-        let a = list.find( s => s.dictKey == i);
-        name += a.dictValue+' ';
+    getOwnServer(row, name, list) {
+      // console.log(">>>>>",row,name,list);
+      // console.log(">>>>>",row);
+      // console.log(">>>>>",name);
+      // console.log(">>>>>",list);
+      row.forEach(i => {
+        // console.log(i,"-=-=-=-");
+        let a = list.find(s => s.dictKey == i);
+        // console.log("aaaa",a);
+        if (!!a) {
+          name += a.dictValue;
+        }
       });
       return name;
     },
-  }
+  },
 };
 </script>
 <style scoped>
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index 55864091..cea91045 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -4,7 +4,7 @@
       <el-row :hidden="!search" style="padding:6px 18px">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
-          <!--<el-form-item label="备货状态:">
+<!--          <el-form-item label="备货状态:">
             <el-input v-model="query.stockupStatus" placeholder="请输入备货状态"></el-input>
           </el-form-item>
           <el-form-item label="备货区:">
@@ -65,18 +65,9 @@
         >
           <template #default="slotProps">
             <el-button type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-button>
-<!--            <el-button   type="primary" text  v-on:mouseover="handleMouseEnter" v-on:mouseout="handleMouseLeave">-->
-<!--              编辑-->
-<!--              <el-icon class="el-icon&#45;&#45;right">-->
-<!--                <arrow-down />-->
-<!--              </el-icon>-->
-<!--            </el-button>-->
-<!--            <div v-if="bianjiKz"  class="bianji">-->
-<!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑提货信息</el-button>-->
-              <el-button type="primary" text icon="el-icon-edit" @click="handleBeiHuo(slotProps.scope)">编辑备货信息</el-button>
-<!--            </div>-->
-<!--            <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
-            <el-button type="primary" text icon="el-icon-edit" @click="handlePrint(slotProps.scope)">打印</el-button>
+            <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">编辑</el-button>
+            <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">取消</el-button>-->
+            <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(slotProps.scope)">打印</el-button>
           </template>
         </tablecmt>
       </el-row>
@@ -97,6 +88,15 @@
       </el-row>
       <el-dialog v-model="dialogFormCustomer" title="指派备货信息">
         <el-form :model="form">
+          <el-form-item label="备货时间" :label-width="formLabelWidth" v-if="this.num=='2'">
+            <el-date-picker style="width: 25%;"
+                            v-model="form.stockupDate"
+                            type="datetime"
+                            format="YYYY-MM-DD HH:mm:ss"
+                            value-format="YYYY-MM-DD HH:mm:ss"
+                            placeholder="时间"
+            />
+          </el-form-item>
           <el-form-item label="备货人员" :label-width="formLabelWidth">
             <el-select v-model="form.forkliftId" clearable placeholder="请选择备货人员"  @change="getForklift($event,'1')">
               <el-option
@@ -127,7 +127,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="出库时间" prop="outboundDate" :label-width="formLabelWidth">
+          <el-form-item label="出库时间" prop="outboundDate" :label-width="formLabelWidth" v-if="this.num=='2'">
             <el-date-picker v-model="form.outboundDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择出库时间" style="width: 26%"></el-date-picker>
           </el-form-item>
         </el-form>
@@ -135,7 +135,7 @@
       <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>
+        <el-button type="primary" @click="callFordelivery"> 确定 </el-button>
       </span>
         </template>
       </el-dialog>
@@ -228,8 +228,7 @@
 </template>
 
 <script>
-import { getListUser } from "@/api/distribution/distributionStockup";
-import { getList, getDetail, add, update, remove,addAssign } from "@/api/distribution/distrilbutionBillLading";
+import { getList, getDetail, add, update, remove,getListUser,addAssign } from "@/api/distribution/distributionStockup";
 import { getPostList } from '@/api/system/post';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import { getListOwn,getUser } from '@/api/system/user';
@@ -263,36 +262,38 @@ export default {
           sortable: true,
           head: false,
         },
-        // {
-        //   prop: 'stockupUser',
-        //   label: '备货人',
-        //   type: 2,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        // },
         {
-          prop: 'pickUpTime',
+          prop: 'stockupDate',
           label: '备货时间',
           type: 4,
           values: '',
           width: '150',
           checkarr: [],
-          fixed: false,
+          fixed: true,
           sortable: true,
+          head: false,
         },
         {
-          prop: 'outboundDate',
+          prop: 'stockupDate',
           label: '出库时间',
           type: 4,
           values: '',
           width: '150',
           checkarr: [],
-          fixed: false,
+          fixed: true,
           sortable: true,
+          head: false,
         },
+        // {
+        //   prop: 'stockupUser',
+        //   label: '备货人',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'stockupStatusName',
           label: '备货状态',
@@ -330,6 +331,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        // {
+        //   prop: 'goodsAreaId',
+        //   label: '备货区Id',
+        //   type: 2,
+        //   values: '',
+        //   width: '180',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'assignStatusName',
           label: '指派状态',
@@ -360,19 +371,8 @@ export default {
           sortable: true,
         },
         // {
-        //   prop: 'pickUpPlate',
-        //   label: '提货车次',
-        //   type: 2,
-        //   values: '',
-        //   width: '150',
-        //   checkarr: [],
-        //   fixed: false,
-        //   sortable: true,
-        //   head: true,
-        // },
-        // {
-        //   prop: 'consignee',
-        //   label: '提货人',
+        //   prop: 'goodsAreaId',
+        //   label: '备货区编号',
         //   type: 2,
         //   values: '',
         //   width: '150',
@@ -445,7 +445,6 @@ export default {
       ],
       columnListedit: [],
       drawerShow: false,
-      bianjiKz: false,
       height: 0,
       // 弹框标题
       title: '',
@@ -469,6 +468,7 @@ export default {
       },
       // 表单数据
       form: {},
+      formOne: {},
       // 选择行
       selectionList: [],
       // 表单配置
@@ -481,6 +481,8 @@ export default {
       distributionType: [],
       deptId: '',
       num: '',
+      stockupStatus: [],
+      stockAllocation: [],
       stockupDate: [],
       shortcuts :[
         {
@@ -544,17 +546,8 @@ export default {
     }
   },
   methods: {
-    //移出
-    handleMouseLeave(){
-      this.bianjiKz = false;
-    },
-    //移入
-    handleMouseEnter(){
-      this.bianjiKz = true;
-    },
     //选择
     getForklift(row,ty){
-      console.log("执行了了了了",row);
       switch (ty){
         case '1':
           let x = this.forkliftData.find(i =>i.dictKey==row);
@@ -654,7 +647,6 @@ export default {
     },
     //查询备货
     getStockUp(row){
-      console.log("row",row);
       let params = {};
       switch (row) {
         case '1':
@@ -760,6 +752,7 @@ export default {
      * 指派叉车查询的司机
      */
     handleForklift(){
+
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
         return;
@@ -773,10 +766,10 @@ export default {
       })
       // = this.selectionList.findIndex(i => i.assignStatus == 2);
       if(!a){
-        this.num = '3'
+        this.num = '3';
         this.dialogFormCustomer = true;
         this.getFork();
-        this.getTeam()
+        this.getTeam();
       }else{
         this.$message.warning("已指派，请勿重复指派！！！")
       }
@@ -813,29 +806,34 @@ export default {
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
-        // console.log("8908098080",res.data.data);
         this.distributionType = res.data.data;
-      /*  this.columnList[8].checkarr =res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
+        // this.checkcColumnList("typeServiceName", this.columnList).checkarr = res.data.data.map(item => {
+        //   item.value = item.dictKey
+        //   item.label = item.dictValue
+        //   return item
+        // });
+      });
+      getDictionaryBiz('stockup_status').then(res => {
+        this.stockupStatus = res.data.data;
+        this.checkcColumnList("stockupStatusName", this.columnList).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey
+          item.label = item.dictValue
           return item
-        });*/
+        });
       });
       getDictionaryBiz('stock_assign_status').then(res => { //指派
-        // console.log("8908098080",res.data.data);
-        this.distributionType = res.data.data;
+        console.log("8908098080",res.data.data);
         this.checkcColumnList("assignStatusName", this.columnList).checkarr =res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
         });
       });
-      getDictionaryBiz('stockup_status').then(res => { //备货
-        // console.log("8908098080",res.data.data);
-        this.distributionType = res.data.data;
-        this.checkcColumnList("stockupStatusName", this.columnList).checkarr =res.data.data.map(item=>{
-          item.value=item.dictKey
-          item.label=item.dictValue
+      getDictionaryBiz('stock_allocation').then(res => {
+        this.stockAllocation = res.data.data;
+        this.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => {
+          item.value = item.dictKey
+          item.label = item.dictValue
           return item
         });
       });
@@ -882,9 +880,6 @@ export default {
         })
       }
     },
-    handlePrint(row){
-      this.$message.warning("！！！");
-    },
     handleAdd () {
       this.title = '新增'
       this.form = {}
@@ -896,40 +891,22 @@ export default {
       // getDetail(row.id).then(res => {
       //   this.form = res.data.data;
       // });
-      this.$router.push({
-        path: '/distribution/inventory/distrilbutionBillLading',
-        query:{
-          id: row.row.id,
-          name: '编辑提货单',
-          type: '2'
-        }
-      });
-    },
-    //备货编辑
-    handleBeiHuo (row) {
-      // if(row.row.assignStatus == '1'){
-      //   this.$message.warning("")
-      // }else{
-      console.log("",row.row);
-        this.form.forkliftId = !!row.row.forkliftId && row.row.forkliftId != -1 ? row.row.forkliftId : null;
-        this.form.loaderId = !!row.row.loaderId && row.row.loaderId != -1 ? row.row.loaderId : null;
-        this.form.goodsAreaId = !!row.row.goodsAreaId && row.row.goodsAreaId != -1 ? row.row.goodsAreaId : null;
-        this.form.outboundDate = !!row.row.outboundDate && row.row.outboundDate != -1 ? row.row.outboundDate : null;
-        this.dialogFormCustomer = true;
-        this.num = '2';
-        this.formOne = row.row;
-        this.getFork();
-        this.getTeam();
-      // }
+      console.log("row<<<<<",row);
+      this.form.forkliftId = !!row.row.forkliftId && row.row.forkliftId != "-1" ? row.row.forkliftId : null ;
+      this.form.loaderId = !!row.row.loaderId && row.row.loaderId != "-1" ? row.row.loaderId : null;
+      this.form.goodsAreaId = !!row.row.goodsAreaId && row.row.goodsAreaId != "-1" ? row.row.goodsAreaId : null;
+      this.form.stockupDate = !!row.row.stockupDate && row.row.stockupDate != "-1" ? row.row.stockupDate : null;
+      this.form.outboundDate = !!row.row.outboundDate && row.row.outboundDate != "-1" ? row.row.outboundDate : null;
+      this.dialogFormCustomer = true;
+      this.num = '2';
+      this.formOne.id = row.row.id;
+      this.getFork();
+      this.getTeam();
+
 
     },
     handleView (row) {
-      // this.title = '查看'
-      // this.view = true;
-      // this.box = true;
-      // getDetail(row.id).then(res => {
-      //   this.form = res.data.data;
-      // });
+ 
       this.$router.push({
         path: '/distribution/stockup/distributionStockupDetailsSelf',
         query: {
@@ -988,7 +965,7 @@ export default {
       this.selectionList = list;
     },
     selectionClear () {
-      this.selectionList = [];
+      // this.selectionList = [];
       // this.$refs.table.clearSelection();
     },
     currentChange (currentPage) {
@@ -1022,33 +999,13 @@ export default {
         params.startDate = this.getTime(startDate.toString());
         params.entDate = this.getTime(entDate.toString());
       }
+      this.query.typeService = '3';
       getList(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.forEach(async i =>{
-          /* if(i.forkliftId != "-1"){
-             console.log("i==",i);
-             let a = await getUser(i.forkliftId);
-             i.forkliftId =a.data.data.name;
-           }*/
-          // let s =this.distributionType.find(d => d.dictKey == i.typeService);
-          // // console.log("sssss",s);
-          // i.typeServiceName = s.dictValue;
-          // i.loader = i.groupName;
-          // i.stockupArea = i.headline;
-          // if(i.assignStatus == '2'){
-          //   i.assignStatusName = '已指派';
-          // }else{
-          //   i.assignStatusName = '未指派';
-          // }
-          // if(i.stockupStatus == '2'){
-          //   i.stockupStatusName = '待备货';
-          // }else if(i.stockupStatus == '3'){
-          //   i.stockupStatusName = '已备货';
-          // }else{
-          //   i.stockupStatusName = '未备货';
-          // }
+          i.loader = i.groupName;
         });
         this.selectionClear();
         this.loading = false;
@@ -1057,8 +1014,3 @@ export default {
   }
 };
 </script>
-<style >
-.bianji{
-
-}
-</style>