重构商配页面待完善

src/api/basicdata/basicdataGoodsArea.js

@@ -8,80 +8,80 @@ export const getList = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 
-export const stockUp = ( params) => {
+export const stockUp = params => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/stockUp',
     method: 'get',
     params: {
       ...params,
-    }
-  })
-}
+    },
+  });
+};
 
 export const getStockUpArea = () => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/getStockUpArea',
     method: 'get',
-  })
-}
+  });
+};
 
-export const getDetail = (id) => {
+export const getDetail = id => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/detail',
     method: 'get',
     params: {
-      id
-    }
-  })
-}
+      id,
+    },
+  });
+};
 
-export const remove = (ids) => {
+export const remove = ids => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/remove',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
-export const disable = (ids) => {
+    },
+  });
+};
+export const disable = ids => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/disable',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
-export const enable = (ids) => {
+    },
+  });
+};
+export const enable = ids => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/enable',
     method: 'post',
     params: {
       ids,
-    }
-  })
-}
+    },
+  });
+};
 
-export const add = (row) => {
+export const add = row => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/save',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
-export const update = (row) => {
+export const update = row => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/update',
     method: 'post',
-    data: row
-  })
-}
+    data: row,
+  });
+};
 
 export const getWarehouseList = (current, size, params) => {
   return request({
@@ -91,9 +91,9 @@ export const getWarehouseList = (current, size, params) => {
       ...params,
       current,
       size,
-    }
-  })
-}
+    },
+  });
+};
 // /**
 //  * 货区下拉列表数据获取
 //  * @param current
@@ -122,8 +122,8 @@ export const getGoodsAreaList = () => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/list',
     method: 'get',
-  })
-}
+  });
+};
 /**
  * 货区列表信息
  * @param id 仓库ID
@@ -133,8 +133,8 @@ export const getGoodsAreaNodeList = () => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/getNode',
     method: 'get',
-  })
-}
+  });
+};
 /**
  * 货区列表信息
  * @param id 仓库ID
@@ -144,25 +144,32 @@ export const getGoodsAreaoptionList = () => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/getAreaoption',
     method: 'get',
-  })
-}
+  });
+};
 
 /**
  * 查询当前登录人所能操作的备货区
  * @param params
  * @returns {AxiosPromise}
  */
-export const stockUpInfo = ( params) => {
+export const stockUpInfo = params => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/stockUpInfo',
     method: 'get',
     params: {
       params,
-    }
-  })
-}
-
-
-
-
-
+    },
+  });
+};
+/**
+ * 查询当前登录人所能操作的备货区
+ * @param params
+ * @returns {AxiosPromise}
+ */
+export const $_stockUpInfo = params => {
+  return request({
+    url: '/api/logpm-basicdata/goodsArea/stockUpInfo',
+    method: 'get',
+    params,
+  });
+};

src/api/distribution/distributionDeliveryList.js

@@ -208,6 +208,14 @@ export const getPackageListByDeliveryIdAndOrderId = (current,size,deliveryId,ord
   });
 };
 
+export const $_getPackageListByDeliveryIdAndOrderId = params => {
+  return request({
+    url: '/api/logpm-distribution/deliveryList/getPackageListByDeliveryIdAndOrderId',
+    method: 'get',
+    params,
+  });
+};
+
 /**
  * 取消配送任务
  * @param data

src/api/distribution/distributionStockArticle.js

@@ -285,5 +285,12 @@ export const getPackageListByStockArticleId = (current, size, orderId) => {
     }
   })
 }
+export const $_getPackageListByStockArticleId = params => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockArticle/getPackageListByStockArticleId',
+    method: 'get',
+    params,
+  });
+};
 
 

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -1017,7 +1017,7 @@ export default {
     handleEdit(scope) {
       const { row } = scope;
       this.$router.push({
-        path: '/distribution/turndelivery/deliveryDiscuss',
+        path: '/distribution/turndelivery/devtmp',
         query: {
           id: row.id,
           name: row.trainNumber + '-编辑配送',

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -1422,20 +1422,7 @@ import { ElMessage } from 'element-plus'
        * 订单提交
        */
       onSubmitBusiness() {
-        if( !this.driverForm.masterDriverName ){
-          ElMessage({
-          message: '没有选择配送司信息',
-          type: 'warning',
-          })
-         return
-       }
-       if(!this.driverForm.masterVehicleNub){
-          ElMessage({
-           message: '没有选择配车辆信息',
-          type: 'warning',
-          })
-        return
-       }
+
         this.BtnDisabled=true
         setTimeout(() => {
           // 启用按钮
@@ -1477,12 +1464,14 @@ import { ElMessage } from 'element-plus'
               stockup.forkliftId = b.dictKey;
             }
           });
+
           this.goodsAreaData.forEach(c => {
             if (this.stockUpForm.goodsAreaId === c.dictKey) {
               stockup.goodsAreaId = c.dictKey;
               stockup.goodsAreaName = c.dictValue;
             }
           });
+
           if (this.stockUpForm.stockupDate) {
             stockup.stockupDate = this.stockUpForm.stockupDate;
           }
@@ -1654,6 +1643,20 @@ import { ElMessage } from 'element-plus'
               data.tripartite = tripartite;
             }
           } else {
+            if( !this.driverForm.masterDriverName ){
+          ElMessage({
+          message: '没有选择配送司信息',
+          type: 'warning',
+          })
+             return
+            }
+            if(!this.driverForm.masterVehicleNub){
+          ElMessage({
+           message: '没有选择配车辆信息',
+          type: 'warning',
+          })
+             return
+              }
             //自主配送数据构建
             if (this.driverList.length !== this.vehticleList.length) {
               this.$message({