diff --git a/src/api/basicdata/basicdataWarehouse.js b/src/api/basicdata/basicdataWarehouse.js
index 8c4821c5..4f19a450 100644
--- a/src/api/basicdata/basicdataWarehouse.js
+++ b/src/api/basicdata/basicdataWarehouse.js
@@ -96,6 +96,3 @@ export const getWarehouseList = () => {
 };
 
 
-
-
-
diff --git a/src/option/distribution/distributionStockArticle.js b/src/option/distribution/distributionStockArticle.js
index 2f6214b5..a387eb7b 100644
--- a/src/option/distribution/distributionStockArticle.js
+++ b/src/option/distribution/distributionStockArticle.js
@@ -561,12 +561,16 @@ export default {
     },
     {
       label: '订单自编号',
-      prop: 'orderSelfNumbering'
+      prop: 'orderSelfNumbering',
+      width: '100'
+
     },
     {
       label: '商场名称',
       prop: 'mallName',
-      search: true
+      search: true,
+      width: '100'
+
     },
     {
       prop: 'mallId',
@@ -577,7 +581,8 @@ export default {
     {
       prop: 'storeName',
       label: '门店名称',
-      width: '100'
+      width: '100',
+
     },
     {
       prop: 'storeId',
@@ -588,12 +593,16 @@ export default {
     {
       label: '货物名称',
       prop: 'descriptionGoods',
-      search: true
+      search: true,
+      width: '100'
+
     },
     {
       label: '仓库',
       prop: 'warehouse',
-      search: true
+      search: true,
+      width: '100'
+
     },
     {
       label: '入库时间',
@@ -603,16 +612,20 @@ export default {
     },
     {
       label: '在库时间',
-      prop: 'storeTime'
+      prop: 'storeTime',
+      width: '100'
+
     },
     {
       label: '订单总件数',
-      prop: 'totalNumber'
-
+      prop: 'totalNumber',
+      width: '100'
     },
     {
       label: '在库件数',
-      prop: 'handQuantity'
+      prop: 'handQuantity',
+      width: '100'
+
     },
     {
       label: '是否齐套',
@@ -631,23 +644,33 @@ export default {
     {
       label: '服务类型',
       prop: 'typeService',
-      search: true
+      search: true,
+      width: '100'
+
     },
     {
       label: '顾客名字',
-      prop: 'customerName'
+      prop: 'customerName',
+      width: '100'
+
     },
     {
       label: '顾客电话',
-      prop: 'customerTelephone'
+      prop: 'customerTelephone',
+      width: '100'
+
     },
     {
       label: '顾客地址',
-      prop: 'customerAddress'
+      prop: 'customerAddress',
+      width: '100'
+
     },
     {
       label: '增值服务',
-      prop: 'fee'
+      prop: 'fee',
+      width: '100'
+
     }
     // {
     //   label: "类型;1 预约单  2库存单",
@@ -664,12 +687,14 @@ export default {
     {
       prop: 'serviceNumber',
       label: '服务号',
-      width: '100'
+      width: '100',
+      hide:true,
     },
     {
       label: '订单自编号',
       prop: 'orderSelfNumbering',
-      width: '100'
+      width: '100',
+
     },
     // {
     //   prop: 'incomingBatch',
@@ -693,38 +718,83 @@ export default {
     //   sortable: true,
     // },
     {
-      prop: 'market',
-      label: '商场',
+      prop: 'marketId',
+      label: '商场ID',
+      width: '100',
+      hide: true
+    },
+    {
+      prop: 'marketCode',
+      label: '商场编码',
+      width: '100',
+    },
+    {
+      prop: 'marketName',
+      label: '商场名称',
+      width: '100',
+    },
+    {
+      prop: 'storeId',
+      label: '门店编号',
+      width: '100',
+      hide: true
+    },
+    {
+      prop: 'storeCode',
+      label: '门店编码',
+      width: '100',
+    },
+    {
+      prop: 'storeName',
+      label: '门店名称',
+      width: '100',
+    },
+    {
+      prop: 'cargoNumber',
+      label: '货物编号',
       width: '100'
-
     },
     {
-      prop: 'descriptionGoods',
-      label: '货物名称',
+      prop: 'materialId',
+      label: '物料ID',
       width: '100'
-
     }, {
-      prop: 'cargoNumber',
-      label: '货物编号',
+      prop: 'descriptionGoods',
+      label: '物料名称',
+      width: '100'
+    },{
+      prop: 'cargoUnit',
+      label: '物料单位',
       width: '100'
-
     },
-    // {
-    //   prop: 'warehouse',
-    //   label: '仓库',
-    //   type: 2,
-    //   values: '',
-    //   width: '180',
-    //   checkarr: [],
-    //   fixed: false,
-    //   sortable: true,
-    // },
     {
-      prop: 'shop',
-      label: '门店',
+      prop: 'category',
+      label: '品分类',
+      width: '100'
+    },
+    {
+      prop: 'warehouse',
+      label: '仓库',
+      type: 2,
+      values: '',
+      width: '180',
+      checkarr: [],
+      fixed: false,
+      sortable: true,
+      hide:true,
+    },
+    {
+      prop: 'warehouseName',
+      label: '仓库名称',
       width: '100'
 
     },
+    // {
+    //   prop: 'shop',
+    //   label: '门店',
+    //   width: '100'
+    //
+    // },
     /*        {
               prop: 'storageLocation',
               label: '库位信息',
@@ -735,12 +805,13 @@ export default {
               fixed: false,
               sortable: true,
             },*/
+    // {
+    //   prop: 'mallName',
+    //   label: '商城名称',
+    //   width: '100'
+    //
+    // },
     {
-      prop: 'mallName',
-      label: '商城名称',
-      width: '100'
-
-    }, {
       prop: 'quantityStock',
       label: '库存数量',
       width: '100'
@@ -767,12 +838,7 @@ export default {
        fixed: false,
        sortable: true,
      },*/
-    {
-      prop: 'category',
-      label: '品分类',
-      width: '100'
 
-    },
     // {
     //   prop: 'unpack',
     //   label: '是否拆包',
@@ -794,44 +860,22 @@ export default {
       prop: 'brand',
       label: '品牌',
       width: '100'
-
     },
     {
-      prop: 'storeName',
-      label: '门店名称',
+      prop: 'cargoNumber',
+      label: '规格',
       width: '100'
-
     },
     {
-      prop: 'storeCode',
-      label: '门店编码',
-      width: '100'
-
+      prop: 'unpack',
+      label: '是否拆包',
+      hide: true
     },
-    // {
-    //   prop: 'marketName',
-    //   label: '商场名称',
-    //
-    // },
-    // {
-    //   prop: 'marketCode',
-    //   label: '商场编码',
-    //
-    // },{
-    //   prop: 'shoppingMall',
-    //   label: '所属商场',
-    //
-    // },
-    {
-      prop: 'warehouseName',
-      label: '仓库名称',
-      width: '100'
 
-    }, {
-      prop: 'unit',
+    {
+      prop: 'cargoUnit',
       label: '单位',
       width: '100'
-
     }
   ]
 };
diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
index 9978f770..ab54d443 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue
@@ -378,6 +378,9 @@
             }
             b.join(",")
             item.addressInfo=b;
+            if (item.department){
+              //这里请求部门
+            }
           })
           console.log("data>>>>>>>>>>>>>",data);
           this.data = data.records;
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index ef21dcb1..6045c1cb 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -202,7 +202,7 @@ export default {
           fixed: true,
         },
         {
-          prop: 'reservationId',
+          prop: 'reservationCode',
           label: '预约单编号',
           type: 2,
           values: '',
diff --git a/src/views/distribution/reservation/reservationFrom.vue b/src/views/distribution/reservation/reservationFrom.vue
index 284b663c..cb7a1951 100644
--- a/src/views/distribution/reservation/reservationFrom.vue
+++ b/src/views/distribution/reservation/reservationFrom.vue
@@ -413,7 +413,7 @@
                         <el-input type="number" v-model="item.e"
                                   :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
                                   @change="textbox($event,index,6)"
-                                  style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
+                                  style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
                      </span>
                         </el-checkbox>
                     </el-checkbox-group>
@@ -435,7 +435,7 @@
 
 <script>
   import { add, update, remove, getReservationInfo } from '@/api/distribution/distributionReservation';
-  import { getList, getStockArticleList } from '@/api/distribution/distributionStockArticle';
+  import { getList, getStockArticleList, selectStockArticleList } from '@/api/distribution/distributionStockArticle';
   import { getDetailDelivery, addDelivery } from '@/api/distribution/distributionDelivery';
   import { addIncrement } from '@/api/distribution/distributionStockArticle';
   import { getInventoryList } from '@/api/distribution/distributionStockList';
@@ -504,7 +504,7 @@
         //增加订单弹窗
         orderShow: false,
         //在库订单信息
-        stockArticleInfo: {},
+        stockArticleInfo: [],
         //库存品信息
         inventoryInfo: {},
         //时段
@@ -598,10 +598,38 @@
         this.onLoad(this.page);
       },
       handleAddOrder() {
+        this.query.typeService=1;
+        let page =this.page;
+        let params = {};
+        selectStockArticleList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{
+          const data = res.data.data;
+          data.records.forEach(item => {
+            item.reservationNum = item.handQuantity;
+          });
+          this.page.total = data.total;
+          this.stockArticleInfo = data.records;
+          this.loading = false;
+          this.selectionClear();
+        })
         this.selectionList = [];
         this.orderShow = true;
+
+
+        console.log("?????????????",params);
       },
       handleAddInventory() {
+        let page =this.page;
+        let params = {};
+        getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const inventoryList = res.data.data;
+          inventoryList.records.forEach(item => {
+            item.reservationNum = '0';
+          });
+          this.page.total = inventoryList.total;
+          this.inventoryInfo = inventoryList.records;
+          this.loading = false;
+          this.selectionClear();
+        });
         this.selectionList = [];
         this.stockListShow = true;
       },
@@ -957,7 +985,6 @@
             this.form.deliveryAddress = address;
 
             this.orderData = data;
-            this.loading = false;
           });
         }
         if (this.reservationId) {
@@ -977,28 +1004,7 @@
             this.form = reservation;
           });
         }
