diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue index ed420fd181..36a8f23cfe 100644 --- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue +++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue @@ -135,7 +135,7 @@ 退 - + @@ -186,7 +186,7 @@ 删除 - + @@ -325,7 +325,7 @@ export default { let clf = '0' if (this.formobj.returnGoods.length > 0) { this.formobj.returnGoods.forEach((e) => { - if (e.goodsSpuName !== '') { + if (e.goodsSkuTitle !== '') { clf = Math.round((parseFloat(clf) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100 } }) @@ -508,8 +508,8 @@ export default { goodsID: row.goodsID, goodSpuSid: row.sid, goodsSpuName: row.goodsSpuName, - goodsSkuSid: '', - goodsSkuTitle: '', + goodsSkuSid: row.goodsSkuSid, + goodsSkuTitle: row.goodsSkuTitle, goodsSkuCode: row.goodsSkuCode, unit: row.unit, goodsSkuOwnSpec: row.goodsSkuOwnSpec, @@ -532,7 +532,7 @@ export default { fullyWithdraw() { if (this.formobj.returnGoods.length > 0) { this.formobj.returnGoods.forEach((e) => { - if (e.goodsSpuName !== '') { + if (e.goodsSkuTitle !== '') { // 计算退货数量 = 总数量 - 已退数量 e.backCount = Math.round((parseFloat(e.currentCount) - parseFloat(e.returnedCount !== '' ? e.returnedCount : '0')) * 100) / 100 // 计算退货金额 @@ -546,7 +546,7 @@ export default { }, // 计算退货金额 backAmountInput(row) { - if (row.goodsSpuName !== '') { + if (row.goodsSkuTitle !== '') { row.backAmount = Math.round((parseFloat(row.backPrice !== '' ? row.backPrice : '0') * parseFloat(row.backCount !== '' ? row.backCount : '0')) * 100) / 100 } }, diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue index 8dd93cf06a..cf429fedc4 100644 --- a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue +++ b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue @@ -123,7 +123,7 @@ - + diff --git a/yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue b/yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue index 4e2748da50..a7ea896634 100644 --- a/yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue +++ b/yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue @@ -80,7 +80,7 @@
商品列表
- + @@ -202,7 +202,7 @@ export default { let clf = '0' if (this.formobj.goodsVos.length > 0) { this.formobj.goodsVos.forEach((e) => { - if (e.goodsSpuName !== '') { + if (e.goodsSkuTitle !== '') { clf = Math.round((parseFloat(clf) + (parseFloat(e.price !== '' ? e.price : '0') * parseFloat(e.count !== '' ? e.count : '0'))) * 100) / 100 } })