diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js
index 9858dbae..e76515f9 100644
--- a/src/api/distribution/distributionStockArticle.js
+++ b/src/api/distribution/distributionStockArticle.js
@@ -55,6 +55,16 @@ export const getDetail = (id) => {
   })
 }
 
+export const getQueryQRCode = (params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockArticle/getShowTemplate',
+    method: 'get',
+    params: {
+      ...params
+    }
+  })
+}
+
 export const remove = (ids) => {
   return request({
     url: '/api/logpm-distribution/distributionStockArticle/remove',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 75f1b760..933af11b 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -942,7 +942,7 @@ export default {
         this.query['completeSet'] = index;
       }else if(row.prop ==='orderStatusName'){
         this.query['orderStatus'] = index;
-      }else if(row.prop ==='typeName'){
+      }else if(row.prop ==='typeServerName'){
         this.query['typeService'] = index;
       }else{
         this.query[row.prop] = index;
@@ -972,12 +972,13 @@ export default {
         return;
       }
       let st = false;
-      this.selectionList.some( i =>{
-        if(i.stateName === "已预约"){
+      this.selectionList.forEach( i =>{
+        console.log("yuyuyuuyu",i);
+        if(i.reservationStatusName === "已预约"){
           st = true;
           this.$message.warning(i.orderCode+" - 已预约，请勿重复预约！！！");
         }
-        if(i.typeService === 3){
+        if(i.typeService == 3){
           st = true;
           this.$message.warning(i.orderCode+" - 为自提单，无法预约！！！");
         }
@@ -1012,8 +1013,25 @@ export default {
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
         return;
+      }else{
+        let st = false;
+        this.selectionList.forEach( i =>{
+          console.log("yuyuyuuyu",i);
+          if(i.reservationStatusName == "已预约"){
+            st = true;
+            this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！");
+          }
+          if(i.typeService == 3){
+            st = true;
+            this.$message.warning(i.orderCode+" - 为自提单，无法转为库存品！！！");
+          }
+        })
+        if(st){
+          return
+        }
+        this.getSock();
       }
-      this.getSock();
+
 
       /*else if (this.selectionList.length > 1){
         this.getSock();
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index d1e93551..17b7ad13 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -632,16 +632,16 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
-          prop: 'typeServerName',
-          label: '服务类型',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'typeServerName',
+        //   label: '服务类型',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'customerName',
           label: '顾客名字',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index 290352dd..51602b5d 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -983,8 +983,21 @@ export default {
       if (this.selectionList.length === 0) {
         this.$message.warning("请选择至少一条数据");
         return;
+      }else{
+        let st = false;
+        this.selectionList.forEach( i =>{
+
+          if(i.reservationStatusName == "已预约"){
+            st = true;
+            this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！");
+          }
+        })
+        if(st){
+          return
+        }
+        this.getSock();
       }
-      this.getSock();
+
 
       /*else if (this.selectionList.length > 1){
         this.getSock();
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index 8eb1524c..33024e7b 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -681,16 +681,16 @@ export default {
         //   fixed: false,
         //   sortable: true,
         // },
-        {
-          prop: 'typeServerName',
-          label: '服务类型',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'typeServerName',
+        //   label: '服务类型',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'notification',
           label: '通知状态',
@@ -1065,6 +1065,16 @@ export default {
         this.$message.warning("请选择至少一条数据");
         return;
       }else {
+        let st = false;
+        this.selectionList.forEach( i =>{
+          if(i.reservationStatusName == "已预约"){
+            st = true;
+            this.$message.warning(i.orderCode+" - 已预约，无法转为库存品！！！");
+          }
+        })
+        if(st){
+          return
+        }
         this.getSock();
       }
 
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index e8413654..8797c19b 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue
@@ -184,7 +184,15 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,addStock } from "@/api/distribution/distributionStockArticle";
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  addStock,
+  getQueryQRCode
+} from '@/api/distribution/distributionStockArticle';
 import { getListOwn } from "@/api/distribution/distributionParcelList";
 import { addCallDelivery } from "@/api/distribution/distrilbutionCallDelivery";
 import { addClient } from "@/api/distribution/distributionClientMessage";
@@ -528,8 +536,13 @@ export default {
       // this.view = true;
       // this.box = true;
       this.dialogVisible = true;
-      getDetail(row.id).then(res => {
-        this.form = res.data.data;
+      let qr ={
+        id : row.id,
+        qrCode: row.orderPackageCode
+      }
+      getQueryQRCode(qr).then(res => {
+        // this.form = res.data.data;
+        console.log("查看二维码",res.data.data);
       });
 
 
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index df28b1bc..bc1c7b60 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -26,7 +26,7 @@
           <div class="avue-crud__left">
          <!--   <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
-            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派配货信息</el-button>
+            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派备货信息</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -75,7 +75,7 @@
           </el-pagination>
         </div>
       </el-row>
-      <el-dialog v-model="dialogFormCustomer" title="指派叉车">
+      <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%;"
@@ -116,6 +116,9 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="出库时间" prop="outboundDate" :label-width="formLabelWidth">
+            <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>
         <template #footer>
       <span class="dialog-footer">
@@ -248,6 +251,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'stockupDate',
+          label: '出库时间',
+          type: 4,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'stockupUser',
           label: '备货人',
@@ -316,7 +330,7 @@ export default {
         },
         {
           prop: 'stockipAllocation',
-          label: '备货库位',
+          label: '所在库位',
           type: 2,
           values: '',
           width: '150',
@@ -345,7 +359,7 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
+        /*{
           prop: 'typeServiceName',
           label: '服务类型',
           type: 3,
@@ -354,7 +368,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        },
+        },*/
         {
           prop: 'loaderName',
           label: '装卸班组',
@@ -713,7 +727,7 @@ export default {
            this.dialogFormCustomer = false;
          })
        }else if(this.num == '2'){
-         console.log(">>>>>>>",this.formOne);
+         console.log("修改提交",this.formOne);
          update(Object.assign(this.formOne,this.form)).then(res =>{
            console.log(">>>>>>>",this.formOne);
            this.onLoad(this.page);
@@ -732,12 +746,13 @@ export default {
       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
-          return item
-        });
+        // this.columnList[8].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
       });
+
       this.onLoad(this.page);
     },
     searchHide () {
@@ -884,23 +899,23 @@ export default {
            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;
+         //  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.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 = '未备货';
+         // }
        });
         this.selectionClear();
         this.loading = false;
diff --git a/src/views/distribution/stockup/distributionStockupDetails.vue b/src/views/distribution/stockup/distributionStockupDetails.vue
index fcda66b6..b73962f0 100644
--- a/src/views/distribution/stockup/distributionStockupDetails.vue
+++ b/src/views/distribution/stockup/distributionStockupDetails.vue
@@ -642,6 +642,7 @@ export default {
         const serveTypes = !!serveType ? serveType.split(',') : null;
         const deliveryWays = !!deliveryWay ? deliveryWay.split(',') : null;
         const deliveryTypes = !!deliveryType ?  deliveryType.split(',') : null;
+        // console.log("123456",serveTypes,deliveryWays,deliveryTypes);
         const serveTypeName =!!serveTypes ? this.getOwnServer(serveTypes, '', this.serveTypeList) || null : null;
         const deliveryWayName =!!deliveryWays ? this.getOwnServer(deliveryWays, '', this.deliveryWayList) || null : null;
         const deliveryTypeName =!!deliveryTypes ? this.getOwnServer(deliveryTypes, '', this.distributionType) || null : null;
@@ -675,7 +676,7 @@ export default {
     //查询包件列表
    async getStockUpParcelsList(page){
       let a = await getParcelListOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
-     console.log("包件...",a.data);
+     // console.log("包件...",a.data);
       const data = a.data.data;
       this.data1 = data.records;
       this.data1.forEach(i =>{
@@ -691,7 +692,7 @@ export default {
     //查询订单列表
    async getOrderList(page){
       let a =await getDetailOrderOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
-     console.log("订单...",a.data);
+     // console.log("订单...",a.data);
       const data = a.data.data;
       this.dataPare = data.records;
       this.dataPare.forEach(i =>{
@@ -707,7 +708,7 @@ export default {
     //查询库存品列表
    async getInventoryList(page){
       let a =await getDetailInventoryOwn(page.currentPage,page.pageSize,{id :this.$route.query.id});
-     console.log("库存品...",a.data);
+     // console.log("库存品...",a.data);
       const data = a.data.data;
       this.data2 = data.records;
       this.data2.forEach(i =>{
@@ -722,11 +723,15 @@ export default {
     },
     //转换类型
     getOwnServer(row,name,list){
-      console.log(">>>>>",row);
+      // console.log(">>>>>",row,name,list);
       row.forEach( i =>{
         console.log(i,"-=-=-=-");
         let a = list.find( s => s.dictKey == i);
-        name += a.dictValue+' ';
+        // console.log("aaaa",a);
+        if(!!a){
+          name += a.dictValue;
+        }
+
       });
       return name;
     },
diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue
index 1297b7bd..c0665911 100644
--- a/src/views/distribution/stockup/distributionStockupDiscuss.vue
+++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue
@@ -55,7 +55,7 @@
           <div class="avue-crud__left">
             <!--   <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
                <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
-            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派配货信息</el-button>
+            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派备货信息</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -104,7 +104,7 @@
           </el-pagination>
         </div>
       </el-row>
-      <el-dialog v-model="dialogFormCustomer" title="指派叉车">
+      <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%;"
@@ -145,12 +145,15 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <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>
         <template #footer>
       <span class="dialog-footer">
         <el-button @click="dialogFormCustomer = false">取消</el-button>
         <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-        <el-button type="primary" @click="callFordelivery()"> 确定 </el-button>
+        <el-button type="primary" @click="callFordelivery"> 确定 </el-button>
       </span>
         </template>
       </el-dialog>
@@ -277,6 +280,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'outboundDate',
+          label: '出库时间',
+          type: 4,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'stockupUser',
           label: '备货人',
@@ -345,7 +359,7 @@ export default {
         },
         {
           prop: 'stockipAllocation',
-          label: '备货库位',
+          label: '所在库位',
           type: 2,
           values: '',
           width: '150',
@@ -374,7 +388,7 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
+       /* {
           prop: 'typeServiceName',
           label: '服务类型',
           type: 3,
@@ -383,7 +397,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        },
+        },*/
         {
           prop: 'loaderName',
           label: '装卸班组',
@@ -744,7 +758,7 @@ export default {
       }
       let a = false ;
       this.selectionList.some(i =>{
-        if(i.assignStatus == "2"){
+        if(i.assignStatus == "20"){
           a = true;
           return;
         }
@@ -774,7 +788,7 @@ export default {
           this.dialogFormCustomer = false;
         })
       }else if(this.num == '2'){
-        console.log(">>>>>>>",this.formOne);
+        console.log("修改数据",this.formOne);
         update(Object.assign(this.formOne,this.form)).then(res =>{
           console.log(">>>>>>>",this.formOne);
           this.onLoad(this.page);
@@ -878,13 +892,14 @@ export default {
       //   this.form = res.data.data;
       // });
       console.log("row<<<<<",row);
-      this.form.forkliftId = row.row.forkliftId;
-      this.form.loaderId = row.row.loaderId;
-      this.form.goodsAreaId = row.row.goodsAreaId;
-      this.form.stockupDate = row.row.stockupDate;
+      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 = row.row;
+      this.formOne.id = row.row.id;
       this.getFork();
       this.getTeam();
 
@@ -998,7 +1013,7 @@ export default {
         this.data = data.records;
         this.data.forEach(async i =>{
           i.loader = i.groupName;
-          i.stockupArea = i.headline;
+          // i.stockupArea = i.headline;
         });
         this.selectionClear();
         this.loading = false;
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index 8634b845..cbe7e578 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -37,7 +37,7 @@
           <div class="avue-crud__left">
             <!--   <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
                <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
-            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派配货信息</el-button>
+            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派备货信息</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -86,7 +86,7 @@
           </el-pagination>
         </div>
       </el-row>
-      <el-dialog v-model="dialogFormCustomer" title="指派叉车">
+      <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%;"
@@ -127,12 +127,15 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <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>
         <template #footer>
       <span class="dialog-footer">
         <el-button @click="dialogFormCustomer = false">取消</el-button>
         <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
-        <el-button type="primary" @click="callFordelivery()"> 确定 </el-button>
+        <el-button type="primary" @click="callFordelivery"> 确定 </el-button>
       </span>
         </template>
       </el-dialog>
@@ -259,6 +262,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'stockupDate',
+          label: '出库时间',
+          type: 4,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'stockupUser',
           label: '备货人',
@@ -327,7 +341,7 @@ export default {
         },
         {
           prop: 'stockipAllocation',
-          label: '备货库位',
+          label: '所在库位',
           type: 2,
           values: '',
           width: '150',
@@ -356,16 +370,16 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'typeServiceName',
-          label: '服务类型',
-          type: 3,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'typeServiceName',
+        //   label: '服务类型',
+        //   type: 3,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'loaderName',
           label: '装卸班组',
@@ -726,7 +740,7 @@ export default {
       }
       let a = false ;
       this.selectionList.some(i =>{
-        if(i.assignStatus == "2"){
+        if(i.assignStatus == "20"){
           a = true;
           return;
         }
@@ -851,13 +865,14 @@ export default {
       //   this.form = res.data.data;
       // });
       console.log("row<<<<<",row);
-      this.form.forkliftId = row.row.forkliftId;
-      this.form.loaderId = row.row.loaderId;
-      this.form.goodsAreaId = row.row.goodsAreaId;
-      this.form.stockupDate = row.row.stockupDate;
+      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 = row.row;
+      this.formOne.id = row.row.id;
       this.getFork();
       this.getTeam();
 
@@ -976,8 +991,9 @@ export default {
           // let s =this.distributionType.find(d => d.dictKey == i.typeService);
           // // console.log("sssss",s);
           // i.typeServiceName = s.dictValue;
+          console.log("数据数据",i.groupName,i.headline);
           i.loader = i.groupName;
-          i.stockupArea = i.headline;
+          // i.stockupArea = i.headline;
         });
         this.selectionClear();
         this.loading = false;
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index 230f6563..cc9c2cd4 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/src/views/distribution/stockup/distributionStockupSelf.vue
@@ -37,7 +37,7 @@
           <div class="avue-crud__left">
             <!--   <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
                <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
-            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派配货信息</el-button>
+            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派备货信息</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -95,7 +95,7 @@
           </el-pagination>
         </div>
       </el-row>
-      <el-dialog v-model="dialogFormCustomer" title="指派叉车">
+      <el-dialog v-model="dialogFormCustomer" title="指派备货信息">
         <el-form :model="form">
           <el-form-item label="叉车司机" :label-width="formLabelWidth">
             <el-select v-model="form.forkliftId" clearable placeholder="请选择叉车司机"  @change="getForklift($event,'1')">
@@ -127,6 +127,9 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="出库时间" prop="outboundDate" :label-width="formLabelWidth">
+            <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>
         <template #footer>
       <span class="dialog-footer">
@@ -270,6 +273,26 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'pickUpTime',
+          label: '备货时间',
+          type: 4,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'outboundDate',
+          label: '出库时间',
+          type: 4,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'stockupStatusName',
           label: '备货状态',
@@ -277,22 +300,22 @@ export default {
           values: '',
           width: '180',
           checkarr: [
-            {
-              label: '未备货',
-              value: '1',
-            },
-            {
-              label: '待备货',
-              value: '2',
-            },
-            {
-              label: '备货中',
-              value: '3',
-            },
-            {
-              label: '已备货',
-              value: '4',
-            },
+            // {
+            //   label: '未备货',
+            //   value: '1',
+            // },
+            // {
+            //   label: '待备货',
+            //   value: '2',
+            // },
+            // {
+            //   label: '备货中',
+            //   value: '3',
+            // },
+            // {
+            //   label: '已备货',
+            //   value: '4',
+            // },
           ],
           fixed: false,
           sortable: true,
@@ -328,7 +351,7 @@ export default {
         },
         {
           prop: 'stockipAllocation',
-          label: '备货库位',
+          label: '所在库位',
           type: 2,
           values: '',
           width: '150',
@@ -743,7 +766,7 @@ export default {
       }
       let a = false ;
       this.selectionList.some(i =>{
-        if(i.assignStatus == "2"){
+        if(i.assignStatus == "20"){
           a = true;
           return;
         }
@@ -808,6 +831,7 @@ export default {
     },
     searchReset () {
       this.query = {};
+      this.stockupDate = [];
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
@@ -861,6 +885,7 @@ export default {
         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;