From 9694e2c0d8b4f9671be2a047ecb92fe9f04d0d3e Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 11 Oct 2024 15:18:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue | 1 + .../bicyclerebatecheck/bicyclerebatetobechecked.vue | 2 +- .../bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue index 1bfbcdf5f1..228047c2e3 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue @@ -279,6 +279,7 @@ export default { }, handleClick() { this.$parent.resetState() + this.$parent.handleReset() }, toEdit(row) { this.viewState = 2 diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue index 8fdacc00d1..6bd16de752 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue @@ -457,7 +457,7 @@ export default { size: 5, total: 0 } - this.init() + this.getList() }, getNumber(val, limit) { val = val.replace(/[^0-9.]/g, '') // 保留数字 diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue index 8f2f1ab42c..759a4565de 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue @@ -264,8 +264,8 @@ export default { }, isAdjustmentInput(val) { let money = '0' - // 上传金额(一次上传金额 + 二次上传金额) - 费用 - 待确定金额 - 预提返利 - money = Math.round((parseFloat(val.uploadMoney !== '' ? val.uploadMoney : 0) + parseFloat(val.secondaryUploadMoney !== '' ? val.secondaryUploadMoney : 0) - parseFloat(val.stayDetermineMoney !== '' ? val.stayDetermineMoney : 0) - (parseFloat(val.onceTreatCost !== '' ? val.onceTreatCost : 0) + parseFloat(val.onceSuppCost !== '' ? val.onceSuppCost : 0) + parseFloat(val.secondTreatCost !== '' ? val.secondTreatCost : 0) + parseFloat(val.secondSuppCost !== '' ? val.secondSuppCost : 0)) - parseFloat(val.estimateRebate !== '' ? val.estimateRebate : 0)) * 100) / 100 + // 上传金额(一次上传金额 + 二次上传金额) - 其中费用 - 待确定金额 - （预提返利 - 其中预提费用） + money = Math.round((parseFloat(val.uploadMoney !== '' ? val.uploadMoney : 0) + parseFloat(val.secondaryUploadMoney !== '' ? val.secondaryUploadMoney : 0) - parseFloat(val.stayDetermineMoney !== '' ? val.stayDetermineMoney : 0) - (parseFloat(val.onceTreatCost !== '' ? val.onceTreatCost : 0) + parseFloat(val.onceSuppCost !== '' ? val.onceSuppCost : 0) + parseFloat(val.secondTreatCost !== '' ? val.secondTreatCost : 0) + parseFloat(val.secondSuppCost !== '' ? val.secondSuppCost : 0)) - (parseFloat(val.estimateRebate !== '' ? val.estimateRebate : 0) - parseFloat(val.expectTreatCost !== '' ? val.expectTreatCost : 0) - parseFloat(val.expectSuppCost !== '' ? val.expectSuppCost : 0))) * 100) / 100 if (val.stayDetermineMoney === '0') { if (parseFloat(money) > 0) { this.isAdjustment = '是' From 046730ac3d140f0ae00bc4aa1e84135ca889f079 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 11 Oct 2024 15:21:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../specialrebate/specialrebatecheck/specialrebatecheck.vue | 1 + .../specialrebatecheck/specialrebatetobechecked.vue | 2 +- .../specialrebatecheck/specialrebatetobecheckedByUpdate.vue | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue index 22f0a49d0f..01b2bff585 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue @@ -272,6 +272,7 @@ export default { }, handleClick() { this.$parent.resetState() + this.$parent.handleReset() }, toEdit(row) { this.viewState = 2 diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue index 707b9b1e2f..4f0997a384 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue @@ -466,7 +466,7 @@ export default { size: 5, total: 0 } - this.init() + this.getList() }, getNumber(val, limit) { val = val.replace(/[^0-9.]/g, '') // 保留数字 diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue index d5d0f227c4..86e79ffcfd 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue @@ -262,8 +262,8 @@ export default { }, isAdjustmentInput(val) { let money = '0' - // 上传金额(一次上传金额 + 二次上传金额) - 费用 - 待确定金额 - 预提返利 - money = Math.round((parseFloat(val.uploadMoney !== '' ? val.uploadMoney : 0) + parseFloat(val.secondaryUploadMoney !== '' ? val.secondaryUploadMoney : 0) - parseFloat(val.stayDetermineMoney !== '' ? val.stayDetermineMoney : 0) - (parseFloat(val.onceItureCost !== '' ? val.onceItureCost : 0) + parseFloat(val.onceTreatCost !== '' ? val.onceTreatCost : 0) + parseFloat(val.onceSuppCost !== '' ? val.onceSuppCost : 0) + parseFloat(val.secondItureCost !== '' ? val.secondItureCost : 0) + parseFloat(val.secondTreatCost !== '' ? val.secondTreatCost : 0) + parseFloat(val.secondSuppCost !== '' ? val.secondSuppCost : 0)) - parseFloat(val.estimateRebate !== '' ? val.estimateRebate : 0)) * 100) / 100 + // 上传金额(一次上传金额 + 二次上传金额) - 费用 - 待确定金额 - (预提返利 - 其中预提费用) + money = Math.round((parseFloat(val.uploadMoney !== '' ? val.uploadMoney : 0) + parseFloat(val.secondaryUploadMoney !== '' ? val.secondaryUploadMoney : 0) - parseFloat(val.stayDetermineMoney !== '' ? val.stayDetermineMoney : 0) - (parseFloat(val.onceItureCost !== '' ? val.onceItureCost : 0) + parseFloat(val.onceTreatCost !== '' ? val.onceTreatCost : 0) + parseFloat(val.onceSuppCost !== '' ? val.onceSuppCost : 0) + parseFloat(val.secondItureCost !== '' ? val.secondItureCost : 0) + parseFloat(val.secondTreatCost !== '' ? val.secondTreatCost : 0) + parseFloat(val.secondSuppCost !== '' ? val.secondSuppCost : 0)) - (parseFloat(val.estimateRebate !== '' ? val.estimateRebate : 0) - parseFloat(val.expectItureCost !== '' ? val.expectItureCost : 0) - parseFloat(val.expectTreatCost !== '' ? val.expectTreatCost : 0) - parseFloat(val.expectSuppCost !== '' ? val.expectSuppCost : 0))) * 100) / 100 if (val.stayDetermineMoney === '0') { if (parseFloat(money) > 0) { this.isAdjustment = '是' From 4ad529c4a0b69e0960da0f957b2ebacbcf50c8cf Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 11 Oct 2024 16:53:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/specialrebate/specialrebatecheck.js | 2 +- .../relation/specialrebatetobecheckedAdd.vue | 2 +- .../relation/specialrebatetobecheckedInfo.vue | 2 +- .../relation/yiheduizhuanxiangfanli.vue | 2 +- .../specialrebatecheck/specialrebatecheckAdd.vue | 16 ++++++++-------- .../specialrebatetobechecked.vue | 4 ++-- .../specialrebatemanagement.vue | 2 +- .../relation/specialrebatetobecheckedAdd.vue | 2 +- .../relation/specialrebatetobecheckedInfo.vue | 2 +- .../relation/yiheduizhuanxiangfanli.vue | 2 +- .../zhuanxiangfanliheduiEdit.vue | 16 ++++++++-------- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js index 46f3b7c555..473b08c87a 100644 --- a/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js +++ b/anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js @@ -94,7 +94,7 @@ export default { // 查看明细 specialRebateCheckDetails: function(data) { return request({ - url: '/scm/v1/scmspecialrebatecheckapply/specialRebateCheckDetails/' + data, + url: '/scm/v1/scmspecialrebatecheckapplydetail/specialRebateCheckDetails/' + data, method: 'get' }) }, diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue index 401838d785..a2350c59d6 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedAdd.vue @@ -30,7 +30,7 @@ - + diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue index 58065bf547..2dcafaf925 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/specialrebatetobecheckedInfo.vue @@ -28,7 +28,7 @@ - + diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue index 2d68b51dd1..64e4f2de3e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/relation/yiheduizhuanxiangfanli.vue @@ -18,7 +18,7 @@ - + diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue index 959b3181f1..879755d70a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue @@ -180,7 +180,7 @@ export default { if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) { this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1) this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100 - this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost : 0) + parseFloat(e.expectCost !== '' ? e.expectCost : 0)) * 100) / 100 + this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100 this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100 this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100 this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100 @@ -197,7 +197,7 @@ export default { rebateTypeValue: e.rebateTypeValue, num: 1, withRebate: e.estimateRebate, - expectCost: e.expectCost, + withholdCost: e.withholdCost, brandName: e.brandName, brandSid: e.brandSid, uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100, @@ -217,7 +217,7 @@ export default { if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) { this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1) this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100 - this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost : 0) + parseFloat(s.expectCost !== '' ? s.expectCost : 0)) * 100) / 100 + this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100 this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100 this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100 this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100 @@ -232,7 +232,7 @@ export default { withholdingDate: s.withholdingDate, num: 1, withRebate: s.estimateRebate, - expectCost: s.expectCost, + withholdCost: s.withholdCost, brandName: s.brandName, brandSid: s.brandSid, uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100, @@ -273,7 +273,7 @@ export default { if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) { this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1) this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100 - this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost : 0) + parseFloat(e.expectCost !== '' ? e.expectCost : 0)) * 100) / 100 + this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100 this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100 this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100 this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100 @@ -290,7 +290,7 @@ export default { rebateTypeValue: e.rebateTypeValue, num: 1, withRebate: e.estimateRebate, - expectCost: e.expectCost, + withholdCost: e.withholdCost, brandName: e.brandName, brandSid: e.brandSid, uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100, @@ -310,7 +310,7 @@ export default { if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) { this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1) this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100 - this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost : 0) + parseFloat(s.expectCost !== '' ? s.expectCost : 0)) * 100) / 100 + this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100 this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100 this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100 this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100 @@ -325,7 +325,7 @@ export default { withholdingDate: s.withholdingDate, num: 1, withRebate: s.estimateRebate, - expectCost: s.expectCost, + withholdCost: s.withholdCost, brandName: s.brandName, brandSid: s.brandSid, uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100, diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue index 4f0997a384..57edecbb30 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue @@ -76,7 +76,7 @@ - + @@ -530,7 +530,7 @@ export default { // 二次调整页面--调整说明模块 adjustmentMoneyAdd() { // 剩余预计返利 = 列表预提返利-其中预提费用-一次上传返利金额(列表一次上传金额-一次费用-待确定） - this.formobj.surplusRebate = Math.round((parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - parseFloat(this.formobj.expectCost !== '' ? this.formobj.expectCost : 0) - (parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) - parseFloat(this.formobj.onceItureCost !== '' ? this.formobj.onceItureCost : 0) - parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) - parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) - parseFloat(this.formobj.stayDetermineMoneyNew !== '' ? this.formobj.stayDetermineMoneyNew : 0))) * 100) / 100 + this.formobj.surplusRebate = Math.round((parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - parseFloat(this.formobj.withholdCost !== '' ? this.formobj.withholdCost : 0) - (parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) - parseFloat(this.formobj.onceItureCost !== '' ? this.formobj.onceItureCost : 0) - parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) - parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) - parseFloat(this.formobj.stayDetermineMoneyNew !== '' ? this.formobj.stayDetermineMoneyNew : 0))) * 100) / 100 // 调整金额合计 = 其中含返利之和 - 剩余预提返利 this.formobj.adjustmentMoney = Math.round((parseFloat(this.formobj.firstRebate !== '' ? this.formobj.firstRebate : 0) + parseFloat(this.formobj.secondRebate !== '' ? this.formobj.secondRebate : 0) - parseFloat(this.formobj.surplusRebate !== '' ? this.formobj.surplusRebate : 0)) * 100) / 100 }, diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue index bd954254a9..4c35c01ea3 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue @@ -58,7 +58,7 @@ diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue index 43086ccee2..692d66be70 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedAdd.vue @@ -30,7 +30,7 @@ - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue index f7ea8c5229..d1261baaae 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/specialrebatetobecheckedInfo.vue @@ -28,7 +28,7 @@ - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/yiheduizhuanxiangfanli.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/yiheduizhuanxiangfanli.vue index 486fcad035..285b56d6eb 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/yiheduizhuanxiangfanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/relation/yiheduizhuanxiangfanli.vue @@ -18,7 +18,7 @@ - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue index 38fbc3ed5d..34023c027c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiEdit.vue @@ -165,7 +165,7 @@ export default { if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) { this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1) this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100 - this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost : 0) + parseFloat(e.expectCost !== '' ? e.expectCost : 0)) * 100) / 100 + this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100 this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100 this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100 this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100 @@ -182,7 +182,7 @@ export default { rebateTypeValue: e.rebateTypeValue, num: 1, withRebate: e.estimateRebate, - expectCost: e.expectCost, + withholdCost: e.withholdCost, brandName: e.brandName, brandSid: e.brandSid, uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100, @@ -202,7 +202,7 @@ export default { if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) { this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1) this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100 - this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost : 0) + parseFloat(s.expectCost !== '' ? s.expectCost : 0)) * 100) / 100 + this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100 this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100 this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100 this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100 @@ -217,7 +217,7 @@ export default { withholdingDate: s.withholdingDate, num: 1, withRebate: s.estimateRebate, - expectCost: s.expectCost, + withholdCost: s.withholdCost, brandName: s.brandName, brandSid: s.brandSid, uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100, @@ -258,7 +258,7 @@ export default { if (this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].rebateTypeValue === e.rebateTypeValue) { this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num = parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].num) + parseFloat(1) this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withRebate : 0) + parseFloat(e.estimateRebate !== '' ? e.estimateRebate : 0)) * 100) / 100 - this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].expectCost : 0) + parseFloat(e.expectCost !== '' ? e.expectCost : 0)) * 100) / 100 + this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].withholdCost : 0) + parseFloat(e.withholdCost !== '' ? e.withholdCost : 0)) * 100) / 100 this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].uploadMoney : 0) + (parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0))) * 100) / 100 this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].stayDetermineMoney : 0) + parseFloat(e.stayDetermineMoney !== '' ? e.stayDetermineMoney : 0)) * 100) / 100 this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney = Math.round((parseFloat(this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney !== '' ? this.formobj.scmWhenSpecialrebateCheckapplydetailDetails[i].adjustmentMoney : 0) + parseFloat(e.adjustmentMoney !== '' ? e.adjustmentMoney : 0)) * 100) / 100 @@ -275,7 +275,7 @@ export default { rebateTypeValue: e.rebateTypeValue, num: 1, withRebate: e.estimateRebate, - expectCost: e.expectCost, + withholdCost: e.withholdCost, brandName: e.brandName, brandSid: e.brandSid, uploadMoney: Math.round((parseFloat(e.uploadMoney !== '' ? e.uploadMoney : 0) + parseFloat(e.secondaryUploadMoney !== '' ? e.secondaryUploadMoney : 0)) * 100) / 100, @@ -295,7 +295,7 @@ export default { if (this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdingDate === s.withholdingDate) { this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num = parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].num) + parseFloat(1) this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withRebate : 0) + parseFloat(s.estimateRebate !== '' ? s.estimateRebate : 0)) * 100) / 100 - this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].expectCost : 0) + parseFloat(s.expectCost !== '' ? s.expectCost : 0)) * 100) / 100 + this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].withholdCost : 0) + parseFloat(s.withholdCost !== '' ? s.withholdCost : 0)) * 100) / 100 this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].uploadMoney : 0) + (parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0))) * 100) / 100 this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].stayDetermineMoney : 0) + parseFloat(s.stayDetermineMoney !== '' ? s.stayDetermineMoney : 0)) * 100) / 100 this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney = Math.round((parseFloat(this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney !== '' ? this.formobj.scmLastSpecialrebateCheckapplydetailDetails[l].adjustmentMoney : 0) + parseFloat(s.adjustmentMoney !== '' ? s.adjustmentMoney : 0)) * 100) / 100 @@ -310,7 +310,7 @@ export default { withholdingDate: s.withholdingDate, num: 1, withRebate: s.estimateRebate, - expectCost: s.expectCost, + withholdCost: s.withholdCost, brandName: s.brandName, brandSid: s.brandSid, uploadMoney: Math.round((parseFloat(s.uploadMoney !== '' ? s.uploadMoney : 0) + parseFloat(s.secondaryUploadMoney !== '' ? s.secondaryUploadMoney : 0)) * 100) / 100, From d179596f9b54ebe4ac166a739380ed6b218c6341 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 11 Oct 2024 16:54:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue index 6bd16de752..db424b6e22 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue @@ -524,7 +524,7 @@ export default { // 二次调整页面--调整说明模块 adjustmentMoneyAdd() { // 剩余预计返利 = 列表预提返利-其中预提费用-一次上传返利金额(列表一次上传金额-一次费用-待确定） - this.formobj.surplusRebate = Math.round((parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - parseFloat(this.formobj.expectCost !== '' ? this.formobj.expectCost : 0) - (parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) - parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) - parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) - parseFloat(this.formobj.stayDetermineMoneyNew !== '' ? this.formobj.stayDetermineMoneyNew : 0))) * 100) / 100 + this.formobj.surplusRebate = Math.round((parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - parseFloat(this.formobj.withholdCost !== '' ? this.formobj.withholdCost : 0) - (parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) - parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) - parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) - parseFloat(this.formobj.stayDetermineMoneyNew !== '' ? this.formobj.stayDetermineMoneyNew : 0))) * 100) / 100 // 调整金额合计 = 其中含返利之和 - 剩余预提返利 this.formobj.adjustmentMoney = Math.round((parseFloat(this.formobj.firstRebate !== '' ? this.formobj.firstRebate : 0) + parseFloat(this.formobj.secondRebate !== '' ? this.formobj.secondRebate : 0) - parseFloat(this.formobj.surplusRebate !== '' ? this.formobj.surplusRebate : 0)) * 100) / 100 },