From 42a107687df15b51001d37e962137d0702da2c36 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 21 Oct 2024 15:57:34 +0800 Subject: [PATCH 1/2] =?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 --- .../bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 759a4565de..714e07177c 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 @@ -295,8 +295,8 @@ export default { }, changeIsAdjustment(val) { if (val === '是' || val === '无需调整') { - // 计算调整金额 = 上传金额(一次上传金额 + 二次上传金额) - 待确定金额 - 费用(一次待支付费用 + 一次抵顶费用 + 二次待支付费用 + 二次抵顶费用) - 预提返利 - this.formobj.adjustmentMoney = Math.round((parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) + parseFloat(this.formobj.secondaryUploadMoney !== '' ? this.formobj.secondaryUploadMoney : 0) - parseFloat(this.formobj.stayDetermineMoney !== '' ? this.formobj.stayDetermineMoney : 0) - (parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) + parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) + parseFloat(this.formobj.secondTreatCost !== '' ? this.formobj.secondTreatCost : 0) + parseFloat(this.formobj.secondSuppCost !== '' ? this.formobj.secondSuppCost : 0)) - parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0)) * 100) / 100 + // 计算调整金额 = 上传金额(一次上传金额 + 二次上传金额) - 待确定金额 - 费用(一次待支付费用 + 一次抵顶费用 + 二次待支付费用 + 二次抵顶费用) - (预提返利 - 其中预提费用) + this.formobj.adjustmentMoney = Math.round((parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) + parseFloat(this.formobj.secondaryUploadMoney !== '' ? this.formobj.secondaryUploadMoney : 0) - parseFloat(this.formobj.stayDetermineMoney !== '' ? this.formobj.stayDetermineMoney : 0) - (parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) + parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) + parseFloat(this.formobj.secondTreatCost !== '' ? this.formobj.secondTreatCost : 0) + parseFloat(this.formobj.secondSuppCost !== '' ? this.formobj.secondSuppCost : 0)) - (parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - parseFloat(this.formobj.expectTreatCost !== '' ? this.formobj.expectTreatCost : 0) - parseFloat(this.formobj.expectSuppCost !== '' ? this.formobj.expectSuppCost : 0))) * 100) / 100 } else { this.formobj.adjustmentMoney = '0' this.formobj.adjustmentRemarks = '' From 073325a0b7122426b98ea8517f1dcce5a6267233 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 21 Oct 2024 17:06:46 +0800 Subject: [PATCH 2/2] =?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 --- .../bicyclerebatecheckAdd.vue | 8 +++---- .../bicyclerebatecheckInfo.vue | 8 +++---- .../relation/bicyclerebatetobecheckedAdd.vue | 23 +++++++++++-------- .../relation/bicyclerebatetobecheckedInfo.vue | 5 ++-- .../danchefanliheduiDaiBanInfo.vue | 8 +++---- .../danchefanliheduiEdit.vue | 8 +++---- .../danchefanliheduiYiBanInfo.vue | 8 +++---- .../relation/bicyclerebatetobecheckedAdd.vue | 23 +++++++++++-------- .../relation/bicyclerebatetobecheckedInfo.vue | 5 ++-- 9 files changed, 50 insertions(+), 46 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 7e41d5093b..70d6f7985c 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 @@ -45,7 +45,7 @@ @@ -62,7 +62,7 @@ @@ -279,9 +279,9 @@ export default { dataDelete(index) { this.formobj.baseVehinstallModpricedetails.splice(index, 1) }, - handleLook(row) { + handleLook() { this.viewState = 3 - this.$refs['divAdd'].showInfo(row, this.formobj.scmVehrebateCheckapplydetailList) + this.$refs['divAdd'].showInfo(this.formobj.sid, this.formobj.scmVehrebateCheckapplydetailList) }, backAdd(val) { this.viewState = 1 diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue index 222ee85213..7a4b493496 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue @@ -34,7 +34,7 @@ @@ -51,7 +51,7 @@ @@ -106,9 +106,9 @@ export default { this.formobj = row }) }, - handleLook(row) { + handleLook() { this.viewState = 2 - this.$refs['divInfo'].showInfo(row) + this.$refs['divInfo'].showInfo(this.formobj.sid) }, resetState() { this.viewState = 1 diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue index 951c1b4f8c..1f90843067 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedAdd.vue @@ -83,20 +83,23 @@ export default { this.sids = aa console.log('sids', this.sids) }, - showInfo(row, value) { + showInfo(sid, value) { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) + this.scmVehrebateCheckapplydetailList = JSON.parse(JSON.stringify(value)) this.viewTitle = '单车返利核对审核申请明细' - console.log('编辑回显', row) - req.vehRebateCheckDetails(row.vehRebateSids).then((resp) => { - if (resp.success) { - this.list = resp.data - this.scmVehrebateCheckapplydetailList = JSON.parse(JSON.stringify(value)) - } - }).catch((e) => { - this.list = [] - }) + if (sid !== '' && sid !== null) { + req.vehRebateCheckDetails(sid).then((resp) => { + if (resp.success) { + this.list = resp.data + } + }).catch((e) => { + this.list = [] + }) + } else { + this.list = this.scmVehrebateCheckapplydetailList + } }, handleDelete() { if (this.sids.length === 0) { diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue index 337f2a12ad..0209bd5a9a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/relation/bicyclerebatetobecheckedInfo.vue @@ -72,13 +72,12 @@ export default { } }, methods: { - showInfo(row) { + showInfo(sid) { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) this.viewTitle = '单车返利核对审核申请明细' - console.log('编辑回显', row) - req.vehRebateCheckDetails(row.vehRebateSids).then((resp) => { + req.vehRebateCheckDetails(sid).then((resp) => { if (resp.success) { this.list = resp.data } diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue index 277cfbc1b7..ad8c243c88 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue @@ -36,7 +36,7 @@ @@ -53,7 +53,7 @@ @@ -179,9 +179,9 @@ export default { this.formobj = {} }) }, - handleLook(row) { + handleLook() { this.viewState = 2 - this.$refs['divInfo'].showInfo(row) + this.$refs['divInfo'].showInfo(this.formobj.sid) }, resetState() { this.viewState = 1 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 eac298407d..6fe2cbeb8f 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 @@ -44,7 +44,7 @@ @@ -61,7 +61,7 @@ @@ -274,9 +274,9 @@ export default { dataDelete(index) { this.formobj.baseVehinstallModpricedetails.splice(index, 1) }, - handleLook(row) { + handleLook() { this.viewState = 3 - this.$refs['divAdd'].showInfo(row, this.formobj.scmVehrebateCheckapplydetailList) + this.$refs['divAdd'].showInfo(this.formobj.sid, this.formobj.scmVehrebateCheckapplydetailList) }, backAdd(val) { this.viewState = 1 diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue index 5cee6725f2..c10ccf6224 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue @@ -34,7 +34,7 @@ @@ -51,7 +51,7 @@ @@ -142,9 +142,9 @@ export default { this.formobj = {} }) }, - handleLook(row) { + handleLook() { this.viewState = 2 - this.$refs['divInfo'].showInfo(row) + this.$refs['divInfo'].showInfo(this.formobj.sid) }, resetState() { this.viewState = 1 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 9d39419a9c..80db93ce72 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 @@ -83,20 +83,23 @@ export default { this.sids = aa console.log('sids', this.sids) }, - showInfo(row, value) { + showInfo(sid, value) { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) + this.scmVehrebateCheckapplydetailList = JSON.parse(JSON.stringify(value)) this.viewTitle = '单车返利核对审核申请明细' - console.log('编辑回显', row) - req.vehRebateCheckDetails(row.vehRebateSids).then((resp) => { - if (resp.success) { - this.list = resp.data - this.scmVehrebateCheckapplydetailList = JSON.parse(JSON.stringify(value)) - } - }).catch((e) => { - this.list = [] - }) + if (sid !== '' && sid !== null) { + req.vehRebateCheckDetails(sid).then((resp) => { + if (resp.success) { + this.list = resp.data + } + }).catch((e) => { + this.list = [] + }) + } else { + this.list = this.scmVehrebateCheckapplydetailList + } }, handleDelete() { if (this.sids.length === 0) { diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue index 009ae05f0e..b344e23064 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue @@ -72,13 +72,12 @@ export default { } }, methods: { - showInfo(row) { + showInfo(sid) { this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) this.viewTitle = '单车返利核对审核申请明细' - console.log('编辑回显', row) - req.vehRebateCheckDetails(row.vehRebateSids).then((resp) => { + req.vehRebateCheckDetails(sid).then((resp) => { if (resp.success) { this.list = resp.data }