yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完善单车返利预提

zhanglei
yunuo970428 1 month ago
parent
3ce8700124
commit
0ea781ddb4
5 changed files with 99 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
  2. 68
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue
  3. 47
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue
  4. 20
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue
  5. 47
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue

20
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
View File

@ -352,30 +352,20 @@ export default {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else { } else {
return prev return Math.round((parseFloat(prev)) * 100) / 100
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''
this.formobj.withRebateTotal = 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) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else { } else {
return prev return Math.round((parseFloat(prev)) * 100) / 100
}
}, 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
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''

68
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue
View File

@ -92,7 +92,26 @@ export default {
tableKey: 0, tableKey: 0,
viewState: 1, 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: {}, rules: {},
submitdisabled: false submitdisabled: false
} }
@ -129,33 +148,13 @@ export default {
return return
} }
const values = data.map(item => Number(item[column.property])) 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) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else { } else {
return prev return Math.round((parseFloat(prev)) * 100) / 100
}
}, 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
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''
@ -218,7 +217,26 @@ export default {
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist') 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.$refs['form_obj'].resetFields()
this.$emit('doback') this.$emit('doback')
} }

47
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue
View File

@ -127,7 +127,26 @@ export default {
tableKey: 0, tableKey: 0,
viewState: 1, 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: {}, rules: {},
submitdisabled: false, submitdisabled: false,
options: [], options: [],
@ -405,33 +424,13 @@ export default {
return return
} }
const values = data.map(item => Number(item[column.property])) 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
} 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) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else { } else {
return prev return Math.round((parseFloat(prev)) * 100) / 100
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''

20
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue
View File

@ -283,30 +283,20 @@ export default {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else { } else {
return prev return Math.round((parseFloat(prev)) * 100) / 100
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''
this.formobj.withRebateTotal = 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) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else { } else {
return prev return Math.round((parseFloat(prev)) * 100) / 100
}
}, 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
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''

47
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiYiBanInfo.vue
View File

@ -92,7 +92,26 @@ export default {
tableKey: 0, tableKey: 0,
viewState: 1, 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: {}, rules: {},
submitdisabled: false, submitdisabled: false,
// 环节所需参数 // 环节所需参数
@ -253,33 +272,13 @@ export default {
return return
} }
const values = data.map(item => Number(item[column.property])) 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) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr) const value = Number(curr)
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else { } else {
return prev return Math.round((parseFloat(prev)) * 100) / 100
}
}, 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
} }
}, 0) }, 0)
sums[index] += '' sums[index] += ''

Write Preview
Loading…
Cancel
Save