From a07d107b8c1f858f411a25528150e2d9b44fb41a Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Wed, 16 Aug 2023 21:50:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AE=A1=E5=88=92=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=91=88=E7=8E=B0=E3=80=81=E5=B8=82=E9=85=8D=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E7=BC=96=E8=BE=91=E6=95=B0=E6=8D=AE=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverylist/distributionDeliveryList.vue |    2 +-
 .../distributionDeliveryListdis.vue           |    2 +-
 .../distributionDeliveryListmar.vue           |    4 +-
 src/views/distribution/reservation/atlas.vue  |    1 +
 src/views/distribution/reservation/atlas1.vue |  242 +--
 .../turndelivery/deliveryDiscuss.vue          |    2 +-
 .../turndelivery/deliveryMarket.vue           | 1350 +++++++++--------
 7 files changed, 859 insertions(+), 744 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue
index b32d84a5..812f62e7 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryList.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue
@@ -52,7 +52,7 @@
           <template #default="slotProps">
             <el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
             <el-button size="small" @click="editmap(slotProps.scope)">地 图</el-button>
-            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>
+<!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
           </template>
         </tablecmt>
 <!--        <el-table ref="table" v-loading="loading"-->
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
index 85af9424..84defd72 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue
@@ -43,7 +43,7 @@
             <el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
             <el-button size="small" @click="editmap(slotProps.scope)">地 图</el-button>
             <el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>
-            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>
+<!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
           </template>
         </tablecmt>
         <!--        <el-table ref="table" v-loading="loading"-->
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index 9698769c..e6116385 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -40,8 +40,8 @@
           <template #default="slotProps">
             <el-button size="small" @click="editsolt(slotProps.scope)">查 看</el-button>
             <el-button size="small" @click="editmap(slotProps.scope)">地 图</el-button>
-            <el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>
-            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>
+<!--            <el-button size="small" @click="handleEdit(slotProps.scope)">编 辑</el-button>-->
+<!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
           </template>
         </tablecmt>
         <!--        <el-table ref="table" v-loading="loading"-->
diff --git a/src/views/distribution/reservation/atlas.vue b/src/views/distribution/reservation/atlas.vue
index 20ab7b85..5f2f4fc4 100644
--- a/src/views/distribution/reservation/atlas.vue
+++ b/src/views/distribution/reservation/atlas.vue
@@ -41,6 +41,7 @@ export default {
       type:true,
     }
   },
+
   mounted() {
     let router = useRouter();
     let type =router.currentRoute.value.query.type
diff --git a/src/views/distribution/reservation/atlas1.vue b/src/views/distribution/reservation/atlas1.vue
index 99c4ce1b..4dc372db 100644
--- a/src/views/distribution/reservation/atlas1.vue
+++ b/src/views/distribution/reservation/atlas1.vue
@@ -1,115 +1,147 @@
 <template>
-  <div class="bmap" id="container" style="float: left"></div>
-  <div
-    style="
-      border: 1px solid pink;
-      margin-left: 5px;
-      height: 600px;
-      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-    "
-  >
-    <!--            @change="handleCheckedCitiesChange"-->
-    <el-checkbox-group v-model="reservationIds">
-      <el-col v-for="(item, index) in reservationData">
-        <el-checkbox :label="item.id" :key="item.id"
-          >{{ item.consignee }}&emsp;{{ item.deliveryAddress }}&emsp;{{
-            item.deliveryPhone
-          }}</el-checkbox
-        >
-      </el-col>
-    </el-checkbox-group>
-  </div>
-
-  <div style="margin-left: 40%; margin-top: 5%; float: bottom">
-    <el-button icon="el-icon-circle-close" @click="back">返 回</el-button>
-  </div>
+    <div class="bmap" id="container" ></div>
+<!--    <div-->
+<!--            style="-->
+<!--      border: 1px solid pink;-->
+<!--      margin-left: 5px;-->
+<!--      height: 600px;-->
+<!--      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);-->
+<!--    "-->
+<!--    >-->
+<!--        &lt;!&ndash;            @change="handleCheckedCitiesChange"&ndash;&gt;-->
+<!--        <el-checkbox-group v-model="reservationIds">-->
+<!--            <el-col v-for="(item, index) in reservationData">-->
+<!--                <el-checkbox :label="item.id" :key="item.id"-->
+<!--                >{{ item.consignee }}&emsp;{{ item.deliveryAddress }}&emsp;{{-->
+<!--                    item.deliveryPhone-->
+<!--                    }}-->
+<!--                </el-checkbox-->
+<!--                >-->
+<!--            </el-col>-->
+<!--        </el-checkbox-group>-->
+<!--    </div>-->
+
+    <div style="margin-left: 50%; margin-top: 5%; float: bottom">
+        <el-button icon="el-icon-circle-close" @click="back">返 回</el-button>
+    </div>
 </template>
 
 <script setup>
