From b581f6554264442c52a455bd525cddba9b9f01d6 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 21 Jan 2025 11:44:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6=E8=BF=94?= =?UTF-8?q?=E5=88=A9=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bicyclerebatecheckAdd.vue | 132 +++++++++--------- .../danchefanliheduiEdit.vue | 132 +++++++++--------- .../relation/bicyclerebatetobecheckedAdd.vue | 2 +- 3 files changed, 129 insertions(+), 137 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue index ccdab26d75..27f4bee717 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue @@ -224,21 +224,20 @@ export default { // 按照返利类型统计 list.forEach((e) => { let v = 0 - for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) { - if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) { - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num) + parseFloat(1) - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].vehRebateSids.push(e.sid) + this.formobj.scmWhenVehrebateCheckapplydetailDetails.forEach((i) => { + if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) { + i.num = parseFloat(i.num) + parseFloat(1) + i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100 + i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100 + i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100 + i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0) : 0)) * 100) / 100 + i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100 + i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + (e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0))) * 100) / 100 + i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0)) * 100) / 100 + i.vehRebateSids.push(e.sid) v = 1 - break } - } + }) if (v === 0) { // 第一次对比没有参照，放入参照物 this.formobj.scmWhenVehrebateCheckapplydetailDetails.push({ @@ -251,11 +250,11 @@ export default { brandSid: e.brandSid, purchaseSystemName: e.purchaseSystemName, purchaseSystemSid: e.purchaseSystemSid, - uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100, - stayDetermineMoney: e.stayDetermineMoney, + uploadMoney: Math.round((e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100, + stayDetermineMoney: e.onceCheckState === 0 ? e.stayDetermineMoney : 0, adjustmentMoney: e.adjustmentMoney, - money: e.money, - fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100, + money: Math.round((e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0)) * 100) / 100, + fyAdjustmentMoney: Math.round((e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0) * 100) / 100, vehRebateSids: [e.sid], sid: '', mainSid: '' @@ -265,21 +264,20 @@ export default { // 按照预提年月统计 list.forEach((s) => { let k = 0 - for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) { - if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) { - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1) - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(s.sid) + this.formobj.scmLastVehrebateCheckapplydetailDetails.forEach((l) => { + if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) { + l.num = parseFloat(l.num) + parseFloat(1) + l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100 + l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100 + l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100 + l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0) : 0)) * 100) / 100 + l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100 + l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + (s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0))) * 100) / 100 + l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0)) * 100) / 100 + l.vehRebateSids.push(s.sid) k = 1 - break } - } + }) if (k === 0) { this.formobj.scmLastVehrebateCheckapplydetailDetails.push({ withholdingDate: s.withholdingDate, @@ -290,11 +288,11 @@ export default { brandSid: s.brandSid, purchaseSystemName: s.purchaseSystemName, purchaseSystemSid: s.purchaseSystemSid, - uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100, - stayDetermineMoney: s.stayDetermineMoney, + uploadMoney: Math.round((s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100, + stayDetermineMoney: s.onceCheckState === 0 ? s.stayDetermineMoney : 0, adjustmentMoney: s.adjustmentMoney, - money: s.money, - fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100, + money: Math.round((s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0)) * 100) / 100, + fyAdjustmentMoney: Math.round((s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0) * 100) / 100, vehRebateSids: [s.sid], sid: '', mainSid: '' @@ -328,21 +326,20 @@ export default { // 按照返利类型统计 this.formobj.scmVehrebateCheckapplydetailList.forEach((e) => { let v = 0 - for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) { - if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) { - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num) + parseFloat(1) - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].vehRebateSids.push(e.sid) + this.formobj.scmWhenVehrebateCheckapplydetailDetails.forEach((i) => { + if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) { + i.num = parseFloat(i.num) + parseFloat(1) + i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100 + i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100 + i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100 + i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0) : 0)) * 100) / 100 + i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100 + i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + (e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0))) * 100) / 100 + i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0)) * 100) / 100 + i.vehRebateSids.push(e.sid) v = 1 - break } - } + }) if (v === 0) { // 第一次对比没有参照，放入参照物 this.formobj.scmWhenVehrebateCheckapplydetailDetails.push({ @@ -355,11 +352,11 @@ export default { brandSid: e.brandSid, purchaseSystemName: e.purchaseSystemName, purchaseSystemSid: e.purchaseSystemSid, - uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100, - stayDetermineMoney: e.stayDetermineMoney, + uploadMoney: Math.round((e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100, + stayDetermineMoney: e.onceCheckState === 0 ? e.stayDetermineMoney : 0, adjustmentMoney: e.adjustmentMoney, - money: e.money, - fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100, + money: Math.round((e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0)) * 100) / 100, + fyAdjustmentMoney: Math.round((e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0) * 100) / 100, vehRebateSids: [e.sid], sid: '', mainSid: '' @@ -369,21 +366,20 @@ export default { // 按照预提年月统计 this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => { let k = 0 - for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) { - if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) { - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1) - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(s.sid) + this.formobj.scmLastVehrebateCheckapplydetailDetails.forEach((l) => { + if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) { + l.num = parseFloat(l.num) + parseFloat(1) + l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100 + l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100 + l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100 + l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0) : 0)) * 100) / 100 + l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100 + l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + (s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0))) * 100) / 100 + l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0)) * 100) / 100 + l.vehRebateSids.push(s.sid) k = 1 - break } - } + }) if (k === 0) { this.formobj.scmLastVehrebateCheckapplydetailDetails.push({ withholdingDate: s.withholdingDate, @@ -394,11 +390,11 @@ export default { brandSid: s.brandSid, purchaseSystemName: s.purchaseSystemName, purchaseSystemSid: s.purchaseSystemSid, - uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100, - stayDetermineMoney: s.stayDetermineMoney, + uploadMoney: Math.round((s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100, + stayDetermineMoney: s.onceCheckState === 0 ? s.stayDetermineMoney : 0, adjustmentMoney: s.adjustmentMoney, - money: s.money, - fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100, + money: Math.round((s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0)) * 100) / 100, + fyAdjustmentMoney: Math.round((s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0) * 100) / 100, vehRebateSids: [s.sid], sid: '', mainSid: '' diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue index 751d427c77..d3a1e04f23 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue @@ -192,21 +192,20 @@ export default { // 按照返利类型统计 list.forEach((e) => { let v = 0 - for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) { - if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) { - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num) + parseFloat(1) - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].vehRebateSids.push(e.sid) + this.formobj.scmWhenVehrebateCheckapplydetailDetails.forEach((i) => { + if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) { + i.num = parseFloat(i.num) + parseFloat(1) + i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100 + i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100 + i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100 + i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0) : 0)) * 100) / 100 + i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100 + i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + (e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0))) * 100) / 100 + i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0)) * 100) / 100 + i.vehRebateSids.push(e.sid) v = 1 - break } - } + }) if (v === 0) { // 第一次对比没有参照，放入参照物 this.formobj.scmWhenVehrebateCheckapplydetailDetails.push({ @@ -219,11 +218,11 @@ export default { brandSid: e.brandSid, purchaseSystemName: e.purchaseSystemName, purchaseSystemSid: e.purchaseSystemSid, - uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100, - stayDetermineMoney: e.stayDetermineMoney, + uploadMoney: Math.round((e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100, + stayDetermineMoney: e.onceCheckState === 0 ? e.stayDetermineMoney : 0, adjustmentMoney: e.adjustmentMoney, - money: e.money, - fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100, + money: Math.round((e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0)) * 100) / 100, + fyAdjustmentMoney: Math.round((e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0) * 100) / 100, vehRebateSids: [e.sid], sid: '', mainSid: '' @@ -233,21 +232,20 @@ export default { // 按照预提年月统计 list.forEach((s) => { let k = 0 - for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) { - if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) { - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1) - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(s.sid) + this.formobj.scmLastVehrebateCheckapplydetailDetails.forEach((l) => { + if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) { + l.num = parseFloat(l.num) + parseFloat(1) + l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100 + l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100 + l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100 + l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0) : 0)) * 100) / 100 + l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100 + l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + (s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0))) * 100) / 100 + l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0)) * 100) / 100 + l.vehRebateSids.push(s.sid) k = 1 - break } - } + }) if (k === 0) { this.formobj.scmLastVehrebateCheckapplydetailDetails.push({ withholdingDate: s.withholdingDate, @@ -258,11 +256,11 @@ export default { brandSid: s.brandSid, purchaseSystemName: s.purchaseSystemName, purchaseSystemSid: s.purchaseSystemSid, - uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100, - stayDetermineMoney: s.stayDetermineMoney, + uploadMoney: Math.round((s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100, + stayDetermineMoney: s.onceCheckState === 0 ? s.stayDetermineMoney : 0, adjustmentMoney: s.adjustmentMoney, - money: s.money, - fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100, + money: Math.round((s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0)) * 100) / 100, + fyAdjustmentMoney: Math.round((s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0) * 100) / 100, vehRebateSids: [s.sid], sid: '', mainSid: '' @@ -296,21 +294,20 @@ export default { // 按照返利类型统计 this.formobj.scmVehrebateCheckapplydetailList.forEach((e) => { let v = 0 - for (var i in this.formobj.scmWhenVehrebateCheckapplydetailDetails) { - if (this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].purchaseSystemName === e.purchaseSystemName && this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].brandName === e.brandName) { - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].num) + parseFloat(1) - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].money : 0) + parseFloat(e.money !== '' ? e.money : 0)) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney !== '' ? this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].fyAdjustmentMoney : 0) + (parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0))) * 100) / 100 - this.formobj.scmWhenVehrebateCheckapplydetailDetails[i].vehRebateSids.push(e.sid) + this.formobj.scmWhenVehrebateCheckapplydetailDetails.forEach((i) => { + if (i.rebateTypeValue === e.rebateTypeValue && i.purchaseSystemName === e.purchaseSystemName && i.brandName === e.brandName) { + i.num = parseFloat(i.num) + parseFloat(1) + i.withRebate = Math.round((parseFloat(i.withRebate !== '' ? i.withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100 + i.withholdCost = Math.round((parseFloat(i.withholdCost !== '' ? i.withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100 + i.uploadMoney = Math.round((parseFloat(i.uploadMoney !== '' ? i.uploadMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100 + i.stayDetermineMoney = Math.round((parseFloat(i.stayDetermineMoney !== '' ? i.stayDetermineMoney : 0) + (e.onceCheckState === 0 ? parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0) : 0)) * 100) / 100 + i.adjustmentMoney = Math.round((parseFloat(i.adjustmentMoney !== '' ? i.adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100 + i.money = Math.round((parseFloat(i.money !== '' ? i.money : 0) + (e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0))) * 100) / 100 + i.fyAdjustmentMoney = Math.round((parseFloat(i.fyAdjustmentMoney !== '' ? i.fyAdjustmentMoney : 0) + (e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0)) * 100) / 100 + i.vehRebateSids.push(e.sid) v = 1 - break } - } + }) if (v === 0) { // 第一次对比没有参照，放入参照物 this.formobj.scmWhenVehrebateCheckapplydetailDetails.push({ @@ -323,11 +320,11 @@ export default { brandSid: e.brandSid, purchaseSystemName: e.purchaseSystemName, purchaseSystemSid: e.purchaseSystemSid, - uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100, - stayDetermineMoney: e.stayDetermineMoney, + uploadMoney: Math.round((e.onceCheckState === 0 ? parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0) : parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100, + stayDetermineMoney: e.onceCheckState === 0 ? e.stayDetermineMoney : 0, adjustmentMoney: e.adjustmentMoney, - money: e.money, - fyAdjustmentMoney: Math.round((parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100, + money: Math.round((e.onceCheckState === 0 ? parseFloat(e.onceSuppCost !== '' ? e.onceSuppCost : 0) + parseFloat(e.onceTreatCost !== '' ? e.onceTreatCost : 0) + parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0) : parseFloat(e.secondSuppCost !== '' ? e.secondSuppCost : 0) + parseFloat(e.secondTreatCost !== '' ? e.secondTreatCost : 0)) * 100) / 100, + fyAdjustmentMoney: Math.round((e.isAdjustment === '是' ? parseFloat(e.money !== '' ? e.money : 0) - parseFloat(e.withholdCost !== '' ? e.withholdCost : 0) : 0) * 100) / 100, vehRebateSids: [e.sid], sid: '', mainSid: '' @@ -337,21 +334,20 @@ export default { // 按照预提年月统计 this.formobj.scmVehrebateCheckapplydetailList.forEach((s) => { let k = 0 - for (var l in this.formobj.scmLastVehrebateCheckapplydetailDetails) { - if (this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].purchaseSystemName === s.purchaseSystemName && this.formobj.scmLastVehrebateCheckapplydetailDetails[l].brandName === s.brandName) { - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].num) + parseFloat(1) - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].money : 0) + parseFloat(s.money !== '' ? s.money : 0)) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney = Math.round((parseFloat(this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney !== '' ? this.formobj.scmLastVehrebateCheckapplydetailDetails[l].fyAdjustmentMoney : 0) + (parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0))) * 100) / 100 - this.formobj.scmLastVehrebateCheckapplydetailDetails[l].vehRebateSids.push(s.sid) + this.formobj.scmLastVehrebateCheckapplydetailDetails.forEach((l) => { + if (l.withholdingDate === s.withholdingDate && l.purchaseSystemName === s.purchaseSystemName && l.brandName === s.brandName) { + l.num = parseFloat(l.num) + parseFloat(1) + l.withRebate = Math.round((parseFloat(l.withRebate !== '' ? l.withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100 + l.withholdCost = Math.round((parseFloat(l.withholdCost !== '' ? l.withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100 + l.uploadMoney = Math.round((parseFloat(l.uploadMoney !== '' ? l.uploadMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100 + l.stayDetermineMoney = Math.round((parseFloat(l.stayDetermineMoney !== '' ? l.stayDetermineMoney : 0) + (s.onceCheckState === 0 ? parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0) : 0)) * 100) / 100 + l.adjustmentMoney = Math.round((parseFloat(l.adjustmentMoney !== '' ? l.adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100 + l.money = Math.round((parseFloat(l.money !== '' ? l.money : 0) + (s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0))) * 100) / 100 + l.fyAdjustmentMoney = Math.round((parseFloat(l.fyAdjustmentMoney !== '' ? l.fyAdjustmentMoney : 0) + (s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0)) * 100) / 100 + l.vehRebateSids.push(s.sid) k = 1 - break } - } + }) if (k === 0) { this.formobj.scmLastVehrebateCheckapplydetailDetails.push({ withholdingDate: s.withholdingDate, @@ -362,11 +358,11 @@ export default { brandSid: s.brandSid, purchaseSystemName: s.purchaseSystemName, purchaseSystemSid: s.purchaseSystemSid, - uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100, - stayDetermineMoney: s.stayDetermineMoney, + uploadMoney: Math.round((s.onceCheckState === 0 ? parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0) : parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100, + stayDetermineMoney: s.onceCheckState === 0 ? s.stayDetermineMoney : 0, adjustmentMoney: s.adjustmentMoney, - money: s.money, - fyAdjustmentMoney: Math.round((parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100, + money: Math.round((s.onceCheckState === 0 ? parseFloat(s.onceSuppCost !== '' ? s.onceSuppCost : 0) + parseFloat(s.onceTreatCost !== '' ? s.onceTreatCost : 0) + parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0) : parseFloat(s.secondSuppCost !== '' ? s.secondSuppCost : 0) + parseFloat(s.secondTreatCost !== '' ? s.secondTreatCost : 0)) * 100) / 100, + fyAdjustmentMoney: Math.round((s.isAdjustment === '是' ? parseFloat(s.money !== '' ? s.money : 0) - parseFloat(s.withholdCost !== '' ? s.withholdCost : 0) : 0) * 100) / 100, vehRebateSids: [s.sid], sid: '', mainSid: '' diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue index 4a2794c48b..7b3d349014 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue @@ -85,7 +85,7 @@ export default { this.sids = aa console.log('sids', this.sids) }, - showInfo(sid, value) { + showInfo(vehRebateSids) { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() })