修改地图，配送编辑

src/api/distribution/distributionDeliveryList.js

@@ -162,6 +162,33 @@ export const updateDeliveryList = (data) => {
     data: data
   })
 }
+/**
+ * 修改配送计划
+ * @param data
+ * @returns {AxiosPromise}
+ */
+export const updateMarketDelivery = (data) => {
+  return request({
+    url: '/api/logpm-distribution/deliveryList/updateMarketDelivery',
+    method: 'put',
+    data: data
+  })
+}
+
+/**
+ * 查询配送任务订单地图信息
+ * @param data
+ * @returns {AxiosPromise}
+ */
+export const selectStockArticleAtlasInfo = (id) => {
+  return request({
+    url: '/api/logpm-distribution/deliveryList/selectStockArticleAtlasInfo',
+    method: 'get',
+    params: {
+      id,
+    }
+  })
+}
 
 
 

src/api/distribution/distributionStockArticle.js

@@ -196,5 +196,16 @@ export const selectStockArticleInfoList = (current, size, params) => {
   })
 }
 
+export const selectUpdateAvailableStockArticle = (id) => {
+  return request({
+    url: '/api/logpm-distribution/reservation/selectUpdateAvailableStockArticle',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+
 
 

src/router/views/index.js

@@ -417,12 +417,25 @@ export default [
     children: [
       {
         path: '/distribution/reservation/atlas',
-        name: '地图展示',
+        name: '市配地图展示',
         id:'id',
         component: () => import('@/views/distribution/reservation/atlas.vue'),
       },
     ],
   },
+  {
+    path: '/distribution/reservation/atlas1',
+    component: Layout,
+    redirect: '/distribution/reservation/atlas1',
+    children: [
+      {
+        path: '/distribution/reservation/atlas1',
+        name: '配送地图展示',
+        id:'id',
+        component: () => import('@/views/distribution/reservation/atlas1.vue'),
+      },
+    ],
+  },
   {
     path: '/distribution/reservation/reservationDetails',
     component: Layout,

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -535,9 +535,9 @@ export default {
       const { row } = scope;
       console.log("row>>>>>>xxxx",row);
       this.$router.push({
-        path: '/distribution/reservation/atlas',
+        path: '/distribution/reservation/atlas1',
         query: {
-          id: row.reservationId,
+          id: JSON.stringify(row),
           type:'2'
         }
       });

src/views/distribution/reservation/atlas1.vue

@@ -0,0 +1,109 @@
+<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>
+</template>
+
+<script setup>
+  import { useStore } from 'vuex';
+  import { getReservationAddr } from '@/api/distribution/distributionReservation';
+  import { getDictionaryBiz } from '@/api/system/dict';
+  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);
+    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
+    }
+    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 back() {
+    router.back(-1);
+  }
+  const { reservationIds }=toRefs(details)
+</script>
+
+<style scoped>
+    .bmap {
+        width: 800px;
+        height: 600px;
+        border: 1px solid pink;
+    }
+</style>

src/views/distribution/reservation/reservationFrom.vue

@@ -472,7 +472,8 @@
   import {
     getStockArticleList,
     selectStockArticleList,
-    selectStockArticleInfoList
+    selectStockArticleInfoList,
+    selectUpdateAvailableStockArticle
   } from '@/api/distribution/distributionStockArticle';
   import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
   import { addIncrement } from '@/api/distribution/distributionStockArticle';
@@ -656,16 +657,19 @@
       //查询出所有的市配订单
       handleAddOrder() {
         this.loading = true;
-
         console.log('$$$$$$', this.orderData);
         this.query.typeService = 2;
         this.query.genre = '1';
         const params = {};
         const page = this.page;
-        selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => {
+        if (this.reservationId){
+          console.log("------------>",'预约编辑');
+          //编辑和新增不一样的处理方式
+          //这里需要查询出未被预约的订单和该预约自己本身的订单
+          selectUpdateAvailableStockArticle(this.reservationId).then(res=>{
             console.log('res------------>', res);
             const data = res.data.data;
-         this.stockArticleInfo =  data.records;
+            this.stockArticleInfo =  data
             this.stockArticleInfo.forEach((item, index) => {
               //检查订单是否冻结
               this.checkOrder(item, index);
@@ -681,7 +685,32 @@
                 this.orderList = [];
               }
             });
+          })
+
+        }else {
+          selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( res => {
+            console.log('res------------>', res);
+            const data = res.data.data;
+            this.stockArticleInfo =  data.records;
+            this.stockArticleInfo.forEach((item, index) => {
+              //检查订单是否冻结
+              this.checkOrder(item, index);
+              // if (this.orderData) {
+              //   this.orderData.forEach(o => {
+              //     if (o.id === item.id) {
+              //       this.$nextTick(() => {
+              //         this.$refs.orderList.toggleRowSelection(this.stockArticleInfo[index], true);
+              //       });
+              //     }
+              //   });
+              // }else {
+              //   this.orderList = [];
+              // }
+            });
+            this.orderList = [];
+
           });
+        }
         this.loading = false;
         console.log("this.stockArticleInfo------------->",this.stockArticleInfo);
         // if (this.reservationId) {
@@ -1192,24 +1221,21 @@
             return;
           }
         }
-        const data = this.orderList;
+        this.orderData = this.orderList;
         let info = [];
-        if (this.orderData){
+        // if (this.orderData){
-          let a = this.orderData;
+        //   let a = this.orderData;
-          data.forEach(item=>{
+        //   data.forEach(item=>{
-            a.forEach(order=>{
+        //     a.forEach(order=>{
-              if (item.id === order.id){
+        //       if (item.id === order.id){
-                console.log("order----------------->",order);
+                console.log("orderData----------------->",this.orderData);
-                item = order;
+        //         item = order;
-              }
+        //       }
-            })
+        //     })
-            info.push(item);
+        //     info.push(item);
-          })
+        //   })
-        }
+        // }
-        console.log("orderList------------------->",this.orderList);
+        // this.orderData = info;
-        console.log("list------------------->",list);
-        console.log("orderData------------------->",this.orderData);
-        this.orderData = info;
         this.orderShow = false;
       },
       selectionClear() {

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -1447,6 +1447,7 @@
         this.query.genre = "1";
         const page = this.page;
         let params = {};
+
          console.log("------------->",this.query);
          selectStockArticleInfoList(page.currentPage,page.pageSize,Object.assign(params,this.query)).then(res=>{
           console.log(res.data.data);

src/views/distribution/turndelivery/deliveryMarket.vue

@@ -201,7 +201,7 @@
             <!--                            value-format="YYYY-MM-DD HH:mm:ss"-->
             <!--            >-->
             <!--            </el-date-picker>-->
-            <el-date-picker v-model="form.taskTime"  type="datetime" placeholder="请选择配车时间">
+            <el-date-picker v-model="stockUpForm.taskTime"  type="datetime" placeholder="请选择配车时间">
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -336,7 +336,7 @@
   import option from '@/option/distribution/distributionReservation';
   import { getListTeamInfo } from '@/api/basicdata/basicdataTeamGroup';
   import { deliveryTask, getReservationAddr } from '@/api/distribution/distributionReservation';
-  import { getMarketDeliveryList } from '@/api/distribution/distributionDeliveryList';
+  import { getMarketDeliveryList,updateMarketDelivery } from '@/api/distribution/distributionDeliveryList';
   import { getListUser } from '@/api/distribution/distributionStockup';
   import { getPostList } from '@/api/system/post';
   import { getListOwn } from '@/api/system/user';
@@ -617,14 +617,33 @@
       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;
         }
         if (this.$route.query.deliveryId) {
           this.deliveryListId = this.$route.query.deliveryId;
         }
+        this.loading = false;
+
 
+      },
+      removeStockArticle(row){
+        if (this.data.length===1){
+          this.$message({
+            message: '无法进行预约任务取消!!!',
+            type: 'warning'
+          });
+          return;
+        }
+        let data = this.data;
+        data.forEach((item,index)=>{
+          if (item.id === row.id){
+            data.splice(index, 1);
+          }
+        })
+        this.data = data;
+        console.log("row------------->",row);
       },
       viewDriverInfo() {
         console.log(this.driverInfo.length);
@@ -665,6 +684,7 @@
             for (let i = 0; i < this.driverInfo.length; i++) {
               let obj = {};
               obj.driver = this.driverInfo[i].name;
+              obj.driverName = this.driverInfo[i].name;
               obj.driverId = this.driverInfo[i].id;
               obj.driverPhone = this.driverInfo[i].phone;
               obj.vehicleNub = this.vehticleInfo[i].vehicleNub;
@@ -747,19 +767,35 @@
             }
             data.stockup = stockup;
           }
-        if (this.form.taskTime){
+          if (this.stockUpForm.taskTime) {
-          data.taskTime = this.form.taskTime;
+            data.taskTime = this.stockUpForm.taskTime.toString();
           }
         }
+        console.log('this.data------------>', this.data);
+        if (!this.deliveryListId) {
           data.reservationIds = this.reservationIds;
-      console.log("this.data------------>",this.data);
+          console.log('>>>>>>>>>>>>', data);
-      console.log(">>>>>>>>>>>>",data);
           deliveryTask(data).then((res) => {
             this.$router.push({
               path: '/distribution/deliverylist/distributionDeliveryListmar',
               name: '配送市配列表'
             });
           });
+        } else {
+          data.reservationInfos =this.data;
+          data.id = this.deliveryListId;
+          data.stockupInfo = stockup;
+          updateMarketDelivery(data).then(res=>{
+            let result = res;
+            console.log("result---------------->",result);
+              this.$message({
+                message: '操作成功',
+                type: 'message'
+              });
+              this.$router.go(-1)
+              return;
+          })
+        }
       },
       changeVehicle(params) {
         console.log(params);
@@ -814,7 +850,7 @@
         } else {
           this.$message({
             message: '已经是第一条，上移失败',
-          type: 'warning',
+            type: 'warning'
           });
         }
         console.log(this.vehticleInfo);
@@ -928,13 +964,15 @@
         this.stockUpForm.stockupDate = new Date();
         this.form.taskTime = new Date();
         this.stockUpForm.outboundDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
+        this.stockUpForm.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
         this.stockUpForm.otherFee = 0;
-        this.loadAndUnload = ["1","2"] ;
+        this.loadAndUnload = ['1', '2'];
         if (this.reservationIds) {
-          console.log("》》》》》》》》》》》》》》》",this.reservationIds);
+          this.isoperation = false;
+          console.log('》》》》》》》》》》》》》》》', this.reservationIds);
           let ids = this.reservationIds;
           getReservationAddr(ids).then(res => {
-           console.log("------------->",res);
+            console.log('------------->', res);
             const reservationData = res.data.data;
             this.page.total = reservationData.total;
             this.data = reservationData.records;
@@ -943,12 +981,72 @@
           });
         }
         if (this.deliveryListId) {
-          console.log("<<<<<<<<<<",this.deliveryListId);
+          this.isoperation = true;
+          console.log('<<<<<<<<<<', this.deliveryListId);
 
           //市配计划编辑回显
-          getMarketDeliveryList(this.deliveryListId).then(res=>{
+          getMarketDeliveryList(this.deliveryListId).then(async res => {
-            console.log(res.data.data);
+            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 = deliveryData.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 {
+              let deliveryTripartiteVO = deliveryData.deliveryTripartiteVO;
+              this.aaa = false;
+              this.bbb = true;
+              // this.form.tripartiteSource = deliveryTripartiteVO.distributionCompanyId;
+              this.waixieForm.tripartiteSource = "1";
+              this.waixieForm.driverName = deliveryTripartiteVO.driverName ;
+              this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum ;
+              this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone ;
+              this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee ;
+            }
+          });
         }
         this.loading = false;
     },