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/option/distribution/distributionReservation.js b/src/option/distribution/distributionReservation.js
index 20fce529..0d425a04 100644
--- a/src/option/distribution/distributionReservation.js
+++ b/src/option/distribution/distributionReservation.js
@@ -87,21 +87,45 @@ export default {
     {
       label: '时段',
       prop: 'periodOfTime',
+      width: '100',
+      hide: true,
+    },
+    {
+      label: '时段',
+      prop: 'periodOfTimeName',
       width: '100'
     },
     {
       label: '配送方式',
       prop: 'deliveryWay',
+      width: '100',
+      hide: true,
+    },
+    {
+      label: '配送方式',
+      prop: 'deliveryWayName',
       width: '100'
     },
     {
       label: '配送类型',
       prop: 'deliveryType',
-      width: '100'
+      width: '100',
+      hide: true,
+    },
+    {
+      label: '配送类型',
+      prop: 'deliveryTypeName',
+      width: '100',
     },
     {
       label: '服务类型',
       prop: 'serveType',
+      width: '100',
+      hide: true,
+    },
+    {
+      label: '服务类型',
+      prop: 'serveTypeName',
       width: '100'
     },
     {
@@ -127,6 +151,12 @@ export default {
     {
       label: '预约信息状态',
       prop: 'reservationStatus',
+      width: '120',
+      hide: true,
+    },
+    {
+      label: '预约信息状态',
+      prop: 'reservationStatusName',
       width: '120'
     },
     {
@@ -138,6 +168,12 @@ export default {
     {
       label: '备货状态',
       prop: 'stockupStatus',
+      width: '100',
+      hide: true,
+    },
+    {
+      label: '备货状态',
+      prop: 'stockupStatusName',
       width: '100'
     },
     {
diff --git a/src/option/distribution/distributionStockArticle.js b/src/option/distribution/distributionStockArticle.js
index 370d8960..814898fb 100644
--- a/src/option/distribution/distributionStockArticle.js
+++ b/src/option/distribution/distributionStockArticle.js
@@ -534,6 +534,10 @@ export default {
       prop: 'descriptionGoods',
       search: true
     },
+    {
+      label: '预约状态',
+      prop: 'reservationStatusName'
+    },
     {
       label: '仓库',
       prop: 'warehouse',
@@ -560,16 +564,16 @@ export default {
       prop: 'completeSetName',
       search: true
     },
+    // {
+    //   label: '服务类型',
+    //   prop: 'typeService',
+    //   search: true
+    // },
     {
       label: '品牌',
       prop: 'brand',
       search: true
     },
-    {
-      label: '服务类型',
-      prop: 'typeService',
-      search: true
-    },
     {
       label: '顾客名字',
       prop: 'customerName'
@@ -578,6 +582,10 @@ export default {
       label: '顾客电话',
       prop: 'customerTelephone'
     },
+    {
+      label: '可用数量',
+      prop: 'applyNum'
+    },
     {
       label: '顾客地址',
       prop: 'customerAddress'
diff --git a/src/router/views/index.js b/src/router/views/index.js
index b61f6875..4b530884 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -450,15 +450,15 @@ export default [
   //   ],
   // },
   {
-    path: '/distribution/turndelivery/deliveryInfo',
+    path: '/distribution/turndelivery/deliveryMarket',
     component: Layout,
-    redirect: '/distribution/turndelivery/deliveryInfo',
+    redirect: '/distribution/turndelivery/deliveryMarket',
     children: [
       {
-        path: '/distribution/turndelivery/deliveryInfo',
+        path: '/distribution/turndelivery/deliveryMarket',
         name: 'name',
         id:'id',
-        component: () => import('@/views/distribution/turndelivery/deliveryInfo.vue'),
+        component: () => import('@/views/distribution/turndelivery/deliveryMarket.vue'),
       },
     ],
   },
@@ -719,6 +719,25 @@ export default [
       },
     ],
   },
+  {
+    path: '/reservation/order_listFrom',
+    component: Layout,
+    redirect: '/reservation/order_listFrom',
+    children: [
+      {
+        path: '/distribution/reservation/order_listFrom',
+        name: '自提明细',
+        meta: {
+          i18n: 'dict',
+        },
+        props: route => ({
+          name: route.query.name,
+          id: route.query.id
+        }),
+        component: () => import('@/views/reservation/order_listFrom.vue'),
+      },
+    ],
+  },
   // {
   //   path: '/distribution/inventory/distributionPrints',
   //   component: Layout,
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index cae23d61..987b73fc 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -276,7 +276,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'state',
+          prop: 'deliveryStatus',
           label: '配送状态',
           type: 3,
           values: '',
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 25338b12..cc375f53 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -562,7 +562,7 @@ export default {
         column: [
           {
             label: "包条码",
-            prop: "packetBarCode",
+            prop: "orderPackageCode",
             search: true,
             width:"100px"
           },
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 75f1b760..092814c3 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();
@@ -1169,7 +1187,7 @@ export default {
         //   return item
         // });
       });
-      getDictionaryBiz('order_package_status').then(res => {
+      getDictionaryBiz('order_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
         this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index d1e93551..7efe69e9 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: '顾客名字',
@@ -1137,11 +1137,11 @@ export default {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-        this.checkcColumnList("typeServerName", this.columnList).checkarr=res.data.data.map(item=>{
+     /*   this.checkcColumnList("typeServerName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
-        });
+        });*/
 
         // this.columnList[26].checkarr =res.data.data.map(item=>{
         //   item.value=item.dictKey
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index 290352dd..5440adb9 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();
@@ -1137,14 +1150,14 @@ export default {
     },
     init () {
       this.height = this.setPx(document.body.clientHeight - 340);
-      // getDictionaryBiz('distribution_type').then(res => {
-      //   // this.distributionType = res.data.data;
-      //   // this.columnList[26].checkarr =res.data.data.map(item=>{
-      //   //   item.value=item.dictKey
-      //   //   item.label=item.dictValue
-      //   //   return item
-      //   // });
-      // });
+      getDictionaryBiz('distribution_type').then(res => {
+        this.distributionType = res.data.data;
+        // this.columnList[26].checkarr =res.data.data.map(item=>{
+        //   item.value=item.dictKey
+        //   item.label=item.dictValue
+        //   return item
+        // });
+      });
       getDictionaryBiz('order_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
         this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index 8eb1524c..d4065a73 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -623,7 +623,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'orderStateName',
+          prop: 'orderStatusName',
           label: '订单状态',
           type: 3,
           values: '',
@@ -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: '通知状态',
@@ -1002,8 +1002,8 @@ export default {
         this.query['freezeStatus'] = index;
       }else if(row.prop ==='completeSetName'){
         this.query['completeSet'] = index;
-      }else if(row.prop ==='orderStateName'){
-        this.query['state'] = index;
+      }else if(row.prop ==='orderStatusName'){
+        this.query['orderStatus'] = index;
       }else if(row.prop ==='typeName'){
         this.query['typeService'] = index;
       }else{
@@ -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();
       }
 
@@ -1263,19 +1273,13 @@ export default {
       this.height = this.setPx(document.body.clientHeight - 340);
       getDictionaryBiz('distribution_type').then(res => {
         this.distributionType = res.data.data;
-        this.checkcColumnList("typeServerName", this.columnList).checkarr=res.data.data.map(item=>{
+        /*this.checkcColumnList("typeServerName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
           item.label=item.dictValue
           return item
-        });
-
-        // this.columnList[26].checkarr =res.data.data.map(item=>{
-        //   item.value=item.dictKey
-        //   item.label=item.dictValue
-        //   return item
-        // });
+        });*/
       });
-      getDictionaryBiz('order_package_status').then(res => {
+      getDictionaryBiz('order_status').then(res => {
         this.deliveryOrderStatus = res.data.data;
         this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{
           item.value=item.dictKey
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/reservation/atlas.vue b/src/views/distribution/reservation/atlas.vue
index c6e20a06..20ab7b85 100644
--- a/src/views/distribution/reservation/atlas.vue
+++ b/src/views/distribution/reservation/atlas.vue
@@ -137,7 +137,7 @@ export default {
       }
       details.loading = true;
       getReservationAddr(ids).then(res => {
-        res.data.data.forEach(item => {
+        res.data.data.records.forEach(item => {
           details.ids.split(',').forEach(id => {
             if (item.id == id) {
               details.reservationIds.push(item.id);
@@ -145,9 +145,9 @@ export default {
           });
         });
         console.log(details.reservationIds);
-        details.reservationData = res.data.data;
+        details.reservationData = res.data.data.records;
 
-        details.addressList = res.data.data;
+        details.addressList = res.data.data.records;
       });
       details.loading = false;
     }
@@ -155,7 +155,7 @@ export default {
       console.log('>>>>>>>>>>>', details.reservationIds);
       let ids = details.reservationIds.join(',');
       router.push({
-        path: '/distribution/turndelivery/deliveryInfo',
+        path: '/distribution/turndelivery/deliveryMarket',
         query: {
           id: ids,
           name:'市配计划'
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index d684f55c..b2078788 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -96,7 +96,7 @@
                         <el-button size="small" @click="cancelReservation(slotProps.scope)">取消预约</el-button>
                         <br/>
 <!--                        ${{slotProps.scope}}-->
-                        <el-button v-if="this.query.reservationStatus==='1'?true:false " type="small" @click="confirmReservation(slotProps.scope)">确认预约</el-button>
+                        <el-button v-if="this.query.reservationStatus==='1'?true:false " size="small" @click="confirmReservation(slotProps.scope)">确认预约</el-button>
                     </template>
                 </tablecmt>
                 <!--        <el-popover :visible="visible" placement="top-start" :width="160">-->
@@ -242,6 +242,7 @@
   import { getListOwn } from '@/api/system/user';
   import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
   import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
+  import dayjs from 'dayjs';
 
   export default {
     data() {
@@ -278,6 +279,16 @@
             sortable: true,
             head: false
           },
+          {
+            prop: 'serviceNumber',
+            label: '服务号',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
           {
             prop: 'consignee',
             label: '收货人',
@@ -301,19 +312,9 @@
           {
             prop: 'deliveryPhone',
             label: '收件人电话',
-            type: 3,
+            type: 2,
             values: '',
             width: '180',
-            checkarr: [
-              {
-                label: '1231213',
-                value: '123121123'
-              },
-              {
-                label: '112121',
-                value: '12312123111123'
-              }
-            ],
             fixed: false,
             sortable: true
           },
@@ -329,18 +330,55 @@
           },
           {
             prop: 'periodOfTime',
+            label: '时段1',
+            type: 3,
+            values: '',
+            width: '180',
+            checkarr: [
+              {
+                label: '上午',
+                value: '1'
+              },
+              {
+                label: '下午',
+                value: '2'
+              },
+              {
+                label: '全天',
+                value: '3'
+              },
+            ],
+            fixed: false,
+            sortable: true,
+            head:true,
+          },
+          {
+            prop: 'periodOfTimeName',
             label: '时段',
-            type: 4,
+            type: 3,
             values: '',
             width: '180',
-            checkarr: [],
+            checkarr: [
+              {
+                label: '上午',
+                value: '1'
+              },
+              {
+                label: '下午',
+                value: '2'
+              },
+              {
+                label: '全天',
+                value: '3'
+              },
+            ],
             fixed: false,
             sortable: true
           },
           {
             prop: 'deliveryWay',
             label: '配送方式',
-            type: 2,
+            type: 3,
             values: '',
             width: '150',
             checkarr: [],
@@ -348,18 +386,38 @@
             sortable: true,
             head: true
           },
+          // {
+          //   prop: 'deliveryType',
+          //   label: '配送类型',
+          //   type: 3,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [
+          //     {
+          //       label: '商配',
+          //       value: '1',
+          //     },
+          //     {
+          //       label: '市配',
+          //       value: '2'
+          //     },
+          //   ],
+          //   fixed: false,
+          //   sortable: true
+          // },
           {
-            prop: 'deliveryType',
-            label: '配送类型',
+            prop: 'serveType',
+            label: '服务类型1',
             type: 2,
             values: '',
             width: '150',
             checkarr: [],
             fixed: false,
-            sortable: true
+            sortable: true,
+            head:true,
           },
           {
-            prop: 'serveType',
+            prop: 'serveTypeName',
             label: '服务类型',
             type: 2,
             values: '',
@@ -389,8 +447,8 @@
             sortable: true
           },
           {
-            prop: 'collectFee',
-            label: '到付运费',
+            prop: 'collectionFee',
+            label: '待收货款',
             type: 2,
             values: '',
             width: '150',
@@ -410,7 +468,7 @@
           },
           {
             prop: 'replaceFee',
-            label: '代付运费',
+            label: '代收运费',
             type: 2,
             values: '',
             width: '150',
@@ -418,25 +476,37 @@
             fixed: false,
             sortable: true
           },
+          // {
+          //   prop: 'fee',
+          //   label: '总费用',
+          //   type: 2,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true
+          // },
           {
-            prop: 'fee',
-            label: '总费用',
-            type: 2,
+            prop: 'reservationStatus',
+            label: '预约信息状态1',
+            type: 4,
             values: '',
-            width: '150',
+            width: '180',
             checkarr: [],
             fixed: false,
-            sortable: true
+            sortable: true,
+            hide: true,
+
           },
           {
-            prop: 'reservationStatus',
+            prop: 'reservationStatusName',
             label: '预约信息状态',
-            type: 4,
+            type: 1,
             values: '',
             width: '180',
             checkarr: [],
             fixed: false,
-            sortable: true
+            sortable: true,
           },
           {
             prop: 'orderSource',
@@ -458,16 +528,16 @@
             fixed: false,
             sortable: true
           },
-          {
-            prop: 'goodsAreaName',
-            label: '备货区',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
+          // {
+          //   prop: 'goodsAreaName',
+          //   label: '备货区',
+          //   type: 2,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true
+          // },
           // {
           //   prop: 'goodsAreaId',
           //   label: '备货区编号',
@@ -489,16 +559,7 @@
           //   fixed: false,
           //   sortable: true,
           // },
-          {
-            prop: 'serviceNumber',
-            label: '服务号',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
+
           // {
           //   prop: 'notes',
           //   label: '备注',
@@ -972,8 +1033,9 @@
         }
         let data = this.selectionList;
         let a=[];
+        console.log(">>>>>>>>>>>>>",data);
         data.forEach(d=>{
-          if (d.stockupStatus !== "未备货"){
+          if (d.stockupStatus === "1" ){
             a.push(d.reservationCode);
           }
         })
@@ -982,6 +1044,8 @@
           return;
         }
         this.dialogFormCustomer = true;
+        this.info.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss')
+
         this.getFork();
         this.getTeam();
       },
@@ -994,7 +1058,6 @@
             this.info.goodsAreaName = item.dictValue
           }
         })
-
         confirms(this.info).then(res => {
           this.$message({
             type: 'success',
diff --git a/src/views/distribution/reservation/reservationDetails.vue b/src/views/distribution/reservation/reservationDetails.vue
index 07a12612..959df040 100644
--- a/src/views/distribution/reservation/reservationDetails.vue
+++ b/src/views/distribution/reservation/reservationDetails.vue
@@ -11,15 +11,15 @@
                 <el-col :xl="5" :lg="7" :md="8" :sm="24">
                     <span>预约单号：{{reservationData.reservationCode}} </span>
                 </el-col>
-                <el-col :xl="5" :lg="7" :md="8" :sm="24">
-                    <span>商场名称：{{reservationData.mallName}} </span>
-                </el-col>
+<!--                <el-col :xl="5" :lg="7" :md="8" :sm="24">-->
+<!--                    <span>商场名称：{{reservationData.mallName}} </span>-->
+<!--                </el-col>-->
                 <el-col :xl="5" :lg="7" :md="8" :sm="24">
                     <span>预约时间：{{reservationData.reservationDate}} </span>
                 </el-col>
                 <el-col :xl="3" :lg="7" :md="8" :sm="24">
 <!--                    <span>服务类型：{{reservationData.deliveryType}}</span>-->
-                    <span>市配</span>
+                    <span>服务类型：市配</span>
                 </el-col>
             </el-row>
             <el-divider>收货人信息</el-divider>
diff --git a/src/views/distribution/reservation/reservationFrom.vue b/src/views/distribution/reservation/reservationFrom.vue
index a21fd49b..2dac36bf 100644
--- a/src/views/distribution/reservation/reservationFrom.vue
+++ b/src/views/distribution/reservation/reservationFrom.vue
@@ -5,7 +5,8 @@
             <el-form ref="form"
                      :model="form"
                      prop="consignee"
-                     label-width="80px">
+                     label-width="80px"
+            :rules="reservationRules">
                 <el-row>
                     <el-col :span="10">
                         <el-form-item label="收货人:" prop="consignee" label-width="100px">
@@ -31,7 +32,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="10">
-                        <el-form-item label="时&emsp;&emsp;段:" prop="deliveryAddress" label-width="100px">
+                        <el-form-item label="时&emsp;&emsp;段:" prop="periodOfTime" label-width="100px">
                             <el-radio-group v-model="form.periodOfTime" v-for="item in this.periodOfTimeData">
                                 <el-radio
 
@@ -54,8 +55,8 @@
 
                     <el-col :span="10">
                         <el-form-item label="配送类型:" prop="serveType" label-width="100px">
-<!--                            v-for="item in this.deliveryTypeData"-->
-                            <el-radio-group v-model="form.deliveryType" >
+                            <!--                            v-for="item in this.deliveryTypeData"-->
+                            <el-radio-group v-model="form.deliveryType">
                                 <el-radio
                                         :label="'2'"
                                         :value="'2'">市配&emsp;
@@ -68,19 +69,14 @@
 
                 <el-row>
                     <el-col :span="10">
-                        <el-form-item label="备注:" prop="orderSource" label-width="100px" style="width: 100%">
-                            <el-input
-                                    type="textarea"
-                                    :rows="2"
-                                    placeholder="请输入内容"
-                                    v-model="form.remarks">
-                            </el-input>
+                        <el-form-item label="代收运费:" prop="replaceFee" label-width="100px">
+                            <el-input v-model="form.replaceFee" :disabled="true"/>
                         </el-form-item>
                     </el-col>
                     <el-col :span="10">
                         <el-form-item label="配送方式:" prop="serveType" label-width="100px">
-<!--                            v-for="item in this.deliveryWayData"-->
-                            <el-radio-group v-model="form.deliveryWay" >
+                            <!--                            v-for="item in this.deliveryWayData"-->
+                            <el-radio-group v-model="form.deliveryWay">
                                 <el-radio :label="'1'"
                                           :value="'1'">送货&emsp;
                                 </el-radio>
@@ -92,14 +88,38 @@
                 </el-row>
 
                 <el-row>
+                    <!--                    <el-col :span="10">-->
+                    <!--                        <el-form-item label="到付运费:" prop="collectFee" label-width="100px">-->
+                    <!--                            <el-input type="number" v-model="form.collectFee" :disabled="true"/>-->
+                    <!--                        </el-form-item>-->
+                    <!--                    </el-col>-->
                     <el-col :span="10">
-                        <el-form-item label="到付运费:" prop="collectFee" label-width="100px">
-                            <el-input type="number" v-model="form.collectFee" :disabled="true"/>
+                        <el-form-item label="待收货款:" prop="collectionFee" label-width="100px">
+                            <el-input type="number" v-model="form.collectionFee"/>
                         </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="加&emsp;&emsp;急:" prop="serveType" label-width="100px">
+                            <!--                            v-for="item in this.deliveryWayData"-->
+                            <el-radio-group v-model="form.isUrgent" v-for="item in this.whetherData">
+                                <el-radio
 
+                                        :label="item.dictKey"
+                                        :value="item.dictKey">{{item.dictValue}}&emsp;
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item>
                     </el-col>
+
+
+
                     <el-col :span="10">
-                        <el-form-item label="增值服务类型:" prop="serveType" label-width="100px">
+                        <el-form-item label="其他费用:" prop="collectFee" label-width="100px">
+                            <el-input v-model="form.otherFee" placeholder="请输入其他费用"/>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="增值服务类型:" prop="serveType" label-width="120px">
                             <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
                                 <el-checkbox :label="item.dictKey"
                                              :value="item.dictKey">{{item.dictValue}}&emsp;
@@ -107,16 +127,19 @@
                             </el-checkbox-group>
                         </el-form-item>
                     </el-col>
+
+
                     <el-col :span="10">
-                        <el-form-item label="代收运费:" prop="replaceFee" label-width="100px">
-                            <el-input v-model="form.replaceFee" :disabled="true"/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                        <el-form-item label="其他费用:" prop="collectFee" label-width="100px">
-                            <el-input v-model="form.otherFee" placeholder="请输入其他费用"/>
+                        <el-form-item label="备注:" prop="orderSource" label-width="100px" style="width: 100%">
+                            <el-input
+                                    type="textarea"
+                                    :rows="1"
+                                    placeholder="请输入内容"
+                                    v-model="form.remarks">
+                            </el-input>
                         </el-form-item>
                     </el-col>
+
                 </el-row>
             </el-form>
 
@@ -154,9 +177,9 @@
                                            @click="viewStockArticlePackage(row)">查看包件
                                 </el-button>
 
-                                    <!--                                2023 07 25 取消增值服务  -->
-<!--                                <el-button type="primary" link icon="el-icon-delete" @click="addvalueServe(row)">增值服务-->
-<!--                                </el-button>-->
+                                <!--                                2023 07 25 取消增值服务  -->
+                                <!--                                <el-button type="primary" link icon="el-icon-delete" @click="addvalueServe(row)">增值服务-->
+                                <!--                                </el-button>-->
                                 <el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)">移除
                                 </el-button>
 
@@ -210,8 +233,8 @@
                     title="在库订单信息"
                     width="100%"
                     :model="addvalue"
-                    >
-<!--                :before-close="handleClose"-->
+            >
+                <!--                :before-close="handleClose"-->
                 <el-form :inline="true" :model="query">
                     <el-form-item label="订单自编号:">
                         <el-input v-model="query.orderCode" placeholder="请输入商场名称"></el-input>
@@ -271,8 +294,8 @@
                     v-model="stockListShow"
                     title="库存品信息"
                     width="100%"
-                    >
-<!--                :before-close="handleClose"-->
+            >
+                <!--                :before-close="handleClose"-->
                 <el-form :inline="true" :model="query">
                     <el-form-item label="商场名称:">
                         <el-input v-model="query.marketName" placeholder="请输入服务类型"></el-input>
@@ -487,6 +510,7 @@
         addvalueServeTypeData: [],
         //配送方式字典列表
         deliveryWayData: [],
+        whetherData:[],
         //配送类型字典列表
         deliveryTypeData: [],
         //增值服务列表
@@ -521,7 +545,21 @@
         stockListShow: false,
         isaddvalue: false,
         packageData: [],
-        packageList: []
+        packageList: [],
+        reservationRules: {
+          consignee: [
+            { required: true, message: '请填写收货人名称!!!', trigger: 'change' }
+          ],
+          deliveryAddress: [
+            { required: true, message: '请填写收货人地址!!!', trigger: 'blur' }
+          ],
+          deliveryPhone: [
+            { required: true, message: '请填写收货人电话!!!', trigger: 'change' }
+          ],
+          // enableStatus: [
+          //   { required: true, message: '请选择启用状态!', trigger: 'change' }
+          // ],
+        },
       };
     },
     created() {
@@ -592,7 +630,7 @@
         params.id = this.orderInfo.id;
         params.addvalue = addvalueInfos;
         params.relatedId = 1;
-        console.log("params>>>>>>>>>>>>",params);
+        console.log('params>>>>>>>>>>>>', params);
         addIncrement(params).then(res => {
           this.dialogVisible = false;
           this.$message({
@@ -604,27 +642,64 @@
       },
       //查询出所有的市配订单
       handleAddOrder() {
-        this.query.typeService=2;
-        this.query.genre = "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;
+        console.log('$$$$$$', this.reservationId);
+        if (this.reservationId) {
+          //这里需要编辑，那么这里就需要在订单列表中回显已使用包件，禁用勾选其他预约使用的包件细信息
+
+          this.query.typeService = 2;
+          this.query.genre = '1';
+          //查询所有订单列表信息
+
+          let page = this.page;
+          let params = {};
+          selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+            console.log('$$$$$$$$>', res);
+            let orderData = res.data.data;
+            console.log('$$$$$$$$', orderData);
+            orderData.records.forEach((item, index) => {
+              item.reservationNum = item.handQuantity;
+              // if ()
+              //订单已预约
+              // if (item.reservationStatus !== '30' ){
+              //   a.push(item)
+              // }
+            });
+            this.page.total = orderData.total;
+            this.stockArticleInfo = orderData;
+            this.loading = false;
+            this.selectionClear();
           });
-          this.page.total = data.total;
-          this.stockArticleInfo = data.records;
-          this.loading = false;
-          this.selectionClear();
-        })
-        this.selectionList = [];
+        } else {
+          this.query.typeService = 2;
+          this.query.genre = '1';
+          let page = this.page;
+          let params = {};
+          selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+            let data = res.data.data;
+            let a = [];
+            console.log('$$$$$$$$', data);
+            data.records.forEach((item, index) => {
+              item.reservationNum = item.handQuantity;
+              //订单已预约
+              if (item.reservationStatus !== '30') {
+                a.push(item);
+              }
+            });
+            console.log('$$$$$$$$', a);
+            this.page.total = data.total;
+            this.stockArticleInfo = a;
+            this.loading = false;
+            this.selectionClear();
+          });
+          this.selectionList = [];
+        }
+
         this.orderShow = true;
       },
       handleAddInventory() {
-        let page =this.page;
+        let page = this.page;
         let params = {};
-        this.query.serviceType = "2";
+        this.query.serviceType = '2';
         getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const inventoryList = res.data.data;
           inventoryList.records.forEach(item => {
@@ -687,6 +762,9 @@
         getDictionaryBiz('period_of_time').then(res => {
           this.periodOfTimeData = res.data.data;
         });
+        getDictionaryBiz('yes_no').then(res => {
+          this.whetherData = res.data.data;
+        });
       },
       addvalueServe(row) {
         //查询订单的增值服务，
@@ -721,12 +799,12 @@
         });
       },
       //搜索订单
-      searchStockArticle(){
-        let params={};
+      searchStockArticle() {
+        let params = {};
         let page = this.page;
-        this.query.typeService=2;
-        this.query.genre=1;
-        selectStockArticleList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{
+        this.query.typeService = 2;
+        this.query.genre = 1;
+        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;
@@ -735,10 +813,10 @@
           this.stockArticleInfo = data.records;
           this.loading = false;
           this.selectionClear();
-        })
+        });
       },
-      searchStockList(){
-        let params={};
+      searchStockList() {
+        let params = {};
         let page = this.page;
         this.query.serviceType = 2;
         getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
@@ -752,14 +830,14 @@
           this.selectionClear();
         });
       },
-      stockArticleSearchReset(){
+      stockArticleSearchReset() {
         this.selectionList = [];
-        this.query={};
+        this.query = {};
         this.handleAddOrder();
       },
-      stockListSearchReset(){
+      stockListSearchReset() {
         this.selectionList = [];
-        this.query={};
+        this.query = {};
         this.handleAddInventory();
       },
       onSubmitPackage() {
@@ -830,17 +908,17 @@
         //服务号
 
         // this.form.packageList = this.packageList;
-        console.log(">>>>>>>>",this.form);
-        if (operation){
-          if (this.reservationId){
-            update(this.form).then(()=>{
+        console.log('>>>>>>>>', this.form);
+        if (operation) {
+          if (this.reservationId) {
+            update(this.form).then(() => {
               this.$router.go(-1);
               this.$message({
                 type: 'success',
                 message: '操作成功!'
               });
-            })
-          }else {
+            });
+          } else {
             add(this.form).then(() => {
               this.$router.go(-1);
               this.$message({
@@ -994,7 +1072,7 @@
       },
       selectionClear() {
         this.selectionList = [];
-        this.query={};
+        this.query = {};
         // this.$refs.table.clearSelection();
       },
       currentChange(currentPage) {
@@ -1007,10 +1085,13 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        this.form.deliveryType = "1";
-        this.form.deliveryWay = "1";
-        this.form.periodOfTime = "3";
-        this.form.otherFee = 0 ;
+        this.form.deliveryType = '1';
+        this.form.deliveryWay = '1';
+        this.form.periodOfTime = '3';
+        this.form.otherFee = 0;
+        this.form.replaceFee = 0;
+        this.form.collectionFee = 0;
+        this.form.isUrgent = "1";
         this.form.reservationDate = new Date();
         if (this.orderIds) {
           getStockArticleList(this.orderIds).then(res => {
@@ -1042,9 +1123,9 @@
             const reservation = res.data.data;
             this.orderData = reservation.stockArticleList;
             this.inventoryData = reservation.inventoryList;
-            this.inventoryData.forEach(item=>{
-              item.applyNum =item.quantityStock -  item.quantityOccupied;
-            })
+            this.inventoryData.forEach(item => {
+              item.applyNum = item.quantityStock - item.quantityOccupied;
+            });
             this.form.deliveryType = reservation.deliveryType;
             this.form.periodOfTime = reservation.periodOfTime;
             if (reservation.serveType) {
@@ -1055,8 +1136,8 @@
             }
             this.form = reservation;
           });
-        }else {
-          this.form.deliveryType = "2";
+        } else {
+          this.form.deliveryType = '2';
         }
         this.loading = false;
 
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index df28b1bc..49939da0 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: '备货人',
@@ -295,6 +309,7 @@ export default {
           fixed: false,
           sortable: true,
         },
+
         {
           prop: 'assignStatusName',
           label: '指派状态',
@@ -316,7 +331,7 @@ export default {
         },
         {
           prop: 'stockipAllocation',
-          label: '备货库位',
+          label: '所在库位',
           type: 2,
           values: '',
           width: '150',
@@ -345,7 +360,7 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
+        /*{
           prop: 'typeServiceName',
           label: '服务类型',
           type: 3,
@@ -354,7 +369,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
-        },
+        },*/
         {
           prop: 'loaderName',
           label: '装卸班组',
@@ -713,7 +728,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 +747,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 +900,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..58103a71 100644
--- a/src/views/distribution/stockup/distributionStockupDetails.vue
+++ b/src/views/distribution/stockup/distributionStockupDetails.vue
@@ -675,7 +675,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 +691,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 +707,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 +722,18 @@ export default {
     },
     //转换类型
     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);
-        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..e2561a04 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: '备货人',
@@ -306,6 +320,16 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'goodsAreaId',
+          label: '备货区Id',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'assignStatusName',
           label: '指派状态',
@@ -327,7 +351,7 @@ export default {
         },
         {
           prop: 'stockipAllocation',
-          label: '备货库位',
+          label: '所在库位',
           type: 2,
           values: '',
           width: '150',
@@ -356,16 +380,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 +750,7 @@ export default {
       }
       let a = false ;
       this.selectionList.some(i =>{
-        if(i.assignStatus == "2"){
+        if(i.assignStatus == "20"){
           a = true;
           return;
         }
@@ -851,13 +875,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 +1001,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..a9c42102 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,
@@ -314,50 +337,50 @@ export default {
           values: '',
           width: '150',
           checkarr: [
-            {
-              label: '未指派',
-              value: '1',
-            },
-            {
-              label: '已指派',
-              value: '2',
-            },
+            // {
+            //   label: '未指派',
+            //   value: '1',
+            // },
+            // {
+            //   label: '已指派',
+            //   value: '2',
+            // },
           ],
           fixed: false,
           sortable: true,
         },
         {
           prop: 'stockipAllocation',
-          label: '备货库位',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
-        {
-          prop: '配送车次',
-          label: '备货区编号',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: true,
-        },
-        {
-          prop: '配送司机',
-          label: '备货区编号',
+          label: '所在库位',
           type: 2,
           values: '',
           width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,
-          head: true,
         },
+        // {
+        //   prop: 'pickUpPlate',
+        //   label: '提货车次',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: true,
+        // },
+        // {
+        //   prop: 'consignee',
+        //   label: '提货人',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: true,
+        // },
         {
           prop: 'forkliftName',
           label: '叉车司机',
@@ -743,7 +766,7 @@ export default {
       }
       let a = false ;
       this.selectionList.some(i =>{
-        if(i.assignStatus == "2"){
+        if(i.assignStatus == "20"){
           a = true;
           return;
         }
@@ -792,7 +815,25 @@ 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=>{
+      /*  this.columnList[8].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;
+        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
           return item
@@ -800,6 +841,14 @@ export default {
       });
       this.onLoad(this.page);
     },
+    checkcColumnList(prop,columnList){
+      for(var a = 0; a < columnList.length; a++){
+        if(columnList[a].prop===prop){
+          console.log("1111111111111",columnList[a]);
+          return columnList[a];
+        }
+      }
+    },
     searchHide () {
       this.search = !this.search;
     },
@@ -808,6 +857,7 @@ export default {
     },
     searchReset () {
       this.query = {};
+      this.stockupDate = [];
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
@@ -861,6 +911,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;
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index f1f3ce32..f0ced97c 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -457,9 +457,9 @@
                 @click="viewStockArticlePackage(row)"
                 >查看包件
               </el-button>
-              <el-button type="primary" link icon="el-icon-delete" @click="addvalueServe(row)"
-                >增值服务
-              </el-button>
+<!--              <el-button type="primary" link icon="el-icon-delete" @click="addvalueServe(row)"-->
+<!--                >增值服务-->
+<!--              </el-button>-->
               <el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)"
                 >移除
               </el-button>
@@ -1153,7 +1153,6 @@
         this.loading = false;
         this.isShowPackage = true;
 
-
       },
       /**
        * 提交包件信息
diff --git a/src/views/distribution/turndelivery/deliveryInfo.vue b/src/views/distribution/turndelivery/deliveryInfo.vue
deleted file mode 100644
index d3c9deac..00000000
--- a/src/views/distribution/turndelivery/deliveryInfo.vue
+++ /dev/null
@@ -1,935 +0,0 @@
-<template>
-    <div>
-        <el-row>
-            <el-button type="primary" plain style="margin-left: 15%;width: 200px;height: 70px" @click="ccc">自主配送
-            </el-button>
-            <el-button type="primary" plain style="margin-left: 30%;width: 200px;height: 70px" @click="ddd">外协
-            </el-button>
-        </el-row>
-    </div>
-    <div style="margin: 2%" v-if="aaa">
-        <el-form ref="form" :model="form" label-width="100px" style="margin: 3px">
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="车辆信息:" prop="goodsShelfId">
-                        <el-select v-model="vehicleIds" multiple placeholder="请选择车辆" @change="changeVehicle">
-                            <el-option
-                                    v-for="item in vehicleData"
-                                    :key="item.id"
-                                    :label="item.vehicleNub"
-                                    :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <!--                <el-col :span="8">-->
-                <!--                    <el-form-item label="司机负责人:"  prop="goodsShelfId" >-->
-                <!--                        <el-select v-model="form.masterDriver"  placeholder="请选择车辆"  @change="changeMasterDriver">-->
-                <!--                            <el-option-->
-                <!--                                    v-for="item in masterDriverData"-->
-                <!--                                    :key="item.id"-->
-                <!--                                    :label="item.name"-->
-                <!--                                    :value="item.id">-->
-                <!--                            </el-option>-->
-                <!--                        </el-select>-->
-                <!--                    </el-form-item>-->
-                <!--                </el-col>-->
-                <el-col :span="6">
-                    <el-form-item label="配送司机信息:" prop="goodsShelfId">
-                        <!--                        @change="changeSlaveDriver"-->
-                        <el-select v-model="deliveryDriver" multiple placeholder="请选择司机" @change="changeDriver">
-                            <el-option
-
-                                    v-for="item in driverData"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.id">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <span>
-                        <el-form-item label="主司机:" prop="forklift">
-                        <el-input v-model="form.masterDriverName" :disabled="true">
-                        </el-input>
-                    </el-form-item>
-                        <el-form-item label="主车辆:" prop="forklift">
-                        <el-input v-model="form.masterVehicleNub" :disabled="true">
-                        </el-input>
-                    </el-form-item>
-                    </span>
-
-
-                    <!--                    <span >主司机&emsp;:<strong>&emsp;{{this.masterDriverName}}</strong></span><br/>-->
-                    <!--                    <span >主车辆&emsp;:<strong>&emsp;{{this.masetervehictleName}}</strong></span>-->
-                </el-col>
-                <el-col :span="6">
-                    <el-button round @click="viewDriverInfo" style="margin-left: 10%">查看司机配置</el-button>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="叉车司机:" prop="forklift">
-                        <el-select v-model="form.forklift" placeholder="请选择叉车司机">
-                            <el-option
-                                    v-for="item in this.forkliftData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictKey">
-                            </el-option>
-                            <!--                            {{this.forkliftData}}-->
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="装卸班组:" prop="loader">
-                        <el-select v-model="form.loader" placeholder="请选择装卸班组">
-                            <el-option
-                                    v-for="item in loaderData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictKey">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="3">
-                    <!--                    <el-radio-group v-model="form.loadAndUnload" >-->
-                    <!--                        <el-radio  v-for="item in this.loadAndUnloadData" :label="item.dictValue" :value="item.dictKey"></el-radio>-->
-                    <!--                    </el-radio-group>-->
-                    <el-checkbox-group v-model="this.loadAndUnload">
-                        <el-checkbox v-for="item in loadAndUnloadData" :label="item.dictKey" :value="item.dictKey">
-                            {{item.dictValue}}
-                        </el-checkbox>
-                    </el-checkbox-group>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="备货区域:" prop="goodsAreaId">
-                        <el-select v-model="form.goodsAreaId" placeholder="请选择备货区域">
-                            <el-option
-                                    v-for="item in goodsAreaData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictKey">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="备货时间:" prop="goodsShelfId">
-                        <el-date-picker
-                                v-model="form.stockupDate"
-                                type="date"
-                                placeholder="请选择备货时间">
-                        </el-date-picker>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="24">
-                    <el-form-item label="备注:" prop="remarks">
-                        <el-input
-                                type="textarea"
-                                :rows="2"
-                                placeholder="请输入内容"
-                                v-model="form.remarks">
-                        </el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-
-        </el-form>
-    </div>
-
-    <div style="margin: 2%" v-if="bbb">
-        <el-form ref="form" :model="form" label-width="100px" style="margin: 3px">
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="外协来源:" prop="goodsShelfId">
-                        <el-select v-model="form.tripartiteSource" placeholder="请选择来源">
-                            <el-option
-                                    v-for="item in tripartiteSourceData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictValue">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="司机名称:" prop="goodsShelfId">
-                        <el-input v-model="form.driverName" placeholder="请输入司机名称"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="司机电话:" prop="goodsShelfId">
-                        <el-input v-model="form.driverPhone" placeholder="请输入本次费用"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="车辆车牌:" prop="goodsShelfId">
-                        <el-input v-model="form.vehicleNum" placeholder="请输入本次费用"></el-input>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="配送费用:" prop="goodsShelfId">
-                        <el-input v-model="form.deliveryFee" placeholder="请输入本次费用"></el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="叉车司机:" prop="forklift">
-                        <el-select v-model="form.forklift" placeholder="请选择叉车司机">
-                            <el-option
-                                    v-for="item in this.forkliftData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictKey">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="装卸班组:" prop="loader">
-                        <el-select v-model="form.loader" placeholder="请选择装卸班组">
-                            <el-option
-                                    v-for="item in loaderData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictKey">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="3">
-                    <!--                    <el-radio-group v-model="form.loadAndUnload" >-->
-                    <!--                        <el-radio  v-for="item in this.loadAndUnloadData" :label="item.dictValue" :value="item.dictKey"></el-radio>-->
-                    <!--                    </el-radio-group>-->
-                    <el-checkbox-group v-model="form.loadAndUnload">
-                        <el-checkbox v-for="item in loadAndUnloadData" :label="item.dictKey" :value="item.dictKey">
-                            {{item.dictValue}}
-                        </el-checkbox>
-                    </el-checkbox-group>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="6">
-                    <el-form-item label="备货区域:" prop="goodsAreaId">
-                        <el-select v-model="form.goodsAreaId" placeholder="请选择备货区域">
-                            <el-option
-                                    v-for="item in goodsAreaData"
-                                    :key="item.dictKey"
-                                    :label="item.dictValue"
-                                    :value="item.dictKey">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                    <el-form-item label="备货时间:" prop="goodsShelfId">
-                        <el-date-picker
-                                v-model="form.stockupDate"
-                                type="date"
-                                placeholder="请选择备货时间">
-                        </el-date-picker>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="24">
-                    <el-form-item label="备注:" prop="remarks">
-                        <el-input
-                                type="textarea"
-                                :rows="2"
-                                placeholder="请输入内容"
-                                v-model="form.remarks">
-                        </el-input>
-                    </el-form-item>
-                </el-col>
-            </el-row>
-        </el-form>
-    </div>
-    <div >
-        <el-row>
-            <!-- 列表模块 -->
-            <!--            <el-table-->
-            <!--                    :data="data"-->
-            <!--                    :height="height"-->
-            <!--                    :border="option.border"-->
-            <!--                    style="width: 100%">-->
-            <!--                <template v-for="(item,index) in option.column">-->
-            <!--                    &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-table ref="table" v-loading="loading"
-                      :data="data"
-                      style="width: 100%; height: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="80px"
-                                 align="center"></el-table-column>
-
-                <template v-for="(item,index) in option.column">
-                    <!-- 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-form-item style="margin-left: 45%;margin-top: 10px">
-            <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder">提交(配送内容)</el-button>
-            <el-button icon="el-icon-circle-close" @click="this.$router.go(-1)">返 回</el-button>
-        </el-form-item>
-    </div>
-
-    <el-dialog
-            title="司机配置"
-            v-model="isDriverShow"
-            width="50%"
-
-    >
-        <div style="display: flex">
-            <div style="flex:1;">
-                <el-table ref="multipleTable" v-loading="loading"
-                          :data="driverInfo"
-                          style="width: 100%; "
-                          :border="option.border"
-                          @select-all="handleSelect"
-                          @selection-change="selectionDriverChange"
-                          @select="handleSelect">
-                    <!--                                                                    @selection-change="handleSelectionChange"
-                        @selection-change="handleCurrentChange"
-                    -->
-                    <!--                    <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="80px"-->
-                    <!--                             align="center"></el-table-column>-->
-
-                    <!--                    <el-table-column label="预约数量" type="index" width="200px">-->
-                    <!--                        <template #="{row}">-->
-                    <el-table-column type="selection" v-if="option.selection" width="55"
-                                     align="center"></el-table-column>
-                    <!--                        </template>-->
-                    <!--                    </el-table-column>-->
-                    <template v-for="(item,index) in option.columnDriverInfo">
-                        <!-- 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>
-            </div>
-            <div style="flex:1;">
-                <el-table ref="table" v-loading="loading"
-                          :data="vehticleInfo"
-                          style="width: 100%; "
-                          :border="option.border">
-                    <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
-                    <template v-for="(item,index) in option.columnVehicleInfo">
-                        <!-- 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 label="预约数量" type="index" width="200px">
-                        <template #="{row}">
-                            <span>
-<!--                                 <el-button type="primary" text size="small" @click="MoveUpVehictle(row)">置顶-->
-                                <!--                            </el-button>-->
-                            <el-button type="primary" text size="small" @click="moveUpVehictle(row)">上移
-                            </el-button>
-                            </span>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-        </div>
-
-
-        <el-form-item style="margin-left: 45%;margin-top: 10px">
-        <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="confirmDriver">确 定</el-button>
-            <el-button @click="isDriverShow = false">取 消</el-button>
-        </span>
-        </el-form-item>
-    </el-dialog>
-
-</template>
-
-
-<script>
-  import { getDictionaryBiz } from '@/api/system/dict';
-  import option from '@/option/distribution/distributionReservation';
-  import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
-  import {
-    getReservationAddr,
-    deliveryTask
-  } from '@/api/distribution/distributionReservation';
-  import { getListUser } from '@/api/distribution/distributionStockup';
-  import { getPostList } from '@/api/system/post';
-  import { getListOwn } from '@/api/system/user';
-  import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
-  import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
-  import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
-  // import { ref } from 'vue'
-  export default {
-    data() {
-      return {
-        height: 0,
-        loading: false,
-        ids: null,
-        error: null,
-        form: {},
-        data: [],
-        page: {
-          currentPage: 1,
-          pageSize: 10,
-          total: 40
-        },
-        aaa: true,
-        bbb: false,
-        option: option,
-        deliveryTypeData: [],
-        //配送类型字典列表
-        resvervationStatusData: [],
-        //备货状态
-        stockupStatusData: [],
-        //订单来源
-        orderSourceData: [],
-        //预约时段
-        periodOfTimeData: [],
-        //配送方式
-        deliveryWayData: [],
-        //服务内容
-        addvalueServeTypeData: [],
-        //基础车辆信息
-        vehicleData: [],
-        //叉车信息
-        forkliftData: [],
-        //班组信息
-        loaderData: [],
-        //备货区信息
-        goodsAreaData: [],
-        //部门信息
-        deptId: '',
-        //司机信息
-        driverData: [],
-        //装卸班组
-        loadAndUnloadData: [],
-        //装卸
-        tripartiteSourceData: [],
-        //装卸只能
-        loadAndUnload: [],
-        //车辆信息
-        vehicleIds: [],
-        //配送司机信息
-        deliveryDriver: [],
-        //司机配置
-        isDriverShow: false,
-        //车辆表格信息
-        driverInfo: [],
-        //司机表格信息
-        vehticleInfo: [],
-        //主司机
-        masterDriverName: '',
-        //主车辆
-        masterVehictleName: '',
-        //司机配置选中行信息
-        multipleSelection: [],
-        //
-        multipleTable: {},
-        driverList: [],
-        vehticleList: []
-
-      };
-    },
-    created() {
-      this.$watch(
-        () => this.$route.params,
-        () => {
-          this.fetchData();
-        },
-        // 组件创建完后获取数据，
-        // 此时 data 已经被 observed 了
-        { immediate: true }
-      );
-
-
-      this.getDictionary();
-      this.getFork();
-      this.getTeam();
-      this.getvehicleData();
-      this.getMasterDriverData();
-    },
-    computed: {},
-
-    mounted() {
-      this.onLoad();
-    },
-    methods: {
-      fetchData() {
-        this.error = this.post = null;
-        this.loading = true;
-        if (this.$route.query.id) {
-          this.ids = this.$route.query.id;
-        }
-      },
-      //查询叉车人员
-      async getFork() {
-        let ides = '';
-        let ide = {};
-        await getListUser().then(res => {
-          console.log('res>>>', res.data.data);
-          ides = res.data.data.tenantId;
-          this.deptId = res.data.data.deptId;
-        });
-        await getPostList(ides).then(res => {
-          console.log('>>>>', res.data.data);
-          // this.forkliftData = res.data.data;
-          res.data.data.forEach(i => {
-            if (i.postName == '叉车') {
-              ide = i;
-            }
-          });
-        });
-        // console.log("ied>>>>>",ide);
-        let params = {
-          postId: ide.id, //岗位
-          deptId: this.deptId //部门
-          // roleId: '', //角色
-        };
-        getListOwn(Object.assign(params, this.query)).then(res => {
-          // console.log(".............",res.data.data);
-          let fo = [];
-          res.data.data.forEach(i => {
-            let a = {
-              dictKey: i.id,
-              dictValue: i.name
-            };
-            fo.push(a);
-          });
-          this.forkliftData = fo;
-        });
-        await this.getStorageArea();
-        await this.getTeam();
-      },
-      //查询班组
-      async getTeam() {
-        let params = {
-          department: this.deptId
-        };
-        getListTeam(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
-          let fo = [];
-          res.data.data.records.forEach(i => {
-            let a = {
-              dictKey: i.id,
-              dictValue: i.name + '-' + i.groupName
-            };
-            fo.push(a);
-          });
-          this.loaderData = fo;
-        });
-      },
-      //备货区
-      async getStorageArea() {
-        let params = {
-          department: this.deptId
-        };
-        stockUp(params).then(res => {
-          let fo = [];
-          res.data.data.forEach(i => {
-            let v = {
-              dictKey: i.id,
-              dictValue: i.name + '-' + i.headline
-            };
-            fo.push(v);
-          });
-          this.goodsAreaData = fo;
-        });
-      },
-      //查询司机信息
-      getMasterDriverData() {
-        getDriverList(1, 10, '').then(res => {
-          this.driverData = res.data.data.records;
-        });
-      },
-      //查询车辆信息
-      getvehicleData() {
-        getVehicleList(1, 10, '').then(res => {
-          this.vehicleData = res.data.data.records;
-          console.log(res.data.data);
-        });
-      },
-      viewDriverInfo() {
-        console.log(this.driverInfo.length);
-        console.log(this.vehticleInfo.length);
-        if (this.driverList.length !== this.vehticleList.length) {
-          this.$message({
-            message: '司机车辆数量有误!!!',
-            type: 'warning'
-          });
-          return;
-        }
-        this.isDriverShow = true;
-      },
-      handleClose(done) {
-        this.$confirm('确认关闭？')
-          .then(_ => {
-            done();
-          })
-          .catch(_ => {
-          });
-      },
-      changeVehicle(params) {
-        console.log(params);
-        this.vehticleList = params;
-        let b = [];
-        if (params) {
-          this.vehicleData.forEach(item => {
-            this.vehticleList.forEach(p => {
-              if (p == item.id) {
-                b.push(item);
-                console.log(this.driverInfo);
-              }
-            });
-            if (params[0] === item.id) {
-              this.form.masterVehicleNub = item.vehicleNub;
-            }
-          });
-          this.vehticleInfo = b;
-        }
-
-      },
-      changeDriver(params) {
-        this.driverList = params;
-        let a = [];
-        if (params) {
-          this.driverData.forEach(item => {
-            this.driverList.forEach(p => {
-              if (p == item.id) {
-                a.push(item);
-                console.log(this.driverInfo);
-              }
-            });
-            if (params[0] === item.id) {
-              this.form.masterDriverName = item.name;
-            }
-          });
-          this.driverInfo = a;
-        }
-
-      },
-      //上移
-      moveUpVehictle(row) {
-        console.log(row);
-        let i = 0;
-        this.vehticleInfo.forEach((item, index) => {
-          if (item.id === row.id) {
-            i = index;
-          }
-        });
-        //获取当当前选中的下标，如果下标为第一个则不能上移
-        if (i > 0) {
-          let a = this.vehticleInfo[i - 1];
-          this.vehticleInfo.splice(i - 1, 1);
-          this.vehticleInfo.splice(i, 0, a);
-        } else {
-          this.$message({
-            message: '已经是第一条，上移失败',
-            type: 'warning'
-          });
-        }
-      },
-      selectionDriverChange(list){
-        this.multipleSelection = list;
-      },
-      handleSelect(selection, row) {
-        // 阻止全选框原有逻辑
-        this.$refs.multipleTable.clearSelection();
-        if (row) {
-          if (selection.length === 1) {
-            this.multipleSelection = row;
-            this.$refs.multipleTable.toggleRowSelection(row, true);
-          } else if (selection.length > 1) {
-            let a = {};
-            selection.forEach((s, index) => {
-              if (s.id === row.id) {
-                selection.splice(index, 1);
-                a = s;
-              }
-            });
-            this.multipleSelection = selection;
-            this.$refs.multipleTable.toggleRowSelection(a, true);
-          }
-        }
-      },
-      confirmDriver() {
-        if (this.multipleSelection.length === 0) {
-          this.$message.warning('请选择至少一条数据');
-          return;
-        }
-        console.log('this.adada', this.multipleSelection);
-        this.isDriverShow = false;
-        //获取到表格的行坐标
-        let i = 0;
-        this.driverInfo.forEach((item,index)=> {
-          if (item.id === this.multipleSelection[0].id) {
-            i = index;
-          }
-        });
-        this.form.masterDriverName = this.driverInfo[i].name;
-        this.form.masterVehicleNub = this.vehticleInfo[i].vehicleNub;
-
-      },
-      // //数据字典数据获取
-      getDictionary() {
-        getDictionaryBiz('addvalue_serve_type').then(res => {
-          this.addvalueServeTypeData = res.data.data;
-        });
-        getDictionaryBiz('distribution_type').then(res => {
-          this.deliveryTypeData = res.data.data;
-        });
-        //订单来源
-        getDictionaryBiz('order_source').then(res => {
-          this.orderSourceData = res.data.data;
-          console.log(this.deliveryTypeData);
-        });
-        //预约状态
-        getDictionaryBiz('resvervation_status').then(res => {
-          this.resvervationStatusData = res.data.data;
-        });
-        //备货状态
-        getDictionaryBiz('stockup_status').then(res => {
-          this.stockupStatusData = res.data.data;
-        });
-        //时段
-        getDictionaryBiz('period_of_time').then(res => {
-          this.periodOfTimeData = res.data.data;
-        });
-        getDictionaryBiz('delivery_way').then(res => {
-          this.deliveryWayData = res.data.data;
-        });
-        getDictionaryBiz('load_and_unload').then(res => {
-          this.loadAndUnloadData = res.data.data;
-        });
-        //三方外协来源
-        getDictionaryBiz('tripartite_source').then(res => {
-          this.tripartiteSourceData = res.data.data;
-        });
-      },
-
-      ccc() {
-        this.aaa = true;
-        this.bbb = false;
-        this.form = {};
-        this.loadAndUnload = [];
-      },
-      ddd() {
-        this.aaa = false;
-        this.bbb = true;
-        this.form = {};
-        this.loadAndUnload = [];
-
-      },
-      onSubmitOrder() {
-        const params = this.form;
-        let stockup = {};
-        let tripartite = {};
-        let data = {};
-
-        let allocationInfo = [];
-        //备货区数据构建
-        if (params.loader) {
-          this.loaderData.forEach(a => {
-            if (params.loader === a.dictKey) {
-              stockup.loaderName = a.dictValue;
-              stockup.loaderId = a.dictKey;
-            }
-          });
-          data.stockup = stockup;
-        }
-        if (params.forklift){
-          this.forkliftData.forEach(b => {
-            if (params.forklift === b.dictKey) {
-              stockup.forkliftName = b.dictValue;
-              stockup.forkliftId = b.dictKey;
-            }
-          });
-          data.stockup = stockup;
-        }
-
-        if (params.goodsAreaId){
-
-          this.goodsAreaData.forEach(c => {
-            if (params.goodsAreaId === c.dictKey) {
-              stockup.goodsAreaId = c.dictKey;
-              stockup.goodsAreaName = c.dictValue;
-            }
-
-          });
-          data.stockup = stockup;
-        }
-        if (params.stockupDate) {
-          stockup.stockupDate = params.stockupDate;
-          data.stockup = stockup;
-        }
-        if (params.remarks) {
-          stockup.remarks = params.remarks;
-          data.stockup = stockup;
-        }
-        if (this.loadAndUnload.length>0){
-          stockup.loadAndUnload = this.loadAndUnload.join(',');
-          data.stockup = stockup;
-        }
-        //判断是否是三方配送
-        if (params.tripartiteSource) {
-          //三方配送数据构建
-          if (params.driverName) {
-            tripartite.driverName = params.driverName;
-          }
-          if (params.deiverPhone) {
-            tripartite.deiverPhone = params.deiverPhone;
-          }
-          if (params.vehicleNum) {
-            tripartite.vehicleNum = params.vehicleNum;
-          }
-          if (params.deliveryFee) {
-            tripartite.deliveryFee = params.deliveryFee;
-          }
-          if (params.tripartiteSource) {
-            this.tripartiteSourceData.forEach(item => {
-              if (params.tripartiteSource === item.dictValue) {
-                tripartite.distributionCompanyId = item.dictKey;
-                tripartite.distributionCompany = item.dictValue;
-              }
-            });
-          }
-        } else {
-          //自主配送数据构建
-          if (this.driverList.length !== this.vehticleList.length) {
-            this.$message({
-              message: '司机车辆数量有误!!!',
-              type: 'warning'
-            });
-            return;
-          } else {
-            let info = [];
-            for (let i = 0; i < this.driverInfo.length; i++) {
-              let obj = {};
-              obj.driver = this.driverInfo[i].name;
-              obj.driverId = this.driverInfo[i].id;
-              obj.driverPhone=this.driverInfo[i].phone;
-              obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
-              obj.vehicleId = this.vehticleInfo[i].id;
-              info.push(obj);
-              this.driverInfo[i].name;
-            }
-            allocationInfo = info;
-          }
-        }
-
-        // data.stockup = stockup;
-        data.masterDriverName = this.form.masterDriverName;
-        data.masterVehicleNub = this.form.masterVehicleNub;
-        data.allocationInfo = allocationInfo;
-        data.tripartite = tripartite;
-        data.reservationIds = this.ids;
-        console.log(data);
-        deliveryTask(data).then((res) => {
-          this.$router.push({
-            path: '/distribution/deliverylist/distributionDeliveryListmar',
-            name:'配送市配列表'
-          });
-        });
-      },
-      onLoad() {
-        this.loading = false;
-        if (this.ids){
-          getReservationAddr(this.ids).then(res => {
-            const data = res.data.data;
-            data.forEach(item => {
-              // this.orderSourceData.forEach(a => {
-              //   console.log("#######",a);
-              //   if (item.orderSource === a.dictKey) {
-              //     item.orderSource = a.dictValue;
-              //   }
-              // });
-              this.stockupStatusData.forEach(b => {
-                if (item.stockupStatus === b.dictKey) {
-                  item.stockupStatus = b.dictValue;
-                }
-              });
-              this.resvervationStatusData.forEach(e => {
-                if (item.reservationStatus === e.dictKey) {
-                  item.reservationStatus = e.dictValue;
-                }
-              });
-              this.deliveryTypeData.forEach(c => {
-                if (item.deliveryType === c.dictKey) {
-                  item.deliveryType = c.dictValue;
-                }
-              });
-
-              this.deliveryWayData.forEach(c => {
-                if (item.deliveryWay === c.dictKey) {
-                  item.deliveryWay = c.dictValue;
-                }
-              });
-              this.periodOfTimeData.forEach(d => {
-                if (item.periodOfTime === d.dictKey) {
-                  item.periodOfTime = d.dictValue;
-                }
-              });
-              let pa = [];
-              if (item.serveType.length >= 1) {
-                pa = item.serveType.split(',');
-              } else {
-                pa.push(item.serveType);
-              }
-              this.addvalueServeTypeData.forEach(f => {
-                pa.forEach((p, index) => {
-                  if (p === f.dictKey) {
-                    pa[index] = f.dictValue;
-                  }
-                });
-              });
-              item.serveType = pa;
-            });
-            console.log('>>>>>>>>', data);
-            this.page.total = data.total;
-            this.data = data;
-            console.log('>>>>>>>>>>>', this.data);
-            this.loading = false;
-          });
-        }
-      }
-    }
-  };
-</script>
-
-<style scoped>
-
-</style>
-
diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue
new file mode 100644
index 00000000..5bb528d8
--- /dev/null
+++ b/src/views/distribution/turndelivery/deliveryMarket.vue
@@ -0,0 +1,947 @@
+<template>
+  <div class="head_top">
+    <div @click="ccc" :class="aaa?'buts check':'buts'">
+      自主配送
+    </div>
+    <div @click="ddd" :class="bbb?'buts check':'buts'">
+      外协
+    </div>
+  </div>
+  <div style="margin: 2%;background-color: #ffffff;padding: 20px;box-sizing: border-box;" v-if="aaa">
+    <el-form ref="form" :model="driverForm" label-width="100px" style="margin: 3px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item   label="车辆信息:" prop="vehicleIds">
+            <el-select
+              filterable
+              multiple
+              v-model="vehicleIds"
+              placeholder="请选择车辆"
+              @change="changeVehicle"
+            >
+              <el-option
+                v-for="item in vehicleData"
+                :key="item.id"
+                :label="item.vehicleNub"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="配送司机信息:" prop="goodsShelfId">
+            <!--                        @change="changeSlaveDriver"-->
+            <el-select
+              v-model="deliveryDriver"
+              multiple
+              filterable
+              @change="changeDriver"
+
+              placeholder="请选择司机"
+            >
+              <el-option
+                v-for="item in driverData"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <span>
+            <el-form-item label="主司机:" prop="forklift">
+              <el-input v-model="driverForm.masterDriverName" :disabled="true"> </el-input>
+            </el-form-item>
+            <el-form-item label="主车辆:" prop="forklift">
+              <el-input v-model="driverForm.masterVehicleNub" :disabled="true"> </el-input>
+            </el-form-item>
+          </span>
+        </el-col>
+        <el-col :span="6">
+          <el-button round @click="viewDriverInfo" style="margin-left: 10%">查看司机配置</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+
+  <div style="margin: 2%;background-color: #ffffff;padding: 20px;box-sizing: border-box;" v-if="bbb">
+    <el-form ref="form" :model="driverForm" label-width="100px" style="margin: 3px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="外协来源:" prop="goodsShelfId">
+            <el-select filterable v-model="driverForm.tripartiteSource" placeholder="请选择来源">
+              <el-option
+                v-for="item in tripartiteSourceData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="司机名称:" prop="goodsShelfId">
+            <el-input v-model="driverForm.driverName" placeholder="请输入司机名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="司机电话:" prop="goodsShelfId">
+            <el-input v-model="driverForm.driverPhone" placeholder="请输入司机电话"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="车辆车牌:" prop="goodsShelfId">
+            <el-input v-model="driverForm.vehicleNum" placeholder="请输入本次费用"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="配送费用:" prop="goodsShelfId">
+            <el-input v-model="driverForm.deliveryFee" placeholder="请输入本次费用"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+  <div style="margin: 2%;background-color: #ffffff;padding: 20px;box-sizing: border-box;">
+    <el-form ref="form" :model="stockUpForm" label-width="100px" style="margin: 3px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="叉车司机:" prop="forklift">
+            <el-select filterable v-model="stockUpForm.forklift" placeholder="请选择叉车司机">
+              <el-option
+                v-for="item in this.forkliftData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+                :disabled="isDisable"
+              >
+              </el-option>
+              <!--                            {{this.forkliftData}}-->
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="装卸班组:" prop="loader">
+            <el-select filterable v-model="stockUpForm.loader" placeholder="请选择装卸班组">
+              <el-option
+                v-for="item in loaderData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+                :disabled="isDisable"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="班组职能:" prop="goodsAreaId">
+            <el-checkbox-group v-model="loadAndUnload">
+              <el-checkbox
+                v-for="item in loadAndUnloadData"
+                :label="item.dictKey"
+                :value="item.dictKey"
+                :disabled="isDisable"
+              >
+                <span>{{ item.dictValue }}</span>
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="配送类型:" prop="goodsAreaId">
+            <el-radio-group v-model="stockUpForm.deliveryType">
+              <el-radio :label="'2'" :value="'2'">市配&emsp; </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="备货区域:" prop="goodsAreaId">
+            <el-select filterable v-model="stockUpForm.goodsAreaId" placeholder="请选择备货区域">
+              <el-option
+                v-for="item in goodsAreaData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey"
+                :disabled="isDisable"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="备货时间:" prop="goodsShelfId">
+            <el-date-picker v-model="stockUpForm.stockupDate" type="datetime" placeholder="请选择备货时间" :disabled="isDisable">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="出库时间:" prop="outboundDate" label-width="100px">
+            <!--            <el-date-picker v-model="form.taskTime"-->
+            <!--                            type="datetime"-->
+            <!--                            placeholder="请选择配车时间"-->
+            <!--                            value-format="YYYY-MM-DD HH:mm:ss"-->
+            <!--            >-->
+            <!--            </el-date-picker>-->
+            <el-date-picker v-model="stockUpForm.outboundDate"  value-format="YYYY-MM-DD HH:mm:ss"  type="datetime" placeholder="请选择配车时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="其他费用:" prop="collectFee" label-width="100px">
+            <el-input v-model="stockUpForm.otherFee" placeholder="请输入其他费用" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注:" prop="remarks">
+            <el-input type="textarea" :rows="1" placeholder="请输入内容" v-model="stockUpForm.remarks">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+  <h3>预约列表</h3>
+  <div >
+    <el-row>
+      <el-table ref="table" v-loading="loading"
+                :data="data"
+                style="width: 100%; height: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="80px"
+                         align="center"></el-table-column>
+
+        <template v-for="(item,index) in option.column">
+          <!-- 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-form-item style="margin-left: 45%;margin-top: 10px">
+      <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder">提交(配送内容)</el-button>
+      <el-button icon="el-icon-circle-close" @click="this.$router.go(-1)">返 回</el-button>
+    </el-form-item>
+  </div>
+
+  <el-dialog title="司机配置" v-model="isDriverShow" width="50%">
+    <div style="display: flex">
+      <div style="flex: 1">
+        <el-table
+          ref="multipleTable"
+          v-loading="loading"
+          :data="driverInfo"
+          style="width: 100%"
+          :border="option.border"
+          @select-all="handleSelect"
+          @select="handleSelect"
+        >
+          <el-table-column
+            type="selection"
+            v-if="option.selection"
+            width="55"
+            align="center"
+
+          ></el-table-column>
+          <template v-for="(item, index) in option.columnDriverInfo">
+            <!-- table字段 -->
+            <el-table-column
+              v-if="item.hide !== true"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+              :key="index"
+              style="height: 50px"
+
+            >
+            </el-table-column>
+          </template>
+          <!-- 操作栏模块 -->
+        </el-table>
+      </div>
+      <div style="flex: 1">
+        <el-table
+          ref="table"
+          v-loading="loading"
+          :data="vehticleInfo"
+          style="width: 100%"
+          :border="option.border"
+        >
+          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+          <template v-for="(item, index) in option.columnVehicleInfo">
+            <!-- table字段 -->
+            <el-table-column
+              v-if="item.hide !== true"
+              :prop="item.prop"
+              :label="item.label"
+              :width="item.width"
+              :key="index"
+              style="height: 50px"
+            >
+            </el-table-column>
+          </template>
+          <!-- 操作栏模块 -->
+          <el-table-column label="预约数量" type="index" width="200px">
+            <template #="{ row }">
+              <span>
+                <el-button type="primary" text size="small" @click="moveUpVehictle(row)"
+                  >上移
+                </el-button>
+              </span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+
+    <el-form-item style="margin-left: 45%; margin-top: 10px">
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmDriver">确 定</el-button>
+        <el-button @click="isDriverShow = false">取 消</el-button>
+      </span>
+    </el-form-item>
+  </el-dialog>
+</template>
+
+<script>
+  import { getDictionaryBiz } from '@/api/system/dict';
+  import option from '@/option/distribution/distributionReservation';
+  import { getListTeamInfo } from '@/api/basicdata/basicdataTeamGroup';
+  import { deliveryTask, getReservationAddr } from '@/api/distribution/distributionReservation';
+  import { getListUser } from '@/api/distribution/distributionStockup';
+  import { getPostList } from '@/api/system/post';
+  import { getListOwn } from '@/api/system/user';
+  import { stockUpInfo } from '@/api/basicdata/basicdataGoodsArea';
+  import { getVehicleList } from '@/api/basicdata/basicdataVehicle';
+  import { getDriverList } from '@/api/basicdata/basicdataDriverArtery';
+  import { mapGetters } from 'vuex';
+  import dayjs from 'dayjs';
+
+  export default {
+    data() {
+      return {
+        height: 0,
+        loading: false,
+        error: null,
+        form: {},
+        driverForm:{},
+        stockUpForm:{},
+        data: [],
+        // 分页信息
+        page: {
+          currentPage: 1,
+          pageSize: 10,
+          total: 40
+        },
+
+        query:{},
+        aaa: true,
+        bbb: false,
+        option: option,
+        deliveryTypeData: [],
+        //配送类型字典列表
+        resvervationStatusData: [],
+        //备货状态
+        stockupStatusData: [],
+        //订单来源
+        orderSourceData: [],
+        //预约时段
+        periodOfTimeData: [],
+        //配送方式
+        deliveryWayData: [],
+        //服务内容
+        addvalueServeTypeData: [],
+        //基础车辆信息
+        vehicleData: [],
+        //叉车信息
+        forkliftData: [],
+        //班组信息
+        loaderData: [],
+        //备货区信息
+        goodsAreaData: [],
+        //部门信息
+        deptId: '',
+        //司机信息
+        driverData: [],
+        //装卸班组
+        loadAndUnloadData: [],
+        //装卸
+        tripartiteSourceData: [],
+        //装卸只能
+        loadAndUnload: [],
+        //车辆信息
+        vehicleIds: [],
+        //配送司机信息
+        deliveryDriver: [],
+        //司机配置
+        isDriverShow: false,
+        //车辆表格信息
+        driverInfo: [],
+        //司机表格信息
+        vehticleInfo: [],
+        //主司机
+        masterDriverName: '',
+        //主车辆
+        masterVehictleName: '',
+        //司机配置选中行信息
+        multipleSelection: [],
+        //
+        multipleTable: {},
+        stockArticleTable: [],
+        stockArticleList:[],
+        driverList: [],
+        vehticleList: [],
+        packageList:[],
+        //订单数据
+        orderData:[],
+        //库存品数据
+        inventoryData:[],
+        //
+        selectionList:[],
+        addvalue: {},
+        //订单弹窗
+        orderShow:false,
+        //库存品弹窗
+        stockListShow:false,
+        //在库订单数据
+        stockArticleInfo:[],
+        //库存品信息列表
+        inventoryInfo:[],
+        //包件弹窗控制
+        isShowPackage:false,
+        //包件数据
+        packageData:[],
+        //班组职能
+        loadAndUnload:[],
+        //服务类型
+        serveType:[],
+        //外协数据来源
+        tripartiteSourceData:[],
+        deliveryListId:'',
+        isDisable:false,
+        checked:true,
+        reservationIds:'',
+        obj:{
+          type:Object,
+          default:()=>({})
+        },
+        isInitialized:false,
+        isUpdate:false,
+      };
+    },
+   watch:{
+     // obj:{
+     //   deep:true,
+     //   handler(newVal,oldVal){
+     //     if (this.isInitialized){
+     //       console.log('输入框的值'+JSON.stringify(oldVal)+'从变成了'+JSON.stringify(newVal));
+     //       //这里就需要返回一个false;
+     //        this.isUpdate = true;
+     //      }else {
+     //        this.isInitialized=true;
+     //     }
+     //   }
+     // }
+   },
+    created() {
+      this.$watch(
+        () => this.$route.params,
+        () => {
+          this.fetchData();
+        },
+        // 组件创建完后获取数据，
+        // 此时 data 已经被 observed 了
+        { immediate: true }
+      );
+      this.getDictionary();
+      this.getFork();
+      this.getTeam();
+      this.getvehicleData();
+      this.getMasterDriverData();
+    },
+    computed: {
+      ...mapGetters(['permission']),
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(',');
+      }
+    },
+
+    mounted() {
+      this.onLoad(this.page);
+    },
+    methods: {
+      //查询叉车人员
+      async getFork() {
+        let ides = '';
+        let ide = {};
+        await getListUser().then(res => {
+          console.log('res>>>', res.data.data);
+          ides = res.data.data.tenantId;
+          this.deptId = res.data.data.deptId;
+        });
+        await getPostList(ides).then(res => {
+          console.log('>>>>', res.data.data);
+          // this.forkliftData = res.data.data;
+          res.data.data.forEach(i => {
+            if (i.postName == '叉车') {
+              ide = i;
+            }
+          });
+        });
+        // console.log("ied>>>>>",ide);
+        let params = {
+          postId: ide.id, //岗位
+          deptId: this.deptId //部门
+          // roleId: '', //角色
+        };
+        getListOwn(Object.assign(params, this.query)).then(res => {
+          // console.log(".............",res.data.data);
+          let fo = [];
+          res.data.data.forEach(i => {
+            let a = {
+              dictKey: i.id,
+              dictValue: i.name
+            };
+            fo.push(a);
+          });
+          this.forkliftData = fo;
+        });
+        await this.getStorageArea();
+        await this.getTeam();
+      },
+      //查询班组
+      async getTeam() {
+        let params = this.deptId;
+        console.log("%%%%%%%%%",params);
+        getListTeamInfo(params).then(res => {
+          console.log("aaaaaaaaa",res.data.data);
+          let fo = [];
+          res.data.data.forEach(i => {
+            let a = {
+              dictKey: i.id,
+              dictValue: i.groupName
+            };
+            fo.push(a);
+          });
+          this.loaderData = fo;
+        });
+      },
+      //备货区
+      async getStorageArea() {
+        let params = this.deptId ;
+        console.log("^^^^^^^^^^^^^",params);
+        stockUpInfo(params).then(res => {
+          console.log("=========================》",res);
+          let fo = [];
+          res.data.data.forEach(i => {
+            let v = {
+              dictKey: i.id,
+              dictValue: i.headline
+            };
+            fo.push(v);
+          });
+          this.goodsAreaData = fo;
+        });
+      },
+      //查询司机信息
+      getMasterDriverData() {
+        return new Promise((rv,rev)=>{
+          getDriverList(1, 10, '').then(res => {
+            this.driverData = res.data.data.records;
+            console.log("===============>",res.data.data);
+            rv(res.data.data.records)
+          });
+        })
+      },
+      selectionChange(list) {
+        //只要这个触发就认定为该包件进行了重新勾选，不论数据是否发生变化
+        this.selectionList = list;
+        console.log(" this.selectionList = list", this.selectionList);
+        this.orderData.forEach(item=>{
+          if (item.id===this.obj.id){
+            item.isUpdate = true;
+          }
+        })
+        //这里就为当前选择的订单进行包件信息的添加
+        // this.obj.
+      },
+      selectionStockArticleChange(list) {
+        this.stockArticleList = list;
+      },
+
+
+      //查询车辆信息
+      getvehicleData() {
+        return new Promise((rv,rev)=>{
+          getVehicleList(1, 10, '').then(res => {
+            this.vehicleData = res.data.data.records;
+            console.log("^^^^^^^^^^^^^^^^",res.data.data);
+            rv(res.data.data.records)
+          });
+        })
+      },
+      fetchData() {
+        this.error = this.post = null;
+        this.loading = true;
+        if (this.$route.query.id) {
+          this.reservationIds = this.$route.query.id;
+        }
+      },
+      viewDriverInfo() {
+        console.log(this.driverInfo.length);
+        console.log(this.vehticleInfo.length);
+        if (this.driverList.length !== this.vehticleList.length) {
+          this.$message({
+            message: '司机车辆数量有误!!!',
+            type: 'warning'
+          });
+          return;
+        }
+        this.isDriverShow = true;
+      },
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {
+          });
+      },
+    onSubmitOrder() {
+      let stockup = {};
+      let tripartite = {};
+      let data = {};
+      let allocationInfo = [];
+      if (this.driverForm){
+        //这里就表示司机信息存在，那么就需要构建司机的信息
+          //自主配送数据构建
+          if (this.driverList.length !== this.vehticleList.length) {
+            this.$message({
+              message: '司机车辆数量有误!!!',
+              type: 'warning'
+            });
+            return;
+          } else {
+            let info = [];
+            for (let i = 0; i < this.driverInfo.length; i++) {
+              let obj = {};
+              obj.driver = this.driverInfo[i].name;
+              obj.driverId = this.driverInfo[i].id;
+              obj.driverPhone=this.driverInfo[i].phone;
+              obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
+              obj.vehicleId = this.vehticleInfo[i].id;
+              info.push(obj);
+              this.driverInfo[i].name;
+            }
+            allocationInfo = info;
+          }
+          data.allocationInfo = allocationInfo;
+        data.masterDriverName = this.form.masterDriverName;
+        data.masterVehicleNub = this.form.masterVehicleNub;
+      }
+      if (this.stockUpForm) {
+        let params = this.stockUpForm;
+        if (params.tripartiteSource) {
+          //三方配送数据构建
+          if (params.driverName) {
+            tripartite.driverName = params.driverName;
+          }
+          if (params.deiverPhone) {
+            tripartite.deiverPhone = params.deiverPhone;
+          }
+          if (params.vehicleNum) {
+            tripartite.vehicleNum = params.vehicleNum;
+          }
+          if (params.deliveryFee) {
+            tripartite.deliveryFee = params.deliveryFee;
+          }
+          if (params.tripartiteSource) {
+            this.tripartiteSourceData.forEach(item => {
+              if (params.tripartiteSource === item.dictValue) {
+                tripartite.distributionCompanyId = item.dictKey;
+                tripartite.distributionCompany = item.dictValue;
+              }
+            });
+          }
+          data.tripartite = tripartite;
+        }else {
+          // 自主配送
+          if (params.loader) {
+            this.loaderData.forEach(a => {
+              if (params.loader === a.dictKey) {
+                stockup.loaderName = a.dictValue;
+                stockup.loaderId = a.dictKey;
+              }
+            });
+          }
+          if (params.forklift){
+            this.forkliftData.forEach(b => {
+              if (params.forklift === b.dictKey) {
+                stockup.forkliftName = b.dictValue;
+                stockup.forkliftId = b.dictKey;
+              }
+            });
+          }
+          if (params.goodsAreaId){
+            this.goodsAreaData.forEach(c => {
+              if (params.goodsAreaId === c.dictKey) {
+                stockup.goodsAreaId = c.dictKey;
+                stockup.goodsAreaName = c.dictValue;
+              }
+            });
+          }
+          if (params.stockupDate) {
+            stockup.stockupDate = params.stockupDate;
+          }
+          if (params.remarks) {
+            stockup.remarks = params.remarks;
+          }
+          if (this.loadAndUnload.length>0){
+            stockup.loadAndUnload = this.loadAndUnload.join(',');
+          }
+          if (params.outboundDate){
+            stockup.outboundDate = params.outboundDate;
+          }
+          data.stockup = stockup;
+        }
+      }
+      data.reservationIds = this.reservationIds;
+      console.log(">>>>>>>>>>>>",data);
+      deliveryTask(data).then((res) => {
+        this.$router.push({
+          path: '/distribution/deliverylist/distributionDeliveryListmar',
+          name:'配送市配列表'
+        });
+      });
+    },
+    changeVehicle(params) {
+      console.log(params);
+      this.vehticleList = params;
+      let b = [];
+      if (params) {
+        this.vehicleData.forEach(item => {
+          this.vehticleList.forEach(p => {
+            if (p == item.id) {
+              b.push(item);
+              console.log(this.driverInfo);
+            }
+          });
+          if (params[0] === item.id) {
+            this.driverForm.masterVehicleNub = item.vehicleNub;
+          }
+        });
+        this.vehticleInfo = b;
+      }
+    },
+    changeDriver(params) {
+      this.driverList = params;
+      let a = [];
+      if (params) {
+        this.driverData.forEach(item => {
+          this.driverList.forEach(p => {
+            if (p == item.id) {
+              a.push(item);
+              console.log(this.driverInfo);
+            }
+          });
+          if (params[0] === item.id) {
+            this.driverForm.masterDriverName = item.name;
+          }
+        });
+        this.driverInfo = a;
+      }
+    },
+    //上移
+    moveUpVehictle(row) {
+      let i = 0;
+      this.vehticleInfo.forEach((item, index) => {
+        if (item.id === row.id) {
+          i = index;
+        }
+      });
+      //获取当当前选中的下标，如果下标为第一个则不能上移
+      if (i > 0) {
+        let a = this.vehticleInfo[i - 1];
+        this.vehticleInfo.splice(i - 1, 1);
+        this.vehticleInfo.splice(i, 0, a);
+      } else {
+        this.$message({
+          message: '已经是第一条，上移失败',
+          type: 'warning',
+        });
+      }
+      console.log(this.vehticleInfo);
+    },
+    handleSelect(selection, row) {
+      // 阻止全选框原有逻辑
+      this.$refs.multipleTable.clearSelection();
+      if (row) {
+        if (selection.length === 1) {
+          this.multipleSelection = row;
+          this.$refs.multipleTable.toggleRowSelection(row, true);
+        } else if (selection.length > 1) {
+          let a = {};
+          selection.forEach((s, index) => {
+            if (s.id === row.id) {
+              selection.splice(index, 1);
+              a = s;
+            }
+          });
+          this.multipleSelection = selection;
+          this.$refs.multipleTable.toggleRowSelection(a, true);
+        }
+      }
+    },
+    confirmDriver() {
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      console.log('this.adada', this.multipleSelection);
+      this.isDriverShow = false;
+      //获取到表格的行坐标
+      let a = 0;
+      this.driverInfo.forEach((item, index) => {
+        if (item.id === this.multipleSelection.id) {
+          a = index;
+        }
+      });
+      this.driverForm.masterDriverName = this.driverInfo[a].name;
+      this.driverForm.masterVehicleNub = this.vehticleInfo[a].vehicleNub;
+    },
+    // //数据字典数据获取
+    getDictionary() {
+      getDictionaryBiz('addvalue_serve_type').then(res => {
+        this.addvalueServeTypeData = res.data.data;
+      });
+      getDictionaryBiz('load_and_unload').then(res => {
+        this.loadAndUnloadData = res.data.data;
+      });
+      getDictionaryBiz('delivery_way').then(res => {
+        this.deliveryWayData = res.data.data;
+      });
+      //三方外协来源
+      getDictionaryBiz('tripartite_source').then(res => {
+        this.tripartiteSourceData = res.data.data;
+      });
+    },
+
+      ccc() {
+      if (this.deliveryListId){
+        //清空司机、车辆信息
+        this.driverForm.tripartiteSource = '';
+        this.driverForm.driverName = '';
+        this.driverForm.driverPhone = '';
+        this.driverForm.vehicleNum = '';
+        this.driverForm.deliveryFee = '';
+      }else {
+        this.loadAndUnload = [];
+        this.serveType=[];
+        this.driverForm = {};
+      }
+        this.aaa = true;
+        this.bbb = false;
+        this.stockUpForm.deliveryType="2";
+        this.stockUpForm.deliveryWay="2";
+        this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+        this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+      },
+      ddd() {
+      if (this.deliveryListId){
+        this.vehicleIds=[];
+        this.deliveryDriver=[];
+        this.driverForm.masterDriverName = '';
+        this.driverForm.masterVehicleNub = '';
+      }else {
+        this.loadAndUnload = [];
+        this.serveType=[];
+        this.driverForm={};
+      }
+        this.aaa = false;
+        this.bbb = true;
+        this.stockUpForm.deliveryType="2";
+        this.stockUpForm.deliveryWay="2";
+        this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+        this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.query={};
+      },
+
+      onLoad(page, params = {}) {
+        console.log("》》》》》》》》》》》》》》》",this.reservationIds);
+        //初始化页面数据
+        this.stockUpForm.deliveryType="2";
+        this.stockUpForm.deliveryWay="2";
+        this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+        this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+        this.stockUpForm.otherFee = 0 ;
+        if (this.reservationIds){
+         let ids =this.reservationIds;
+         getReservationAddr(ids).then(res => {
+           console.log("------------->",res);
+           const reservationData = res.data.data;
+           this.page.total = reservationData.total;
+           this.data = reservationData.records;
+           console.log('>>>>>>>>>>>', this.data);
+           this.loading = false;
+         });
+       }
+        this.loading = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.head_top {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  background-color: #ffffff;
+  // border-bottom: 1px solid rgb(228, 228, 228);
+  padding-left: 10px;
+  
+  >.buts{
+    padding: 10px 20px;
+    cursor: pointer;
+    margin-right: 10px;
+    font-size: 18px;
+    border-bottom: 4px solid #ffffff;
+    // background-color: #ffffff;
+  }
+  .check{
+    color: #D3832A;
+    border-bottom: 4px solid #D3832A;
+  }
+}
+.minaxbox{
+  display: flex;
+  flex-direction: column;
+  .tophed{
+    display: flex;
+    flex-wrap: wrap;
+
+  }
+}
+</style>
diff --git a/src/views/reservation/order_list.vue b/src/views/reservation/order_list.vue
index 2469dabc..dcc7739d 100644
--- a/src/views/reservation/order_list.vue
+++ b/src/views/reservation/order_list.vue
@@ -466,16 +466,17 @@
             checkarr: [],
             fixed: false,
             sortable: true,
-          }, {
-            prop: 'availableQuantity',
-            label: '可用数量',
-            type: 2,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
           },
+          // {
+          //   prop: 'availableQuantity',
+          //   label: '可用数量',
+          //   type: 2,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
           {
             prop: 'handQuantity',
             label: '未入库数量',
@@ -608,16 +609,16 @@
           //   fixed: false,
           //   sortable: true,
           // },
-          {
-            prop: 'typeServerName',
-            label: '服务类型',
-            type: 3,
-            values: '',
-            width: '150',
-            checkarr: [],
-            fixed: false,
-            sortable: true,
-          },
+          // {
+          //   prop: 'typeServerName',
+          //   label: '服务类型',
+          //   type: 3,
+          //   values: '',
+          //   width: '150',
+          //   checkarr: [],
+          //   fixed: false,
+          //   sortable: true,
+          // },
           {
             prop: 'customerName',
             label: '顾客名字',
@@ -920,10 +921,10 @@
         this.onLoad(this.page);
       },
       handleMoke(){
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
+        // if (this.selectionList.length === 0) {
+        //   this.$message.warning("请选择至少一条数据");
+        //   return;
+        // }
         let st = false;
         this.selectionList.some( i =>{
           if(i.stateName === "已预约"){
@@ -947,7 +948,7 @@
         // 返回false,说明全都相等
       if(!notEqualFlag){
         this.$router.push({
-          path: '/distribution/reservation/reservationFrom',
+          path: '/distribution/reservation/order_listFrom',
           query:{
             id: this.ids,
             name: '添加预约单'
diff --git a/src/views/reservation/order_listFrom.vue b/src/views/reservation/order_listFrom.vue
new file mode 100644
index 00000000..169952f0
--- /dev/null
+++ b/src/views/reservation/order_listFrom.vue
@@ -0,0 +1,1170 @@
+<template>
+    <basic-container>
+        <div class="avue-crud">
+
+            <el-form ref="form"
+                     :model="form"
+                     prop="consignee"
+                     label-width="80px"
+            :rules="reservationRules">
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="收货人:" prop="consignee" label-width="100px">
+                            <el-input v-model="form.consignee" clearable placeholder="请输入收货人"/>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="预约时间:" prop="reservationDate" label-width="100px">
+                            <el-date-picker
+                                    v-model="form.reservationDate"
+                                    type="date"
+                                    clearable
+                                    placeholder="选择日期时间">
+                            </el-date-picker>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+
+                    <el-col :span="10">
+                        <el-form-item label="收件地址:" prop="deliveryAddress" label-width="100px">
+                            <el-input v-model="form.deliveryAddress" clearable placeholder="请输入收件地址"/>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="时&emsp;&emsp;段:" prop="deliveryAddress" label-width="100px">
+                            <el-radio-group v-model="form.periodOfTime" v-for="item in this.periodOfTimeData">
+                                <el-radio
+
+                                        :label="item.dictKey"
+                                        :value="item.dictKey">{{item.dictValue}}&emsp;
+                                </el-radio>
+                            </el-radio-group>
+                            <!--                            :label="item.dictValue"-->
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+
+                <el-row>
+                    <el-col :span="10">
+                        <el-form-item label="收件人电话:" prop="deliveryPhone" label-width="100px">
+                            <el-input v-model="form.deliveryPhone" placeholder="请输入收件人电话"/>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="10">
+                        <el-form-item label="配送类型:" prop="serveType" label-width="100px">
+                            <!--                            v-for="item in this.deliveryTypeData"-->
+                            <el-radio-group v-model="form.deliveryType">
+                                <el-radio
+                                        :label="'2'"
+                                        :value="'2'">市配&emsp;
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+
+                <el-row>
+                    <!--                    <el-col :span="10">-->
+                    <!--                        <el-form-item label="备注:" prop="orderSource" label-width="100px" style="width: 100%">-->
+                    <!--                            <el-input-->
+                    <!--                                    type="textarea"-->
+                    <!--                                    :rows="1"-->
+                    <!--                                    placeholder="请输入内容"-->
+                    <!--                                    v-model="form.remarks">-->
+                    <!--                            </el-input>-->
+                    <!--                        </el-form-item>-->
+                    <!--                    </el-col>-->
+<!--                    <el-col :span="10">-->
+<!--                        <el-form-item label="代收运费:" prop="replaceFee" label-width="100px">-->
+<!--                            <el-input v-model="form.replaceFee" :disabled="true"/>-->
+<!--                        </el-form-item>-->
+<!--                    </el-col>-->
+                    <el-col :span="10">
+                        <el-form-item label="代收货款:" prop="collectionFee" label-width="100px">
+                            <el-input type="number" v-model="form.collectionFee"/>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="配送方式:" prop="serveType" label-width="100px">
+                            <!--                            v-for="item in this.deliveryWayData"-->
+                            <el-radio-group v-model="form.deliveryWay">
+                                <el-radio :label="'1'"
+                                          :value="'1'">送货&emsp;
+                                </el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+
+
+                </el-row>
+
+                <el-row>
+                    <!--                    <el-col :span="10">-->
+                    <!--                        <el-form-item label="到付运费:" prop="collectFee" label-width="100px">-->
+                    <!--                            <el-input type="number" v-model="form.collectFee" :disabled="true"/>-->
+                    <!--                        </el-form-item>-->
+                    <!--                    </el-col>-->
+
+                    <el-col :span="10">
+                        <el-form-item label="其他费用:" prop="collectFee" label-width="100px">
+                            <el-input v-model="form.otherFee" placeholder="请输入其他费用"/>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                        <el-form-item label="加&emsp;&emsp;急:" prop="deliveryAddress" label-width="100px">
+                            <el-radio-group v-model="form.isUrgent" v-for="item in this.whetherData">
+                                <el-radio
+
+                                        :label="item.dictKey"
+                                        :value="item.dictKey">{{item.dictValue}}&emsp;
+                                </el-radio>
+                            </el-radio-group>
+                            <!--                            :label="item.dictValue"-->
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="10">
+                        <el-form-item label="备注:" prop="orderSource" label-width="100px" style="width: 100%">
+                            <el-input
+                                    type="textarea"
+                                    :rows="1"
+                                    placeholder="请输入内容"
+                                    v-model="form.remarks">
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="10">
+                        <el-form-item label="增值服务类型:" prop="serveType" label-width="120px">
+                            <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">
+                                <el-checkbox :label="item.dictKey"
+                                             :value="item.dictKey">{{item.dictValue}}&emsp;
+                                </el-checkbox>
+                            </el-checkbox-group>
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+            </el-form>
+
+
+            <el-tabs type="border-card">
+                <el-tab-pane label="订单">
+                    <el-button type="primary" link @click="handleAddOrder">新 增</el-button>
+                    <el-table ref="table"
+                              v-loading="loading"
+                              :data="orderData"
+                              :height="height"
+                              style="width: 100%"
+                              :border="option.border">
+                        <el-table-column v-if="option.index" label="序号" type="index" width="80px"
+                                         align="center"></el-table-column>
+                        <template v-for="(item,index) in option.columnReservations">
+                            <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 label="包件数量" type="index" width="100px">
+                            <template #="{row}">
+                                <el-input v-model="row.reservationNum" type="number" :disabled="true"
+                                          placeholder="请输入内容"></el-input>
+                            </template>
+                        </el-table-column>
+                        <!-- 操作栏模块 -->
+                        <el-table-column prop="menu" label="操作" :width="220" align="center">
+                            <template #="{row}">
+                                <el-button type="primary" link icon="el-icon-view"
+                                           @click="viewStockArticlePackage(row)">查看包件
+                                </el-button>
+
+                                <!--                                2023 07 25 取消增值服务  -->
+                                <!--                                <el-button type="primary" link icon="el-icon-delete" @click="addvalueServe(row)">增值服务-->
+                                <!--                                </el-button>-->
+                                <el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)">移除
+                                </el-button>
+
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-tab-pane>
+
+                <el-tab-pane label="库存品">
+                    <el-button link @click="handleAddInventory">新 增</el-button>
+                    <el-table ref="table"
+                              v-loading="loading"
+                              :data="inventoryData"
+                              :height="height"
+                              style="width: 100%"
+                              :border="option.border">
+                        <!--                    <el-table-column type="selection" v-if="stockList.selection" width="55" align="center"></el-table-column>-->
+                        <el-table-column v-if="option.index" label="序号" type="index" width="80px"
+                                         align="center"></el-table-column>
+                        <template v-for="(item,index) in option.stockListColumn">
+                            <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 label="预约数量" type="index" width="100px">
+                            <template #="{row}">
+                                <el-input v-model="row.reservationNum" type="number" :min="0"></el-input>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="menu" label="操作" :width="220" align="center">
+                            <template #="{row}">
+                                <el-button type="primary" link icon="el-icon-edit" @click="removeStockList(row)">移除
+                                </el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </el-tab-pane>
+
+            </el-tabs>
+            <el-form-item style="margin-left: 45%;margin-top: 5px">
+                <el-button type="primary" icon="el-icon-circle-close" @click="onSubmit">提交(配送订单预约)</el-button>
+                <el-button icon="el-icon-circle-close" @click="$router.go(-1)">返 回</el-button>
+            </el-form-item>
+
+
+            <el-dialog
+                    v-model="orderShow"
+                    title="在库订单信息"
+                    width="100%"
+                    :model="addvalue"
+            >
+                <!--                :before-close="handleClose"-->
+                <el-form :inline="true" :model="query">
+                    <el-form-item label="订单自编号:">
+                        <el-input v-model="query.orderCode" placeholder="请输入商场名称"></el-input>
+                    </el-form-item>
+                    <el-form-item label="商场名称:">
+                        <el-input v-model="query.mallName" placeholder="请输入货物名称"></el-input>
+                    </el-form-item>
+                    <el-form-item label="货物名称:">
+                        <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>
+                    </el-form-item>
+                    <el-form-item label="品牌:">
+                        <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>
+                    </el-form-item>
+                    <el-form-item label="顾客姓名:">
+                        <el-input v-model="query.customerName" placeholder="请输入顾客姓名"></el-input>
+                    </el-form-item>
+                    <el-form-item label="顾客电话:">
+                        <el-input v-model="query.customerTelephone" placeholder="请输入顾客电话"></el-input>
+                    </el-form-item>
+
+                    <!-- 查询按钮 -->
+                    <el-form-item>
+                        <el-button type="primary" icon="el-icon-search" @click="searchStockArticle">搜 索</el-button>
+                        <el-button icon="el-icon-delete" @click="stockArticleSearchReset()">清 空</el-button>
+                    </el-form-item>
+                </el-form>
+
+
+                <el-table ref="table"
+                          v-loading="loading"
+                          @selection-change="selectionChange"
+                          :data="stockArticleInfo"
+                          :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 v-if="option.index" label="序号" type="index" width="80px"
+                                     align="center"></el-table-column>
+                    <template v-for="(item,index) in option.column">
+                        <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-form-item style="margin-left: 45%;margin-top: 5px">
+                    <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitOrder">提交(订单)</el-button>
+                    <el-button icon="el-icon-circle-close" @click="orderShow=false">返 回</el-button>
+                </el-form-item>
+            </el-dialog>
+
+
+            <el-dialog
+                    v-model="stockListShow"
+                    title="库存品信息"
+                    width="100%"
+            >
+                <!--                :before-close="handleClose"-->
+                <el-form :inline="true" :model="query">
+                    <el-form-item label="商场名称:">
+                        <el-input v-model="query.marketName" placeholder="请输入服务类型"></el-input>
+                    </el-form-item>
+                    <el-form-item label="物料名称:">
+                        <el-input v-model="query.descriptionGoods" placeholder="请输入服务类型"></el-input>
+                    </el-form-item>
+                    <el-form-item label="商场编码:">
+                        <el-input v-model="query.marketCode" placeholder="请输入服务类型"></el-input>
+                    </el-form-item>
+                    <el-form-item label="订单自编号:">
+                        <el-input v-model="query.orderCode" placeholder="请输入服务类型"></el-input>
+                    </el-form-item>
+                    <el-form-item label="品牌:">
+                        <el-input v-model="query.brand" placeholder="请输入服务类型"></el-input>
+                    </el-form-item>
+                    <!-- 查询按钮 -->
+                    <el-form-item>
+                        <el-button type="primary" icon="el-icon-search" @click="searchStockList">搜 索</el-button>
+                        <el-button icon="el-icon-delete" @click="stockListSearchReset()">清 空</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-table ref="table"
+                          v-loading="loading"
+                          @selection-change="selectionChange"
+                          :data="inventoryInfo"
+                          :height="height"
+                          style="width: 90%;height: 100%"
+                          :border="option.border">
+                    <el-table-column type="selection" v-if="option.selection" width="55"
+                                     align="center"></el-table-column>
+                    <el-table-column v-if="option.index" label="序号" type="index" width="80px"
+                                     align="center"></el-table-column>
+                    <template v-for="(item,index) in option.stockListColumn">
+                        <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 label="预约数量" type="index" width="100px">
+                        <template #="{row}">
+                            <el-input v-model="row.reservationNum" type="number" :min="0"></el-input>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-form-item style="margin-left: 45%;margin-top: 5px">
+                    <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory">提交(库存品)</el-button>
+                    <el-button icon="el-icon-circle-close" @click="stockListShow=false">返 回</el-button>
+                </el-form-item>
+            </el-dialog>
+
+
+            <el-dialog
+                    v-model="isaddvalue"
+                    title="包件信息"
+                    width="100%"
+                    :model="addvalue"
+                    :before-close="handleClose">
+                <!-- 列表模块 -->
+                <el-table ref="table" v-loading="loading"
+                          @selection-change="selectionChange"
+                          :data="packageData"
+                          :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.columnParcels">
+                        <!-- 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}">
+                            <!--              <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>
+                <el-form-item style="margin-left: 45%;margin-top: 5px">
+                    <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitPackage">提交(包件)</el-button>
+                    <el-button icon="el-icon-circle-close" @click="isaddvalue=false">返 回</el-button>
+                </el-form-item>
+            </el-dialog>
+
+            <el-dialog
+                    v-model="dialogVisible"
+                    title="增值服务"
+                    width="30%"
+                    :model="addvalue"
+                    :before-close="handleClose">
+                <el-form-item label="增值服务" prop="freightMark">
+                    <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
+                        <el-checkbox style="width: 100%;margin-bottom: 3%;"
+                                     v-for="(item,index) in addvalueServeTypeData"
+                                     :key="item.dictKey"
+                                     :label="item.dictKey"
+                        >{{item.dictValue}}
+                            <span v-if="index===0||index===6||index===2||index===4">&nbsp;件数:
+                         <el-input type="number" v-model="item.f"
+                                   :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                                   @change="textbox($event,index,1)"
+                                   style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
+                     </span>
+                            <span v-if="index===1">公里:
+                          <el-input type="primary" v-model="item.a"
+                                    :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                                    @change="textbox($event,index,2)"
+                                    style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
+                     </span>
+                            <span v-if="index===3">距离:
+                      <el-input type="number" v-model="item.b"
+                                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                                @change="textbox($event,index,3)"
+                                style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
+                     </span>
+                            <span v-if="index===5">人数:
+                      <el-input type="number" v-model="item.c"
+                                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                                @change="textbox($event,index,4)"
+                                style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
+                     </span>
+                            <span v-if="index===0">楼层:
+                      <el-input type="number" v-model="item.d"
+                                :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                                @change="textbox($event,index,5)"
+                                style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
+                     </span>
+                            <span v-if="item">预计费用:
+                        <el-input type="number" v-model="item.e"
+                                  :disabled="this.form?.freightMark?.indexOf(item.dictKey) == -1"
+                                  @change="textbox($event,index,6)"
+                                  style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
+                     </span>
+                        </el-checkbox>
+                    </el-checkbox-group>
+                </el-form-item>
+                <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="aaa">
+          确定(增值服务)
+        </el-button>
+      </span>
+                </template>
+            </el-dialog>
+        </div>
+    </basic-container>
+
+</template>
+
+
+<script>
+  import { add, getReservationInfo, remove, update } from '@/api/distribution/distributionReservation';
+  import {
+    addIncrement,
+    getStockArticleList,
+    selectStockArticleList
+  } from '@/api/distribution/distributionStockArticle';
+  import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
+  import { getInventoryList } from '@/api/distribution/distributionStockList';
+  import { getListOwn } from '@/api/distribution/distributionParcelList';
+  // import option from "@/option/distribution/distributionDelivery";
+  import option from '@/option/distribution/distributionStockArticle';
+  import { mapGetters } from 'vuex';
+  import { getDictionaryBiz } from '@/api/system/dict';
+
+  export default {
+    data() {
+      return {
+        height: 0,
+        // 弹框标题
+        title: '',
+        // 是否展示弹框
+        box: false,
+        // 是否显示查询
+        search: true,
+        // 加载中
+        loading: true,
+        // 是否为查看模式
+        view: false,
+        // 查询信息
+        query: {},
+        // 分页信息
+        page: {
+          currentPage: 1,
+          pageSize: 10,
+          total: 40
+        },
+        // 表单数据
+        form: {},
+        // 选择行
+        selectionList: [],
+        // 表单配置
+        option: option,
+        // 表单列表
+        data: [],
+        //增值服务弹窗
+        dialogVisible: false,
+        textarea: '',
+        //增值服务字典列表
+        addvalueServeTypeData: [],
+        //配送方式字典列表
+        deliveryWayData: [],
+        //配送类型字典列表
+        deliveryTypeData: [],
+        //增值服务列表
+        addvalueServeType: [],
+        //增值表单输入框对象
+        addvalue: {},
+        costList: [], //字典
+        //增值服务对象
+        addvalueObj: {},
+        //费用列表
+        feeList: [],
+        //楼层
+        floorList: [],
+        //订单行数据
+        orderInfo: {},
+        //服务类型
+        serveType: [],
+        //增加订单弹窗
+        orderShow: false,
+        //在库订单信息
+        stockArticleInfo: [],
+        //库存品信息
+        inventoryInfo: [],
+        //时段
+        periodOfTimeData: [],
+        whetherData:[],
+        //路由订单编号
+        orderIds: '',
+        //预约编号
+        reservationId: '',
+        inventoryData: [],
+        orderData: [],
+        stockListShow: false,
+        isaddvalue: false,
+        packageData: [],
+        packageList: [],
+        reservationRules: {
+          consignee: [
+            { required: true, message: '请填写收货人名称!!!', trigger: 'change' }
+          ],
+          deliveryAddress: [
+            { required: true, message: '请填写收货人地址!!!', trigger: 'blur' }
+          ],
+          deliveryPhone: [
+            { required: true, message: '请填写收货人电话!!!', trigger: 'change' }
+          ],
+          enableStatus: [
+            { required: true, message: '请选择启用状态!', trigger: 'change' }
+          ],
+        },
+      };
+    },
+    created() {
+      this.$watch(
+        () => this.$route.params,
+        () => {
+          this.fetchData();
+        },
+        // 组件创建完后获取数据，
+        // 此时 data 已经被 observed 了
+        { immediate: true }
+      );
+    },
+    mounted() {
+      this.init();
+      this.onLoad(this.page);
+      this.getDictionary();
+    },
+    computed: {
+      ...mapGetters(['permission']),
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(',');
+      }
+    },
+    methods: {
+      fetchData() {
+        this.error = this.post = null;
+        this.loading = true;
+        if (this.$route.query.id) {
+          this.orderIds = this.$route.query.id;
+        }
+        if (this.$route.query.reservationId) {
+          this.reservationId = this.$route.query.reservationId;
+        }
+      },
+      init() {
+        this.height = this.setPx(document.body.clientHeight - 340);
+      },
+      aaa() {
+        let addvalueInfos = [];
+        this.form.addvalueType.forEach((item, index) => {
+          let addvalueInfo = {};
+          addvalueInfo.addvalueId = item;
+          if (item == 1 || item == 3 || item == 5 || item == 7) {
+            addvalueInfo.number = this.costList[item];
+          }
+          if (item == 2) {
+            addvalueInfo.kilometer = this.costList[item];
+          }
+          if (item == 4) {
+            addvalueInfo.distance = this.costList[item];
+          }
+          if (item == 6) {
+            addvalueInfo.peopleNum = this.costList[item];
+          }
+          if (this.floorList.length > 1) {
+            addvalueInfo.floor = this.floorList[1];
+            this.floorList = [];
+          }
+          addvalueInfo.fee = this.feeList[item];
+          addvalueInfos.push(addvalueInfo);
+        });
+        let params = {};
+        params.id = this.orderInfo.id;
+        params.addvalue = addvalueInfos;
+        params.relatedId = 1;
+        console.log('params>>>>>>>>>>>>', params);
+        addIncrement(params).then(res => {
+          this.dialogVisible = false;
+          this.$message({
+            type: 'success',
+            message: '操作成功!'
+          });
+        });
+        this.onLoad(this.page);
+      },
+      //查询出所有的市配订单
+      handleAddOrder() {
+        console.log('$$$$$$', this.reservationId);
+        if (this.reservationId) {
+          //这里需要编辑，那么这里就需要在订单列表中回显已使用包件，禁用勾选其他预约使用的包件细信息
+
+          this.query.typeService = 2;
+          this.query.genre = '1';
+          //查询所有订单列表信息
+
+          let page = this.page;
+          let params = {};
+          selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+            console.log('$$$$$$$$>', res);
+
+            let orderData = res.data.data;
+            console.log('$$$$$$$$', orderData);
+            orderData.records.forEach((item, index) => {
+              item.reservationNum = item.handQuantity;
+              // if ()
+              //订单已预约
+              // if (item.reservationStatus !== '30' ){
+              //   a.push(item)
+              // }
+            });
+            this.page.total = orderData.total;
+            this.stockArticleInfo = orderData;
+            this.loading = false;
+            this.selectionClear();
+          });
+        } else {
+          this.query.typeService = 2;
+          this.query.genre = '1';
+          let page = this.page;
+          let params = {};
+          selectStockArticleList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+            let data = res.data.data;
+            let a = [];
+            console.log('$$$$$$$$', data);
+            data.records.forEach((item, index) => {
+              item.reservationNum = item.handQuantity;
+              //订单已预约
+              if (item.reservationStatus !== '30') {
+                a.push(item);
+              }
+            });
+            console.log('$$$$$$$$', a);
+            this.page.total = data.total;
+            this.stockArticleInfo = a;
+            this.loading = false;
+            this.selectionClear();
+          });
+          this.selectionList = [];
+        }
+
+        this.orderShow = true;
+      },
+      handleAddInventory() {
+        let page = this.page;
+        let params = {};
+        this.query.serviceType = '2';
+        getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const inventoryList = res.data.data;
+          inventoryList.records.forEach(item => {
+            item.reservationNum = '0';
+            item.applyNum = item.quantityStock - item.quantityOccupied;
+          });
+          this.page.total = inventoryList.total;
+          this.inventoryInfo = inventoryList.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+        this.query = {};
+        this.selectionList = [];
+        this.stockListShow = true;
+      },
+      handleCheckedCitiesChange(value) {
+        if (value) {
+          this.form.addvalueType = value;
+        }
+        console.log('>>>>>', this.form);
+        if (value.length < 1) {
+          this.costList = [];
+          this.costListName = [];
+        }
+        this.deliveryWayData.forEach(i => {
+          if (value.includes(i.dictKey)) {
+            console.log(i);
+            i.pitch = true;
+            this.costListName = value;
+          }
+        });
+
+      },
+      textbox(e, index, a) {
+        console.log('e,index', e, index, a);
+        if (a === 6) {
+          this.feeList[index + 1] = e;
+          return;
+        }
+        if (a === 5)
+          if (index === 0 && a === 5) {
+            this.floorList[index + 1] = e;
+            return;
+          }
+        this.costList[index + 1] = e;
+
+        //费用列表
+      },
+      //数据字典数据获取
+      getDictionary() {
+        getDictionaryBiz('addvalue_serve_type').then(res => {
+          this.addvalueServeTypeData = res.data.data;
+        });
+        getDictionaryBiz('delivery_way').then(res => {
+          this.deliveryWayData = res.data.data;
+        });
+        getDictionaryBiz('distribution_type').then(res => {
+          this.deliveryTypeData = res.data.data;
+        });
+        getDictionaryBiz('period_of_time').then(res => {
+          this.periodOfTimeData = res.data.data;
+        });
+        getDictionaryBiz('yes_no').then(res => {
+          this.whetherData = res.data.data;
+        });
+      },
+      addvalueServe(row) {
+        //查询订单的增值服务，
+        this.addvalueServeType = [];
+        this.addvalue = {};
+        this.dialogVisible = true;
+        this.costList = [];
+        this.feeList = [];
+        this.floorList = [];
+        this.orderInfo = row;
+      },
+      searchHide() {
+        this.search = !this.search;
+      },
+      searchChange() {
+        this.onLoad(this.page);
+      },
+      searchReset() {
+        this.query = {};
+        this.page.currentPage = 1;
+        this.onLoad(this.page);
+      },
+      viewStockArticlePackage(row) {
+        this.loading = true;
+        console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
+        this.isaddvalue = true;
+        getListOwn('1', '10', { stockArticleId: row.id }).then(res => {
+          const packages = res.data.data;
+          console.log('>>>>>>>', packages);
+          this.packageData = packages.records;
+          this.loading = false;
+        });
+      },
+      //搜索订单
+      searchStockArticle() {
+        let params = {};
+        let page = this.page;
+        this.query.typeService = 2;
+        this.query.genre = 1;
+        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();
+        });
+      },
+      searchStockList() {
+        let params = {};
+        let page = this.page;
+        this.query.serviceType = 2;
+        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();
+        });
+      },
+      stockArticleSearchReset() {
+        this.selectionList = [];
+        this.query = {};
+        this.handleAddOrder();
+      },
+      stockListSearchReset() {
+        this.selectionList = [];
+        this.query = {};
+        this.handleAddInventory();
+      },
+      onSubmitPackage() {
+        this.orderData.forEach(item => {
+          item.reservationNum = 0;
+          this.selectionList.forEach(list => {
+            if (item.id === list.stockArticleId) {
+              item.reservationNum += list.quantity;
+            }
+          });
+          item.packageList = this.selectionList;
+        });
+        this.isaddvalue = false;
+      },
+      onSubmit() {
+        //新增预约单
+        let orderIds = [];
+        let inventoryIds = [];
+        let inventoryList = [];
+        let stockArticleList = [];
+        let operation = true;
+        this.orderData.forEach(item => {
+          if (item.reservationNum === '0') {
+            this.$message({
+              type: 'warning',
+              message: '请选择' + item.orderCode + '包件数量!'
+            });
+            operation = false;
+          }
+          orderIds.push(item.id);
+          item.reservationNum = item.reservationNum;
+          stockArticleList.push(item);
+        });
+        this.inventoryData.forEach(item => {
+          if (item.reservationNum === '0' || item.reservationNum > item.quantityStock) {
+            this.$message({
+              type: 'warning',
+              message: '请输入' + item.orderCode + '正确数量!'
+            });
+            operation = false;
+          }
+          item.reservationNum = item.reservationNum;
+          inventoryIds.push(item.id);
+          inventoryList.push(item);
+        });
+        orderIds.join(',');
+        inventoryIds.join(',');
+        this.form.stockArticleIds = orderIds.toString();
+        this.form.inventoryIds = inventoryIds.toString();
+        this.form.inventoryList = inventoryList;
+        this.form.stockArticleList = stockArticleList;
+        this.deliveryWayData.forEach(item => {
+          if (this.form.deliveryWay === item.dictValue) {
+            this.form.deliveryWay = item.dictKey;
+          }
+        });
+        this.deliveryTypeData.forEach(item => {
+          if (this.form.deliveryType === item.dictValue) {
+            this.form.deliveryType = item.dictKey;
+          }
+        });
+        this.periodOfTimeData.forEach(item => {
+          if (this.form.periodOfTime === item.dictValue) {
+            this.form.periodOfTime = item.dictKey;
+          }
+        });
+        this.form.serveType = this.serveType.join(',');
+        //服务号
+
+        // this.form.packageList = this.packageList;
+        console.log('>>>>>>>>', this.form);
+        if (operation) {
+          if (this.reservationId) {
+            update(this.form).then(() => {
+              this.$router.go(-1);
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              });
+            });
+          } else {
+            add(this.form).then(() => {
+              this.$router.go(-1);
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              });
+            });
+          }
+        }
+      },
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {
+          });
+      },
+      removeStockArticle(row) {
+        this.orderData.forEach((item, index) => {
+          if (item.id === row.id) {
+            this.orderData.splice(index, 1);
+          }
+          console.log(item);
+        });
+        console.log('>>>>>>>>>>>>>>>row', row);
+      },
+      removeStockList(row) {
+        this.inventoryData.forEach((item, index) => {
+          if (item.id === row.id) {
+            this.inventoryData.splice(index, 1);
+          }
+          console.log(item);
+        });
+        console.log('>>>>>>>>>>>>>>>row', row);
+      },
+      handleView(row) {
+        this.title = '查看';
+        this.view = true;
+        this.box = true;
+        getDetailDelivery(row.id).then(res => {
+          this.form = res.data.data;
+        });
+      },
+      rowDel(row) {
+        this.$confirm('确定将选择数据删除?', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+          });
+      },
+      beforeClose(done) {
+        done();
+        this.form = {};
+        this.view = false;
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+
+      // 增加库存品
+      onSubmitInventory() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
+        if (this.orderData.length) {
+          this.selectionList.some(i => {
+            let a = this.inventoryData.filter((ele) => ele.id == i.id).length >= 1;
+            if (!a) {
+              this.inventoryData.push(i);
+            }
+          });
+        } else {
+          this.inventoryData = this.selectionList;
+        }
+
+        this.stockListShow = false;
+      },
+      /**
+       * 增加订单提交
+       */
+      onSubmitOrder() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
+        }
+        let a = [];
+        a = this.selectionList;
+        let b = false;
+        this.selectionList.forEach(item => {
+          a.forEach(a => {
+            if (item.customerName !== a.customerName || item.customerTelephone !== a.customerTelephone || item.customerAddress !== a.customerAddress) {
+              b = true;
+            }
+          });
+        });
+        if (b) {
+          this.$message({
+            type: 'warning',
+            message: '请选择同一顾客订单!'
+          });
+          return;
+        }
+        if (this.orderData.length >= 1) {
+          let flag = false;
+          this.selectionList.some(i => {
+            //过滤选择数据中不是同一用户的数据
+            let b = this.orderData.filter(a => {
+              return i.customerName !== a.customerName && i.customerTelephone !== a.customerTelephone && i.customerAddress !== a.customerAddress;
+            }).length >= 1;
+            console.log('>>>>>>>>>>>>>>>', b);
+            //控制选择记录是否插入订单列表中
+            let a = this.orderData.filter((ele) => ele.id == i.id).length >= 1;
+
+            if (!b) {
+              if (!a) {
+                this.orderData.push(i);
+              } else {
+                flag = true;
+              }
+            }
+          });
+          if (flag) {
+            this.$message({
+              type: 'warning',
+              message: '请选择同一顾客订单!'
+            });
+          }
+        } else {
+          this.orderData = this.selectionList;
+          let a = 0;
+          this.orderData.forEach(item => {
+            if (item.collectFee) {
+              a += parseInt(item.collectFee);
+            }
+          });
+          this.form.collectFee = a;
+        }
+        this.orderShow = false;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.query = {};
+        // this.$refs.table.clearSelection();
+      },
+      currentChange(currentPage) {
+        this.page.currentPage = currentPage;
+        this.onLoad(this.page);
+      },
+      sizeChange(pageSize) {
+        this.page.pageSize = pageSize;
+        this.onLoad(this.page);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        this.form.deliveryType = '1';
+        this.form.deliveryWay = '1';
+        this.form.periodOfTime = '3';
+        this.form.otherFee = 0;
+        this.form.replaceFee = 0;
+        this.form.collectionFee = 0;
+        this.form.isUrgent = "1";
+        this.form.reservationDate = new Date();
+        if (this.orderIds) {
+          getStockArticleList(this.orderIds).then(res => {
+            console.log(res.data.data);
+            const data = res.data.data;
+            let name = '';
+            let phone = '';
+            let address = '';
+            let typeService = '';
+            console.log('>>>>>>>>>>>>>', data);
+            for (let i = 0; i < data.length; i++) {
+              if (i === 0) {
+                name = data[0].customerName;
+                phone = data[0].customerTelephone;
+                address = data[0].customerAddress;
+                typeService = data[0].typeService.toString();
+                // typeName = data[0].typeName;
+              }
+            }
+            this.form.consignee = name;
+            this.form.deliveryPhone = phone;
+            this.form.deliveryType = typeService;
+            this.form.deliveryAddress = address;
+            this.orderData = data;
+          });
+        }
+        if (this.reservationId) {
+          getReservationInfo(this.reservationId).then(res => {
+            const reservation = res.data.data;
+            this.orderData = reservation.stockArticleList;
+            this.inventoryData = reservation.inventoryList;
+            this.inventoryData.forEach(item => {
+              item.applyNum = item.quantityStock - item.quantityOccupied;
+            });
+            this.form.deliveryType = reservation.deliveryType;
+            this.form.periodOfTime = reservation.periodOfTime;
+            if (reservation.serveType) {
+              //过滤字符串中的','
+              this.serveType = Array.from(reservation.serveType).filter(s => {
+                return s !== ',';
+              });
+            }
+            this.form = reservation;
+          });
+        } else {
+          this.form.deliveryType = '2';
+        }
+        this.loading = false;
+
+
+      }
+    }
+
+  };
+</script>
+<style>
+
+    input::-webkit-outer-spin-button,
+    input::-webkit-inner-spin-button {
+        -webkit-appearance: none;
+    }
+
+    input[type="number"] {
+        -moz-appearance: textfield;
+    }
+</style>