|
|
|
|
@ -717,7 +717,7 @@
|
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
<el-row> |
|
|
|
|
<el-form-item label="装卸费:"> |
|
|
|
|
<el-form-item label="仓储操作费:"> |
|
|
|
|
<el-input-number |
|
|
|
|
:value-on-clear="0" |
|
|
|
|
:controls="false" |
|
|
|
|
@ -727,6 +727,19 @@
|
|
|
|
|
v-model="query.handlingFee" |
|
|
|
|
></el-input-number> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="仓储分拣费:"> |
|
|
|
|
<el-input-number |
|
|
|
|
:controls="false" |
|
|
|
|
controls-position="right" |
|
|
|
|
:precision="2" |
|
|
|
|
:min="0" |
|
|
|
|
:step="0.1" |
|
|
|
|
v-model="query.sortingFee" |
|
|
|
|
:value-on-clear="0" |
|
|
|
|
></el-input-number> |
|
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
|
|
<el-form-item label="其它费用:"> |
|
|
|
|
<el-input-number |
|
|
|
|
:value-on-clear="0" |
|
|
|
|
@ -1216,8 +1229,10 @@ const details = reactive<any>({
|
|
|
|
|
warehouseManagementFee: 0, |
|
|
|
|
/** 仓储费 */ |
|
|
|
|
storageFee: 0, |
|
|
|
|
/** 装卸费 */ |
|
|
|
|
/** 仓储操作费 */ |
|
|
|
|
handlingFee: 0, |
|
|
|
|
/** 仓储分拣费 */ |
|
|
|
|
sortingFee: 0, |
|
|
|
|
/** 其他费 */ |
|
|
|
|
otherFee: 0, |
|
|
|
|
/** 保价费 */ |
|
|
|
|
@ -1634,6 +1649,7 @@ const totalCost = computed(() => {
|
|
|
|
|
.next('+', details.query.warehouseManagementFee || 0) |
|
|
|
|
.next('+', details.query.storageFee || 0) |
|
|
|
|
.next('+', details.query.handlingFee || 0) |
|
|
|
|
.next('+', details.query.sortingFee || 0) |
|
|
|
|
.next('+', details.query.otherFee || 0) |
|
|
|
|
.next('+', details.query.insuranceFee || 0) |
|
|
|
|
.next('+', details.query.rebate || 0) |
|
|
|
|
@ -2092,7 +2108,9 @@ const handleComputed = (row: any, onlyComputedTrunline = false) => {
|
|
|
|
|
const _trunklineKey = typeArr[row.chargeType]; |
|
|
|
|
const _pickupKey = typeArr[row.systemPickupChargeType]; |
|
|
|
|
const _dispatchKey = typeArr[row.systemDeliveryChargeType]; |
|
|
|
|
const _warehouseKey = typeArr[row.warehouseManagementType]; |
|
|
|
|
const _warehouseManagementKey = typeArr[row.warehouseManagementType]; |
|
|
|
|
const _warehouseHandlingKey = typeArr[row.warehouseHandlingType]; |
|
|
|
|
const _warehouseSortingKey = typeArr[row.warehouseSortingType]; |
|
|
|
|
|
|
|
|
|
// 计算干线价格 -- 行 |
|
|
|
|
if (_trunklineKey) |
|
|
|
|
@ -2113,9 +2131,22 @@ const handleComputed = (row: any, onlyComputedTrunline = false) => {
|
|
|
|
|
? computeNumber(row.deliveryPrice || 0, '*', row[_dispatchKey]).result |
|
|
|
|
: 0; |
|
|
|
|
|
|
|
|
|
if (_warehouseKey) |
|
|
|
|
row.subtotalWarehouseManagement = _warehouseKey |
|
|
|
|
? computeNumber(row.warehouseManagementPrice || 0, '*', row[_warehouseKey]).result |
|
|
|
|
if (_warehouseManagementKey) |
|
|
|
|
// 计算仓储管理费 -- 行 |
|
|
|
|
row.subtotalWarehouseManagement = _warehouseManagementKey |
|
|
|
|
? computeNumber(row.warehouseManagementPrice || 0, '*', row[_warehouseManagementKey]).result |
|
|
|
|
: 0; |
|
|
|
|
|
|
|
|
|
if (_warehouseHandlingKey) |
|
|
|
|
// 计算仓储操作费 -- 行 |
|
|
|
|
row.subtotalWarehouseHandlingFee = _warehouseHandlingKey |
|
|
|
|
? computeNumber(row.warehouseHandlingPrice || 0, '*', row[_warehouseHandlingKey]).result |
|
|
|
|
: 0; |
|
|
|
|
|
|
|
|
|
if (_warehouseSortingKey) |
|
|
|
|
// 计算仓储分拣费 -- 行 |
|
|
|
|
row.subtotalWarehouseSortingFee = _warehouseSortingKey |
|
|
|
|
? computeNumber(row.warehouseSortingPrice || 0, '*', row[_warehouseSortingKey]).result |
|
|
|
|
: 0; |
|
|
|
|
console.log('row :>> ', row); |
|
|
|
|
} |
|
|
|
|
@ -2510,6 +2541,32 @@ const handleWarehouseManagement = () => {
|
|
|
|
|
details.query.warehouseManagementFee = _total; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 处理仓储操作费 */ |
|
|
|
|
const handleWarehouseHandlingFee = () => { |
|
|
|
|
let _total = 0; |
|
|
|
|
|
|
|
|
|
for (let i = 0; i < details.goodsList.length; i++) { |
|
|
|
|
const value = details.goodsList[i]; |
|
|
|
|
|
|
|
|
|
_total = computeNumber(_total, '+', value.subtotalWarehouseHandlingFee || 0).result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
details.query.handlingFee = _total; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 处理仓储分拣费 */ |
|
|
|
|
const handleWarehouseSortingFee = () => { |
|
|
|
|
let _total = 0; |
|
|
|
|
|
|
|
|
|
for (let i = 0; i < details.goodsList.length; i++) { |
|
|
|
|
const value = details.goodsList[i]; |
|
|
|
|
|
|
|
|
|
_total = computeNumber(_total, '+', value.subtotalWarehouseSortingFee || 0).result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
details.query.sortingFee = _total; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 处理模板费用 */ |
|
|
|
|
const handlePrice = (isAll = false, type) => { |
|
|
|
|
const { dispatch, pickup, template, trunkLine } = details.priceTemplate; |
|
|
|
|
@ -2522,6 +2579,10 @@ const handlePrice = (isAll = false, type) => {
|
|
|
|
|
(isAll || type === 'dispatch') && handleDispatchPrice(dispatch, template); |
|
|
|
|
/** 处理仓库管理费 */ |
|
|
|
|
(isAll || type === 'warehouseMangement') && handleWarehouseManagement(); |
|
|
|
|
/** 处理仓储操作费 */ |
|
|
|
|
(isAll || type === 'warehousehandling') && handleWarehouseHandlingFee(); |
|
|
|
|
/** 处理仓储分拣费 */ |
|
|
|
|
(isAll || type === 'warehouseSorting') && handleWarehouseSortingFee(); |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 重置值 */ |
|
|
|
|
@ -3378,6 +3439,92 @@ const handleAssignmentItemPriceWarehouseManagementPrice = (value, warehouse, tem
|
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 仓储管理价格赋值 */ |
|
|
|
|
const handleAssignmentItemPriceWarehouseHandingPrice = (value, warehouse, template) => { |
|
|
|
|
if (!template || !template.warehouseIsAddFee || !template.warehouseIsManageFee) { |
|
|
|
|
value.warehouseHandlingPrice = 0; |
|
|
|
|
value.warehouseHandlingType = 1; |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
value.warehouseHandlingType = Number(template.warehousePricingType); |
|
|
|
|
|
|
|
|
|
const { additionalCategory } = warehouse; |
|
|
|
|
|
|
|
|
|
if (template.warehouseIsCategorySubjoin) { |
|
|
|
|
// 品类是否存在id |
|
|
|
|
if (!value.goodsId) value.warehouseHandlingPrice = 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.warehouseHandlingPrice = _item.operatePrice; |
|
|
|
|
|
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 赋值 |
|
|
|
|
value.warehouseHandlingPrice = 0; |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
// 不区分品类 -- 暂时默认为按件 |
|
|
|
|
value.warehouseHandlingPrice = |
|
|
|
|
getObjType(additionalCategory) === 'array' && additionalCategory.length > 0 |
|
|
|
|
? additionalCategory[0].operatePrice || 0 |
|
|
|
|
: 0; |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 仓储管理价格赋值 */ |
|
|
|
|
const handleAssignmentItemPriceWarehouseSortingPrice = (value, warehouse, template) => { |
|
|
|
|
if (!template || !template.warehouseIsAddFee || !template.warehouseIsManageFee) { |
|
|
|
|
value.warehouseSortingPrice = 0; |
|
|
|
|
value.warehouseSortingType = 1; |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
value.warehouseSortingType = Number(template.warehousePricingType); |
|
|
|
|
|
|
|
|
|
const { additionalCategory } = warehouse; |
|
|
|
|
|
|
|
|
|
if (template.warehouseIsCategorySubjoin) { |
|
|
|
|
// 品类是否存在id |
|
|
|
|
if (!value.goodsId) value.warehouseSortingPrice = 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.warehouseSortingPrice = _item.warehouseSortPrice; |
|
|
|
|
|
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 赋值 |
|
|
|
|
value.warehouseSortingPrice = 0; |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
// 不区分品类 -- 暂时默认为按件 |
|
|
|
|
value.warehouseSortingPrice = |
|
|
|
|
getObjType(additionalCategory) === 'array' && additionalCategory.length > 0 |
|
|
|
|
? additionalCategory[0].warehouseSortPrice || 0 |
|
|
|
|
: 0; |
|
|
|
|
} |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 价格赋值 |
|
|
|
|
* isOnload 是否为初始化价格赋值, 初始化不赋值干线单价以及计算价格 |
|
|
|
|
*/ |
|
|
|
|
@ -3410,9 +3557,18 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
|
|
|
|
|
|
|
|
|
|
console.log('warehouse :>> ', warehouse); |
|
|
|
|
// 仓库 |
|
|
|
|
if (warehouse && template) |
|
|
|
|
if (warehouse && template) { |
|
|
|
|
// 仓储管理费 |
|
|
|
|
handleAssignmentItemPriceWarehouseManagementPrice(value, warehouse, template); |
|
|
|
|
else value.warehouseManagementPrice = 0; |
|
|
|
|
// 仓储操作费 |
|
|
|
|
handleAssignmentItemPriceWarehouseHandingPrice(value, warehouse, template); |
|
|
|
|
// 仓储分拣费 |
|
|
|
|
handleAssignmentItemPriceWarehouseSortingPrice(value, warehouse, template); |
|
|
|
|
} else { |
|
|
|
|
value.warehouseManagementPrice = 0; |
|
|
|
|
value.warehouseHandlingPrice = 0; |
|
|
|
|
value.warehouseSortingPrice = 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 计算每行价格 |
|
|
|
|
if (!isOnload) handleComputed(value); |
|
|
|
|
|
