|
|
|
|
@ -29,7 +29,12 @@
|
|
|
|
|
<div class="mt10"> |
|
|
|
|
<el-form-item class="mt10" label="运单号: " prop="waybillNo" label-width="80px"> |
|
|
|
|
<div> |
|
|
|
|
<el-input v-model.trim="query.waybillNo" placeholder="运单号" clearable /> |
|
|
|
|
<el-input |
|
|
|
|
v-model.trim="query.waybillNo" |
|
|
|
|
disabled="$route.query && $route.query.type === 'edit'" |
|
|
|
|
placeholder="运单号" |
|
|
|
|
clearable |
|
|
|
|
/> |
|
|
|
|
</div> |
|
|
|
|
</el-form-item> |
|
|
|
|
</div> |
|
|
|
|
@ -2002,7 +2007,7 @@ const onLoad = async (idsArr = []) => {
|
|
|
|
|
} |
|
|
|
|
details.query.transportType = details.query.transportType || '1'; |
|
|
|
|
|
|
|
|
|
handleFindPrice() |
|
|
|
|
handleFindPrice(); |
|
|
|
|
} catch (error) { |
|
|
|
|
console.log('error :>> ', error); |
|
|
|
|
} finally { |
|
|
|
|
@ -2109,6 +2114,7 @@ const initPageInfo = async (idsArr = []) => {
|
|
|
|
|
val.subtotalFreight = Number(val.subtotalFreight); |
|
|
|
|
|
|
|
|
|
val.goodsName = val.productName; |
|
|
|
|
val.goodsId = val.productId; |
|
|
|
|
|
|
|
|
|
val.goodsListOptions = []; |
|
|
|
|
|
|
|
|
|
@ -2122,32 +2128,18 @@ const initPageInfo = async (idsArr = []) => {
|
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
handleFindPrice(false); |
|
|
|
|
handleFindPrice(true); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const { shipper, shipperName, shipperMobile, consignee, consigneeName, consigneeMobile } = |
|
|
|
|
details.query; |
|
|
|
|
|
|
|
|
|
console.log('details.goodsList :>> ', details.goodsList); |
|
|
|
|
|
|
|
|
|
for (let index = 0; index < details.goodsList.length; index++) { |
|
|
|
|
const element = details.goodsList[index]; |
|
|
|
|
|
|
|
|
|
const { arrPirce } = element; |
|
|
|
|
if (arrPirce && arrPirce.length > 0) { |
|
|
|
|
// 价格赋值 |
|
|
|
|
for (let i = 0; i < details.priceArr.length; i++) { |
|
|
|
|
const value = details.priceArr[i]; |
|
|
|
|
element[value.key] = 0; |
|
|
|
|
|
|
|
|
|
for (let index = 0; index < arrPirce.length; index++) { |
|
|
|
|
const item = arrPirce[index]; |
|
|
|
|
|
|
|
|
|
if (item.itemName === value.name) |
|
|
|
|
element[value.key] = isNumber(item.cost) ? Number(item.cost) : 0; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
handleComputed(element); |
|
|
|
|
// handleComputed(element); |
|
|
|
|
handleFindGoods(element.goodsName, element); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -2686,7 +2678,7 @@ const handleDispatchPrice = (dispatch, template) => {
|
|
|
|
|
if (!dispatch || !template) return; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
/** 处理模板费用 */ |
|
|
|
|
/** 处理模板费用 -- 计算 */ |
|
|
|
|
const handlePrice = () => { |
|
|
|
|
const { dispatch, pickup, template, trunkLine } = details.priceTemplate; |
|
|
|
|
|
|
|
|
|
@ -2795,14 +2787,14 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
|
|
|
|
|
.children.find(val => val.value === departure[1]); |
|
|
|
|
|
|
|
|
|
let _itemDeparture: any = {}; |
|
|
|
|
if (_findeDeparture.length === 2) { |
|
|
|
|
if (departure.length === 2) { |
|
|
|
|
_itemDeparture = _findeDeparture; |
|
|
|
|
} else { |
|
|
|
|
_itemDeparture = _findeDeparture.children.find(val => val.value === destination[2]); |
|
|
|
|
_itemDeparture = _findeDeparture.children.find(val => val.value === departure[2]); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
submitData.departure = _findeDeparture.label; |
|
|
|
|
submitData.departureCode = _findeDeparture.value; |
|
|
|
|
submitData.departure = _itemDeparture.label; |
|
|
|
|
submitData.departureCode = _itemDeparture.value; |
|
|
|
|
|
|
|
|
|
console.log('submitData :>> ', submitData); |
|
|
|
|
|
|
|
|
|
@ -3120,12 +3112,15 @@ const handleAssignmentItemPrice = (value, isOnload = false) => {
|
|
|
|
|
const { pickup, template, trunkLine } = details.priceTemplate; |
|
|
|
|
|
|
|
|
|
// 干线 |
|
|
|
|
if (trunkLine && template && !isOnload) { |
|
|
|
|
// 如果品牌为金牌, 切模板选择为特殊计费则特殊处理 |
|
|
|
|
if (isDisabled.value) handleSpecialBrandPrice(value, trunkLine, template); |
|
|
|
|
else handleAssignmentItemPriceTrunkline(value, trunkLine, template); |
|
|
|
|
// 是否为区分品类 |
|
|
|
|
} else value.price = 0; |
|
|
|
|
if (!isOnload) { |
|
|
|
|
if (trunkLine && template) { |
|
|
|
|
// 如果品牌为金牌, 切模板选择为特殊计费则特殊处理 |
|
|
|
|
if (isDisabled.value) handleSpecialBrandPrice(value, trunkLine, template); |
|
|
|
|
else handleAssignmentItemPriceTrunkline(value, trunkLine, template); |
|
|
|
|
// 是否为区分品类 |
|
|
|
|
} else value.price = 0; |
|
|
|
|
console.log('123123 :>> ', 123123); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 提货 |
|
|
|
|
if (pickup && template) { |
|
|
|
|
|
