待签收列表查看增值服务

src/api/addvalue/distributionAddvalue.js

@@ -48,3 +48,5 @@ export const update = (row) => {
   })
 }
 
+
+

src/api/basicdata/basicdataGoodsArea.js

@@ -22,6 +22,13 @@ export const stockUp = ( params) => {
   })
 }
 
+export const getStockUpArea = () => {
+  return request({
+    url: '/api/logpm-basicdata/goodsArea/getStockUpArea',
+    method: 'get',
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/detail',

src/api/distribution/distributionSignfor.js

@@ -55,6 +55,8 @@ export const getDetail = (id) => {
   })
 }
 
+
+
 export const getDetailById = (id) => {
   return request({
     url: '/api/logpm-distribution/signfor/detailById',
@@ -132,3 +134,17 @@ export const getLocationAddress = (signforId) => {
   })
 }
 
+
+/**
+ * 查询对应的增值服务列表信息
+ * @param row
+ * @returns {AxiosPromise}
+ */
+export const addvalueInfoList = (row) => {
+  return request({
+    url: '/api/logpm-distribution/signfor/addvalueInfoList',
+    method: 'post',
+    data: row
+  })
+}
+

src/views/distribution/reservation/reservation.vue

@@ -404,7 +404,7 @@
   import { getPostList } from '@/api/system/post';
   import { getListOwn } from '@/api/system/user';
   import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
-  import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
+  import { stockUp ,getStockUpArea} from '@/api/basicdata/basicdataGoodsArea';
   import dayjs from 'dayjs';
 
   export default {
@@ -1234,6 +1234,22 @@
           this.goodsAreaIdData = fo;
         });
       },
+
+      //备货区
+      async getStockUpArea() {
+        getStockUpArea().then(res => {
+          // console.log("res>>>",res.data.data);
+          let fo = [];
+          res.data.data.forEach(i => {
+            let v = {
+              dictKey: i.id,
+              dictValue: i.name + '-' + i.headline
+            };
+            fo.push(v);
+          });
+          this.goodsAreaIdData = fo;
+        });
+      },
       searchHide() {
         this.search = !this.search;
       },
@@ -1368,9 +1384,9 @@
         }
         this.dialogFormCustomer = true;
         this.info.stockupDate = dayjs().format('YYYY-MM-DD HH:mm:ss');
-
-        this.getFork();
-        this.getTeam();
+        this.getStockUpArea();
+        // this.getFork();
+        // this.getTeam();
       },
       //确定指派
       callFordelivery() {

src/views/distribution/reservation/reservationAddFrom.vue

@@ -1702,7 +1702,7 @@
     },
     mounted() {
       this.init();
-      
+
       this.onLoad(this.page);
       this.getDictionary();
     },
@@ -2054,6 +2054,7 @@
               message: '请输入' + item.orderCode + '正确数量!'
             });
             operation = false;
+            return;
           }
           item.reservationNum = item.reservationNum;
           inventoryIds.push(item.id);
@@ -2095,9 +2096,20 @@
             item.packageListInfo = item.parcelListVOS;
           }
         });
+        console.log("------------------->this.form.inventoryList",this.form.inventoryList);
+        console.log("------------------->this.form.stockArticleList",this.form.stockArticleList);
+
+        if (JSON.stringify(this.form.inventoryList) === '[]' && JSON.stringify(this.form.stockArticleList) === '[]' ){
+          this.$message({
+            type: 'warning',
+            message: '无效的预约计划!'
+          });
+          operation = false;
+          return;
+        }
         // this.form.stockArticleList = this.packageList;
         console.log('>>>>>>>>', this.form);
-        if (this.reservationId) {
+      if (this.reservationId) {
           this.form.id = this.reservationId;
           update(this.form).then(() => {
             this.$router.go(-1);