修复部分bug, 新增开单计算仓储管理费

src/option/distribution/TripartiteTransfer.js

@@ -748,13 +748,14 @@ export const TripartiteTransferColumnList = [
     sortable: true,
   },
   {
-    prop: 'productName',
+    prop: 'goodsName',
     label: '品类名称',
     type: 2,
     values: '',
     width: '130',
     checkarr: [],
     fixed: false,
+    isColumnMerge: true,
     sortable: true,
   },
   {
@@ -891,16 +892,16 @@ export const TripartiteTransferColumnList = [
     isshowSummary: true,
     sortable: true,
   },
-  {
-    prop: 'customerTrain',
-    label: '客户车次',
-    type: 2,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
+  // {
+  //   prop: 'customerTrain',
+  //   label: '客户车次',
+  //   type: 2,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
   {
     prop: 'remark',
     label: '运单备注',

src/views/distribution/artery/TripartiteTransfer.vue

@@ -262,7 +262,9 @@
           :on-preview="handlePictureCardPreview"
           :headers="details.header"
           :on-remove="handleRemove"
+          :before-upload="handleBeforeUpload"
           :on-success="handleSiginImgSuccess"
+          multiple
         >
           <el-icon><Plus /></el-icon>
         </el-upload>
@@ -576,6 +578,7 @@ import {
   postUpdateLoadScanFinalNodeIdById,
 } from '@/api/distribution/VehicleStowage';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import type { UploadRawFile, UploadFiles, UploadFile } from 'element-plus';
 import { useRouter } from 'vue-router';
 import type { UploadProps } from 'element-plus';
 import { getToken } from '@/utils/auth';
@@ -1421,6 +1424,25 @@ const handlePictureCardPreview: UploadProps['onPreview'] = uploadFile => {
   details.popUpShow.dialogVisible = true;
 };
 
+/** 上传前类型检测 */
+const handleBeforeUpload = (rawFile: UploadRawFile) => {
+  console.log('rawFile :>> ', rawFile);
+  const _nameArr = rawFile.name.split('.');
+
+  if (_nameArr.length === 0) {
+    ElMessage.warning('异常类型文件');
+    return false;
+  }
+
+  const _name = _nameArr[_nameArr.length - 1];
+
+  const _whiteArr = ['png', 'jpg', 'jpeg'];
+
+  if (_whiteArr.includes(_name.toLocaleLowerCase())) return true;
+  ElMessage.warning('请上传png、jpg、jpeg的类型图片');
+  return false;
+};
+
 /** 上传成功 */
 const handleSiginImgSuccess = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
   details.viewImgList = details.fileList.map(val => val.url);
@@ -1457,6 +1479,9 @@ const handleSubmitSiginImg = async () => {
       // 存在id, 为已存在数据, 不做上传
       // if (value.id) continue
 
+      if (!value.imgUrl)
+        return ElMessage.warning('存在未上传完成或上传失败的数据，请等待上传完毕或移除');
+
       submitData.signPhotoList.push({
         signOrderId: details.loadId,
         photoType: 1,

src/views/distribution/artery/TripartiteTransferDetails.vue

@@ -303,7 +303,7 @@
     @closce="showdrawer"
     :drawerShow="drawerShow"
     v-model="details.columnList"
-    :columnList="columnList"
+    :columnList="details.columnList"
   >
   </edittablehead>
 </template>

src/views/distribution/inventory/CreateOrder.vue

@@ -2445,6 +2445,7 @@ const handleComputed = (row: any) => {
   const _trunklineKey = typeArr[row.chargeType];
   const _pickupKey = typeArr[row.pickupType];
   const _dispatchKey = typeArr[row.dispatchType];
+  const _warehouseKey = typeArr[row.warehouseManagementType];
 
   // 计算干线价格 -- 行
   if (_trunklineKey)
@@ -2464,6 +2465,10 @@ const handleComputed = (row: any) => {
       ? computeNumber(row.deliveryPrice, '*', row[_dispatchKey]).result
       : 0;
 
+  if (_warehouseKey)
+    row.subtotalWarehouseManagement = _warehouseKey
+      ? computeNumber(row.warehouseManagementPrice, '*', row[_warehouseKey]).result
+      : 0;
   console.log('row :>> ', row);
 
   handlePrice();
@@ -2836,6 +2841,19 @@ const handleDispatchPrice = (dispatch, template) => {
   } else details.query.deliveryFee = _total;
 };
 
+/** 处理仓库管理费 */
+const handleWarehouseManagement = () => {
+  let _total = 0;
+
+  for (let i = 0; i < details.goodsList.length; i++) {
+    const value = details.goodsList[i];
+
+    _total = computeNumber(_total, '+', value.subtotalWarehouseManagement).result;
+  }
+
+  details.query.warehouseManagementFee = _total;
+};
+
 /** 处理模板费用 -- 计算 */
 const handlePrice = () => {
   const { dispatch, pickup, template, trunkLine } = details.priceTemplate;
@@ -2846,6 +2864,8 @@ const handlePrice = () => {
   handleTrunkLinePrice(trunkLine, template);
   /** 处理配送费 */
   handleDispatchPrice(dispatch, template);
+  /** 处理仓库管理费 */
+  handleWarehouseManagement();
 };
 
 /** 重置值 */
@@ -3426,12 +3446,60 @@ const handleAssignmentItemPriceDispatch = (
   }
 };
 
+/** 仓储管理价格赋值 */
+const handleAssignmentItemPriceWarehouseManagementPrice = (
+  value,
+  warehouse,
+  template,
+  chargeType?: number | undefined
+) => {
+  if (!template || !template.warehouseIsAddFee || !template.warehouseIsManageFee) {
+    value.warehouseManagementPrice = 0;
+    value.warehouseManagementType = 1;
+    return;
+  }
+
+  value.warehouseManagementType = Number(template.warehousePricingType);
+
+  const { additionalCategory } = warehouse;
+
+  if (template.warehouseIsCategorySubjoin) {
+    // 品类是否存在id
+    if (!value.goodsId) value.warehouseManagementPrice = 0;
+    else {
+      let _item: any = {};
+
+      if (getObjType(additionalCategory) === 'array') {
+        for (let j = 0; j < additionalCategory.length; j++) {
+          const item = additionalCategory[j];
+
+          if (item.categoryId !== value.goodsId) continue;
+          _item = item;
+
+          value.warehouseManagementPrice = _item.warehouseManagementPrice;
+
+          return;
+        }
+      }
+
+      // 赋值
+      value.warehouseManagementPrice = 0;
+    }
+  } else {
+    // 不区分品类 -- 暂时默认为按件
+    value.warehouseManagementPrice =
+      getObjType(additionalCategory) === 'array' && additionalCategory.length > 0
+        ? additionalCategory[0].price || 0
+        : 0;
+  }
+};
+
 /** 价格赋值
  * isOnload 是否为初始化价格赋值, 初始化不赋值干线单价以及计算价格
  */
 const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number | undefined) => {
   // 处理品类费用
-  const { pickup, template, trunkLine, dispatch } = details.priceTemplate;
+  const { pickup, template, trunkLine, dispatch, warehouse } = details.priceTemplate;
 
   // 干线
   if (!isOnload) {
@@ -3454,6 +3522,9 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
     handleAssignmentItemPriceDispatch(value, dispatch, template, chargeType);
   else value.deliveryPrice = 0;
 
+  // 仓库
+  handleAssignmentItemPriceWarehouseManagementPrice(value, warehouse, template);
+
   // 计算每行价格
   if (!isOnload) handleComputed(value);
 };

src/views/waybill/CreateZeroOrder.vue

@@ -1995,6 +1995,7 @@ const handleComputed = (row: any) => {
   const _trunklineKey = typeArr[row.chargeType];
   const _pickupKey = typeArr[row.pickupType];
   const _dispatchKey = typeArr[row.dispatchType];
+  const _warehouseKey = typeArr[row.warehouseManagementType];
 
   // 计算干线价格 -- 行
   if (_trunklineKey)
@@ -2014,6 +2015,11 @@ const handleComputed = (row: any) => {
       ? computeNumber(row.deliveryPrice, '*', row[_dispatchKey]).result
       : 0;
 
+  if (_warehouseKey)
+    row.subtotalWarehouseManagement = _warehouseKey
+      ? computeNumber(row.warehouseManagementPrice, '*', row[_warehouseKey]).result
+      : 0;
+
   // if (row.chargeType === 1) row.subtotalFreight = computeNumber(row.num, '*', row.price).result;
   // else if (row.chargeType === 2)
   //   row.subtotalFreight = computeNumber(row.volume, '*', row.price).result;
@@ -2385,6 +2391,19 @@ const handleDispatchPrice = (dispatch, template) => {
   } else details.query.deliveryFee = _total;
 };
 
+/** 处理仓库管理费 */
+const handleWarehouseManagement = () => {
+  let _total = 0;
+
+  for (let i = 0; i < details.goodsList.length; i++) {
+    const value = details.goodsList[i];
+
+    _total = computeNumber(_total, '+', value.subtotalWarehouseManagement).result;
+  }
+
+  details.query.warehouseManagementFee = _total;
+};
+
 /** 处理模板费用 */
 const handlePrice = () => {
   const { dispatch, pickup, template, trunkLine } = details.priceTemplate;
@@ -2395,6 +2414,8 @@ const handlePrice = () => {
   handleTrunkLinePrice(trunkLine, template);
   /** 处理配送费 */
   handleDispatchPrice(dispatch, template);
+  /** 处理仓库管理费 */
+  handleWarehouseManagement();
 };
 
 /** 重置值 */
@@ -2959,6 +2980,55 @@ const handleAssignmentItemPriceDispatch = (
     value.dispatchType = 1;
   }
 };
+
+/** 仓储管理价格赋值 */
+const handleAssignmentItemPriceWarehouseManagementPrice = (
+  value,
+  warehouse,
+  template,
+  chargeType?: number | undefined
+) => {
+  if (!template || !template.warehouseIsAddFee || !template.warehouseIsManageFee) {
+    value.warehouseManagementPrice = 0;
+    value.warehouseManagementType = 1;
+    return;
+  }
+
+  value.warehouseManagementType = Number(template.warehousePricingType);
+
+  const { additionalCategory } = warehouse;
+
+  if (template.warehouseIsCategorySubjoin) {
+    // 品类是否存在id
+    if (!value.goodsId) value.warehouseManagementPrice = 0;
+    else {
+      let _item: any = {};
+
+      if (getObjType(additionalCategory) === 'array') {
+        for (let j = 0; j < additionalCategory.length; j++) {
+          const item = additionalCategory[j];
+
+          if (item.categoryId !== value.goodsId) continue;
+          _item = item;
+
+          value.warehouseManagementPrice = _item.warehouseManagementPrice;
+
+          return;
+        }
+      }
+
+      // 赋值
+      value.warehouseManagementPrice = 0;
+    }
+  } else {
+    // 不区分品类 -- 暂时默认为按件
+    value.warehouseManagementPrice =
+      getObjType(additionalCategory) === 'array' && additionalCategory.length > 0
+        ? additionalCategory[0].price || 0
+        : 0;
+  }
+};
+
 /** 价格赋值
  * isOnload 是否为初始化价格赋值, 初始化不赋值干线单价以及计算价格
  */
@@ -2987,6 +3057,9 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
     handleAssignmentItemPriceDispatch(value, dispatch, template, chargeType);
   else value.deliveryPrice = 0;
 
+  // 仓库
+  handleAssignmentItemPriceWarehouseManagementPrice(value, warehouse, template);
+
   // 计算每行价格
   if (!isOnload) handleComputed(value);
 };