市配配送任务编辑页面调整

src/api/distribution/distributionDeliveryList.js

@@ -162,6 +162,18 @@ 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
+  })
+}
 
 /**
  * 查询配送任务订单地图信息

src/api/distribution/distributionStockArticle.js

@@ -184,4 +184,14 @@ export const selectStockArticleAndParcel = (params) => {
   })
 }
 
-
+export const selectStockArticleInfoList = (current, size, params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockArticle/selectStockArticleInfoList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/router/views/index.js

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

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -40,7 +40,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="handleEdit(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>

src/views/distribution/turndelivery/deliveryMarket.vue

@@ -195,14 +195,14 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="配车时间:" prop="taskTime" label-width="100px">
+                    <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 v-model="stockUpForm.taskTime" type="datetime" placeholder="请选择配车时间">
                         </el-date-picker>
                     </el-form-item>
                 </el-col>
@@ -344,7 +344,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';
@@ -497,6 +497,7 @@
       this.getTeam();
       this.getvehicleData();
       this.getMasterDriverData();
+      this.onLoad(this.page);
     },
     computed: {
       ...mapGetters(['permission']),
@@ -508,9 +509,8 @@
         return ids.join(',');
       }
     },
-
     mounted() {
-      this.onLoad(this.page);
+      // this.onLoad(this.page);
     },
     methods: {
       //查询叉车人员
@@ -633,6 +633,8 @@
         if (this.$route.query.deliveryId) {
           this.deliveryListId = this.$route.query.deliveryId;
         }
+        this.loading = false;
+
 
       },
       removeStockArticle(row){
@@ -643,7 +645,13 @@
           });
           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() {
@@ -685,6 +693,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;
@@ -767,8 +776,8 @@
             }
             data.stockup = stockup;
           }
-          if (this.form.taskTime) {
-            data.taskTime = this.form.taskTime;
+          if (this.stockUpForm.taskTime) {
+            data.taskTime = this.stockUpForm.taskTime.toString();
           }
         }
         console.log('this.data------------>', this.data);
@@ -782,10 +791,19 @@
             });
           });
         } else {
-          data.reservationInfos =this.data ;
-          console.log('>>>>>>>>>>>>', data);
-
-          console.log('-------------》', '修改提交');
+          data.reservationInfos =this.data;
+          data.id = this.deliveryListId;
+          data.stockupInfo = stockup;
+          updateMarketDelivery(data).then(res=>{
+            if (res.data.data.code === 200){
+              this.$message({
+                message: res.data.data.msg,
+                type: 'warning'
+              });
+              this.$router.go(-1)
+              return;
+            }
+          })
         }
       },
       changeVehicle(params) {
@@ -952,8 +970,8 @@
         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.taskTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
         this.stockUpForm.otherFee = 0;
         this.loadAndUnload = ['1', '2'];
         if (this.reservationIds) {
@@ -984,7 +1002,7 @@
             this.stockUpForm.loader = deliveryData.stockupInfo.loaderId;
             this.stockUpForm.taskTime = deliveryData.taskTime;
             console.log('reservationInfo--------------->', res.data.data.reservationInfo);
-            this.data = res.data.data.reservationInfos;
+            this.data = deliveryData.reservationInfos;
             if (deliveryData.kind === '1') {
               //自主配送
               let self = deliveryData.deliverySelfVO;
@@ -1025,7 +1043,15 @@
               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 ;
             }
           });
         }