-        getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const inventoryList = res.data.data;
-          inventoryList.records.forEach(item => {
-            item.reservationNum = '0';
-          });
-          this.page.total = inventoryList.total;
-          this.inventoryInfo = inventoryList.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-        this.query.genre = 1;
-        this.query.typeService = "2";
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          data.records.forEach(item => {
-            item.reservationNum = item.handQuantity;
-          });
-          this.page.total = data.total;
-          this.stockArticleInfo = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
+        this.loading = false;
 
 
       }
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index e2997cbb..da4c8ab6 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -376,7 +376,7 @@
     <div>
         <el-tabs type="border-card">
             <el-tab-pane label="订单">
-                <el-button type="primary" link @click="handleAddOrder">新增</el-button>
+                <el-button type="primary" link @click="handleAddOrder">新 增</el-button>
                 <el-table ref="table"
                           v-loading="loading"
                           :data="orderData"
@@ -877,8 +877,6 @@
       //查询司机信息
       getMasterDriverData() {
         getDriverList(1, 10, '').then(res => {
-          this.masterDriverData = res.data.data.records;
-          this.slaveDriverData = res.data.data.records;
           this.driverData = res.data.data.records;
         });
       },
@@ -1072,9 +1070,10 @@
             let info = [];
             for (let i = 0; i < this.driverInfo.length; i++) {
               let obj = {};
-              obj.driver = this.driverInfo[i].name;
+              obj.driverName = this.driverInfo[i].name;
+              obj.driverPhone = this.driverInfo[i].phone;
               obj.driverId = this.driverInfo[i].id;
-              obj.vehicle = this.vehticleInfo[i].vehicleNub;
+              obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
               obj.vehicleId = this.vehticleInfo[i].id;
               info.push(obj);
               this.driverInfo[i].name;
@@ -1098,9 +1097,9 @@
         // data.reservationIds = this.ids;
         console.log("data>>>>>>>>>>>",data);
         deliveryBusinessTask(data).then((res) => {
-          // this.$router.push({
-          //   path: '/distribution/deliverylist/distributionDeliveryListdis'
-          // });
+          this.$router.push({
+            path: '/distribution/deliverylist/distributionDeliveryListdis'
+          });
         });
       },
       changeVehicle(params) {
@@ -1121,7 +1120,6 @@
           });
           this.vehticleInfo = b;
         }
-
       },
       changeDriver(params) {
         this.driverList = params;
@@ -1140,11 +1138,9 @@
           });
           this.driverInfo = a;
         }
-
       },
       //上移
       moveUpVehictle(row) {
-
         let i = 0;
         this.vehticleInfo.forEach((item, index) => {
           if (item.id === row.id) {