|
|
|
|
@ -2454,7 +2454,7 @@ const handleComputed = (row: any) => {
|
|
|
|
|
// 计算配送价格 -- 行 |
|
|
|
|
if (_dispatchKey) |
|
|
|
|
row.subtotalDispatch = _dispatchKey |
|
|
|
|
? computeNumber(row.dispatchPrice, '*', row[_dispatchKey]).result |
|
|
|
|
? computeNumber(row.deliveryPrice, '*', row[_dispatchKey]).result |
|
|
|
|
: 0; |
|
|
|
|
|
|
|
|
|
// if (Boolean(isDisabled.value && template && trunkLine)) |
|
|
|
|
@ -3007,7 +3007,7 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
|
|
|
|
|
const response = await postUpdateWaybillVerify(submitData); |
|
|
|
|
if (response.data.code !== 200) return; |
|
|
|
|
|
|
|
|
|
if (!response.data.data && response.data.data.length === 0) |
|
|
|
|
if (!response.data.data || response.data.data.length === 0) |
|
|
|
|
return ElMessage.warning('没有更改的数据'); |
|
|
|
|
|
|
|
|
|
details.changeData = response.data.data; |
|
|
|
|
@ -3301,7 +3301,7 @@ const handleAssignmentItemPriceDispatch = (
|
|
|
|
|
// 是否区分品类 |
|
|
|
|
if (template.dispatchIsByCategory) { |
|
|
|
|
// 品类是否存在id |
|
|
|
|
if (!value.goodsId) value.dispatchPrice = 0; |
|
|
|
|
if (!value.goodsId) value.deliveryPrice = 0; |
|
|
|
|
// 跟随选择的计价方式赋值 |
|
|
|
|
// else if (getObjType(chargeType) === 'number') { |
|
|
|
|
// const _arr = { |
|
|
|
|
@ -3320,7 +3320,7 @@ const handleAssignmentItemPriceDispatch = (
|
|
|
|
|
// } |
|
|
|
|
// } |
|
|
|
|
// console.log('_item :>> ', _item); |
|
|
|
|
// value.dispatchPrice = _item ? _item.price || 0 : 0; |
|
|
|
|
// value.deliveryPrice = _item ? _item.price || 0 : 0; |
|
|
|
|
// value.dispatchType = chargeType; |
|
|
|
|
// } |
|
|
|
|
else { |
|
|
|
|
@ -3366,10 +3366,10 @@ const handleAssignmentItemPriceDispatch = (
|
|
|
|
|
|
|
|
|
|
if (!_item) { |
|
|
|
|
value.dispatchType = 1; |
|
|
|
|
value.dispatchPrice = 0; |
|
|
|
|
value.deliveryPrice = 0; |
|
|
|
|
} else { |
|
|
|
|
value.dispatchType = _item.chargeType; |
|
|
|
|
value.dispatchPrice = _item.price || 0; |
|
|
|
|
value.deliveryPrice = _item.price || 0; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
console.log('_item', _item); |
|
|
|
|
@ -3379,7 +3379,7 @@ const handleAssignmentItemPriceDispatch = (
|
|
|
|
|
switch (value.chargeType) { |
|
|
|
|
// 件 |
|
|
|
|
case 1: |
|
|
|
|
value.dispatchPrice = |
|
|
|
|
value.deliveryPrice = |
|
|
|
|
getObjType(pieceCategory) === 'array' && pieceCategory.length > 0 |
|
|
|
|
? pieceCategory[0].price || 0 |
|
|
|
|
: 0; |
|
|
|
|
@ -3387,7 +3387,7 @@ const handleAssignmentItemPriceDispatch = (
|
|
|
|
|
|
|
|
|
|
// 方 |
|
|
|
|
case 2: |
|
|
|
|
value.dispatchPrice = |
|
|
|
|
value.deliveryPrice = |
|
|
|
|
getObjType(cubeCategory) === 'array' && cubeCategory.length > 0 |
|
|
|
|
? cubeCategory[0].price || 0 |
|
|
|
|
: 0; |
|
|
|
|
@ -3395,7 +3395,7 @@ const handleAssignmentItemPriceDispatch = (
|
|
|
|
|
|
|
|
|
|
// 公斤 |
|
|
|
|
case 3: |
|
|
|
|
value.dispatchPrice = |
|
|
|
|
value.deliveryPrice = |
|
|
|
|
getObjType(weightCategory) === 'array' && weightCategory.length > 0 |
|
|
|
|
? weightCategory[0].price || 0 |
|
|
|
|
: 0; |
|
|
|
|
@ -3462,7 +3462,7 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
|
|
|
|
|
// 配送 |
|
|
|
|
if (dispatch && template) |
|
|
|
|
handleAssignmentItemPriceDispatch(value, dispatch, template, chargeType); |
|
|
|
|
else value.dispatchPrice = 0; |
|
|
|
|
else value.deliveryPrice = 0; |
|
|
|
|
|
|
|
|
|
// 计算每行价格 |
|
|
|
|
if (!isOnload) handleComputed(value); |
|
|
|
|
@ -3547,7 +3547,9 @@ details.submitType = $route.query.orderStatus;
|
|
|
|
|
initPageInfo(); |
|
|
|
|
|
|
|
|
|
/** 改单提交 */ |
|
|
|
|
const handleSubmitCause = () => { |
|
|
|
|
const handleSubmitCause = async () => { |
|
|
|
|
await nextTick(); |
|
|
|
|
|
|
|
|
|
causeFormRef.value.validate(async valid => { |
|
|
|
|
if (!valid) return; |
|
|
|
|
|
|
|
|
|
|
