商配，自提增加提交限制

src/views/aftersales/aftersalesWorkOrder.vue

@@ -4064,6 +4064,7 @@ const CompletedSubmission = () => {
 
   // 初始化data数组，其结构对应于details.selectionList的长度
   let data = details.selectionList.map(() => ({
+    id:details.selectionList[0].id,
     completionRecipientEntities: [],
     completionRecordEntities: [],
   }));
@@ -4079,9 +4080,9 @@ const CompletedSubmission = () => {
           reason: party.reason,
           money: Number(party.num),
           reasonArbitration: Reasonarbitration.value,
-          // workOrderId: selection.id,
           warehouseId: party.warehouseId, //仓库
           personResponsibleName: party.personResponsibleName,
+          workOrderId: selection.id, //工单id
         };
         // 将赔款方信息添加到对应的completionRecordEntities数组中
         data[index].completionRecordEntities.push(record);
@@ -4093,7 +4094,7 @@ const CompletedSubmission = () => {
           money: Number(party.num),
           responsibleParty: '', //
           workOrderNumber: selection.workOrderNumber,
-          workOrderId: selection.id,
+          workOrderId: selection.id, //工单id
           // warehouseId: selection.warehouseId,(修改过)
           warehouseId: party.warehouseId, //仓库
         };

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -1605,6 +1605,7 @@ const ChangePackageInfo = (val, index) => {
       if (res.data.data.length) {
 
           if(groundlineType.value == 5 || groundlineType.value == 6){
+            TrainnumberList.value=[]
             //当发现节点为配送装车和配送签收的时候进行数据处理
             //筛选出车次号
             //driverName配送司机
@@ -1621,10 +1622,11 @@ const ChangePackageInfo = (val, index) => {
           }
           // 车次号处理
           if(groundlineType.value == 3){
+            TrainnumberList.value=[]
             res.data.data.forEach(item=>{
               item.trunklines.forEach(itemChid=>{
               TrainnumberList.value.push({label:itemChid.trainNumber,value:itemChid.trainNumber})//车次号
-
+              console.log( TrainnumberList.value,' TrainnumberList.value');
               MainlineUnloadingData.value.push(itemChid)
               })
             })

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -624,6 +624,7 @@ import {
   zeroMaterial,
   zeroUpdateMaterial,
 } from '@/api/distribution/distrilbutionBillLading';
+import { ElMessage } from 'element-plus'
 import { getListOwn, getList, getEditList } from '@/api/distribution/distributionParcelList';
 import option from '@/option/distribution/distrilbutionBillLading';
 import { mapGetters } from 'vuex';
@@ -2591,6 +2592,18 @@ export default {
         // if ()
       }
       this.$refs.form.validate(async valid => {
+        console.log(this.data,'当前选择的数据');
+        if(this.data.length){
+        const allQuantitiesAreFalsy = this.data.every(item => item.inventoryQuantity)
+        console.log(allQuantitiesAreFalsy,'allQuantitiesAreFalsy');
+        if(!allQuantitiesAreFalsy){
+          ElMessage({
+          message: '请移除添加数量为0的订单',
+          type: 'warning',
+          })
+          return
+        }
+        }
         if (valid) {
           if (!this.form.id) {
             // if (this.fileListSell.length === 0) {

src/views/distribution/reservation/reservationAddFrom.vue

@@ -471,7 +471,7 @@ import {
 } from '@/api/distribution/distributionStockArticle';
 import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
 import { getInventoryList, selectInventoryDetail } from '@/api/distribution/distributionStockList';
-
+import { ElMessage } from 'element-plus'
 import option from '@/option/distribution/distributionStockArticle';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
@@ -2395,7 +2395,17 @@ export default {
     // 最后提交
     async onSubmit() {
       try {
-        // 开启提交按钮loading
+        if(this.renderInventoryData.length){
+        const allQuantitiesAreFalsy = this.renderInventoryData.every(item => item.reservationNum !='0')
+        if(!allQuantitiesAreFalsy){
+          ElMessage({
+          message: '请移预约加数量为0的订单',
+          type: 'warning',
+          })
+          return
+        }
+        }
+      // 开启提交按钮loading
         this.loadingObj.submitBtnLoading = true;
         this.reservationloading = true; //开启全屏加载
         // 日期必填
@@ -2406,6 +2416,14 @@ export default {
           });
           return;
         }
+      
+
+
+
+
+       
+
+
         // 提交按钮
         //新增预约单
         let orderIds = [];

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -1858,9 +1858,36 @@ function tooSUM() {
 // 弹窗确认表单信息展示
 const submit = () => {
   console.log('dataTmp.value :>> ', dataTmp.value);
-
+  
   // 当前为编辑状态
   if (RouteId.value) {
+    
+    if(!dataTmp.value.length){
+      ElMessageBox.confirm(
+    '当前没有勾选包件，是否移除当前订单?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      console.log(dataInfo.value,'当前所有订单');
+      console.log(dataId.value,'删除订单');
+      dataInfo.value.splice(dataId.value, 1);
+      
+      ElMessage({
+        type: 'success',
+        message: '移除成功',
+      })
+      AddLalog.value = false; //关闭弹窗
+    })
+    .catch(() => {
+     
+    })
+      return
+    }
     if (!wrapLoading.value) {
       dataInfo.value = dataTmp.value;
 
@@ -1879,6 +1906,33 @@ const submit = () => {
       console.log(dataInfo.value, '所有订单信息');
     }
   } else {
+
+    if(!dataTmp.value.length){
+      ElMessageBox.confirm(
+    '当前没有勾选包件，是否移除当前订单?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+      console.log(dataInfo.value,'当前所有订单');
+      console.log(dataId.value,'删除订单');
+      dataInfo.value.splice(dataId.value, 1);
+      
+      ElMessage({
+        type: 'success',
+        message: '移除成功',
+      })
+      AddLalog.value = false; //关闭弹窗
+    })
+    .catch(() => {
+     
+    })
+      return
+    }
     // 新增订单
     //选中好的订单提交到要展示的表格
     if (wrapLoading.value) {
@@ -1897,6 +1951,9 @@ const submit = () => {
     console.log('提交后的参数', dataInfo.value);
     console.log('提交后的临时存储', dataTmp.value);
   }
+
+
+
   // 展示的信息
   dataInfo.value = removeDuplicates(dataInfo.value);
   // 计算总数
@@ -2174,11 +2231,13 @@ function ViewEvent  (val,index) {
   PackageFrom.value = {}; //清空订单搜索参数
   parameter.value = {}; //清空包件搜索
   Packageow.value = val;
-  console.log(val, '查看包件事件INDEX');
+  console.log(index, '查看包件事件INDEX');
   wrapLoading.value = true; //查看包件弹窗
   AddLalog.value = true; //开启弹窗
   editLoading.value = true; //开启加载效果
   dataId.value = findIndexById(val.id);
+  console.log(val.id);
+  
   //接收点击查看当前行数据;
   //   编辑信息弹窗状态
   PackageFn();