From 0ea781ddb45e589e026d744df26e9892028defd0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 30 Apr 2025 16:46:59 +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=E9=A2=84=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bicyclerebatewithholdingAdd.vue | 20 ++---- .../bicyclerebatewithholdingInfo.vue | 68 ++++++++++++------- .../danchefanliyutiDaiBanInfo.vue | 47 +++++++------ .../danchefanliyutiEdit.vue | 20 ++---- .../danchefanliyutiYiBanInfo.vue | 47 +++++++------ 5 files changed, 99 insertions(+), 103 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue index 4209d0eb0d..5df8c6fa84 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue @@ -352,30 +352,20 @@ export default { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { - return prev + curr + return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100 } else { - return prev + return Math.round((parseFloat(prev)) * 100) / 100 } }, 0) sums[index] += '' this.formobj.withRebateTotal = sums[index] += '' - } else if (column.property === 'expectTreatCost') { + } else if (column.property === 'expectTreatCost' || column.property === 'expectSuppCost') { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { - return prev + curr + return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100 } else { - return prev - } - }, 0) - sums[index] += '' - } else if (column.property === 'expectSuppCost') { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr) - if (!isNaN(value)) { - return prev + curr - } else { - return prev + return Math.round((parseFloat(prev)) * 100) / 100 } }, 0) sums[index] += '' diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue index 4cc7f1ed35..81f24d3374 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue @@ -92,7 +92,26 @@ export default { tableKey: 0, viewState: 1, // 表单数据 - formobj: {}, + formobj: { + sid: '', + withApply: '', + billNo: '', + createTime: '', + createOrgName: '', + createOrgSid: '', + deptName: '', + deptSid: '', + useOrgName: '', + useOrgSid: '', + remarks: '', + withRebateTotal: '', + createByName: '', + createBySid: '', + instanceId: '', // 流程实例ID + taskId: '', // 任务ID + orgPath: '', + scmVehRebateWiths: [] + }, rules: {}, submitdisabled: false } @@ -129,33 +148,13 @@ export default { return } const values = data.map(item => Number(item[column.property])) - if (column.property === 'withRebate') { + if (column.property === 'withRebate' || column.property === 'expectTreatCost' || column.property === 'expectSuppCost') { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { - return prev + curr + return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100 } else { - return prev - } - }, 0) - sums[index] += '' - } else if (column.property === 'expectTreatCost') { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr) - if (!isNaN(value)) { - return prev + curr - } else { - return prev - } - }, 0) - sums[index] += '' - } else if (column.property === 'expectSuppCost') { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr) - if (!isNaN(value)) { - return prev + curr - } else { - return prev + return Math.round((parseFloat(prev)) * 100) / 100 } }, 0) sums[index] += '' @@ -218,7 +217,26 @@ export default { handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') // 表单数据 - this.formobj = {} + this.formobj = { + sid: '', + withApply: '', + billNo: '', + createTime: '', + createOrgName: '', + createOrgSid: '', + deptName: '', + deptSid: '', + useOrgName: '', + useOrgSid: '', + remarks: '', + withRebateTotal: '', + createByName: '', + createBySid: '', + instanceId: '', // 流程实例ID + taskId: '', // 任务ID + orgPath: '', + scmVehRebateWiths: [] + } this.$refs['form_obj'].resetFields() this.$emit('doback') } diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue index 8d4acc483e..64470b7df4 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue @@ -127,7 +127,26 @@ export default { tableKey: 0, viewState: 1, // 表单数据 - formobj: {}, + formobj: { + sid: '', + withApply: '', + billNo: '', + createTime: '', + createOrgName: '', + createOrgSid: '', + deptName: '', + deptSid: '', + useOrgName: '', + useOrgSid: '', + remarks: '', + withRebateTotal: '', + createByName: '', + createBySid: '', + instanceId: '', // 流程实例ID + taskId: '', // 任务ID + orgPath: '', + scmVehRebateWiths: [] + }, rules: {}, submitdisabled: false, options: [], @@ -405,33 +424,13 @@ export default { return } const values = data.map(item => Number(item[column.property])) - if (column.property === 'withRebate') { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr) - if (!isNaN(value)) { - return prev + curr - } else { - return prev - } - }, 0) - sums[index] += '' - } else if (column.property === 'expectTreatCost') { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr) - if (!isNaN(value)) { - return prev + curr - } else { - return prev - } - }, 0) - sums[index] += '' - } else if (column.property === 'expectSuppCost') { + if (column.property === 'withRebate' || column.property === 'expectTreatCost' || column.property === 'expectSuppCost') { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { - return prev + curr + return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100 } else { - return prev + return Math.round((parseFloat(prev)) * 100) / 100 } }, 0) sums[index] += '' diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue index 856be2c1b6..59e2cbb34b 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue @@ -283,30 +283,20 @@ export default { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { - return prev + curr + return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100 } else { - return prev + return Math.round((parseFloat(prev)) * 100) / 100 } }, 0) sums[index] += '' this.formobj.withRebateTotal = sums[index] += '' - } else if (column.property === 'expectTreatCost') { + } else if (column.property === 'expectTreatCost' || column.property === 'expectSuppCost') { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { - return prev + curr + return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100 } else { - return prev - } - }, 0) - sums[index] += '' - } else if (column.property === 'expectSuppCost') { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr) - if (!isNaN(value)) { - return prev + curr - } else { - return prev + return Math.round((parseFloat(prev)) * 100) / 100 } }, 0) sums[index] += '' diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue index 47294505c4..52ac159ee0 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue @@ -92,7 +92,26 @@ export default { tableKey: 0, viewState: 1, // 表单数据 - formobj: {}, + formobj: { + sid: '', + withApply: '', + billNo: '', + createTime: '', + createOrgName: '', + createOrgSid: '', + deptName: '', + deptSid: '', + useOrgName: '', + useOrgSid: '', + remarks: '', + withRebateTotal: '', + createByName: '', + createBySid: '', + instanceId: '', // 流程实例ID + taskId: '', // 任务ID + orgPath: '', + scmVehRebateWiths: [] + }, rules: {}, submitdisabled: false, // 环节所需参数 @@ -253,33 +272,13 @@ export default { return } const values = data.map(item => Number(item[column.property])) - if (column.property === 'withRebate') { + if (column.property === 'withRebate' || column.property === 'expectTreatCost' || column.property === 'expectSuppCost') { sums[index] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { - return prev + curr + return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100 } else { - return prev - } - }, 0) - sums[index] += '' - } else if (column.property === 'expectTreatCost') { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr) - if (!isNaN(value)) { - return prev + curr - } else { - return prev - } - }, 0) - sums[index] += '' - } else if (column.property === 'expectSuppCost') { - sums[index] = values.reduce((prev, curr) => { - const value = Number(curr) - if (!isNaN(value)) { - return prev + curr - } else { - return prev + return Math.round((parseFloat(prev)) * 100) / 100 } }, 0) sums[index] += ''