-import { useStore } from 'vuex';
-import { getReservationAddr } from '@/api/distribution/distributionReservation';
-import { getDictionaryBiz } from '@/api/system/dict';
-import { selectStockArticleAtlasInfo} from '@/api/distribution/distributionDeliveryList'
-import { onMounted, reactive, toRefs, watchEffect } from 'vue';
-import { useRouter } from 'vue-router';
-let router = useRouter();
-let details = reactive({
-  name: 'BmapDemo',
-  item: null,
-  error: null,
-  addressList: [],
-  reservationData: [],
-  reservationIds: [],
-  mapLoc: null,
-});
-onMounted(() => {
-  details.item = JSON.parse(router.currentRoute.value.query.item);
-  console.log("details.item.id------------->",details.item.id);
-  selectStockArticleAtlasInfo(details.item.id).then(res=>{
-    console.log("-------------->",res);
-  })
-  console.log("------------->",details.item);
-  setTimeout(() => {
-    init();
-  }, 1500);
-  // setTimeout(()=>{
-  //   details.mapLoc.clearOverlays();
-
-  // },9500)
-});
-
-function init() {
-  details.mapLoc = new BMapGL.Map('container'); // 创建地图实例
-  let point = new BMapGL.Point(116.404, 39.915); // 创建点坐标
-  details.mapLoc.centerAndZoom(point, 12);
-  details.mapLoc.enableScrollWheelZoom(true);
-  // maplabel()
-  if (details.mapLoc) {
-    details.mapLoc.clearOverlays(); //清除地图的label
+  import { useStore } from 'vuex';
+  import { getReservationAddr } from '@/api/distribution/distributionReservation';
+  import { getDictionaryBiz } from '@/api/system/dict';
+  import { selectStockArticleAtlasInfo } from '@/api/distribution/distributionDeliveryList';
+  import { onMounted, reactive, toRefs, createApp } from 'vue';
+  import { useRouter } from 'vue-router';
+  import { ref, watch } from "vue"
+
+
+  let router = useRouter();
+  let details = reactive({
+    name: 'BmapDemo',
+    item: null,
+    error: null,
+    addressList: [],
+    reservationData: [],
+    reservationIds: [],
+    mapLoc: null
+  });
+
+
+  onMounted(() => {
+    details.item = JSON.parse(router.currentRoute.value.query.item);
+
+    console.log('details.item.id------------->', details.item.id);
+
+    watch(details.item.id, (newValue, oldValue) => {
+      console.log("item变了", newValue, oldValue);
+      a(details.item);
+    },{immediate:true});
+    console.log('------------->', details.item);
+    // setTimeout(()=>{
+    //   details.mapLoc.clearOverlays();
+
+    // },9500)
+  });
+
+
+
+  function a(data) {
+    selectStockArticleAtlasInfo(data.id).then(res => {
+      const data = res.data.data;
+      console.log('res------------->', data);
+      setTimeout(() => {
+        init(data);
+      }, 1500);
+    });
   }
-  maplabel('四川成都龙泉驿区','展示的内容', 0);
-}
-function maplabel(address,contents, index) {
-  let myGeo = new BMapGL.Geocoder();
-  myGeo.getPoint(address, function (point) {
-    if (point) {
-      console.log(point, '---------------');
-      if (index == 0) {
-        details.mapLoc.centerAndZoom(point, 12);
-      }
-      let content = contents;
-      let label = new BMapGL.Label(content, {
-        // 创建文本标注
-        position: point,
-        offset: new BMapGL.Size(10, 20),
-      });
-      details.mapLoc.addOverlay(label); // 将标注添加到地图中
-      label.setStyle({
-        // 设置label的样式
-        color: '#000',
-        fontSize: '10px',
-        border: '1px solid #1E90FF',
-        borderRadius: '20px',
-        padding: '5px 10px',
-      });
-      console.log(label, '---------------');
-    } else {
-      // alert('您选择的地址没有解析到结果！');
-      console.log(point);
-      console.log('您选择的地址没有解析到结果！');
+
+
+
+  function init(data) {
+    details.mapLoc = new BMapGL.Map('container'); // 创建地图实例
+    let point = new BMapGL.Point(116.404, 39.915); // 创建点坐标
+    details.mapLoc.centerAndZoom(point, 12);
+    details.mapLoc.enableScrollWheelZoom(true);
+    // maplabel()
+    if (details.mapLoc) {
+      details.mapLoc.clearOverlays(); //清除地图的label
     }
-  });
-}
-function back() {
-  router.back(-1);
-}
-const { reservationIds }=toRefs(details)
+    let a = data;
+    a.forEach((item,index)=>{
+      console.log('item------------->', item);
+
+      maplabel(item.customerAddress, item.customerName+"--"+item.customerAddress+"--"+item.customerTelephone, index);
+
+      // maplabel('中国四川省成都市简阳市石桥镇简阳市石桥镇红星美凯龙雄州商场-1-26-154', '周娅', 0);
+    })
+  }
+
+  function maplabel(address, contents, index) {
+    let myGeo = new BMapGL.Geocoder();
+    myGeo.getPoint(address, function(point) {
+      if (point) {
+        console.log(point, '---------------');
+        if (index == 0) {
+          details.mapLoc.centerAndZoom(point, 12);
+        }
+        let content = contents;
+        let label = new BMapGL.Label(content, {
+          // 创建文本标注
+          position: point,
+          offset: new BMapGL.Size(10, 20)
+        });
+        details.mapLoc.addOverlay(label); // 将标注添加到地图中
+        label.setStyle({
+          // 设置label的样式
+          color: '#000',
+          fontSize: '10px',
+          border: '1px solid #1E90FF',
+          borderRadius: '20px',
+          padding: '5px 10px'
+        });
+        console.log(label, '---------------');
+      } else {
+        // alert('您选择的地址没有解析到结果！');
+        console.log(point);
+        console.log('您选择的地址没有解析到结果！');
+      }
+    });
+  }
+
+  function back() {
+
+    router.back(-1);
+  }
+
+  const { reservationIds } = toRefs(details);
 </script>
 
 <style scoped>
-.bmap {
-  width: 800px;
-  height: 600px;
-  border: 1px solid pink;
-}
+    .bmap {
+      margin-top: 2%;
+        width: 1800px;
+        height: 600px;
+        border: 1px solid pink;
+    }
 </style>
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 65176792..0574a3a8 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -1479,7 +1479,7 @@
               let data = res.data.data;
               Object.assign(this.stockUpForm,data.reservationInfo)
               Object.assign(this.stockUpForm,data.stockupInfo)
-              this.stockUpForm.deliveryType = '10';
+              this.stockUpForm.deliveryType = '1';
               this.stockUpForm.deliveryWay = data.reservationInfo.deliveryWay;
               this.serveType = data.reservationInfo.serveType.split(",");
               if (data.stockupInfo){
diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue
index 46f94c7c..99ece945 100644
--- a/src/views/distribution/turndelivery/deliveryMarket.vue
+++ b/src/views/distribution/turndelivery/deliveryMarket.vue
@@ -1,56 +1,56 @@
 <template>
-  <div class="head_top">
-    <div @click="ccc" :class="aaa?'buts check':'buts'">
-      自主配送
+    <div class="head_top">
+        <div @click="ccc" :class="aaa?'buts check':'buts'">
+            自主配送
+        </div>
+        <div @click="ddd" :class="bbb?'buts check':'buts'">
+            外协
+        </div>
     </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"
+    <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">
+                                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>
@@ -59,276 +59,284 @@
               <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>
+                </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="waixieForm" label-width="100px" style="margin: 3px">
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item label="外协来源:" prop="goodsShelfId">
+                        <el-select filterable v-model="waixieForm.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="waixieForm.driverName" placeholder="请输入司机名称"></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="司机电话:" prop="goodsShelfId">
+                        <el-input v-model="waixieForm.driverPhone" placeholder="请输入司机电话"></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="车辆车牌:" prop="goodsShelfId">
+                        <el-input v-model="waixieForm.vehicleNum" placeholder="请输入本次费用"></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="配送费用:" prop="goodsShelfId">
+                        <el-input v-model="waixieForm.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" type="datetime" placeholder="请选择配车时间">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="配车时间:" prop="taskTime" 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="form.taskTime" type="datetime" placeholder="请选择配车时间">
+                        </el-date-picker>
+                    </el-form-item>
+                </el-col>
 
-  <div style="margin: 2%;background-color: #ffffff;padding: 20px;box-sizing: border-box;" v-if="bbb">
-    <el-form ref="form" :model="waixieForm" label-width="100px" style="margin: 3px">
-      <el-row>
-        <el-col :span="6">
-          <el-form-item label="外协来源:" prop="goodsShelfId">
-            <el-select filterable v-model="waixieForm.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="waixieForm.driverName" placeholder="请输入司机名称"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="司机电话:" prop="goodsShelfId">
-            <el-input v-model="waixieForm.driverPhone" placeholder="请输入司机电话"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="车辆车牌:" prop="goodsShelfId">
-            <el-input v-model="waixieForm.vehicleNum" placeholder="请输入本次费用"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="配送费用:" prop="goodsShelfId">
-            <el-input v-model="waixieForm.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"   type="datetime" placeholder="请选择配车时间">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="配车时间:" prop="taskTime" 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="form.taskTime"  type="datetime" placeholder="请选择配车时间">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
+            </el-row>
 
-      </el-row>
+            <el-row>
+                <el-col :span="12">
+                    <el-form-item label="其他费用:" prop="collectFee" label-width="100px">
+                        <el-input v-model="stockUpForm.otherFee" placeholder="请输入其他费用"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <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>
 
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="其他费用:" prop="collectFee" label-width="100px">
-            <el-input v-model="stockUpForm.otherFee" placeholder="请输入其他费用" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <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-column prop="menu" label="操作" :width="220" align="center" v-if="isoperation">
+                <template #="{row}">
+                  <el-button type="primary" link icon="el-icon-edit" @click="removeStockArticle(row)">移除
+                  </el-button>
 
-        <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>
+                </template>
+              </el-table-column>
+                <!-- 操作栏模块 -->
+            </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-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 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 }">
+                        >
+                        </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>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+        </div>
 
-    <el-form-item style="margin-left: 45%; margin-top: 10px">
+        <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>
+        </el-form-item>
+    </el-dialog>
 </template>
 
 <script>
@@ -353,9 +361,9 @@
         loading: false,
         error: null,
         form: {},
-        driverForm:{},
-        stockUpForm:{},
-        waixieForm:{},
+        driverForm: {},
+        stockUpForm: {},
+        waixieForm: {},
         data: [],
         // 分页信息
         page: {
@@ -364,7 +372,7 @@
           total: 40
         },
 
-        query:{},
+        query: {},
         aaa: true,
         bbb: false,
         option: option,
@@ -418,61 +426,62 @@
         //
         multipleTable: {},
         stockArticleTable: [],
-        stockArticleList:[],
+        stockArticleList: [],
         driverList: [],
         vehticleList: [],
-        packageList:[],
+        packageList: [],
         //订单数据
-        orderData:[],
+        orderData: [],
         //库存品数据
-        inventoryData:[],
+        inventoryData: [],
         //
-        selectionList:[],
+        selectionList: [],
         addvalue: {},
         //订单弹窗
-        orderShow:false,
+        orderShow: false,
         //库存品弹窗
-        stockListShow:false,
+        stockListShow: false,
         //在库订单数据
-        stockArticleInfo:[],
+        stockArticleInfo: [],
         //库存品信息列表
-        inventoryInfo:[],
+        inventoryInfo: [],
         //包件弹窗控制
-        isShowPackage:false,
+        isShowPackage: false,
         //包件数据
-        packageData:[],
+        packageData: [],
         //班组职能
-        loadAndUnload:[],
+        loadAndUnload: [],
         //服务类型
-        serveType:[],
+        serveType: [],
         //外协数据来源
-        tripartiteSourceData:[],
-        deliveryListId:'',
-        isDisable:false,
-        checked:true,
-        reservationIds:'',
-        obj:{
-          type:Object,
-          default:()=>({})
+        tripartiteSourceData: [],
+        deliveryListId: '',
+        isDisable: false,
+        checked: true,
+        reservationIds: '',
+        obj: {
+          type: Object,
+          default: () => ({})
         },
-        isInitialized:false,
-        isUpdate:false,
+        isInitialized: false,
+        isUpdate: false,
+        isoperation: 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;
-     //     }
-     //   }
-     // }
-   },
+    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,
@@ -546,9 +555,9 @@
       //查询班组
       async getTeam() {
         let params = this.deptId;
-        console.log("%%%%%%%%%",params);
+        console.log('%%%%%%%%%', params);
         getListTeamInfo(params).then(res => {
-          console.log("aaaaaaaaa",res.data.data);
+          console.log('aaaaaaaaa', res.data.data);
           let fo = [];
           res.data.data.forEach(i => {
             let a = {
@@ -562,10 +571,10 @@
       },
       //备货区
       async getStorageArea() {
-        let params = this.deptId ;
-        console.log("^^^^^^^^^^^^^",params);
+        let params = this.deptId;
+        console.log('^^^^^^^^^^^^^', params);
         stockUpInfo(params).then(res => {
-          console.log("=========================》",res);
+          console.log('=========================》', res);
           let fo = [];
           res.data.data.forEach(i => {
             let v = {
@@ -579,23 +588,23 @@
       },
       //查询司机信息
       getMasterDriverData() {
-        return new Promise((rv,rev)=>{
+        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)
+            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){
+        console.log(' this.selectionList = list', this.selectionList);
+        this.orderData.forEach(item => {
+          if (item.id === this.obj.id) {
             item.isUpdate = true;
           }
-        })
+        });
         //这里就为当前选择的订单进行包件信息的添加
         // this.obj.
       },
@@ -606,18 +615,18 @@
 
       //查询车辆信息
       getvehicleData() {
-        return new Promise((rv,rev)=>{
+        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)
+            console.log('^^^^^^^^^^^^^^^^', res.data.data);
+            rv(res.data.data.records);
           });
-        })
+        });
       },
       fetchData() {
         this.error = this.post = null;
         this.loading = true;
-        console.log("this.$route.query",this.$route.query);
+        console.log('this.$route.query', this.$route.query);
         if (this.$route.query.id) {
           this.reservationIds = this.$route.query.id;
         }
@@ -626,6 +635,17 @@
         }
 
       },
+      removeStockArticle(row){
+        if (this.data.length===1){
+          this.$message({
+            message: '无法进行预约任务取消!!!',
+            type: 'warning'
+          });
+          return;
+        }
+
+        console.log("row------------->",row);
+      },
       viewDriverInfo() {
         console.log(this.driverInfo.length);
         console.log(this.vehticleInfo.length);
@@ -646,13 +666,13 @@
           .catch(_ => {
           });
       },
-    onSubmitOrder() {
-      let stockup = {};
-      let tripartite = {};
-      let data = {};
-      let allocationInfo = [];
-      if (this.driverForm){
-        //这里就表示司机信息存在，那么就需要构建司机的信息
+      onSubmitOrder() {
+        let stockup = {};
+        let tripartite = {};
+        let data = {};
+        let allocationInfo = [];
+        if (this.driverForm) {
+          //这里就表示司机信息存在，那么就需要构建司机的信息
           //自主配送数据构建
           if (this.driverList.length !== this.vehticleList.length) {
             this.$message({
@@ -666,7 +686,7 @@
               let obj = {};
               obj.driver = this.driverInfo[i].name;
               obj.driverId = this.driverInfo[i].id;
-              obj.driverPhone=this.driverInfo[i].phone;
+              obj.driverPhone = this.driverInfo[i].phone;
               obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
               obj.vehicleId = this.vehticleInfo[i].id;
               info.push(obj);
@@ -675,316 +695,378 @@
             allocationInfo = info;
           }
           data.allocationInfo = allocationInfo;
-        data.masterDriverName = this.driverForm.masterDriverName;
-        data.masterVehicleNub = this.driverForm.masterVehicleNub;
-      }
-      if (this.waixieForm.tripartiteSource){
-        tripartite = this.waixieForm;
-        data.tripartite = tripartite;
-      }
-      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;
+          data.masterDriverName = this.driverForm.masterDriverName;
+          data.masterVehicleNub = this.driverForm.masterVehicleNub;
+        }
+        if (this.waixieForm.tripartiteSource) {
+          tripartite = this.waixieForm;
+          data.tripartite = tripartite;
+        }
+        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;
           }
-          if (params.deliveryFee) {
-            tripartite.deliveryFee = params.deliveryFee;
+          if (this.form.taskTime) {
+            data.taskTime = this.form.taskTime;
           }
-          if (params.tripartiteSource) {
-            this.tripartiteSourceData.forEach(item => {
-              if (params.tripartiteSource === item.dictValue) {
-                tripartite.distributionCompanyId = item.dictKey;
-                tripartite.distributionCompany = item.dictValue;
-              }
+        }
+        console.log('this.data------------>', this.data);
+        if (!this.deliveryListId) {
+          data.reservationIds = this.reservationIds;
+          console.log('>>>>>>>>>>>>', data);
+          deliveryTask(data).then((res) => {
+            this.$router.push({
+              path: '/distribution/deliverylist/distributionDeliveryListmar',
+              name: '配送市配列表'
             });
-          }
-          data.tripartite = tripartite;
-        }else {
-          // 自主配送
-          if (params.loader) {
-            this.loaderData.forEach(a => {
-              if (params.loader === a.dictKey) {
-                stockup.loaderName = a.dictValue;
-                stockup.loaderId = a.dictKey;
+          });
+        } else {
+          data.reservationInfos =this.data ;
+          console.log('>>>>>>>>>>>>', data);
+
+          console.log('-------------》', '修改提交');
+        }
+      },
+      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.forklift){
-            this.forkliftData.forEach(b => {
-              if (params.forklift === b.dictKey) {
-                stockup.forkliftName = b.dictValue;
-                stockup.forkliftId = b.dictKey;
+            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 (params.goodsAreaId){
-            this.goodsAreaData.forEach(c => {
-              if (params.goodsAreaId === c.dictKey) {
-                stockup.goodsAreaId = c.dictKey;
-                stockup.goodsAreaName = c.dictValue;
+        });
+        //获取当当前选中的下标，如果下标为第一个则不能上移
+        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);
           }
-          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;
         }
-        if (this.form.taskTime){
-          data.taskTime = this.form.taskTime;
+      },
+      confirmDriver() {
+        if (this.multipleSelection.length === 0) {
+          this.$message.warning('请选择至少一条数据');
+          return;
         }
-      }
-      data.reservationIds = this.reservationIds;
-      console.log("this.data------------>",this.data);
-      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;
+        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.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.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;
         });
-        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',
+        getDictionaryBiz('load_and_unload').then(res => {
+          this.loadAndUnloadData = res.data.data;
         });
-      }
-      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;
-      });
-    },
+        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.waixieForm = {};
-      }
+        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.waixieForm = {};
+        }
         this.aaa = true;
         this.bbb = false;
-        this.stockUpForm.deliveryType="2";
-        this.stockUpForm.deliveryWay="2";
+        this.stockUpForm.deliveryType = '2';
+        this.stockUpForm.deliveryWay = '2';
         this.stockUpForm.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
         this.form.taskTime = 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.waixieForm={};
-      }
+        if (this.deliveryListId) {
+          this.vehicleIds = [];
+          this.deliveryDriver = [];
+          this.driverForm.masterDriverName = '';
+          this.driverForm.masterVehicleNub = '';
+        } else {
+          this.loadAndUnload = [];
+          this.serveType = [];
+          this.driverForm = {};
+          this.waixieForm = {};
+        }
         this.aaa = false;
         this.bbb = true;
-        this.stockUpForm.deliveryType="2";
-        this.stockUpForm.deliveryWay="2";
+        this.stockUpForm.deliveryType = '2';
+        this.stockUpForm.deliveryWay = '2';
         this.form.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
         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={};
+        this.query = {};
       },
 
       onLoad(page, params = {}) {
-
         //初始化页面数据
-        this.stockUpForm.deliveryType="2";
-        this.stockUpForm.deliveryWay="2";
+        this.stockUpForm.deliveryType = '2';
+        this.stockUpForm.deliveryWay = '2';
         this.stockUpForm.stockupDate = new Date();
         this.form.taskTime = new Date();
         this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
-        this.stockUpForm.otherFee = 0 ;
-        this.loadAndUnload = ["1","2"] ;
-        if (this.reservationIds){
-          console.log("》》》》》》》》》》》》》》》",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;
-         });
-       }
-        if (this.deliveryListId){
-          console.log("<<<<<<<<<<",this.deliveryListId);
+        this.stockUpForm.otherFee = 0;
+        this.loadAndUnload = ['1', '2'];
+        if (this.reservationIds) {
+          this.isoperation = false;
+          console.log('》》》》》》》》》》》》》》》', 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;
+          });
+        }
+        if (this.deliveryListId) {
+          this.isoperation = true;
+          console.log('<<<<<<<<<<', this.deliveryListId);
 
           //市配计划编辑回显
-          getMarketDeliveryList(this.deliveryListId).then(res=>{
-            console.log(res.data.data);
-          })
+          getMarketDeliveryList(this.deliveryListId).then(async res => {
+            console.log('--------------->', res.data.data);
+            const deliveryData = res.data.data;
+            this.stockUpForm.outboundDate = deliveryData.stockupInfo.outboundDate;
+            this.stockUpForm.taskTime = deliveryData.stockupInfo.taskTime;
+            this.stockUpForm.goodsAreaId = deliveryData.stockupInfo.goodsAreaId;
+            this.stockUpForm.forklift = deliveryData.stockupInfo.forkliftId;
+            this.stockUpForm.loader = deliveryData.stockupInfo.loaderId;
+            this.stockUpForm.taskTime = deliveryData.taskTime;
+            console.log('reservationInfo--------------->', res.data.data.reservationInfo);
+            this.data = res.data.data.reservationInfos;
+            if (deliveryData.kind === '1') {
+              //自主配送
+              let self = deliveryData.deliverySelfVO;
+              let vehicle = await this.getvehicleData();
+              console.log('___________________-->', vehicle);
+              let driver = await this.getMasterDriverData();
+              let a = [];
+              let b = [];
+              let vehicleInfo = [];
+              vehicle.forEach(item => {
+                self.forEach(s => {
+                  if (item.id === s.vehicleId) {
+                    a.push(s.vehicleId);
+                    vehicleInfo.push(item);
+                  }
+                  if (s.isMaster === 2) {
+                    this.driverForm.masterVehicleNub = s.vehicleNub;
+                  }
+                });
+              });
+              this.vehticleList = a;
+              this.vehicleIds = a;
+              console.log(' this.vehicleIds', this.vehicleIds);
+              this.vehticleInfo = vehicleInfo;
+              let driverInfo = [];
+              driver.forEach(item => {
+                self.forEach(s => {
+                  if (item.id === s.driverId) {
+                    b.push(s.driverId);
+                    driverInfo.push(item);
+                  }
+                  if (s.isMaster === 2) {
+                    this.driverForm.masterDriverName = s.driverName;
+                  }
+                });
+              });
+              this.deliveryDriver = b;
+              this.driverList = b;
+              this.driverInfo = driverInfo;
+            } else {
+
+            }
+          });
         }
         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;
+    .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>