From 5a5d2834d57d879f7fde05837b10c7983672337a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Fri, 16 Aug 2024 10:09:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE=E5=8D=95?=
=?UTF-8?q?=E3=80=81=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../merchandisereturn/merchandisereturnAdd.vue | 12 ++++++------
.../merchandisereturn/merchandisereturnInfo.vue | 2 +-
.../views/operation/salesticket/salesticketAdd.vue | 8 ++++----
.../views/operation/salesticket/salesticketInfo.vue | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue b/yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue
index 36a8f23cfe..bc9fa68114 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.goodsSkuTitle !== '') {
+ if (e.goodsSpuName !== '') {
clf = Math.round((parseFloat(clf) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
}
})
@@ -509,7 +509,7 @@ export default {
goodSpuSid: row.sid,
goodsSpuName: row.goodsSpuName,
goodsSkuSid: row.goodsSkuSid,
- goodsSkuTitle: row.goodsSkuTitle,
+ goodsSkuTitle: row.goodsSpuName,
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.goodsSkuTitle !== '') {
+ if (e.goodsSpuName !== '') {
// 计算退货数量 = 总数量 - 已退数量
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.goodsSkuTitle !== '') {
+ if (row.goodsSpuName !== '') {
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 cf429fedc4..8dd93cf06a 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/salesticketAdd.vue b/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue
index 653a5848a3..fa8185e6ed 100644
--- a/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue
+++ b/yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue
@@ -114,14 +114,14 @@
-
+
-
+
@@ -390,7 +390,7 @@ export default {
let clf = '0'
if (this.formobj.goodsVos.length > 0) {
this.formobj.goodsVos.forEach((e) => {
- if (e.goodsSkuTitle !== '') {
+ if (e.goodsSpuName !== '') {
clf = Math.round((parseFloat(clf) + (parseFloat(e.price !== '' ? e.price : '0') * parseFloat(e.count !== '' ? e.count : '0'))) * 100) / 100
}
})
@@ -657,7 +657,7 @@ export default {
row.goodsSkuSid = value.goodsSkuSid
row.goodsSpuName = value.goodsSpuName
row.goodsSkuCode = value.goodsSkuCode
- row.goodsSkuTitle = value.goodsSkuTitle
+ row.goodsSkuTitle = value.goodsSpuName
row.goodsSkuOwnSpec = value.goodsSkuOwnSpec
row.unit = value.unit
row.warehouseName = value.warehouseName
diff --git a/yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue b/yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue
index a7ea896634..4e2748da50 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.goodsSkuTitle !== '') {
+ if (e.goodsSpuName !== '') {
clf = Math.round((parseFloat(clf) + (parseFloat(e.price !== '' ? e.price : '0') * parseFloat(e.count !== '' ? e.count : '0'))) * 100) / 100
}
})