修复车辆配载清单显示

src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue

@@ -298,76 +298,93 @@ const totalUnLoadNum = ref(0);
 /** 计划中暑 */
 const totalPlanNum = ref(0);
 
-const orderList = reactive([]);
+const orderList = ref([]);
 
-renderInfo.value = waybillInfo;
+const InitData = () => {
+  try {
+    renderInfo.value = waybillInfo;
 
-renderInfo.value.endWarehouseNames = renderInfo.value.endWarehouseNames.split(',');
+    renderInfo.value.endWarehouseNames = renderInfo.value.endWarehouseNames.split(',');
 
-for (let i = 0; i < renderInfo.value.mainList.length; i++) {
-  const val = renderInfo.value.mainList[i];
-  // 是否存在相同的运单号
-  let _flag = false;
+    const _orderList = [];
 
-  for (let j = orderList.length - 1; j >= 0; j--) {
-    const item = orderList[j];
+    for (let i = 0; i < renderInfo.value.mainList.length; i++) {
+      const val = renderInfo.value.mainList[i];
+      // 是否存在相同的运单号
+      let _flag = false;
 
-    if (item.waybillNo !== val.waybillNo) continue;
-    orderList.splice(j, 0, val);
-    _flag = true;
-  }
-
-  !_flag && orderList.push(val);
-}
+      for (let j = _orderList.length - 1; j >= 0; j--) {
+        const item = _orderList[j];
+        console.log('j :>> ', j);
 
-// 合并起始索引
-let mergeStartIndex = 0;
-// 比对值
-let comparisonValue = '';
-const handleMerge = (startIndex: number, endIndex: number, data: {}) => {
-  for (let index = startIndex; index < endIndex; index++) {
-    const value = data[index];
+        if (item.waybillNo !== val.waybillNo) continue;
+        _orderList.splice(j, 0, val);
+        _flag = true;
+        break;
+      }
 
-    if (index === startIndex) value.mergeColumnIndex = endIndex - startIndex;
-    else {
-      value.mergeColumnIndex = 0;
+      !_flag && _orderList.push(val);
     }
-  }
-};
 
-for (let index = 0; index < orderList.length; index++) {
-  const element = orderList[index];
+    console.log('_orderList :>> ', _orderList);
 
-  if (index === 0) {
-    comparisonValue = element.waybillNo;
-    element.mergeColumnIndex = 1;
-  }
-  totalNum.value += element.smallTotal || 0;
-  totalUnLoadNum.value += element.unloadNum || 0;
-  totalPlanNum.value += element.planNum || 0;
+    // 合并起始索引
+    let mergeStartIndex = 0;
+    // 比对值
+    let comparisonValue = '';
+    const handleMerge = (startIndex: number, endIndex: number, data: {}) => {
+      for (let index = startIndex; index < endIndex; index++) {
+        const value = data[index];
 
-  if (element.waybillNo !== comparisonValue) {
-    // if (index === 1) mergeStartIndex = 1;
-    comparisonValue = element.waybillNo;
-    handleMerge(mergeStartIndex, index, orderList);
-    mergeStartIndex = index;
+        if (index === startIndex) value.mergeColumnIndex = endIndex - startIndex;
+        else {
+          value.mergeColumnIndex = 0;
+        }
+      }
+    };
 
-    if (index === orderList.length - 1) {
-      handleMerge(mergeStartIndex, index + 1, orderList);
-    }
-    // 最后一位特殊处理
-  } else if (index === orderList.length - 1) {
-    handleMerge(mergeStartIndex, index + 1, orderList);
-  }
+    for (let index = 0; index < _orderList.length; index++) {
+      const element = _orderList[index];
 
-  if (element.goodsList && element.goodsList.length > 0) {
-    for (let i = 0; i < element.goodsList.length; i++) {
-      const item = element.goodsList[i];
+      if (index === 0) {
+        comparisonValue = element.waybillNo;
+        element.mergeColumnIndex = 1;
+      }
+      totalNum.value += element.smallTotal || 0;
+      totalUnLoadNum.value += element.unloadNum || 0;
+      totalPlanNum.value += element.planNum || 0;
 
-      if (!goodsTitleList.includes(item.goodsName)) goodsTitleList.push(item.goodsName);
+      if (element.waybillNo !== comparisonValue) {
+        // if (index === 1) mergeStartIndex = 1;
+        comparisonValue = element.waybillNo;
+        handleMerge(mergeStartIndex, index, _orderList);
+        mergeStartIndex = index;
+
+        if (index === _orderList.length - 1) {
+          handleMerge(mergeStartIndex, index + 1, _orderList);
+        }
+        // 最后一位特殊处理
+      } else if (index === _orderList.length - 1) {
+        handleMerge(mergeStartIndex, index + 1, _orderList);
+      }
+
+      if (element.goodsList && element.goodsList.length > 0) {
+        for (let i = 0; i < element.goodsList.length; i++) {
+          const item = element.goodsList[i];
+
+          if (!goodsTitleList.includes(item.goodsName)) goodsTitleList.push(item.goodsName);
+        }
+      }
     }
+
+    orderList.value = _orderList;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
   }
-}
+};
+
+InitData();
 
 console.log('waybillInfo :>> ', waybillInfo);
 </script>

src/views/distribution/artery/VehicleStowage.vue

@@ -1403,14 +1403,14 @@ const handleCancelStartCar = () => {
   });
 };
 
-/** 取消装车 */
+/** 取消配载 */
 const handleCancelCarsLoad = () => {
   if (!ChecksWhetherTheWarehouseIsSelected())
     return ElMessage.warning('多仓权限无法操作，请选择仓库');
 
   if (details.selectionList.length === 0) {
     return ElMessage({
-      message: '请选择发车数据',
+      message: '请选择需要取消的数据',
       type: 'warning',
     });
   } else if (details.selectionList.length !== 1) {
@@ -1419,7 +1419,7 @@ const handleCancelCarsLoad = () => {
       type: 'warning',
     });
   }
-  ElMessageBox.confirm('确认取消装车吗?', 'Warning', {
+  ElMessageBox.confirm('确认取消配载吗?', 'Warning', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
     type: 'warning',